消毒供应起点科室多动作签到

pages/otherCompleteOrder/otherCompleteOrder.vue

@@ -2,9 +2,11 @@
   <view class="HomeItem">
     <view class="goWorkAll">
       <view class="goWorkSelect combination" v-if="actionConfirmSwitch">
-        <view class="goWorkSelect-head">您需要完成以下动作，才可完成工单。如完成请勾选对应项！</view>
+        <view class="goWorkSelect-head" v-if="actionConfirmType == 1">您需要完成以下所有动作，才可完成工单。如完成请勾选对应项！</view>
+        <view class="goWorkSelect-head" v-if="actionConfirmType == 2">您需要完成以下至少一个动作，才可完成工单。如完成请勾选对应项！</view>
+        <view class="goWorkSelect-head" v-if="actionConfirmType == 3">您需要完成以下一个动作，才可完成工单。如完成请勾选对应项！</view>
         <view class="goWorkSelect-list scroll">
-          <checkbox-group @change="checkboxChange">
+          <checkbox-group @change="checkboxChange" v-if="actionConfirmType == 1 || actionConfirmType == 2">
             <label class="goWorkSelect-item relative" v-for="action in actions" :key="action.value">
               <view>
                 <checkbox :value="action.value" :checked="action.checked" />
@@ -12,6 +14,14 @@
               <view>{{action.name}}</view>
             </label>
           </checkbox-group>
+          <radio-group @change="checkboxChange" v-if="actionConfirmType == 3">
+            <label class="goWorkSelect-item relative" v-for="action in actions" :key="action.value">
+              <view>
+                <radio :value="action.value" :checked="action.checked" />
+              </view>
+              <view>{{action.name}}</view>
+            </label>
+          </radio-group>
         </view>
       </view>
       <view class="goWorkSelect history" v-if="actionPhotoSwitch">
@@ -23,7 +33,7 @@
       </view>
     </view>
     <view class="foot_btn_spe">
-      <view class="btn1" @click="photographToOther(order, 'end')">完成工单</view>
+      <view class="btn1" @click="photographToOther(order)">完成工单</view>
       <view class="btn3" @click="goBack">返回</view>
     </view>
     <!-- 填写交接人账号弹窗 -->
@@ -50,6 +60,7 @@
     },
     data() {
       return {
+        currentIndex: undefined,
         // 填写交接人账号弹窗model
         hosModels: {
           disjunctor: false,
@@ -62,6 +73,8 @@
         actionPhotoSwitch: false,
         // 确认动作开关
         actionConfirmSwitch: false,
+        // 确认动作模式开关
+        actionConfirmType: false,
         // 参数
         options: {},
         //动作列表
@@ -75,7 +88,7 @@
       isOpenTransportationProcessRemarks(data, accountObj, funName){
         const tasktype = data.taskType;
         console.log(tasktype, data);
-        if(tasktype.associationType.value === 'other' && tasktype.carryingCourses[1].logSwitch && data.gdState.value == 5){
+        if(tasktype.associationType.value === 'other' && tasktype.carryingCourses[this.currentIndex].logSwitch && data.gdState.value == 5){
           uni.navigateTo({
             url: `../../pages/transportationProcessRemarks/transportationProcessRemarks?data=${data ? encodeURIComponent(JSON.stringify(data)) : ''}&accountObj=${accountObj ? encodeURIComponent(JSON.stringify(accountObj)) : ''}&currentCode=${this.currentCode}&funName=${funName}&actions=${this.actions ? encodeURIComponent(JSON.stringify(this.actions)) : ''}&imageValue=${this.imageValue ? encodeURIComponent(JSON.stringify(this.imageValue)) : ''}`
           })
@@ -147,16 +160,31 @@
         }
       },
       // 拍照-其他
-      photographToOther(data, type) {
+      photographToOther(data) {
         this.currentData = data;
         let actions = this.actions.filter(v => v.checked);
         let imageValue = this.imageValue;
         console.log(actions);
         console.log(imageValue);
-        if(this.actionConfirmSwitch && this.actions.length !== actions.length){
+        if(
+        this.actionConfirmSwitch && 
+        (
+        (this.actionConfirmType == 1 && this.actions.length !== actions.length) || 
+        (this.actionConfirmType == 2 && !actions.length) || 
+        (this.actionConfirmType == 3 && !actions.length)
+        )
+        ){
+          let title = '';
+          if(this.actionConfirmType == 1){
+            title = '您需要完成以下所有动作，才可完成工单！';
+          }else if(this.actionConfirmType == 2){
+            title = '您需要完成以下至少一个动作，才可完成工单！';
+          }else if(this.actionConfirmType == 3){
+            title = '您需要完成以下一个动作，才可完成工单！';
+          }
           uni.showToast({
             icon: "none",
-          	title: '您需要完成以下动作，才可完成功工单！',
+          	title,
           	duration: 2000
           });
           return;
@@ -164,7 +192,7 @@
         if(this.actionPhotoSwitch && !imageValue.length){
           uni.showToast({
             icon: "none",
-          	title: '您需要完成拍照，才可完成功工单！',
+          	title: '您需要完成拍照，才可完成工单！',
           	duration: 2000
           });
           return;
@@ -174,9 +202,15 @@
           mask: true,
         });
         // 其他临床服务
+        let content;
+        if(this.currentIndex == 0){
+          content = data.startDept.qrcode;
+        }else if(this.currentIndex == 1){
+          content = data.endDepts[0].qrcode;
+        }
         //检验二维码的有效性
         post("/dept/scanning", {
-          content: type === 'start' ? data.startDept.qrcode : data.endDepts[0].qrcode,
+          content,
           taskTypeId: data.taskType.id,
           gdState: data.gdState.id,
         }).then((result) => {
@@ -220,9 +254,14 @@
       },
       // 选择动作
       checkboxChange: function (e) {
-        var items = this.actions,
-          values = e.detail.value;
-        for (var i = 0, lenI = items.length; i < lenI; ++i) {
+        let items = this.actions;
+        let values = [];
+        if(this.actionConfirmType == 1 || this.actionConfirmType == 2){
+          values = e.detail.value || [];
+        }else if(this.actionConfirmType == 3){
+          values = [e.detail.value];
+        }
+        for (let i = 0, lenI = items.length; i < lenI; ++i) {
           const item = items[i]
           if(values.includes(item.value)){
             this.$set(item,'checked',true)
@@ -248,20 +287,26 @@
       if(options.order){
         options.order = JSON.parse(options.order);
         this.order = options.order;
+        if(this.order.gdState.value == 4){
+          this.currentIndex = 0;
+        }else if(this.order.gdState.value == 5){
+          this.currentIndex = 1;
+        }
       }
       if(options.orderId){
         this.orderId = options.orderId;
       }
       if(options.taskType){
         options.taskType = JSON.parse(options.taskType);
-        this.actionConfirmSwitch = options.taskType.carryingCourses[1].actionConfirmSwitch;
-        let actions = options.taskType.carryingCourses[1].actionRemarks || "";
+        this.actionConfirmSwitch = options.taskType.carryingCourses[this.currentIndex].actionConfirmSwitch;
+        let actions = options.taskType.carryingCourses[this.currentIndex].actionRemarks || "";
         this.actions = actions.split('$').map((v, i) => ({
           value: i,
           name: v,
         }));
         
-        this.actionPhotoSwitch = options.taskType.carryingCourses[1].actionPhotoSwitch;
+        this.actionPhotoSwitch = options.taskType.carryingCourses[this.currentIndex].actionPhotoSwitch;
+        this.actionConfirmType = options.taskType.carryingCourses[this.currentIndex].actionConfirmType;
       }
     },
   };

pages/receipt_infopage/receipt_infopage.vue

@@ -350,10 +350,12 @@
           infoDATA.taskType.associationType.value != 'specimen' &&
           infoDATA.taskType.associationType.value != 'specimenPlan' &&
           infoDATA.taskType.associationType.value != 'ordinary' &&
-          !(infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch)
+          !(infoDATA.taskType.associationType.value == 'other' && (infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].actionsSwitch || infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch))
         " hover-class="seimin-btn-hover">
           <smallScreen :sData="infoDATA" :sType="1">扫码</smallScreen>
         </view>
+        <!-- 其他临床服务-完成工单-待到达 -->
+        <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].actionsSwitch" class="btn2 page_item_btn" @click="otherCompleteOrder(infoDATA)" hover-class="seimin-btn-hover">完成工单</view>
         <!-- 其他临床服务-完成工单-待送达 -->
         <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch" class="btn2 page_item_btn" @click="otherCompleteOrder(infoDATA)" hover-class="seimin-btn-hover">完成工单</view>
         <!-- 其他临床服务-拍照 -->

pages/receiptpage/receiptpage.vue

@@ -264,9 +264,11 @@
                 item.taskType.associationType.value != 'specimenPlan' &&
                 item.taskType.associationType.value != 'ordinary'
               ">
-              <view v-if="!(item.taskType.associationType.value == 'other' && item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch)" class="page_item_btn" hover-class="seimin-btn-hover">
+              <view v-if="!(item.taskType.associationType.value == 'other' && (item.gdState.value == 4 && item.taskType.carryingCourses[0].actionsSwitch || item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch))" class="page_item_btn" hover-class="seimin-btn-hover">
                 <smallScreen :sData="item" :sType="1">扫码</smallScreen>
               </view>
+              <!-- 其他临床服务-完成工单-待到达 -->
+              <view v-if="item.taskType.associationType.value == 'other' && item.gdState.value == 4 && item.taskType.carryingCourses[0].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 == 5 && item.taskType.carryingCourses[1].actionsSwitch" class="page_item_btn" @click="otherCompleteOrder(item)" hover-class="seimin-btn-hover">完成工单</view>
               <!-- 其他临床服务-拍照 -->

tools/commonFun.js

@@ -15,10 +15,15 @@ export function nextDeptOrder_ss(_this, data, accountObj) {
     let actions = _this.actions.filter(v => v.checked);
     let actionRemarks = actions.map(v => v.name).toString();
     if(actionRemarks){
-      post("/workerOrder/addOtherRemarks", {
+      let postData = {
         orderId: data.id,
-        actionRemarks: actionRemarks,
-      }).then((result1) => {
+      };
+      if(data.gdState.value == 4){
+        postData.actionStartRemarks = actionRemarks;
+      }else if(data.gdState.value == 5){
+        postData.actionRemarks = actionRemarks;
+      }
+      post("/workerOrder/addOtherRemarks", postData).then((result1) => {
         if(result1.state == 200){
           postWorkerOrder(_this, data, accountObj);
         }else{
@@ -45,10 +50,19 @@ export function uploadToOther(_this, data, accountObj){
   });
   _this.imageValue = _this.imageValue || [];
   let imageValue = _this.imageValue;
+  let gdOperate;
+  let uploadType;
+  if(data.gdState.value == 4){
+    gdOperate = 27;
+    uploadType = 'orderStartPhoto';
+  }else if(data.gdState.value == 5){
+    gdOperate = 22;
+    uploadType = 'orderEndPhoto';
+  }
   // 完成工单
   post('/workerOrder/findRecordInfoByOrderId', {
     orderId: data.id,
-    gdOperate: 22,
+    gdOperate,
   }).then(result => {
     if (result.state == 200) {
       let n = 0;
@@ -72,7 +86,7 @@ export function uploadToOther(_this, data, accountObj){
             n++;
             uni.uploadFile({
               url: pathUrl +
-                "/common/common/uploadAttachment/orderEndPhoto/" +
+                "/common/common/uploadAttachment/"+ uploadType +"/" +
                 data.id +
                 "/" + result.recordId,
               filePath: tp,
@@ -116,7 +130,7 @@ export function uploadToOther(_this, data, accountObj){
             n++;
             uni.uploadFile({
               url: pathUrl +
-                "/common/common/uploadAttachment/orderEndPhoto/" +
+                "/common/common/uploadAttachment/"+ uploadType +"/" +
                 data.id +
                 "/" + result.recordId,
               filePath: tp,