Explorar el Código

退货入库修改批次号取值方式
退货入库明细修改名称
调拨修改名称
调拨明细新增时不让行编辑

Qukatie hace 3 semanas
padre
commit
94a9c4f7cc

+ 17 - 13
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -935,13 +935,13 @@ export default {
           }
           itemRemove({ ids: ids.join(",") }).then(res => {
             row.historyList = [];
-            row.dot = null;
+            // row.dot = null;
             row.sendNum = 0;
           });
         });
       } else {
         row.historyList = [];
-        row.dot = null;
+        // row.dot = null;
         row.sendNum = 0;
       }
     },
@@ -1008,25 +1008,29 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          for (let row of this.form.shipItemsList) {
-            let ids = [];
+          let ids = [];
+          for (let row of this.selectionMultilist) {
             if (row.historyList.filter(item => item.id).length) {
               for (let item of row.historyList) {
                 ids.push(item.id);
               }
             } else {
               row.historyList = [];
-              row.dot = null;
+              // row.dot = null;
               row.sendNum = 0;
             }
-            if (ids.length) {
-              itemRemove({ ids: ids.join(",") }).then(res => {
-                this.$message.success("操作成功");
-                row.historyList = [];
-                row.dot = null;
-                row.sendNum = 0;
-              });
-            }
+          }
+          if (ids.length) {
+            itemRemove({ ids: ids.join(",") }).then(res => {
+              for (let row of this.selectionMultilist) {
+                if (row.historyList.filter(item => item.id).length) {
+                  row.historyList = [];
+                  // row.dot = null;
+                  row.sendNum = 0;
+                }
+              }
+              this.$message.success("操作成功");
+            });
           }
         });
       }

+ 18 - 4
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -461,6 +461,8 @@ export default {
           {
             label: "批次号",
             prop: "dot",
+            overHidden: true,
+            width:160,
             type: "select",
             // disabled: true,
             dicData: [],
@@ -473,11 +475,13 @@ export default {
           {
             label: "库存数量",
             prop: "inventory",
+            overHidden: true,
             disabled: true
           },
           {
             label: "参考库存融资",
             prop: "inventoryFinancing",
+            overHidden: true,
             width: 120,
             disabled: true,
             hide: true,
@@ -486,6 +490,7 @@ export default {
           {
             label: "参考库存自有",
             prop: "inventoryHave",
+            overHidden: true,
             width: 120,
             disabled: true,
             hide: true,
@@ -494,18 +499,21 @@ export default {
           {
             label: "调拨数量",
             prop: "goodsNum",
+            overHidden: true,
             disabled: false
           },
           {
-            label: "融资数量",
+            label: "调拨融资",
             prop: "sendNumFinancing",
+            overHidden: true,
             disabled: false,
             hide: true,
             showColumn: false
           },
           {
-            label: "自有数量",
+            label: "调拨自有",
             prop: "sendNumHave",
+            overHidden: true,
             disabled: false,
             hide: true,
             showColumn: false
@@ -513,6 +521,7 @@ export default {
           {
             label: "单价",
             prop: "price",
+            overHidden: true,
             disabled: true
           },
           {
@@ -525,23 +534,27 @@ export default {
           {
             label: "规格型号",
             prop: "propertyName",
+            overHidden: true,
             disabled: true,
             width: 100
           },
           {
             label: "花纹",
             prop: "pattern",
+            overHidden: true,
             disabled: true,
             width: 100
           },
           {
             label: "商品描述",
             prop: "goodsDescription",
+            overHidden: true,
             disabled: true
           },
           {
             label: "单位",
             prop: "units",
+            overHidden: true,
             type: "select",
             disabled: true,
             props: {
@@ -552,7 +565,8 @@ export default {
           },
           {
             label: "备注",
-            prop: "remarks"
+            prop: "remarks",
+            overHidden: true,
           }
         ]
       },
@@ -1449,7 +1463,7 @@ export default {
           // 价格
           pricetype: false,
           historyList: [],
-          $cellEdit: true
+          $cellEdit: this.reservoirArea == 1 ? false : true
         };
         this.form.shipItemsList.push(obj);
       }

+ 14 - 3
src/views/tirePartsMall/salesService/inStorage/components/viewArea.vue

@@ -19,10 +19,10 @@
               v-model="query.dot"
               placeholder="批次号"
               label="dot"
-              :disabled="true"
-              :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+              :mockData="dots"
+              :disabled="disabled"
+              :activateCreated="false"
               :filterable="true"
-              :allowCreate="true"
             ></dic-select>
             <el-tag type="danger" style="margin-left: 10px;">销售数量:{{ qtyMax }}</el-tag>
           </div>
@@ -81,6 +81,7 @@ export default {
   },
   data() {
     return {
+      dots:[],
       data: [],
       dialogVisible: false,
       loading: false,
@@ -142,6 +143,9 @@ export default {
       });
     },
     addRow() {
+      if(!this.query.dot){
+        return this.$message.error("请选择批次号!");
+      }
       if (this.data.length == 0) {
         this.data.push({
           quantity: this.qtyMax
@@ -177,10 +181,17 @@ export default {
       this.form = {};
       this.query = {};
       this.index = null;
+      this.dots=[];
       this.data = [];
       this.qtyMax = 0;
       this.form = form;
       this.query = row;
+      let list=this.deepClone(row.dots.split(','))
+      for(let item of list){
+        this.dots.push({
+          dot:item
+        })
+      }
       this.index = index;
       this.data = this.deepClone(row.historyList);
       this.qtyMax = row.remainingNum;

+ 16 - 12
src/views/tirePartsMall/salesService/inStorage/detailsPage.vue

@@ -575,7 +575,7 @@ export default {
           //     }]
           // },
           {
-            label: "销售数量",
+            label: "退货数量",
             prop: "goodsNum",
             disabled: true,
             ovrHidden: true
@@ -587,7 +587,7 @@ export default {
             overHidden: true
           },
           {
-            label: "退数量",
+            label: "退数量",
             prop: "sendNum",
             width: 100,
             // cell: true,
@@ -1011,8 +1011,8 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          for (let row of this.form.shipItemsList) {
-            let ids = [];
+          let ids = [];
+          for (let row of this.selectionMultilist) {
             if (row.historyList.filter(item => item.id).length) {
               for (let item of row.historyList) {
                 ids.push(item.id);
@@ -1022,14 +1022,18 @@ export default {
               // row.dot = null;
               row.sendNum = 0;
             }
-            if (ids.length) {
-              itemRemove({ ids: ids.join(",") }).then(res => {
-                this.$message.success("操作成功");
-                row.historyList = [];
-                // row.dot = null;
-                row.sendNum = 0;
-              });
-            }
+          }
+          if (ids.length) {
+            itemRemove({ ids: ids.join(",") }).then(res => {
+              for (let row of this.selectionMultilist) {
+                if (row.historyList.filter(item => item.id).length) {
+                  row.historyList = [];
+                  // row.dot = null;
+                  row.sendNum = 0;
+                }
+              }
+              this.$message.success("操作成功");
+            });
           }
         });
       }