Qukatie пре 1 недеља
родитељ
комит
bc8a3531cf

+ 1 - 0
src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -463,6 +463,7 @@ export default {
       data1: [],
       data1: [],
       data2: [],
       data2: [],
       option: {
       option: {
+        disabled:false,
         menuBtn: false,
         menuBtn: false,
         labelWidth: 130,
         labelWidth: 130,
         column: [
         column: [

+ 0 - 2
src/views/tirePartsMall/inventory/areaRecord.vue

@@ -52,10 +52,8 @@ export default {
     } else {
     } else {
       this.option = await this.getColumnData(this.getColumnName(279), option);
       this.option = await this.getColumnData(this.getColumnName(279), option);
     }
     }
-    this.$store.commit("DOMAS_IN_DETAIL");
   },
   },
   activated() {
   activated() {
-    this.$store.commit("DOMAS_IN_DETAIL");
     this.params = {
     this.params = {
         goodsId: this.$route.query.goodsId,
         goodsId: this.$route.query.goodsId,
         stockId: this.$route.query.stockId,
         stockId: this.$route.query.stockId,

+ 2 - 2
src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -416,7 +416,7 @@ export default {
               label: "dot",
               label: "dot",
               value: "dot"
               value: "dot"
             },
             },
-            dicUrl: "/api/blade-sales-part/stockDesc/dotList"
+            // dicUrl: "/api/blade-sales-part/stockDesc/dotList"
           },
           },
           {
           {
             label: "退货数量",
             label: "退货数量",
@@ -674,7 +674,7 @@ export default {
       this.$refs["form"].validate((valid, done) => {
       this.$refs["form"].validate((valid, done) => {
         done();
         done();
         if (valid) {
         if (valid) {
-          if (this.whetherFinancing == 1) {
+          if (this.reservoirArea==1) {
             for (let item of this.form.shipItemsList) {
             for (let item of this.form.shipItemsList) {
               if (item.historyList.length == 0) {
               if (item.historyList.length == 0) {
                 return this.$message.error("请维护出库明细的库区");
                 return this.$message.error("请维护出库明细的库区");

+ 1 - 1
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -911,7 +911,7 @@ export default {
                             label: "dot",
                             label: "dot",
                             value: "dot"
                             value: "dot"
                         },
                         },
-                        dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+                        // dicUrl: "/api/blade-sales-part/stockDesc/dotList",
                         overHidden: true,
                         overHidden: true,
                     }, {
                     }, {
                         label: '小计',
                         label: '小计',

+ 7 - 4
src/views/tirePartsMall/salesManagement/outboundWorkOrder/components/viewArea.vue

@@ -119,13 +119,14 @@ export default {
           this.onLoad();
           this.onLoad();
         } else {
         } else {
           this.query.dot = null;
           this.query.dot = null;
+          this.onLoad();
         }
         }
       }
       }
     },
     },
     qtyChange(row) {
     qtyChange(row) {
-      let sum = 0;
-      for (let item of this.data) {
-        sum += Number(item.quantity);
+          let sum = 0;
+      for (let item of this.data.filter(item => item.quantity > 0)) {
+        sum += Number(item.quantity?item.quantity:0);
       }
       }
       if (sum > this.qtyMax) {
       if (sum > this.qtyMax) {
         return this.$message.error("总数量不能超过" + this.qtyMax);
         return this.$message.error("总数量不能超过" + this.qtyMax);
@@ -143,6 +144,8 @@ export default {
       selectReservoirAreaList(obj)
       selectReservoirAreaList(obj)
         .then(res => {
         .then(res => {
           this.data = res.data.data;
           this.data = res.data.data;
+        }).catch(()=>{
+          this.data =[]
         })
         })
         .finally(() => {
         .finally(() => {
           this.loading = false;
           this.loading = false;
@@ -178,7 +181,7 @@ export default {
       }
       }
       let sum = 0;
       let sum = 0;
       for (let item of this.data.filter(item => item.quantity > 0)) {
       for (let item of this.data.filter(item => item.quantity > 0)) {
-        sum += Number(item.quantity);
+        sum += Number(item.quantity?item.quantity:0);
       }
       }
       if (sum > this.qtyMax) {
       if (sum > this.qtyMax) {
         return this.$message.error("总数量不能超过" + this.qtyMax);
         return this.$message.error("总数量不能超过" + this.qtyMax);

+ 3 - 9
src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -415,15 +415,9 @@ export default {
           },
           },
           {
           {
             label: "品牌",
             label: "品牌",
-            prop: "brandId",
+            prop: "brandName",
             width: 100,
             width: 100,
             overHidden: true,
             overHidden: true,
-            type: "select",
-            props: {
-              label: "cname",
-              value: "id"
-            },
-            dicUrl: "/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1"
           },
           },
           {
           {
             label: "规格型号",
             label: "规格型号",
@@ -453,7 +447,7 @@ export default {
               label: "dot",
               label: "dot",
               value: "dot"
               value: "dot"
             },
             },
-            dicUrl: "/api/blade-sales-part/stockDesc/dotList"
+            // dicUrl: "/api/blade-sales-part/stockDesc/dotList"
           },
           },
           {
           {
             label: "单位",
             label: "单位",
@@ -767,7 +761,7 @@ export default {
       this.$refs["form"].validate((valid, done) => {
       this.$refs["form"].validate((valid, done) => {
         done();
         done();
         if (valid) {
         if (valid) {
-          if (this.whetherFinancing == 1) {
+          if (this.reservoirArea==1) {
             for (let item of this.form.shipItemsList) {
             for (let item of this.form.shipItemsList) {
               if (item.historyList.length == 0) {
               if (item.historyList.length == 0) {
                 return this.$message.error("请维护出库明细的库区");
                 return this.$message.error("请维护出库明细的库区");

+ 12 - 12
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/components/viewArea.vue

@@ -179,11 +179,11 @@ export default {
     dicChange(name, row) {
     dicChange(name, row) {
       if (name == "dot") {
       if (name == "dot") {
         if (row) {
         if (row) {
-          this.qtyMax=row.balanceQuantity
-          this.query.inventoryFinancing=row.balanceQuantityFinancing
-          this.query.inventoryHave=row.balanceQuantityHave
+          this.qtyMax = row.balanceQuantity;
+          this.query.inventoryFinancing = row.balanceQuantityFinancing;
+          this.query.inventoryHave = row.balanceQuantityHave;
         } else {
         } else {
-          this.qtyMax= 0;
+          this.qtyMax = 0;
           this.query.inventoryFinancing = 0;
           this.query.inventoryFinancing = 0;
           this.query.inventoryHave = 0;
           this.query.inventoryHave = 0;
         }
         }
@@ -239,9 +239,9 @@ export default {
       row.quantityHave = 0;
       row.quantityHave = 0;
       let sum = 0;
       let sum = 0;
       let sendNumFinancing = 0;
       let sendNumFinancing = 0;
-      for (let item of this.data) {
-        sum += Number(item.quantity);
-        sendNumFinancing += Number(item.quantityFinancing);
+      for (let item of this.data.filter(item => item.quantity > 0)) {
+        sum += Number(item.quantity ? item.quantity : 0);
+        sendNumFinancing += Number(item.quantityFinancing?item.quantityFinancing:0);
       }
       }
       if (sendNumFinancing > Number(this.query.inventoryFinancing)) {
       if (sendNumFinancing > Number(this.query.inventoryFinancing)) {
         return this.$message.error("融资数量不能超过" + this.query.inventoryFinancing);
         return this.$message.error("融资数量不能超过" + this.query.inventoryFinancing);
@@ -255,9 +255,9 @@ export default {
       row.quantityFinancing = 0;
       row.quantityFinancing = 0;
       let sum = 0;
       let sum = 0;
       let sendNumHave = 0;
       let sendNumHave = 0;
-      for (let item of this.data) {
-        sum += Number(item.quantity);
-        sendNumHave += Number(item.quantityHave);
+      for (let item of this.data.filter(item => item.quantity > 0)) {
+        sum += Number(item.quantity?item.quantity:0);
+        sendNumHave += Number(item.quantityHave?item.quantityHave:0);
       }
       }
 
 
       if (sendNumHave > Number(this.query.inventoryHave)) {
       if (sendNumHave > Number(this.query.inventoryHave)) {
@@ -274,7 +274,7 @@ export default {
       this.data = [];
       this.data = [];
       this.qtyMax = 0;
       this.qtyMax = 0;
       this.form = form;
       this.form = form;
-      this.query =this.deepClone(row) ;
+      this.query = this.deepClone(row);
       this.index = index;
       this.index = index;
       this.data = this.deepClone(row.historyList);
       this.data = this.deepClone(row.historyList);
       this.qtyMax = row.inventory;
       this.qtyMax = row.inventory;
@@ -319,7 +319,7 @@ export default {
       let obj = {
       let obj = {
         ...this.query,
         ...this.query,
         sendNum: sum,
         sendNum: sum,
-        inventory:this.qtyMax,
+        inventory: this.qtyMax,
         sendNumFinancing: sendNumFinancing,
         sendNumFinancing: sendNumFinancing,
         sendNumHave: sendNumHave,
         sendNumHave: sendNumHave,
         historyList: this.data
         historyList: this.data

+ 1 - 1
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -447,7 +447,7 @@ export default {
               label: "dot",
               label: "dot",
               value: "dot"
               value: "dot"
             },
             },
-            dicUrl: "/api/blade-sales-part/stockDesc/dotList"
+            // dicUrl: "/api/blade-sales-part/stockDesc/dotList"
           },
           },
           {
           {
             label: "库存数量",
             label: "库存数量",

+ 1 - 1
src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -993,7 +993,7 @@ export default {
               label: "dot",
               label: "dot",
               value: "dot"
               value: "dot"
             },
             },
-            dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+            // dicUrl: "/api/blade-sales-part/stockDesc/dotList",
             overHidden: true
             overHidden: true
           },
           },
           {
           {

+ 1 - 1
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1219,7 +1219,7 @@ export default {
               label: "dot",
               label: "dot",
               value: "dot"
               value: "dot"
             },
             },
-            dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+            // dicUrl: "/api/blade-sales-part/stockDesc/dotList",
             overHidden: true
             overHidden: true
           },
           },
           // {
           // {