From a7f6dda10aceb92498c122d743a9f336b10dd725 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 6 Sep 2024 09:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue     | 74 ++++++++++++++++-------------
 src/views/collect/IoCreateOrder.vue |  1 -
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 6354c3f4..36ee39d2 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -15,24 +15,25 @@
             <el-button-group>
               <el-button
                 type="primary"
-                :disabled="isSelectOrder"
+                :disabled="formData.billNo"
                 @click.native="nextCollectOrder()"
               >下一单据
               </el-button>
               <el-button
                 type="primary"
-                :disabled="isSelectOrder"
+                :disabled="formData.billNo"
                 @click.native="selectPrescribe()"
               >选入单据
               </el-button>
               <el-button
                 type="primary"
-
+                :disabled="!formData.billNo"
                 @click.native="saveDraftOrder()"
               >单据挂起
               </el-button>
               <el-button
                 type="primary"
+                :disabled="!formData.billNo"
                 @click.native="confirmFinishOrder()"
               >处理完成
               </el-button>
@@ -196,26 +197,26 @@
         <!--            :refreshPanel="refreshCodesPanelP"-->
         <!--          ></PanelOrderManuTagCode>-->
         <!--        </el-tab-pane>-->
-<!--        <el-tab-pane label="拆零详情" name="prescribeCodePanel1">-->
-<!--          <prescribeCodePanel-->
-<!--            v-if="panelALive"-->
-<!--            :prescribeData="curRow"-->
-<!--            :fifoSplit="1"-->
-<!--          ></prescribeCodePanel>-->
-<!--        </el-tab-pane>-->
-<!--        <el-tab-pane label="整取详情" name="prescribeCodePanel2">-->
-<!--          <prescribeCodePanel-->
-<!--            v-if="panelALive"-->
-<!--            :prescribeData="curRow"-->
-<!--            :fifoSplit="2"-->
-<!--          ></prescribeCodePanel>-->
-<!--        </el-tab-pane>-->
-<!--        <el-tab-pane label="整单详情" name="PanelOrderAllDetail">-->
-<!--          <PanelOrderAllDetail-->
-<!--            v-if="panelALive"-->
-<!--            :prescribeData="curRow"-->
-<!--          ></PanelOrderAllDetail>-->
-<!--        </el-tab-pane>-->
+        <!--        <el-tab-pane label="拆零详情" name="prescribeCodePanel1">-->
+        <!--          <prescribeCodePanel-->
+        <!--            v-if="panelALive"-->
+        <!--            :prescribeData="curRow"-->
+        <!--            :fifoSplit="1"-->
+        <!--          ></prescribeCodePanel>-->
+        <!--        </el-tab-pane>-->
+        <!--        <el-tab-pane label="整取详情" name="prescribeCodePanel2">-->
+        <!--          <prescribeCodePanel-->
+        <!--            v-if="panelALive"-->
+        <!--            :prescribeData="curRow"-->
+        <!--            :fifoSplit="2"-->
+        <!--          ></prescribeCodePanel>-->
+        <!--        </el-tab-pane>-->
+        <!--        <el-tab-pane label="整单详情" name="PanelOrderAllDetail">-->
+        <!--          <PanelOrderAllDetail-->
+        <!--            v-if="panelALive"-->
+        <!--            :prescribeData="curRow"-->
+        <!--          ></PanelOrderAllDetail>-->
+        <!--        </el-tab-pane>-->
 
       </el-tabs>
 
@@ -305,11 +306,9 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {enterCodeWeb} from "@/api/inout/order";
 import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
-import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
 import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
-import A from '../../plugins/KeyScaner'
 
 export default {
   /**
@@ -621,12 +620,12 @@ export default {
             this.originCode = "";
             this.filterQuery.code = "01" + response.data.nameCode;
             this.originCode = this.filterQuery.code;
-          }else if (response.code == 601) {
+          } else if (response.code == 601) {
             this.formData.billNo = response.data.billNo
             this.getBillNo(this.formData.billNo)
             this.startDeal();
 
-          }else {
+          } else {
             this.scanCode = ""
             this.$alert(response.message, "提示", {
               confirmButtonText: "确定",
@@ -727,15 +726,22 @@ export default {
         if (res.code == 20000) {
           this.resetWork()
         } else if (res.code == 502) {
-          this.$confirm(res.message, '提示', {
+          // this.$confirm(res.message, '提示', {
+          //   confirmButtonText: '确定',
+          //   cancelButtonText: '取消',
+          //   type: 'warning'
+          // }).then(() => {
+          //   this.formData.confirmFinish = true;
+          //   // this.finishOrder();
+          // }).catch(() => {
+          // });
+
+          this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', {
             confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.formData.confirmFinish = true;
-            this.finishOrder();
-          }).catch(() => {
+            callback: action => {
+            }
           });
+
         } else {
           this.$message.error(res.message)
         }
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 9f381854..cd64cab0 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1118,7 +1118,6 @@ export default {
           parseTime(date, "{y}{m}{d}{h}{i}{s}") +
           Math.ceil(Math.random() * 89 + 10);
       }
-      debugger
       this.loading = true;
       let tQuery = Object.assign(
         JSON.parse(JSON.stringify(this.orderFormData))