优化

App.vue

@@ -146,11 +146,11 @@
   .uni-picker-action-confirm {
     color: #49b856 !important;
   }
-	
+
 	.selected-item-active{
 		border-color: #49b856 !important;;
 	}
-	
+
   .footerPadding {
     padding-bottom: 50rpx !important;
   }
@@ -163,6 +163,10 @@
     color: red !important;
   }
 
+  .green{
+    color: #49B856 !important;
+  }
+
   .fweight {
     font-weight: bold !important;
   }

pages/specimenPackage/checkPage/checkPage.vue

@@ -11,7 +11,7 @@
         <view class="column" v-for="item in specimenPackageList" :key="item.id">
           <view class="row bd">
             <view class="name">{{item.deptName}}</view>
-            <view class="value" :class="{ red: item.sacnState === 0 }">{{item.sacnState === 0 ? '未扫描' : '已扫描'}}</view>
+            <view class="value" :class="[ item.sacnState === 0 ? 'red' : 'green']">{{item.sacnState === 0 ? '未扫描' : '已扫描'}}</view>
           </view>
           <view class="row">
             <view class="name">{{item.pack_code}}</view>
@@ -24,15 +24,15 @@
     <view class="foot_btn_spe">
       <view class="column">
         <template v-if="!config.drugsEndManual">
-          <view :class="[(scanNum == totalNum) ? 'btn' : 'btnW100']" @click="Scanning_again()">继续扫描</view>
-          <view class="btn" v-if="scanNum == totalNum" @click="scanCode()">扫一扫核对交接</view>
+          <view class="btnW100" v-if="scanNum != totalNum" @click="Scanning_again()">继续扫描</view>
+          <view class="btnW100" v-if="scanNum == totalNum" @click="scanCode()">扫一扫交接</view>
         </template>
-        
+
         <!-- 三个按钮-样式 -->
         <template v-else-if="config.drugsEndManual">
-          <view class="btn" v-if="scanNum == totalNum" @click="scanCode()">扫一扫核对交接</view>
-          <view class="btn" v-if="scanNum == totalNum" @click="fillInManually(config.drugsEndManual.value)">{{config.drugsEndManual.name}}核对交接</view>
-          <view class="btnW100"  @click="Scanning_again()">继续扫描</view>
+          <view class="btn" v-if="scanNum == totalNum" @click="scanCode()">扫一扫交接</view>
+          <view class="btn" v-if="scanNum == totalNum" @click="fillInManually(config.drugsEndManual.value)">{{config.drugsEndManual.name}}交接</view>
+          <view class="btnW100" v-if="scanNum != totalNum"  @click="Scanning_again()">继续扫描</view>
         </template>
       </view>
     </view>
@@ -90,7 +90,7 @@
       			model:"all"
       		}
         };
-      
+
         post("/simple/data/fetchDataList/hospitalConfig",postData).then((result) => {
             if (result.status == 200) {
       				this.keyArr = []
@@ -450,7 +450,7 @@
         });
 
         Promise.all([info$, config$]).then(result => {
-          
+
           let [info, config] = result || [];
 
           if(info.state == 200){
@@ -475,7 +475,7 @@
               title: config.msg || "接口获取数据失败！",
             });
           }
-          
+
           post(`/nurse/specimen/getSpePackageScanCount`, {endDeptId: this.workOrder.endDepts[0].id}).then((ress) => {
             uni.hideLoading();
             if(ress.state == 200){

pages/specimenPackage/createOrder/createOrder.vue

@@ -49,9 +49,9 @@
     <view class="foot_btn_spe" v-if="config.id">
       <view class="column">
         <!-- 需要核对 -->
-        <template v-if="config.drugsStartCheck === 1">
+        <template v-if="(queryObj.type === 'build' || queryObj.type === 'receive') && (config.drugsCreateSign === 1 || config.drugsReceiveSign === 1) && config.drugsStartCheck === 1">
           <!-- 两个按钮-样式 设计如此，别BB -->
-          <template v-if="(queryObj.type === 'build' || queryObj.type === 'receive') && (config.drugsCreateSign === 1 || config.drugsReceiveSign === 1) && !config.drugsStartManual">
+          <template v-if="!config.drugsStartManual">
             <view class="btn" @click="goIndex()">返回</view>
             <view class="btn" @click="createOrBuildOrder(undefined, 'scan')" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1">建单签到扫一扫</view>
             <view class="btn" @click="createOrBuildOrder(undefined, 'hand')" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1 && config.drugsStartManual">建单签到{{config.drugsStartManual.name}}</view>
@@ -60,7 +60,7 @@
           </template>
           
           <!-- 三个按钮-样式 设计如此，别BB -->
-          <template v-else-if="(queryObj.type === 'build' || queryObj.type === 'receive') && (config.drugsCreateSign === 1 || config.drugsReceiveSign === 1) && config.drugsStartManual">
+          <template v-else>
             <view class="btn" @click="createOrBuildOrder(undefined, 'scan')" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1">建单签到扫一扫</view>
             <view class="btn" @click="createOrBuildOrder(undefined, 'hand')" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1 && config.drugsStartManual">建单签到{{config.drugsStartManual.name}}</view>
             <view class="btn" @click="createOrBuildOrder(orderId, 'scan')" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单签到扫一扫</view>
@@ -69,8 +69,8 @@
           </template>
         </template>
         <!-- 不需要核对 -->
-        <template  v-if="config.drugsStartCheck !== 1">
-          <view class="btn" @click="goIndex()">返回</view>
+        <template  v-if="(queryObj.type === 'build' || queryObj.type === 'receive') && config.drugsStartCheck !== 1">
+          <view :class="((queryObj.type === 'build' && config.drugsCreateSign === 1) || (queryObj.type === 'receive' && config.drugsReceiveSign === 1)) ? 'btn' : 'btnW100'" @click="goIndex()">返回</view>
           <view class="btn" @click="createOrBuildOrder()" v-if="queryObj.type === 'build' && config.drugsCreateSign === 1">建单并签到</view>
           <view class="btn" @click="createOrBuildOrder(orderId)" v-if="queryObj.type === 'receive' && config.drugsReceiveSign === 1">接单并签到</view>
         </template>
@@ -481,10 +481,24 @@
                 uni.hideLoading();
                 if (ress.state == 200) {
                   if(ress.data.msg){
-                    uni.showToast({
-                      icon: "none",
-                      title: ress.data.msg || "接口获取数据失败！",
-                    });
+                    if(ress.data.state == 502){
+                      // 工单已建单，返回列表
+                      uni.showToast({
+                        icon: "none",
+                        mask: true,
+                        title: ress.data.msg,
+                      });
+                      setTimeout(() => {
+                        uni.redirectTo({
+                          url: `/pages/receiptpage/receiptpage`,
+                        });
+                      },300)
+                    }else{
+                      uni.showToast({
+                        icon: "none",
+                        title: ress.data.msg || "接口获取数据失败！",
+                      });
+                    }
                   }else{
                     this.workOrder = {
                       id: ress.data.orderId,
@@ -523,7 +537,7 @@
               this.orderId = this.queryObj.orderId;
               this.config = res.data.taskTypeConfig || {};
               let tube = res.data.tube || [];
-              this.tube = chunk(tube, 3);
+              this.tube = chunk(tube, 2);
             }
           }else{
             uni.showToast({