文字修改

pages/otherCompleteOrder/otherCompleteOrder.vue

@@ -2,9 +2,9 @@
   <view class="HomeItem">
     <view class="goWorkAll">
       <view class="goWorkSelect combination" v-if="actionConfirmSwitch">
-        <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-head" v-if="actionConfirmType == 1">请选择以下选项可选择多项，必须所有都选择后选择{{tips}}</view>
+        <view class="goWorkSelect-head" v-if="actionConfirmType == 2">请选择以下选项可选择多项，至少选择一项后选择{{tips}}</view>
+        <view class="goWorkSelect-head" v-if="actionConfirmType == 3">请选择以下选项，至少单选一项{{tips}}</view>
         <view class="goWorkSelect-list scroll">
           <checkbox-group @change="checkboxChange" v-if="actionConfirmType == 1 || actionConfirmType == 2">
             <label class="goWorkSelect-item relative" v-for="action in actions" :key="action.value">
@@ -25,7 +25,7 @@
         </view>
       </view>
       <view class="goWorkSelect history" v-if="actionPhotoSwitch">
-        <view class="goWorkSelect-head">您需要拍摄现场照片才可完成工单！</view>
+        <view class="goWorkSelect-head">您需要拍摄现场照片才可{{tips}}！</view>
         <view class="goWorkSelect-list">
           <uni-file-picker :auto-upload="false" :limit="3" title="最多选择3张图片" v-model="imageValue" fileMediatype="image"
             mode="grid" @select="selectFile" @delete="deleteFile"></uni-file-picker>
@@ -33,7 +33,7 @@
       </view>
     </view>
     <view class="foot_btn_spe">
-      <view class="btn1" @click="photographToOther(order)">完成工单</view>
+      <view class="btn1" @click="photographToOther(order)">{{tips}}</view>
       <view class="btn3" @click="goBack">返回</view>
     </view>
     <!-- 填写交接人账号弹窗 -->
@@ -60,6 +60,7 @@
     },
     data() {
       return {
+        tips: '',
         currentIndex: undefined,
         // 填写交接人账号弹窗model
         hosModels: {
@@ -176,11 +177,11 @@
         ){
           let title = '';
           if(this.actionConfirmType == 1){
-            title = '您需要完成以下所有动作，才可完成工单！';
+            title = '请选择以下选项可选择多项，必须所有都选择后选择' + this.tips;
           }else if(this.actionConfirmType == 2){
-            title = '您需要完成以下至少一个动作，才可完成工单！';
+            title = '请选择以下选项可选择多项，至少选择一项后选择' + this.tips;
           }else if(this.actionConfirmType == 3){
-            title = '您需要完成以下一个动作，才可完成工单！';
+            title = '请选择以下选项，至少单选一项' + this.tips;
           }
           uni.showToast({
             icon: "none",
@@ -192,7 +193,7 @@
         if(this.actionPhotoSwitch && !imageValue.length){
           uni.showToast({
             icon: "none",
-          	title: '您需要完成拍照，才可完成工单！',
+          	title: '您需要完成拍照，才可' + this.tips,
           	duration: 2000
           });
           return;
@@ -289,8 +290,10 @@
         this.order = options.order;
         if(this.order.gdState.value == 4){
           this.currentIndex = 0;
+          this.tips = '确认到达';
         }else if(this.order.gdState.value == 5){
           this.currentIndex = 1;
+          this.tips = '完成工单';
         }
       }
       if(options.orderId){

pages/receipt_infopage/receipt_infopage.vue

@@ -355,7 +355,7 @@
           <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 == 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

@@ -268,7 +268,7 @@
                 <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 == 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>
               <!-- 其他临床服务-拍照 -->