Merge remote-tracking branch 'origin/dev'

src/api/system/order.js

@@ -19,7 +19,7 @@ export function Detailed(id) {
 
 export function appointmentOrderDetails(id) {
     return request({
-        url: `/system/appointmentOrderDetails/Detailed` + `?orderNo=${id}`,
+        url: `/system/appointmentOrderDetails/detailed` + `?orderNo=${id}`,
         method: 'get',
 
     })
@@ -78,3 +78,20 @@ export function getPersonInfo(nurseStationPersonId) {
         method: 'get'
     })
 }
+
+//xiugai
+
+export function edit(data) {
+    return request({
+        url: `/system/appointmentOrderDetails/updateAppointmentOrderInfo`,
+        method: "post",
+        data
+    })
+}
+//确认完成
+export function updateCompanionStatus(orderStatus, orderNo) {
+    return request({
+        url: `/system/appointmentOrder/updateCompanionStatus?orderStatus=${orderStatus}&orderNo=${orderNo}`,
+        method: "post"
+    })
+}

src/api/system/station.js

@@ -111,3 +111,12 @@ export function updatePicture(data) {
         data: data
     })
 }
+
+
+//生成二维码
+export function nurseStationFriends(nurseStationId) {
+    return request({
+        url: `/system/station/nurseStationCode?nurseStationId=${nurseStationId}`,
+        method: 'post'
+    })
+}

src/components/Editor/index.vue

@@ -103,7 +103,6 @@ export default {
   },
   created() {
     this.uploadUrl = process.env.VUE_APP_BASE_API + this.url;
-    // console.log(this.url)
     // this.filetype.type = this.filetypes;
   },
   computed: {
@@ -197,7 +196,6 @@ export default {
           "image",
           process.env.VUE_APP_BASE_API + res.fileName
         );
-        console.log(res);
         this.$emit("imgs", res.fileName);
         // 调整光标到最后
         quill.setSelection(length + 1);

src/views/system/goodsOrder/index.vue

@@ -51,9 +51,9 @@
     </el-form>
 
     <el-table v-loading="loading" :data="goodsOrderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" align="center" />
       <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
-      <el-table-column label="订单编号" align="center" prop="orderNo" width="190" />
+      <el-table-column label="订单编号" align="center" prop="orderNo" />
       <el-table-column label="商品名称" align="center" prop="goodsName" />
 
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
@@ -63,9 +63,16 @@
           <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'">待付款</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'">待发货</el-button>
           <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'">已取消</el-button>
-          <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'">待收货</el-button>
+          <el-button
+            type="primary"
+            v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'&&scope.row.orderType !='HEALTH_CONSULTATION'"
+          >待收货</el-button>
+          <el-button
+            type="primary"
+            v-if="scope.row.orderStatus == 'WAIT_RECEIVED_GOODS'&&scope.row.orderType =='HEALTH_CONSULTATION'"
+          >待咨询</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'RECEIVED_GOODS'">待评价</el-button>
-          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">交易完成</el-button>
+          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">已完成</el-button>
           <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_REFUND'">退款中</el-button>
           <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_RETURNED_GOODS'">待退货</el-button>
           <el-button type="danger" v-if="scope.row.orderStatus == 'REFUNDED'">已退款</el-button>
@@ -94,7 +101,7 @@
           <el-button
             v-if="
               scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
-              scope.row.expressNo
+              scope.row.expressNo&&scope.row.orderType !='HEALTH_CONSULTATION'
             "
             size="mini"
             type="text"
@@ -105,7 +112,7 @@
           <el-button
             v-if="
               scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
-              scope.row.expressNo == ''
+              scope.row.expressNo == ''&&scope.row.orderType !='HEALTH_CONSULTATION'
             "
             size="mini"
             type="text"
@@ -116,7 +123,7 @@
           <el-button
             v-if="
               scope.row.orderStatus == 'WAIT_RECEIVED_GOODS' &&
-              scope.row.expressNo == null
+              scope.row.expressNo == null&&scope.row.orderType !='HEALTH_CONSULTATION'
             "
             size="mini"
             type="text"
@@ -135,7 +142,6 @@
             @click="seeOrder(scope.row)"
             v-hasPermi="['system:goodsOrder:goodsOrderByOrder']"
           >订单详情</el-button>
-
           <el-button
             v-if="scope.row.orderStatus == 'WAIT_REFUND'"
             size="mini"
@@ -275,9 +281,7 @@
               v-model="orderList.compositeScore"
               style="padding-top: 7px"
               disabled
-              show-score
               text-color="#ff9900"
-              score-template="{value}"
             ></el-rate>
             <el-input v-else type="text" disabled style="width: 240px" placeholder="未评分"></el-input>
           </div>
@@ -302,7 +306,6 @@
               style="width: 23%; height: 100%; margin: 1%"
               v-for="(item, index) in ratelist"
               :src="baseurl + item.evaluatePictureUrl"
-              alt
               :key="index"
             />
           </div>
@@ -877,17 +880,17 @@ export default {
           if (this.form.id != null) {
             updateGoodsOrder(this.form).then(response => {
               if (response.code == 200) {
-              this.$modal.msgSuccess("修改成功");
+                this.$modal.msgSuccess("修改成功");
-              this.open = false;
+                this.open = false;
-              this.getList();
+                this.getList();
               }
             });
           } else {
             addGoodsOrder(this.form).then(response => {
               if (response.code == 200) {
-              this.$modal.msgSuccess("新增成功");
+                this.$modal.msgSuccess("新增成功");
-              this.open = false;
+                this.open = false;
-              this.getList();
+                this.getList();
               }
             });
           }

src/views/system/order/index.vue

@@ -27,7 +27,7 @@
         />
       </el-form-item>
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
           <el-option
             v-for="item in orderStatuslist"
             :key="item.value"
@@ -36,6 +36,16 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="订单类型" prop="orderStatus">
+        <el-select v-model="queryParams.orderType" placeholder="请选择订单状态" clearable>
+          <el-option
+            v-for="item in ordertypelist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="会员名称" prop="patientName">
         <el-input
           v-model="queryParams.patientName"
@@ -62,7 +72,14 @@
         <template slot-scope="scope">
           <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'">待付款</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'">已付款</el-button>
-          <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_DISPATCH'">待派单</el-button>
+          <el-button
+            type="success"
+            v-if="scope.row.orderStatus == 'WAIT_DISPATCH'&&scope.row.orderType=='COMPANION_IN_HOSPITAL'"
+          >已支付</el-button>
+          <el-button
+            type="primary"
+            v-if="scope.row.orderStatus == 'WAIT_DISPATCH'&&scope.row.orderType!='COMPANION_IN_HOSPITAL'"
+          >待派单</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_RECEIVE'">待接单</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'NOT_FINISH'">未完成</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'COMPLETE'">待评价</el-button>
@@ -72,17 +89,41 @@
           <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'">已取消</el-button>
         </template>
       </el-table-column>
+      <el-table-column label="订单类型" align="center" prop="orderType">
+        <template slot-scope="scope">{{scope.row.orderType=='COMPANION_IN_HOSPITAL'?'陪诊陪护':'其它' }}</template>
+      </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
       <el-table-column label="会员名称" align="center" prop="patientName" />
       <el-table-column label="护理员" align="center" prop="nursePersonName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
+            @click="seelookedit(scope.row,false)"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
+            @click="Confirmcompletion(scope.row)"
+          >确认完成</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-zoom-in"
+            v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus != 'WAIT_DISPATCH'"
+            @click="seelookedit(scope.row,true)"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-zoom-in"
+            v-if="scope.row.orderType!='COMPANION_IN_HOSPITAL'"
             @click="seeLook(scope.row)"
-            v-hasPermi="['system:appointmentOrder:query']"
           >查看</el-button>
           <el-button
             size="mini"
@@ -90,7 +131,7 @@
             icon="el-icon-s-promotion"
             @click="dispatch(scope.row)"
             v-hasPermi="['system:appointmentOrder:dispatch']"
-            v-if="scope.row.orderStatus == 'WAIT_DISPATCH'"
+            v-if="scope.row.orderStatus == 'WAIT_DISPATCH'&&scope.row.orderType!='COMPANION_IN_HOSPITAL'"
           >派单</el-button>
           <el-button
             size="mini"
@@ -152,7 +193,15 @@
           <div class="text">{{query.nurseStationName}}</div>
         </el-form-item>
         <el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
-          <div class="text">{{query.compositeScore}}</div>
+          <div class="text" style="border:none">
+            <el-rate
+              v-if="query.compositeScore"
+              v-model="query.compositeScore"
+              style="padding-top: 7px"
+              disabled
+              text-color="#ff9900"
+            ></el-rate>
+          </div>
         </el-form-item>
         <el-form-item
           label="评价满意度"
@@ -168,16 +217,10 @@
           <div class="text">{{query.disablingReason}}</div>
         </el-form-item>
         <el-form-item label="健康状况" prop="diseaseName">
-          <div
+          <div class="textr">{{query.diseaseName}}</div>
-            class="text"
-            style="height:100px;line-height:26px;overflow: scroll"
-          >{{query.diseaseName}}</div>
         </el-form-item>
         <el-form-item label="服务地址" prop="serviceAddress">
-          <div
+          <div class="textr">{{query.serviceAddress}}</div>
-            class="text"
-            style="height:100px;line-height:26px;overflow: scroll"
-          >{{query.serviceAddress}}</div>
         </el-form-item>
         <el-form-item
           label="服务到岗照片"
@@ -373,6 +416,141 @@
         <el-button type="primary" @click="certificateshow=false">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 编辑弹框 -->
+    <el-dialog title="院内陪护订单信息" :visible.sync="editinnerVisible" append-to-body width="1280px">
+      <el-form :inline="true" ref="form" :model="query" :rules="rules" label-width="130px">
+        <el-form-item label="订单填写人姓名" prop="orderWriteName">
+          <input
+            v-if="!lookedit"
+            class="text"
+            type="text"
+            v-model="query.orderWriteName"
+            placeholder="请输入姓名"
+            maxlength="5"
+          />
+          <div class="text" v-else>{{query.orderWriteName}}</div>
+        </el-form-item>
+        <el-form-item label="姓名" prop="caregiverName">
+          <input
+            class="text"
+            v-if="!lookedit"
+            type="text"
+            v-model="query.caregiverName"
+            placeholder="请输入姓名"
+            maxlength="5"
+          />
+          <div class="text" v-else>{{query.caregiverName}}</div>
+        </el-form-item>
+        <el-form-item label="电话" prop="caregiverPhone">
+          <input
+            v-if="!lookedit"
+            class="text"
+            type="text"
+            v-model="query.caregiverPhone"
+            placeholder="请输入电话"
+            maxlength="11"
+          />
+          <div class="text" v-else>{{query.caregiverPhone}}</div>
+        </el-form-item>
+        <el-form-item label="医院名称" prop="hospitalName">
+          <input
+            v-if="!lookedit"
+            class="text"
+            type="text"
+            v-model="query.hospitalName"
+            placeholder="请输入医院名称"
+            maxlength="20"
+          />
+          <div class="text" v-else>{{query.hospitalName}}</div>
+        </el-form-item>
+        <el-form-item label="科室名称" prop="departmentName">
+          <input
+            v-if="!lookedit"
+            class="text"
+            type="text"
+            v-model="query.departmentName"
+            placeholder="请输入科室名称"
+            maxlength="20"
+          />
+          <div class="text" v-else>{{query.departmentName}}</div>
+        </el-form-item>
+        <el-form-item label="病床号" prop="hospitalBedNumber">
+          <input
+            v-if="!lookedit"
+            class="text"
+            type="text"
+            v-model="query.hospitalBedNumber"
+            placeholder="请输入病床号"
+            maxlength="20"
+          />
+          <div class="text" v-else>{{query.hospitalBedNumber}}</div>
+        </el-form-item>
+        <el-form-item label="时间" prop="time">
+          <el-date-picker
+            :picker-options="setDateRange"
+            v-if="!lookedit"
+            v-model="timevalue"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            align="right"
+            @change="timechange"
+          ></el-date-picker>
+          <div
+            v-else
+            class="text"
+          >{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}</div>
+        </el-form-item>
+        <div class="text" style="border:none;display: inline-block;"></div>
+        <div class="text" style="border:none;display: inline-block;"></div>
+        <el-form-item label="护理站名称" prop="nurseStationName">
+          <div class="text">{{query.nurseStationName}}</div>
+        </el-form-item>
+        <el-form-item label="护理项目名称" prop="nurseItemName">
+          <div class="text">{{query.nurseItemName}}</div>
+        </el-form-item>
+        <el-form-item label="订单编号" prop="orderNo">
+          <div class="text">{{query.orderNo}}</div>
+        </el-form-item>
+        <el-form-item label="订单状态" prop="orderStatus">
+          <div class="text">{{switchOrderStatus2(query.orderStatus)}}</div>
+        </el-form-item>
+        <el-form-item label="订单总金额" prop="totalPrice">
+          <div class="text">{{query.totalPrice}}</div>
+        </el-form-item>
+        <el-form-item label="数量" prop="companionDays">
+          <div class="text">{{query.companionDays}}</div>
+        </el-form-item>
+        <!-- <el-form-item label="护理员名称" prop="nursePersonName">
+          <div class="text">{{query.nursePersonName}}</div>
+        </el-form-item>-->
+        <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
+          <div class="text">{{query.itemServeDurationUnit}}</div>
+        </el-form-item>
+        <el-form-item
+          label="评价满意度"
+          prop="evaluateSatisfaction"
+          v-if="query.orderStatus == 'EVALUATED'"
+        >
+          <div class="text">{{query.evaluateSatisfaction}}</div>
+        </el-form-item>
+        <el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
+          <el-rate
+            v-if="query.compositeScore"
+            v-model="query.compositeScore"
+            style="padding-top: 7px"
+            disabled
+            text-color="#ff9900"
+          ></el-rate>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-right: 50px">
+        <el-button @click="editinnerVisible = false" v-if="!lookedit">取 消</el-button>
+        <el-button type="primary" @click="editsubmitForm" v-if="!lookedit">确 定</el-button>
+        <el-button type="primary" @click="editinnerVisible = false" v-if="lookedit">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -384,7 +562,9 @@ import {
   dispatchsubmit,
   xylWeChatRefundNotify,
   appointmentOrderDetails,
-  getPersonInfo
+  getPersonInfo,
+  edit,
+  updateCompanionStatus
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
 
@@ -392,6 +572,13 @@ export default {
   name: "order",
   data() {
     return {
+      setDateRange: {
+        disabledDate: time => {
+          // 禁用今天之前的日期【当前天可选】
+          return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
+        }
+      },
+      lookedit: undefined,
       map: null,
       baseurl: process.env.VUE_APP_BASE_API,
       orderStatuslist: [
@@ -433,9 +620,11 @@ export default {
         }
       ],
       value: "",
+      timevalue: [],
       // 遮罩层
       loading: true,
       innerVisible4: false,
+      editinnerVisible: false,
       innerrefund: false,
       // 派单弹框
       innerdispatch: false,
@@ -482,7 +671,8 @@ export default {
         // orderStatus: null,
         orderStatus: "",
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        orderType: null
       },
       querynursePersonname: {
         orderNo: "",
@@ -496,7 +686,17 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
+      ordertypelist: [
+        {
+          value: "COMPANION_IN_HOSPITAL",
+          label: "陪诊陪护"
+        },
+        {
+          value: "OTHER",
+          label: "其它"
+        }
+      ]
     };
   },
   created() {
@@ -593,13 +793,73 @@ export default {
           break;
       }
     },
-    // 查看
+    switchOrderStatus2(orderStatus) {
-    seeLook(row) {
+      switch (orderStatus) {
+        case "WAIT_PAY":
+          return "待付款";
+        case "PAY":
+          return "已付款";
+        case "WAIT_DISPATCH":
+          return "已支付";
+        case "NOT_FINISH":
+          return "未完成";
+        case "WAIT_RECEIVE":
+          return "待接单";
+        case "COMPLETE":
+          return "待评价";
+        case "EVALUATED":
+          return "服务完成";
+        case "WAIT_REFUND":
+          return "退款中";
+        case "REFUNDED":
+          return "退款成功";
+        case "CANCEL":
+          return "已取消";
+        default:
+          break;
+      }
+    },
+    formatDate(time, timetype) {
+      let date = new Date(time); //13位时间戳
+      //let date = new Date(parseInt(time) * 1000); //10位时间戳
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      return y + "-" + MM + "-" + d;
+    },
+    //时间确定
+    timechange(e) {
+      this.query.companionStartDate = this.formatDate(new Date(e[0]).getTime());
+      this.query.companionEndDate = this.formatDate(new Date(e[1]).getTime());
+    },
+    //确认完成
+    Confirmcompletion(row) {
+      this.$confirm("确认完成此陪诊陪护订单？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          updateCompanionStatus(row.orderStatus, row.orderNo).then(res => {
+            this.$modal.msgSuccess("订单已完成");
+            this.getList();
+          });
+        })
+        .catch(() => {});
+    },
+    //编辑
+    seelookedit(row, boolean) {
+      this.lookedit = boolean;
       this.loading = true;
       const id = row.orderNo;
       this.map = null;
       appointmentOrderDetails(id).then(res => {
-        res.data.time = res.data.serviceDate + "-" + res.data.serviceStartTime;
+        this.timevalue = [
+          res.data.companionStartDate ? res.data.companionStartDate : "",
+          res.data.companionEndDate ? res.data.companionEndDate : ""
+        ];
         this.query = res.data;
         res.data.disablingCondition == "DISABLED"
           ? (res.data.disablingCondition = "是")
@@ -614,33 +874,24 @@ export default {
             } else if (res.data.evaluateSatisfaction == "SATISFIED") {
               this.query.evaluateSatisfaction = "满意";
             } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
-              this.query.evaluateSatisfaction = "不满意";
+              this.query.evaluateSatisfaction = "差";
             } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
               this.query.evaluateSatisfaction = "非常满意";
             } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
-              this.query.evaluateSatisfaction = "非常不满意";
+              this.query.evaluateSatisfaction = "非常差";
             }
             this.loading = false;
-            this.innerVisible4 = true;
+            this.editinnerVisible = true;
-            setTimeout(() => {
-              this.init(this.query);
-            }, 500);
           } else {
             this.loading = false;
-            this.innerVisible4 = true;
+            this.editinnerVisible = true;
-            setTimeout(() => {
-              this.init(this.query);
-            }, 500);
           }
         } else if (row.orderStatus == "COMPLETE") {
           this.loading = false;
-          this.innerVisible4 = true;
+          this.editinnerVisible = true;
-          setTimeout(() => {
-            this.init(this.query);
-          }, 500);
         } else {
           this.loading = false;
-          this.innerVisible4 = true;
+          this.editinnerVisible = true;
         }
       });
     },
@@ -665,11 +916,11 @@ export default {
             } else if (res.data.evaluateSatisfaction == "SATISFIED") {
               this.query.evaluateSatisfaction = "满意";
             } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
-              this.query.evaluateSatisfaction = "不满意";
+              this.query.evaluateSatisfaction = "差";
             } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
               this.query.evaluateSatisfaction = "非常满意";
             } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
-              this.query.evaluateSatisfaction = "非常不满意";
+              this.query.evaluateSatisfaction = "非常差";
             }
             this.loading = false;
             this.innerVisible4 = true;
@@ -726,6 +977,15 @@ export default {
     submitForm(row) {
       this.nursePersonlist = row;
     },
+    //修改提交
+    editsubmitForm() {
+      edit(this.query).then(res => {
+        if (res.code == 200) {
+          this.$message.success("修改成功");
+          this.editinnerVisible = false;
+        }
+      });
+    },
     // 查看护理员证书按钮
     nursePersonclick(row) {
       this.PersonChecksrcList = [];
@@ -780,6 +1040,7 @@ export default {
     resetQuery() {
       if (this.nurseStationlist[0]) {
         this.queryParams.pageNum = 1;
+        this.queryParams.orderType = null;
         this.queryParams.pageSize = 10;
         this.queryParams.patientName = null;
         this.queryParams.orderNo = null;
@@ -871,6 +1132,22 @@ export default {
   border-radius: 4px;
   padding: 0 15px;
   border: 1px solid #e6ebf5;
+  color: black;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.textr {
+  width: 250px;
+  padding-left: 15px;
+  font-size: 14px;
+  border-radius: 4px;
+  padding: 0 15px;
+  border: 1px solid #e6ebf5;
+  color: black;
+  height: 100px;
+  line-height: 26px;
+  overflow: scroll;
 }
 ::v-deep .el-dialog {
   margin-top: 30px !important;

src/views/system/trainingItem/index.vue

@@ -1223,7 +1223,6 @@ export default {
     },
     //删除视频列表
     delPictureUrl(item) {
-      console.log(item);
       if (item.idd && !item.trainingItemDirectoryId) {
         if (this.form.trainingItemDirectoryList.length == 1) {
           this.$message.error("最后一条不可删除");
@@ -1243,7 +1242,6 @@ export default {
             );
         }
       }
-      console.log(this.form.trainingItemDirectoryList);
     },
     // 章节视频
     itemDirectoryUrl(item) {
@@ -1326,7 +1324,6 @@ export default {
     trainingParentinfo() {
       this.loading = true;
       selectTrainingParent(this.trainingParentqueryParams).then((response) => {
-        console.log(response);
         this.trainingParentlist = response.rows;
         this.total3 = response.total;
         this.loading = false;
@@ -1344,7 +1341,6 @@ export default {
     },
     //上架
     uptrainingShelfFlag(row) {
-      console.log(row);
       if (row.trainingShelfFlag == false) {
         var obj = {
           id: row.id,
@@ -1371,7 +1367,6 @@ export default {
     getList() {
       this.loading = true;
       listTrainingItem(this.queryParams).then((response) => {
-        console.log(response);
         response.rows.forEach((e) => {
           e.selectSubordinateItemlist = []; // 先给一个空值
           e.expand = false; // 表示当前行是闭合的，不设置这个等下展开后就没法闭合了

src/views/system/trainingOrder/index.vue

@@ -474,7 +474,6 @@ export default {
     // 章节视频
     itemDirectoryUrl(item) {
       let items = JSON.parse(item);
-      console.log(items);
       if (items.idd && !items.trainingItemDirectoryId) {
         this.form.trainingItemDirectoryList.forEach(e => {
           if (e.idd == items.idd) {
@@ -496,14 +495,12 @@ export default {
     },
     // // 确认退款
     cencel(row) {
-      console.log(row);
       refundInformation(row.id).then(response => {
         this.query = response.data;
         this.innerrefund = true;
       });
     },
     imgs(item) {
-      console.log(item);
       this.imgsurl.pictureUrlList.push(item);
     },
     //退款确定按钮
@@ -539,7 +536,6 @@ export default {
     handlelook(row) {
       this.loading = true;
       this.innerrefundvideo = true;
-      console.log(row);
       this.formlist.trainingItemCoverUrl = row.trainingItemCoverUrl;
       this.formlist.trainingItemPosterUrl = row.trainingItemPosterUrl;
       this.formlist.trainingItemDetails = row.trainingItemDetails;
@@ -611,7 +607,6 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getTrainingOrder(id).then(response => {
-        console.log(response);
         this.form = response.data;
         this.form.trainingOrderDetailsList =
           response.data.trainingOrderDetailsList;