拉取代码

components/bigScreen/bigScreen.vue

@@ -369,7 +369,7 @@
           }
         })
       },
-      // 根据配置跳转页面
+      // 根据配置跳转页面 
       pageNavigateByConfig(config, responseData, queryObj, code){
         let drugsBagType = queryObj.drugsBagType;
         let orderId = responseData.orderId;
@@ -452,9 +452,15 @@
                   title: ress.data.msg || "接口获取数据失败！",
                 });
               }else{
-                uni.navigateTo({
-                  url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue}`,
-                });
+								if(config.drugsEndCountMethod && config.drugsEndCountMethod==2){
+									uni.navigateTo({
+									  url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+									});
+								}else{
+									uni.navigateTo({
+									  url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue}`,
+									});
+								}
               }
             } else {
               uni.showToast({
@@ -511,7 +517,7 @@
       // 底部扫描
       Scanning(qrcodePrefix = '') {
 				// 标本码
-				// this.ScanningCommon('', '250522891576@_1');
+				this.ScanningCommon('', '250529338897@_1');
 				
 				// 快捷建单-轮巡工单码
 				// this.ScanningCommon('', '3330ec8e-76eb-413e-b000-995f08d2ff96');
@@ -522,15 +528,15 @@
 				// 终点科室核对码--本部住院检验科
 				// this.ScanningCommon('', '95c5de27-c05f-11ea-8cfe-000c29097622');
 				
-        if (!this.SMFlag) {
-          return;
-        }
-        this.SMFlag = false;
-        SM().then((content) => {
-          this.ScanningCommon(qrcodePrefix, content);
-        }).catch(err => {
-          this.SMFlag = true;
-        });
+        // if (!this.SMFlag) {
+        //   return;
+        // }
+        // this.SMFlag = false;
+        // SM().then((content) => {
+        //   this.ScanningCommon(qrcodePrefix, content);
+        // }).catch(err => {
+        //   this.SMFlag = true;
+        // });
       },
       //底部扫描-无须扫码
       ScanningCommon(qrcodePrefix = '', content){

pages/newDrug/continueScanning/continueScanning.vue

@@ -226,7 +226,6 @@
               title: info.msg || "接口获取数据失败！",
             });
           }
-        
           if(config.status == 200){
             let list  = config.list || [];
             this.config = list.length ? list[0] : {};

pages/receipt_infopage/receipt_infopage.vue

@@ -52,7 +52,7 @@
           <view class="page_item_cont_title" v-for="(dept, index) of infoDATA.middleDept" :key="'ico' + index">
             <view v-if="infoDATA.taskType.associationType.value == 'inspect'">
               <text> <text class="End">检</text> 查科室 </text>
-              <text class="text_big">{{ dept.dept }}</text>
+              <text class="text_big" :class="dept.signIn ? 'green': ''">{{ dept.dept }}</text>
               <view></view>
             </view>
           </view>
@@ -341,6 +341,10 @@
                 <text class="text1">预约时间</text>
                 <text class="text2">{{ item.yyTime || "-" }}</text>
               </view>
+							<view class="page_item_foot_text">
+							  <text class="text1">是否送达</text>
+							  <text class="text2">{{ item.inspectState && item.inspectState.value=='3' ? '是':'否'}}</text>
+							</view>
               <!-- <view class="page_item_foot_text"
                 v-show="item.inspectState.value==1||item.inspectState.value==2||item.inspectState.value==4">
                 <view class="btn" @click.stop="remove(item)">移除</view>

pages/receiptpage/receiptpage.vue

@@ -244,10 +244,16 @@
                   <text> <text class="End">终</text> 点科室 </text>
                   <text class="text_big" v-for="(dept, i) of item.endDepts" :key="i">{{ dept.dept }}</text>
                 </view>
-                <view class="page_item_cont_title" v-if="item.taskType.associationType.value == 'inspect'">
+                <view class="page_item_cont_title" v-if="item.middleDept&&item.middleDept.length==1 && item.taskType.associationType.value == 'inspect'">
                   <text> <text class="End">检</text> 查科室 </text>
                   <text class="text_big" v-for="(dept, i) of item.middleDept" :key="i">{{ dept.dept }}</text>
                 </view>
+								<view class="page_item_cont_title" v-if="item.middleDept&&item.middleDept.length>1 && item.taskType.associationType.value == 'inspect'">
+								  <view v-for="(dept, i) of item.middleDept" :key="i">
+										<text> <text class="End">检</text> 查科室 </text>
+										<text class="text_big" :class="dept.signIn ? 'green': ''">{{ dept.dept }}</text>
+									</view>
+								</view>
               </view>
             </view>
             <view v-if="