修改

src/api/system/order.js

@@ -78,3 +78,13 @@ export function getPersonInfo(nurseStationPersonId) {
         method: 'get'
     })
 }
+
+//xiugai
+
+export function edit(data) {
+    return request({
+        url: `/system/appointmentOrderDetails/edit`,
+        method: "post",
+        data
+    })
+}

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/order/index.vue

@@ -77,6 +77,14 @@
       <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'"
+            @click="seeedit(scope.row)"
+            v-hasPermi="['system:appointmentOrder:query']"
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"
@@ -373,6 +381,139 @@
         <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="caregiverName">
+          <input class="text" type="text" v-model="query.caregiverName" placeholder="请输入被护理人姓名" />
+        </el-form-item>
+        <el-form-item label="被护理人电话" prop="caregiverPhone">
+          <input class="text" type="text" v-model="query.caregiverPhone" placeholder="请输入被护理人电话" />
+        </el-form-item>
+        <el-form-item label="医院名称" prop="hospitalName">
+          <input class="text" type="text" v-model="query.hospitalName" placeholder="请输入医院名称" />
+        </el-form-item>
+        <el-form-item label="科室名称" prop="departmentName">
+          <input class="text" type="text" v-model="query.departmentName" placeholder="请输入科室名称" />
+        </el-form-item>
+        <el-form-item label="病床号" prop="hospitalBedNumber">
+          <input class="text" type="text" v-model="query.hospitalBedNumber" placeholder="请输入病床号" />
+        </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">{{switchOrderStatus(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="orderCount">
+          <div class="text">{{query.orderCount}}</div>
+        </el-form-item>
+        <el-form-item label="佣金金额" prop="orderCount">
+          <div class="text">{{query.orderCommissionAmount}}</div>
+        </el-form-item>
+        <el-form-item label="护理项目名称" prop="nurseItemName">
+          <div class="text">{{query.nurseItemName}}</div>
+        </el-form-item>
+        <!-- <el-form-item label="护理员名称" prop="nursePersonName">
+          <div class="text">{{query.nursePersonName}}</div>
+        </el-form-item>-->
+        <el-form-item label="服务时间" prop="time">
+          <div class="text">{{query.time}}</div>
+        </el-form-item>
+        <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
+          <div class="text">{{query.itemServeDurationUnit}}</div>
+        </el-form-item>
+        <el-form-item label="护理站名称" prop="nurseStationName">
+          <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>
+        </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="disablingCondition">
+          <div class="text">{{query.disablingCondition}}</div>
+        </el-form-item>
+        <el-form-item label="失能情况" prop="disablingReason">
+          <div class="text">{{query.disablingReason}}</div>
+        </el-form-item>
+        <el-form-item label="健康状况" prop="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
+            class="text"
+            style="height:100px;line-height:26px;overflow: scroll"
+          >{{query.serviceAddress}}</div>
+        </el-form-item>
+        <el-form-item
+          label="服务到岗照片"
+          prop="onDutyPictureUrl"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
+        >
+          <img class="img" :src="baseurl + query.onDutyPictureUrl" alt />
+        </el-form-item>
+        <el-form-item
+          label="服务结束照片"
+          prop="serviceEndPictureUrl"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
+        >
+          <img class="img" :src="baseurl + query.serviceEndPictureUrl" alt />
+        </el-form-item>
+        <el-form-item
+          label="用户确认签名"
+          prop="userSignaturePictureUrl"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
+        >
+          <img class="img" :src="baseurl + query.userSignaturePictureUrl" alt />
+        </el-form-item>
+        <el-table
+          :data="query.appointmentOrderConsumableList"
+          align="center"
+          style="margin: 10px 0 20px 0; padding-bottom: 20px"
+        >
+          <el-table-column prop="orderConsumableName" label="耗材包名称" align="center"></el-table-column>
+          <el-table-column prop="orderConsumableCount" label="耗材包数量" align="center"></el-table-column>
+          <el-table-column prop="orderConsumablePrice" label="耗材包价格" align="center"></el-table-column>
+        </el-table>
+        <el-form-item
+          label="预约服务位置"
+          v-if="
+            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
+          "
+        >
+          <el-input v-model="query.serviceLocationName" disabled style="width: 250px" />
+        </el-form-item>
+      </el-form>
+      <div
+        id="container"
+        v-if="
+          this.query.orderStatus == 'COMPLETE' ||
+          this.query.orderStatus == 'EVALUATED'
+        "
+      ></div>
+      <div slot="footer" class="dialog-footer" style="margin-right: 50px">
+        <el-button @click="editinnerVisible = false">取 消</el-button>
+        <el-button type="primary" @click="editsubmitForm">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -384,7 +525,8 @@ import {
   dispatchsubmit,
   xylWeChatRefundNotify,
   appointmentOrderDetails,
-  getPersonInfo
+  getPersonInfo,
+  edit
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
 
@@ -436,6 +578,7 @@ export default {
       // 遮罩层
       loading: true,
       innerVisible4: false,
+      editinnerVisible: false,
       innerrefund: false,
       // 派单弹框
       innerdispatch: false,
@@ -593,8 +736,8 @@ export default {
           break;
       }
     },
-    // 查看
+    //编辑
-    seeLook(row) {
+    seeedit(row) {
       this.loading = true;
       const id = row.orderNo;
       this.map = null;
@@ -621,26 +764,26 @@ export default {
               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;
         }
       });
     },
@@ -726,6 +869,13 @@ export default {
     submitForm(row) {
       this.nursePersonlist = row;
     },
+    //修改提交
+    editsubmitForm() {
+      this.query.id = this.query.appointOrderDetailsId;
+      edit(this.query).then(res => {
+        this.editinnerVisible = false;
+      });
+    },
     // 查看护理员证书按钮
     nursePersonclick(row) {
       this.PersonChecksrcList = [];
@@ -871,6 +1021,7 @@ export default {
   border-radius: 4px;
   padding: 0 15px;
   border: 1px solid #e6ebf5;
+  color: black;
 }
 ::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;