拉取代码

components/bigScreen/bigScreen.vue

@@ -517,7 +517,7 @@
       // 底部扫描
       Scanning(qrcodePrefix = '') {
 				// 标本码
-				this.ScanningCommon('', '250529338897@_1');
+				// this.ScanningCommon('', '250529338897@_1');
 				
 				// 快捷建单-轮巡工单码
 				// this.ScanningCommon('', '3330ec8e-76eb-413e-b000-995f08d2ff96');
@@ -528,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/receiptpage/receiptpage.vue

@@ -1278,7 +1278,7 @@
 			  let drugsBagType = queryObj.drugsBagType.value;
 			  let orderId = responseData.gdId;
 			  let drugsBagId = responseData.id;
-				let orderStateValue = responeseData.workOrderDTO ? responeseData.workOrderDTO.gdState.value : null;
+				let orderStateValue = responseData.workOrderDTO ? responseData.workOrderDTO.gdState.value : null;
 			  if(config.drugsModel === 1){
 			    // 一单一码
 			    if(orderStateValue == 4){