界面修改

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>
@@ -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 {
   /**
@@ -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: '取消',
+            callback: action => {
-            type: 'warning'
+            }
-          }).then(() => {
-            this.formData.confirmFinish = true;
-            this.finishOrder();
-          }).catch(() => {
           });
+
         } else {
           this.$message.error(res.message)
         }

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))