Explorar o código

fix(purchase&sale order): 补充重复校验字段,完善重复校验逻辑

在采购、销售订单相关的新增弹窗中,新增产地、机型、商品等级的重复校验条件,并更新错误提示文案,避免重复添加相同的订单明细
liujt hai 2 días
pai
achega
4a39c54eba

+ 3 - 0
src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -2160,6 +2160,9 @@
                 v.taskId == v2.taskId &&
                 v.batchNo == v2.batchNo &&
                 v.colorKey == v2.colorKey &&
+                v.provenance?.join() == v2.provenance?.join() &&
+                v.modelKey == v2.modelKey &&
+                v.goodsLevel == v2.goodsLevel &&
                 i != j
               ) {
                 is = true;

+ 3 - 0
src/views/purchasingManage/purchaseOrder/invoice/components/addInvoiceDialog.vue

@@ -524,6 +524,9 @@
                 v.taskId == v2.taskId &&
                 v.batchNo == v2.batchNo &&
                 v.colorKey == v2.colorKey &&
+                v.provenance?.join() == v2.provenance?.join() &&
+                v.modelKey == v2.modelKey &&
+                v.goodsLevel == v2.goodsLevel &&
                 i != j
               ) {
                 is = true;

+ 4 - 1
src/views/saleManage/saleOrder/components/addDialogNew.vue

@@ -2044,6 +2044,9 @@
                   v.taskId == v2.taskId &&
                   v.batchNo == v2.batchNo &&
                   v.colorKey == v2.colorKey &&
+                  v.provenance?.join() == v2.provenance?.join() &&
+                  v.modelKey == v2.modelKey &&
+                  v.goodsLevel == v2.goodsLevel &&
                   i != j
                 ) {
                   is = true;
@@ -2061,7 +2064,7 @@
             }
 
             if (is) {
-              this.$message.error('同产品,工序、批次号、颜色不能完全一致!');
+              this.$message.error('同产品,工序、批次号、颜色、机型、产地、等级不能完全一致!');
               return;
             }
             // if(+ratioSum != 100){

+ 3 - 0
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -1036,6 +1036,9 @@
                 v.taskId == v2.taskId &&
                 v.batchNo == v2.batchNo &&
                 v.colorKey == v2.colorKey &&
+                v.provenance?.join() == v2.provenance?.join() &&
+                v.modelKey == v2.modelKey &&
+                v.goodsLevel == v2.goodsLevel &&
                 i != j
               ) {
                 is = true;