2/10 扫码数量 1.1

src/views/collect/ConfirmDrugDealOrder.vue

@@ -422,6 +422,7 @@ import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysW
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {orderbatchAddCode} from "@/api/inout/splitCode";
 import {isBlank} from "@/utils/strUtil";
+import { getSet } from '@/api/collect/collectSet'
 
 export default {
   /**
@@ -536,6 +537,7 @@ export default {
       },
       labelName: 1,
       scanStatus: null, // 1:扫码剔除; null 处理单据
+      collectSet: {}
     }
   },
 
@@ -1313,6 +1315,7 @@ export default {
       this.curRow = null
       this.formData.confirmFinish = false;
       this.refreshCodesPanelBank(this)
+      this.selectSysParam()
       this.clearCode()
       this.$refs.inputRef.focus();
       this.$refs.inputRef.select();
@@ -1342,6 +1345,7 @@ export default {
     //处理事件
     handleRecCodesEvent(event) {
       console.log('接收 recCodes event:', event.detail.recCodes);
+
       let params = {
         codeList: event.detail.recCodes,
       };
@@ -1349,7 +1353,10 @@ export default {
         this.$message.error("请先选入单据！");
         return
       }
-      this.batchVailCode(params)
+      const verify = this.verifyScanCount(event.detail.recCodes)
+      if (verify){
+        this.batchVailCode(params)
+      }
 
     },
 
@@ -1451,6 +1458,7 @@ export default {
         this.enterBillNoKey(fullScanData[0])
         return;
       }
+
       let params = {
         codeList: fullScanData,
       };
@@ -1458,7 +1466,11 @@ export default {
         this.$message.error("请先选入单据！");
         return
       }
-      this.batchVailCode(params)
+      const verify = this.verifyScanCount(fullScanData)
+      if (verify){
+        this.batchVailCode(params)
+      }
+
       // 在这里处理完整的扫码数据，如提交到后台或显示
     },
 
@@ -1547,6 +1559,28 @@ export default {
         }
       }
     },
+    verifyScanCount(codeArray){
+      //判断扫码数量是否超出或少于设置扫码数量
+      if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
+        if (this.collectSet.scanMaxCount > codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量少于设置扫码数量");
+          return false;
+        } else if (this.collectSet.scanMaxCount < codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量超出");
+          return false;
+        }
+      }
+      return true;
+    },
+    selectSysParam() {
+      getSet().then((response) => {
+        if (response.code == 20000) {
+          this.collectSet = response.data
+        }
+      })
+    },
 
     //扫码剔除操作
     deleteCode() {
@@ -1614,7 +1648,7 @@ export default {
       this.fromList = re.data.fromList;
     });
     this.findCurWorkPlaces();
-
+    this.selectSysParam();
     this.formData.invCode = this.$store.getters.locInvCode;
     if (this.$route.query.billNo != null) {
       this.formData.billNo = this.$route.query.billNo

src/views/collect/DealOrder.vue

@@ -434,6 +434,7 @@ import {orderbatchAddCode} from "@/api/inout/splitCode";
 import {isBlank} from "@/utils/strUtil";
 
 import JsBarcode from 'jsbarcode';
+import { getSet } from '@/api/collect/collectSet'
 export default {
   /**
    * 处理处方
@@ -545,6 +546,7 @@ export default {
       },
       labelName: 1,
       scanStatus: null, // 1:扫码剔除; null 处理单据
+      collectSet: {}
     }
   },
 
@@ -856,10 +858,13 @@ export default {
       this.filterQuery.code = this.scanCode.trim();
       if (this.filterQuery.code.includes(";")) {
         const codeArray = this.filterQuery.code.split(";");
-        let params = {
-          codeList: codeArray,
-        };
-        this.batchVailCode(params)
+        const verify = this.verifyScanCount(codeArray)
+        if (verify){
+          let params = {
+            codeList: codeArray,
+          };
+          this.batchVailCode(params)
+        }
         return;
       }
       if (this.filterQuery.code)
@@ -1242,12 +1247,14 @@ export default {
               type: 'warning'
             }).then(() => {
               this.formData = temp;
+              this.generateBarcode()
               this.startDeal();
             }).catch(() => {
             });
           } else if (temp.tagStatus === 2 || temp.tagStatus === 1) {
 
             this.formData = temp;
+            this.generateBarcode()
             this.panelALive = true
             this.startDeal();
             // this.$confirm('检测到当前工位存在正在处理单据，是否继续上一次单据处理?', '提示', {
@@ -1289,6 +1296,7 @@ export default {
       // this.selectTabsname(this.formData.busType);
       this.formData.tagStatus = 2;
       this.updateOrder();
+      this.selectSysParam()
       // this.refreshCodesPanel(this);
       this.$refs.inputRef.focus();
     },
@@ -1445,6 +1453,21 @@ export default {
     handleCommand(command) {
       // this.$message('click on item ' + command);
     },
+    verifyScanCount(codeArray){
+      //判断扫码数量是否超出或少于设置扫码数量
+      if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
+        if (this.collectSet.scanMaxCount > codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量少于设置扫码数量");
+          return false;
+        } else if (this.collectSet.scanMaxCount < codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量超出");
+          return false;
+        }
+      }
+      return true;
+    },
     clearCode() {
       // this.originCode = "";
       // this.formData.code = "";
@@ -1485,6 +1508,7 @@ export default {
         shipper: null,
         fromCorp: null,
       };
+      this.selectSysParam()
       this.curRow = null
       this.formData.confirmFinish = false;
       this.refreshCodesPanelBank(this)
@@ -1526,6 +1550,7 @@ export default {
     //处理事件
     handleRecCodesEvent(event) {
       console.log('接收 recCodes event:', event.detail.recCodes);
+
       let params = {
         codeList: event.detail.recCodes,
       };
@@ -1533,7 +1558,12 @@ export default {
         this.$message.error("请先选入单据！");
         return
       }
-      this.batchVailCode(params)
+
+      const verify = this.verifyScanCount(event.detail.recCodes)
+      if (verify){
+        this.batchVailCode(params)
+      }
+
 
     },
 
@@ -1588,6 +1618,7 @@ export default {
               });
               // this.scanCode = this.valiCodes.join(";");
             }
+            this.selectSysParam()
 
           } else {
             this.$message.error(res.message)
@@ -1635,6 +1666,7 @@ export default {
         this.enterBillNoKey(fullScanData[0])
         return;
       }
+
       let params = {
         codeList: fullScanData,
       };
@@ -1642,7 +1674,10 @@ export default {
         this.$message.error("请先选入单据！");
         return
       }
-      this.batchVailCode(params)
+     const verify = this.verifyScanCount(fullScanData)
+      if (verify){
+        this.batchVailCode(params)
+      }
       // 在这里处理完整的扫码数据，如提交到后台或显示
     },
 
@@ -1751,6 +1786,13 @@ export default {
       this.scanTip = "扫码录入:"
       this.placeholder = '请点击输入框进行选扫码'
     },
+    selectSysParam() {
+      getSet().then((response) => {
+        if (response.code == 20000) {
+          this.collectSet = response.data
+        }
+      })
+    },
   },
   mounted() {
     this.$refs.inputRef.focus();
@@ -1800,6 +1842,7 @@ export default {
       this.fromList = re.data.fromList;
     });
     this.findCurWorkPlaces();
+    this.selectSysParam();
 
     this.formData.invCode = this.$store.getters.locInvCode;
     if (this.$route.query.billNo != null) {

src/views/collect/IoCreateOrder.vue

@@ -1127,11 +1127,13 @@ export default {
       }
       if (this.codeFormData.code.includes(';')) {
         const codeArray = this.codeFormData.code.split(';')
-        this.verifyScanCount(codeArray)
-        let params = {
-          codeList: codeArray
+        const verify = this.verifyScanCount(codeArray)
+        if (verify){
+          let params = {
+            codeList: codeArray
+          }
+          this.batchVailCode(params)
         }
-        this.batchVailCode(params)
         return
       }
       let tQuery = Object.assign(
@@ -1782,11 +1784,13 @@ export default {
       this.codeFormData.code = this.scanCode.trim()
       if (this.codeFormData.code.includes(';')) {
         const codeArray = this.codeFormData.code.split(';')
-        this.verifyScanCount(codeArray)
-        let params = {
-          codeList: codeArray
+        const verify = this.verifyScanCount(codeArray)
+        if (verify){
+          let params = {
+            codeList: codeArray
+          }
+          this.batchVailCode(params)
         }
-        this.batchVailCode(params)
         return
       }
 
@@ -1870,12 +1874,15 @@ export default {
       if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
         if (this.collectSet.scanMaxCount > codeArray.length) {
           this.scanCode = ''
-          return this.$message.error("扫码数量少于设置扫码数量");
+          this.$message.error("扫码数量少于设置扫码数量");
+          return false;
         } else if (this.collectSet.scanMaxCount < codeArray.length) {
           this.scanCode = ''
-          return this.$message.error("扫码数量超出");
+          this.$message.error("扫码数量超出");
+          return false;
         }
       }
+      return true;
     },
     removeCodesTemp(query) {
       //todo 已经传过来 扫码明细 的数据 this.codeArray   根据id删除码明细的方法 deleteCodesTempById
@@ -2145,11 +2152,14 @@ export default {
     //处理事件
     handleRecCodesEvent(event) {
       console.log('接收 recCodes event:', event.detail.recCodes)
-      this.verifyScanCount(event.detail.recCodes)
-      let params = {
-        codeList: event.detail.recCodes
+      const verify = this.verifyScanCount(event.detail.recCodes)
+      if (verify){
+        let params = {
+          codeList: event.detail.recCodes
+        }
+        this.batchVailCode(params)
       }
-      this.batchVailCode(params)
+
     },
 
     batchVailCode(params) {
@@ -2306,19 +2316,21 @@ export default {
       // } else if (this.queueStatus == "1") {
       //   this.getDMHotskeyValue(fullScanData[0]);
       // }
-
-      if (this.scanStatus == 1) {
-        let query = {
-          orderId: this.orderFormData.billNo,
-          codeList: fullScanData
-        }
-        //剔除码
-        this.removeCodesTemp(query)
-      } else {
-        let params = {
-          codeList: fullScanData
+      const verify = this.verifyScanCount(fullScanData)
+      if (verify){
+        if (this.scanStatus == 1) {
+          let query = {
+            orderId: this.orderFormData.billNo,
+            codeList: fullScanData
+          }
+          //剔除码
+          this.removeCodesTemp(query)
+        } else {
+          let params = {
+            codeList: fullScanData
+          }
+          this.batchVailCode(params)
         }
-        this.batchVailCode(params)
       }
     },
 

src/views/collect/IocCollectOrderCheckCode.vue

@@ -227,6 +227,7 @@ import {
 } from '@/api/collect/collectOrder'
 import { checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder } from '@/api/collect/splitCreateOrder'
 import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
+import { getSet } from '@/api/collect/collectSet'
 
 export default {
   name: 'IocCollectOrderCheckCode',
@@ -291,7 +292,7 @@ export default {
       codeCount: 0,
       selectPrescriptionVisible: false,
       viewType: 1,
-
+      collectSet: {}
     }
   },
   methods: {
@@ -333,11 +334,14 @@ export default {
       this.filterQuery.udiCode = this.scanCode.trim()
       if (this.filterQuery.udiCode.includes(';')) {
         const codeArray = this.filterQuery.udiCode.split(';')
-        this.filterQuery.udiCodeList = codeArray
-        this.filterQuery.udiCode = ''
-        this.filterQuery.orderIdFk = this.orderData.billNo
-        // 处理多码的情况
-        this.batchVailCode(this.filterQuery)
+        const verify = this.verifyScanCount(codeArray)
+        if (verify){
+          this.filterQuery.udiCodeList = codeArray
+          this.filterQuery.udiCode = ''
+          this.filterQuery.orderIdFk = this.orderData.billNo
+          // 处理多码的情况
+          this.batchVailCode(this.filterQuery)
+        }
         return
       }
       if (this.filterQuery.udiCode) {
@@ -778,6 +782,7 @@ export default {
       this.getInputFocus()
       this.updateOrder()
       this.closeDialog()
+      this.selectSysParam()
       // this.startDeal();
     },
     selectAllData(){
@@ -880,6 +885,29 @@ export default {
       this.placeholder = '请输入单据号进行扫码审核'
       this.resultTotal = 0
       this.getInputFocus()
+      this.selectSysParam()
+    },
+    verifyScanCount(codeArray){
+      //判断扫码数量是否超出或少于设置扫码数量
+      if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
+        if (this.collectSet.scanMaxCount > codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量少于设置扫码数量");
+          return false;
+        } else if (this.collectSet.scanMaxCount < codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量超出");
+          return false;
+        }
+      }
+      return true;
+    },
+    selectSysParam() {
+      getSet().then((response) => {
+        if (response.code == 20000) {
+          this.collectSet = response.data
+        }
+      })
     },
     rowStyle({ row, rowIndex }) {
       let rowBackground = {}
@@ -919,6 +947,7 @@ export default {
     this.checkCodeList = []
     this.codeCount = 0
     this.findCurOrder()
+    this.selectSysParam();
   },
   mounted() {
     this.getInputFocus()

src/views/collect/IocCollectOrderVerify.vue

@@ -188,6 +188,7 @@ import {
   scanCheckCodeReplace
 } from '@/api/collect/splitCreateOrder'
 import { isBlank } from '@/utils/strUtil'
+import { getSet } from '@/api/collect/collectSet'
 
 export default {
   name: 'IocCollectOrderVerify',
@@ -246,6 +247,7 @@ export default {
       checkCodeEndList: [],
       panelALive: false,
       ws: null,
+      collectSet: {}
     }
   },
   methods: {
@@ -287,11 +289,14 @@ export default {
       this.filterQuery.code = this.scanCode.trim()
       if (this.filterQuery.code.includes(';')) {
         const codeArray = this.filterQuery.code.split(';')
-        this.filterQuery.codeList = codeArray
-        this.filterQuery.code = ''
-        this.filterQuery.billNo = this.orderData.billNo
-        // 处理多码的情况
-        this.batchVailCode(this.filterQuery)
+        const verify = this.verifyScanCount(codeArray)
+        if (verify){
+          this.filterQuery.codeList = codeArray
+          this.filterQuery.code = ''
+          this.filterQuery.billNo = this.orderData.billNo
+          // 处理多码的情况
+          this.batchVailCode(this.filterQuery)
+        }
         return
       }
       if (this.filterQuery.code) {
@@ -735,6 +740,7 @@ export default {
         this.busType = this.$route.query.busType
       }
       this.panelALive = false
+      this.selectSysParam()
     },
     clear() {
       this.init()
@@ -759,10 +765,14 @@ export default {
         this.$message.error("请先选入单据！");
         return
       }
-      this.filterQuery.codeList = event.detail.recCodes
-      this.filterQuery.code = ''
-      this.filterQuery.billNo = this.orderData.billNo
-      this.batchVailCode(this.filterQuery)
+      const verify = this.verifyScanCount(event.detail.recCodes)
+      if (verify){
+        this.filterQuery.codeList = event.detail.recCodes
+        this.filterQuery.code = ''
+        this.filterQuery.billNo = this.orderData.billNo
+        this.batchVailCode(this.filterQuery)
+      }
+
     },
     handleVisibilityChange() {
       if (document.visibilityState === 'visible') {
@@ -834,10 +844,35 @@ export default {
         this.$message.error("请先选入单据！");
         return
       }
-      this.filterQuery.codeList = fullScanData
-      this.filterQuery.code = ''
-      this.filterQuery.billNo = this.orderData.billNo
-      this.batchVailCode(this.filterQuery)
+      const verify = this.verifyScanCount(fullScanData)
+      if (verify){
+        this.filterQuery.codeList = fullScanData
+        this.filterQuery.code = ''
+        this.filterQuery.billNo = this.orderData.billNo
+        this.batchVailCode(this.filterQuery)
+      }
+    },
+    selectSysParam() {
+      getSet().then((response) => {
+        if (response.code == 20000) {
+          this.collectSet = response.data
+        }
+      })
+    },
+    verifyScanCount(codeArray){
+      //判断扫码数量是否超出或少于设置扫码数量
+      if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
+        if (this.collectSet.scanMaxCount > codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量少于设置扫码数量");
+          return false;
+        } else if (this.collectSet.scanMaxCount < codeArray.length) {
+          this.scanCode = ''
+          this.$message.error("扫码数量超出");
+          return false;
+        }
+      }
+      return true;
     },
   },
   watch: {