Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck

src/views/inventory/count/InvCountOrderModify.vue

@@ -361,6 +361,7 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
 import invCountCodes from "@/views/inventory/count/InvCountCodes.vue";
 import {updateBizProduct} from "@/api/inout/orderDetailCode";
 
+
 export default {
   props: {
     countOrder: {
@@ -381,6 +382,7 @@ export default {
     }
   },
 
+
   data() {
     return {
       formData: {
@@ -595,7 +597,7 @@ export default {
           if (response.code === 20000) {
             this.$message.success("保存成功！");
             this.selectedIndex = null;
-            this.getCountOrderList();
+            this.getList();
           } else {
             this.$message.error(response.message);
           }
@@ -679,28 +681,40 @@ export default {
         this.$message.warning("请选择产品");
         return;
       }
+      let existsMsg = ""
+      let exists = this.multiProduct.some(product => {
+        if (this.countProductList.total != 0) {
+           return this.countProductList.some(item => {
+             existsMsg = product.nameCode
+            return item && item.productId == product.relIdFk && item.batchNo == product.batchNo;
+          });
+        }
+      });
+
+      if (exists){
+        this.$message.error("当前产品【"+ existsMsg + "】不能重复选入！");
+        return;
+      }
 
-      // if (this.countProductList.length === 0) {
       //添加第一个产品，先保存单据，再添加单据详情
       this.multiProduct.forEach(product => {
-        let detailData = {
+          let detailData = {
-          orderIdFk: this.formData.orderId,
+            orderIdFk: this.formData.orderId,
-          productId: product.relIdFk,
+            productId: product.relIdFk,
-          nameCode: product.nameCode,
+            nameCode: product.nameCode,
-          batchNo: product.batchNo,
+            batchNo: product.batchNo,
-          produceDate: product.productionDate,
+            produceDate: product.productionDate,
-          expireDate: product.expireDate,
+            expireDate: product.expireDate,
-          invCode: this.formData.invStorageCode,
+            invCode: this.formData.invStorageCode,
-          invSpaceCode: this.formData.invSpaceCode,
+            invSpaceCode: this.formData.invSpaceCode,
-          invNum: product.reCount,
+            invNum: product.reCount,
-          supId: product.supId
+            supId: product.supId
-        };
+          };
-        this.countProductList.push(detailData);
+          this.countProductList.push(detailData);
       });
-      // this.saveOrderDetail();
+
-      this.saveOrder(1);
+        this.saveOrder(1);
-      // }
+        this.selectInvProductVisible = false;
-      this.selectInvProductVisible = false;
     },
     getRowKeys(row) {
       return row.id;

src/views/purchase/purApply/pureApplyMySearch.vue

@@ -685,7 +685,7 @@ export default {
         this.filterQuery.endAuditDate = null;
       }
       this.loading = true;
-      this.filterQuery.status = 3;
+      this.filterQuery.status = null;
       this.filterQuery.isUser = true
       listApply(this.filterQuery)
         .then((response) => {