列表增加追加执行人

main.js

@@ -7,7 +7,7 @@ import './mixins/mixin'
 // new VConsole();
 // import eruda from 'eruda';
 // eruda.init();
-console.info('v2.4.37');
+console.info('v2.4.38');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/receipt_infopage/receipt_infopage.vue

@@ -426,8 +426,8 @@
       @cancel="hosCancel">
     </selectAccount>
     <!-- 手动查询弹窗 -->
-    <checkboxModal v-if="speModels.disjunctor" :content="speModels.content" :disjunctor="speModels.disjunctor"
-      @ok="speOk" @cancel="speCancel">
+    <checkboxModal v-if="checkboxModels.disjunctor" :content="checkboxModels.content" :disjunctor="checkboxModels.disjunctor"
+      @ok="checkboxOk" @cancel="checkboxCancel">
     </checkboxModal>
   </view>
 </template>
@@ -455,7 +455,7 @@
           data: {},
         },
         // 手动查询弹窗model
-        speModels: {
+        checkboxModels: {
           disjunctor: false,
         },
         taskTypeConfig: {},
@@ -520,15 +520,15 @@
     },
     methods: {
       // 手动查询-确认
-      speOk(bulkCopy) {
+      checkboxOk(bulkCopy) {
         console.log(bulkCopy);
-        this.speModels.disjunctor = false;
+        this.checkboxModels.disjunctor = false;
         let { user, data } = this.other;
         this.additionalUserCommon(user, data.id, data.worker.id, bulkCopy);
       },
       // 手动查询-取消
-      speCancel() {
-        this.speModels.disjunctor = false;
+      checkboxCancel() {
+        this.checkboxModels.disjunctor = false;
       },
       // 手动查询弹窗
       showCheckboxModal(user, data) {
@@ -536,7 +536,7 @@
           user,
           data,
         };
-        this.speModels = {
+        this.checkboxModels = {
           content: `您要最追加的人员为${user.name}，您确认要追加吗？`,
           disjunctor: true,
         }
@@ -1105,7 +1105,7 @@
           };
         }
       },
-      // 追加陪检人员按钮
+      // 追加陪检人/执行人按钮
       additionalUser(data) {
         if (!this.SMFlag) {
           return;
@@ -1139,6 +1139,7 @@
                 user = result.code;
               }
               if(Object.prototype.toString.call(user).slice(8, -1).toLowerCase() === 'object' && user.type == 'myQrCode' && user.id && user.name){
+                user.qrcode = ress1;
                 uni.hideLoading();
                 if(data.taskType.associationType.value == 'other'){
                   this.showCheckboxModal(user, data);
@@ -1165,7 +1166,7 @@
                   if(result.status == 200){
                     result.list = result.list || [];
                     if(result.list.length){
-                      let user = {name: result.list[0].name, identityCardNumber};
+                      let user = {name: result.list[0].name, identityCardNumber, qrcode: ress1};
                       if(data.taskType.associationType.value == 'other'){
                         this.showCheckboxModal(user, data);
                       }else{
@@ -1210,7 +1211,7 @@
           this.SMFlag = true;
         });
       },
-      // 追加陪检人
+      // 追加陪检人/执行人
       additionalUserCommon(user, gdId, workerId, bulkCopy) {
         console.log(user, gdId, workerId, bulkCopy);
         uni.showLoading({
@@ -1227,18 +1228,16 @@
         }).then((result) => {
           uni.hideLoading();
           if (result.state == 200) {
-            this.getInfo(this.dataId);
+            this.getInfo(gdId);
             uni.showToast({
               icon: 'none',
               duration: 4000,
               title: '操作成功！'
             })
           } else {
-            uni.showToast({
-              icon: 'none',
-              duration: 4000,
-              title: result.msg || '操作失败！'
-            })
+            uni.navigateTo({
+              url: `../result_error/result_error?qrcode=${user.qrcode}&msg=${result.msg || '接口获取数据失败！'}`,
+            });
           }
         });
       },

pages/receiptpage/receiptpage.vue

@@ -277,8 +277,9 @@
               <view v-if="item.taskType.associationType.value == 'other' && item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch" class="page_item_btn" @click="otherCompleteOrder(item)" hover-class="seimin-btn-hover">完成工单</view>
               <!-- 其他临床服务-拍照 -->
               <view v-if="item.taskType.associationType.value == 'other' && item.gdState.value == 4 && item.taskType.carryingCourses[0].photoSwitch" class="page_item_btn" @click="photographToOther(item, 'start')" hover-class="seimin-btn-hover">拍照</view>
-              
               <view v-if="item.taskType.associationType.value != 'other' && item.gdState.value == 4" class="page_item_btn" @click="photograph(item)" hover-class="seimin-btn-hover">拍照</view>
+              <!-- 其他临床服务-追加 -->
+              <view v-if="item.taskType.associationType.value == 'other' && item.worker && item.worker.id && clinicalMultiplayerMode === 1 && showAppendUser === 1 && item.clinicalTaskIdsFlag" class="page_item_btn" @click="additionalUser(item)" hover-class="seimin-btn-hover">追加</view>
             </view>
             <view class="page_item_btn" v-if="selectedLabelSlots == '待接单'" @click="showAlerts(item)" hover-class="seimin-btn-hover">接单</view>
           </view>
@@ -315,6 +316,10 @@
     <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
     </selectAccount>
+    <!-- 手动查询弹窗 -->
+    <checkboxModal v-if="checkboxModels.disjunctor" :content="checkboxModels.content" :disjunctor="checkboxModels.disjunctor"
+      @ok="checkboxOk" @cancel="checkboxCancel">
+    </checkboxModal>
   </view>
 </template>
 <script>
@@ -338,6 +343,19 @@
   export default {
     data() {
       return {
+        otherAssociationTypeId: null,
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        clinicalMultiplayerMode: 0,
+        showAppendUser: 0,
+        clinicalTaskIds: [],
+        other: {
+          user: {},
+          data: {},
+        },
+        // 手动查询弹窗model
+        checkboxModels: {
+          disjunctor: false,
+        },
         // 填写交接人账号弹窗model
         hosModels: {
           disjunctor: false,
@@ -460,6 +478,219 @@
       selectAccount,
     },
     methods: {
+      async initList(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        //获取其他临床服务业务类型
+        let res = await this.getOtherAssociationTypes();
+        let otherAssociationType = res.find(v => v.value === 'other');
+        this.otherAssociationTypeId = otherAssociationType ? otherAssociationType.id : null;
+        if(this.otherAssociationTypeId){
+          // 获取临床服务页面控制开关
+          let result = await this.getTaskOtherConfig();
+          if (result.status == 200) {
+            if(result.list && result.list[0]){
+              this.clinicalMultiplayerMode = result.list[0].clinicalMultiplayerMode;
+              this.showAppendUser = result.list[0].showAppendUser;
+              this.clinicalTaskIds = result.list[0].clinicalTaskIds ? result.list[0].clinicalTaskIds.split(',') : [] ;
+            }else{
+              this.clinicalMultiplayerMode = 0;
+              this.showAppendUser = 0;
+            }
+          } else {
+            this.clinicalMultiplayerMode = 0;
+            this.showAppendUser = 0;
+          }
+        }else{
+          uni.showToast({
+            icon: 'none',
+            title: '未设置其他临床服务业务类型！'
+          })
+        }
+        
+        this.waitingOrdersGetNum();
+        this.executingOrders(0);
+      },
+      //获取其他临床服务业务类型
+      getOtherAssociationTypes(){
+        return post('/common/common/getDictionary', {
+          "type": "list",
+          "key": "association_types"
+        });
+      },
+      // 获取临床服务页面控制开关
+      getTaskOtherConfig(){
+        return post("/simple/data/fetchDataList/taskTypeConfig", {
+            "idx": 0,
+            "sum": 10,
+            "taskTypeConfig": {
+                "hosId": this.hosId,
+                "associationType": this.otherAssociationTypeId,
+            }
+        });
+      },
+      // 手动查询-确认
+      checkboxOk(bulkCopy) {
+        console.log(bulkCopy);
+        this.checkboxModels.disjunctor = false;
+        let { user, data } = this.other;
+        this.additionalUserCommon(user, data.id, data.worker.id, bulkCopy);
+      },
+      // 手动查询-取消
+      checkboxCancel() {
+        this.checkboxModels.disjunctor = false;
+      },
+      // 手动查询弹窗
+      showCheckboxModal(user, data) {
+        this.other = {
+          user,
+          data,
+        };
+        this.checkboxModels = {
+          content: `您要最追加的人员为${user.name}，您确认要追加吗？`,
+          disjunctor: true,
+        }
+      },
+      // 追加陪检人/执行人按钮
+      additionalUser(data) {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        console.log(data, 'data');
+        SM().then((ress1) => {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          //检验二维码的有效性
+          post("/dept/scanning", {
+            content: ress1,
+            taskTypeId: data.taskType.id,
+            gdState: data.gdState.id,
+          }).then((result) => {
+            this.SMFlag = true;
+            // this.currentCode = result.code;
+            if (result.state == 200 || result.state == 201) {
+              console.log(result);
+              let user;
+              try{
+                // json对象字符串
+                user = JSON.parse(result.code);
+                // 不是json对象字符串
+                if(Object.prototype.toString.call(user).slice(8, -1).toLowerCase() !== 'object'){
+                  user = result.code;
+                }
+              }catch(e){
+                user = result.code;
+              }
+              if(Object.prototype.toString.call(user).slice(8, -1).toLowerCase() === 'object' && user.type == 'myQrCode' && user.id && user.name){
+                user.qrcode = ress1;
+                uni.hideLoading();
+                if(data.taskType.associationType.value == 'other'){
+                  this.showCheckboxModal(user, data);
+                }else{
+                  uni.showModal({
+                    title: "提示",
+                    content: `您要最追加的人员为${user.name}，您确认要追加吗？`,
+                    success: (res) => {
+                      if (res.confirm) {
+                        console.log("用户点击确定");
+                        this.additionalUserCommon(user, data.id, data.worker.id, false);
+                      } else if (res.cancel) {
+                        console.log("用户点击取消");
+                      }
+                    },
+                  });
+                }
+              }else if(Object.prototype.toString.call(user).slice(8, -1).toLowerCase() === 'string'){
+                let identityCardNumber = user;
+                // 根据身份证获取name
+                // todo
+                post("/data/fetchDataList/user", {idx: 0, sum: 1, user: { identityCardNumber }}).then((result) => {
+                  uni.hideLoading();
+                  if(result.status == 200){
+                    result.list = result.list || [];
+                    if(result.list.length){
+                      let user = {name: result.list[0].name, identityCardNumber, qrcode: ress1};
+                      if(data.taskType.associationType.value == 'other'){
+                        this.showCheckboxModal(user, data);
+                      }else{
+                        uni.showModal({
+                          title: "提示",
+                          content: `您要最追加的人员为${user.name}，您确认要追加吗？`,
+                          success: (res) => {
+                            if (res.confirm) {
+                              console.log("用户点击确定");
+                              this.additionalUserCommon(user, data.id, data.worker.id, false);
+                            } else if (res.cancel) {
+                              console.log("用户点击取消");
+                            }
+                          },
+                        });
+                      }
+                    }else{
+                      uni.navigateTo({
+                        url: `../result_error/result_error?qrcode=${ress1}&msg=扫描二维码无法找到用户！`,
+                      });
+                    }
+                  }else{
+                    uni.navigateTo({
+                      url: `../result_error/result_error?qrcode=${ress1}&msg=请扫描正确的二维码！`,
+                    });
+                  }
+                })
+              }else{
+                uni.hideLoading();
+                uni.navigateTo({
+                  url: `../result_error/result_error?qrcode=${ress1}&msg=请扫描正确的二维码！`,
+                });
+              }
+            } else {
+              uni.hideLoading();
+              uni.navigateTo({
+                url: `../result_error/result_error?qrcode=${ress1}&msg=接口获取数据失败！`,
+              });
+            }
+          });
+        }).catch(err=>{
+          this.SMFlag = true;
+        });
+      },
+      // 追加陪检人/执行人
+      additionalUserCommon(user, gdId, workerId, bulkCopy) {
+        console.log(user, gdId, workerId, bulkCopy);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        // 二维码里有id则传userid，没有则传identityCardNumber
+        post("/workerOrder/additionalAccompanyingPersonnel", {
+          userId: user.id || undefined,
+          identityCardNumber: !user.id ? user.identityCardNumber : undefined,
+          gdId,
+          workerId,
+          bulkCopy: bulkCopy ? 1 : undefined,
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.state == 200) {
+            uni.showToast({
+              icon: 'none',
+              duration: 4000,
+              title: '操作成功！'
+            })
+            uni.redirectTo({
+              url: `../receiptpage/receiptpage`,
+            });
+          } else {
+            uni.navigateTo({
+              url: `../result_error/result_error?qrcode=${user.qrcode}&msg=${result.msg || '接口获取数据失败！'}`,
+            });
+          }
+        });
+      },
       // 前往其他临床服务完成工单确认页面
       otherCompleteOrder(data){
         console.log(data);
@@ -1249,6 +1480,10 @@
             this.triggered = false;
             this.freshing = true;
             this.totalNum = res.data.resultCount;
+            res.data.data = res.data.data || [];
+            res.data.data.forEach(v => {
+              v.clinicalTaskIdsFlag = this.clinicalTaskIds.includes(v.taskType.id.toString());
+            })
             if (idx === 0) {
               this.zxzData = res.data.data;
             } else {
@@ -1426,8 +1661,7 @@
       // });
       // #endif
       this.selectedLabelSlots = "执行中";
-      this.waitingOrdersGetNum();
-      this.executingOrders(0);
+      this.initList();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif