拉取代码

pages/newDrug/checkPage/checkPage.vue

@@ -25,7 +25,8 @@
 
     <view class="foot_btn_spe">
       <view class="column">
-        <view class="btn" @click="scanCode()">扫一扫交接</view>
+				<view v-if="config.drugsStartCheck==0" class="btn" @click="checkSubmit()">核对交接</view>
+        <view v-else class="btn" @click="scanCode()">扫一扫交接</view>
         <view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 4 && config.drugsStartManual">{{config.drugsStartManual.name}}</view>
         <view class="btn" @click="fillInManually(config.drugsEndManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 5 && config.drugsEndManual">{{config.drugsEndManual.name}}</view>
       </view>
@@ -36,7 +37,12 @@
     </selectAccount>
     <!-- 动态密钥 -->
     <numberKeyModel v-if="showKey" :keyArr="keyArr" @cancel="showKey = false" @confirm="confirmKey($event)"></numberKeyModel>
-  </view>
+		<!-- 核对交接 -->
+		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
+			<uni-popup-dialog type="info" cancelText="取消" confirmText="确定" title="提示" content="是否核对完成？" @confirm="dialogConfirm"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
+	</view>
 </template>
 <script>
   import numberKeyModel from "@/components/numberKeyModel/numberKeyModel.vue";
@@ -63,6 +69,7 @@
         keyNum:4, //密钥位数
         isNumberKey:false, //是否开启动态密钥
         keyArr: [],
+				checkDialog:false
       };
     },
     components: {
@@ -237,7 +244,7 @@
           });
       },
       // 工单完成
-      completeOrder(workOrder, queryObj, accountObj){
+      completeOrder(workOrder, queryObj, accountObj, type){
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -250,20 +257,21 @@
         post('/transflow/checkComplete', postData).then(res => {
           uni.hideLoading();
           if(res.state == 200){
+						if(type=='check'){
+							this.$refs.alertDialog.close()
+						}
             uni.showToast({
               icon: "none",
-              title: workOrder.gdState.value == 4 ? "交接成功，请尽快送达科室！" : (workOrder.gdState.value == 5 ? "交接成功，完成配送！" : ""),
-              duration: 60000,
+              title: workOrder.gdState.value == 4 ? "交接成功，请尽快送达科室！" : (workOrder.gdState.value == 5 ? "交接成功，完成配送！" : "核对完成"),
+              duration: 2000,
               mask: true,
-              complete(){
-                setTimeout(() => {
-                  uni.hideToast();
-                  uni.redirectTo({
-                    url: `/pages/receiptpage/receiptpage`,
-                  });
-                }, 2000)
-              }
             });
+						setTimeout(() => {
+						  // uni.hideToast();
+						  uni.redirectTo({
+						    url: `/pages/receiptpage/receiptpage`,
+						  });
+						}, 2000)
           }else{
             uni.showToast({
               icon: "none",
@@ -286,7 +294,7 @@
             });
           }else{
             // 起点科室不支持拍照留存
-            this.completeOrder(workOrder, queryObj, accountObj);
+            this.completeOrder(workOrder, queryObj, accountObj, "");
           }
         }else if(workOrder.gdState.value == 5){
           // 待送达
@@ -297,10 +305,22 @@
             });
           }else{
             // 起点科室不支持拍照留存
-            this.completeOrder(workOrder, queryObj, accountObj);
+            this.completeOrder(workOrder, queryObj, accountObj, "");
           }
         }
       },
+			// 核对交接
+			checkSubmit(){
+				this.$refs.alertDialog.open()
+			},
+			// 确定核对交接
+			dialogConfirm(){
+				this.completeOrder(this.workOrder, this.queryObj, "", "check")
+			},
+			// 取消核对交接
+			dialogClose(){
+				this.$refs.alertDialog.close()
+			},
       // 扫一扫交接
       scanCode(){
         if (!this.SMFlag) {