Browse Source

查看库区新加拖动
出库工单切换页面重新请求去掉

Qukatie 2 days ago
parent
commit
1b8a4e067d

+ 3 - 1
src/views/tirePartsMall/purchaseService/outStorage/components/viewArea.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose"  v-dialog-drag>
       <div style="display: flex;align-items: center;">
         <dic-select
           v-if="dialogVisible"
@@ -87,6 +87,8 @@ export default {
           {
             label: "批次",
             prop: "dot",
+            filters: true,
+            sortable: true,
             overHidden: true
           },
           {

+ 2 - 2
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/components/viewArea.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose" v-dialog-drag>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -33,7 +33,7 @@
             placeholder="库区"
             label="cname"
             res="records"
-            :url="'/blade-sales-part/reservoirarea/listZero?current=1&size=5&storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+            :url="'/blade-sales-part/reservoirarea/listZero?current=1&size=5&storageId=' + form.storageId"
             :filterable="true"
             :remote="true"
             dataName="cname"

+ 0 - 3
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -875,9 +875,6 @@ export default {
     dicSelect,
     viewArea
   },
-  activated() {
-    this.$store.commit("DOMIO_IN_DETAIL");
-  },
   methods: {
     rowDelArea(row, index) {
       if (row.historyList.filter(item => item.id).length) {

+ 4 - 8
src/views/tirePartsMall/salesManagement/Inventory/components/viewArea.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose" v-dialog-drag>
       <div style="display: flex;align-items: center;">
         <dic-select
           v-if="dialogVisible"
@@ -25,13 +25,7 @@
         :header-cell-class-name="headerClassName"
       >
         <template slot="quantity" slot-scope="{ row }">
-          <el-input-number
-            v-model="row.quantity"
-            size="small"
-            :controls="false"
-            style="width: 100%"
-            :disabled="disabled"
-          />
+          <el-input-number v-model="row.quantity" size="small" :controls="false" style="width: 100%" :disabled="disabled" />
         </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
@@ -84,6 +78,8 @@ export default {
           {
             label: "批次",
             prop: "dot",
+            filters: true,
+            sortable: true,
             overHidden: true
           },
           {

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

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose" 
+      v-dialog-drag>
       <div style="display: flex;align-items: center;">
         <dic-select
           v-if="dialogVisible"
@@ -87,6 +88,8 @@ export default {
           {
             label: "批次",
             prop: "dot",
+            filters: true,
+            sortable: true,
             overHidden: true
           },
           {

+ 0 - 6
src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -637,12 +637,6 @@ export default {
       this.reservoirArea = res.data.data;
     });
   },
-  activated() {
-    if (this.detailData.id) {
-      this.refresh();
-    }
-    this.$store.commit("DOMIO_IN_DETAIL");
-  },
   methods: {
     rowDelArea(row, index) {
       if (row.historyList.filter(item => item.id).length) {

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose" v-dialog-drag>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -213,7 +213,7 @@ export default {
       });
     },
     addRow() {
-      if(!this.query.dot){
+      if (!this.query.dot) {
         return this.$message.error("请选择批次号!");
       }
       this.data.push({

+ 5 - 3
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -1198,9 +1198,11 @@ export default {
               if (item.historyList.length == 0) {
                 return this.$message.error("请维护出库明细的库区");
               }
-              if (!item.dot) {
-                return this.$message.error("请维护明细信息的批次号");
-              }
+            }
+          }
+          for (let item of this.form.shipItemsList) {
+            if (!item.dot && item.whether == 1) {
+              return this.$message.error("请维护明细信息的批次号");
             }
           }
           const loading = this.$loading({

+ 0 - 13
src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -2034,20 +2034,7 @@ export default {
         let picihao = false;
         if (valid) {
           for (let i in this.form.orderItemsList) {
-            console.log(this.form.orderItemsList[i], 1800);
             this.form.orderItemsList[i].subTotalMoney = this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price;
-            if (this.form.orderItemsList[i].pid) {
-            } else {
-              if (this.form.orderItemsList[i].whether == "1") {
-                if (this.form.orderItemsList[i].dot) {
-                } else {
-                  this.$message.warning(`采购明细序号${Number(i) + 1}的批次号不能为空`);
-                  picihao = true;
-                  break;
-                }
-              } else {
-              }
-            }
             if (this.form.orderItemsList[i].goodsNum <= 0) {
               this.$message.warning(`采购明细序号${Number(i) + 1}的数量不能为零`);
               picihao = true;

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose" v-dialog-drag>
       <avue-crud
         v-if="dialogVisible"
         :option="option"