Browse Source

采购入库修改操作流程

Qukatie 2 days ago
parent
commit
81ef6f717b

+ 5 - 0
src/components/dicSelect/main.vue

@@ -20,6 +20,7 @@
           :size="size"
           :disabled="disabled"
           :collapse-tags="collapseTags"
+          :allow-create="allowCreate"
           @visible-change="visibleChange"
         >
           <el-option
@@ -238,6 +239,10 @@ export default {
       type: Boolean,
       default: true
     },
+    allowCreate: {
+      type: Boolean,
+      default: false
+    },
     slotRight: {
       type: Boolean,
       default: false

+ 53 - 80
src/views/tirePartsMall/purchaseService/outStorage/components/viewArea.vue

@@ -1,6 +1,17 @@
 <template>
   <div>
     <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+      <dic-select
+        v-if="dialogVisible"
+        style="width: 300px;"
+        v-model="query.dot"
+        placeholder="批次号"
+        label="dot"
+        :disabled="disabled || query.historyList.length"
+        :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+        :filterable="true"
+        @selectChange="dicChange('dot', $event)"
+      ></dic-select>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -34,6 +45,7 @@
 import { selectReservoirAreaList } from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
 import { head } from "lodash";
 import { isProcurement } from "@/api/basicData/configuration";
+import dicSelect from "@/components/dicSelect/main";
 export default {
   props: {
     disabled: {
@@ -41,6 +53,9 @@ export default {
       default: false
     }
   },
+  components: {
+    dicSelect
+  },
   data() {
     return {
       data: [],
@@ -55,12 +70,15 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
+        columnBtn:false,
         menu: false,
         header: false,
         column: [
           {
             label: "库区",
             prop: "reservoirAreaName",
+            filters: true,
+            sortable: true,
             overHidden: true
           },
           {
@@ -74,54 +92,30 @@ export default {
             overHidden: true
           },
           {
-            label: "融资库存",
-            prop: "balanceQuantityFinancing",
-            overHidden: true,
-            hide: true
-          },
-          {
-            label: "自有库存",
-            prop: "balanceQuantityHave",
-            overHidden: true,
-            hide: true
-          },
-          {
             label: "本次数量",
             prop: "quantity",
             overHidden: true
-          },
-          {
-            label: "本次融资数量",
-            prop: "quantityFinancing",
-            overHidden: true,
-            hide: true
-          },
-          {
-            label: "本次自有数量",
-            prop: "quantityHave",
-            overHidden: true,
-            hide: true
           }
         ]
       },
+      form: {},
       query: {},
       index: 0,
-      whetherFinancing: 0,
       qtyMax: 0
     };
   },
-  async created() {
-    isProcurement({ param: "whether.financing" }).then(res => {
-      if (res.data.data == 1) {
-        this.whetherFinancing = res.data.data;
-        this.findObject(this.option.column, "balanceQuantityFinancing").hide = false;
-        this.findObject(this.option.column, "balanceQuantityHave").hide = false;
-        this.findObject(this.option.column, "quantityFinancing").hide = false;
-        this.findObject(this.option.column, "quantityHave").hide = false;
-      }
-    });
-  },
+  async created() {},
   methods: {
+    dicChange(name, row) {
+      if (name == "dot") {
+        if (row) {
+          this.query.inventory = row.balanceQuantity;
+          this.onLoad();
+        } else {
+          this.query.dot = null;
+        }
+      }
+    },
     qtyChange(row) {
       let sum = 0;
       for (let item of this.data) {
@@ -130,39 +124,17 @@ export default {
       if (sum > this.qtyMax) {
         return this.$message.error("总数量不能超过" + this.qtyMax);
       }
-      //融资系统参数=1
-      if (this.whetherFinancing == 1) {
-        if (row.balanceQuantityFinancing > 0) {
-          //融资库存>0
-          if (Number(row.quantity) <= Number(row.balanceQuantityFinancing)) {
-            //本次数量小于等于融资库存 取本次数量
-            row.quantityFinancing = row.quantity;
-          } else {
-            //本次数量大于融资库存 最大值取融资库存
-            row.quantityFinancing = row.balanceQuantityFinancing;
-          }
-        } else {
-          //融资库存=0
-          row.quantityFinancing = 0;
-        }
-        if (row.balanceQuantityHave > 0) {
-          //自有库存>0
-          if (Number(row.quantity) <= Number(row.balanceQuantityHave)) {
-            //本次数量小于等于自有库存 取本次数量
-            row.quantityHave = row.quantity;
-          } else {
-            //本次数量大于融资库存 最大值取自有库存
-            row.quantityHave = row.balanceQuantityHave;
-          }
-        } else {
-          //自有库存=0
-          row.quantityHave = 0;
-        }
-      }
     },
     onLoad() {
+      let obj = {
+        shipId: this.form.id,
+        shipItemId: this.query.id,
+        goodsId: this.query.goodsId,
+        storageId: this.form.storageId,
+        dot: this.query.dot
+      };
       this.loading = true;
-      selectReservoirAreaList(this.obj)
+      selectReservoirAreaList(obj)
         .then(res => {
           this.data = res.data.data;
         })
@@ -170,18 +142,18 @@ export default {
           this.loading = false;
         });
     },
-    openDialog(val, index, list, max) {
+    openDialog(form, row, index) {
+      this.form = {};
+      this.query = {};
+      this.index = null;
       this.data = [];
-      this.index = 0;
       this.qtyMax = 0;
-      this.dialogVisible = true;
-      this.obj = val;
+      this.form = form;
+      this.query = row;
       this.index = index;
-      this.data = list;
-      this.qtyMax = max;
-      if (list.length == 0) {
-        this.onLoad();
-      }
+      this.data = row.historyList;
+      this.qtyMax = row.goodsNum;
+      this.dialogVisible = true;
     },
     submit() {
       if (this.data.filter(item => item.quantity > 0).length == 0) {
@@ -194,11 +166,12 @@ export default {
       if (sum > this.qtyMax) {
         return this.$message.error("总数量不能超过" + this.qtyMax);
       }
-      this.$emit(
-        "areaData",
-        this.data.filter(item => item.quantity > 0),
-        this.index
-      );
+      let obj = {
+        ...this.query,
+        sendNum: sum,
+        historyList: this.data.filter(item => item.quantity > 0)
+      };
+      this.$emit("areaData", obj, this.index);
 
       this.dialogVisible = false;
     },

+ 36 - 13
src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -55,10 +55,17 @@
                 >
                   清空库区
                 </el-button>
-                <el-button v-if="reservoirArea == 1" :size="size" :disabled="!row.id" type="text" @click="rowArea(row, index)">
+                <el-button
+                  v-if="reservoirArea == 1"
+                  :size="size"
+                  :disabled="!row.id || disabled || isDisabled"
+                  type="text"
+                  @click="rowArea(row, index)"
+                >
                   {{ row.historyList.length ? "查看库区" : "选择库区" }}
                 </el-button>
                 <el-button
+                  v-if="reservoirArea != 1"
                   :size="size"
                   :disabled="disabled || isDisabled"
                   :type="type"
@@ -108,7 +115,7 @@
           </el-tab-pane>
         </el-tabs>
       </trade-card>
-      <view-area ref="viewArea" @areaData="areaData"  :disabled="disabled || isDisabled"></view-area>
+      <view-area ref="viewArea" @areaData="areaData" :disabled="disabled || isDisabled"></view-area>
       <containerTitle title="上传附件"></containerTitle>
       <c-upload
         v-loading="loadingBtn"
@@ -126,7 +133,14 @@
 </template>
 
 <script>
-import { getDetails, tradingBox, submit, warehousingComplete, revokeOutboundCompleted,itemRemove } from "@/api/tirePartsMall/purchaseService/outboundWorkOrder";
+import {
+  getDetails,
+  tradingBox,
+  submit,
+  warehousingComplete,
+  revokeOutboundCompleted,
+  itemRemove
+} from "@/api/tirePartsMall/purchaseService/outboundWorkOrder";
 import { dateFormat } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
 import { dotList } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
@@ -581,25 +595,34 @@ export default {
           }
           itemRemove({ ids: ids.join(",") }).then(res => {
             row.historyList = [];
+            row.dot = null;
+            row.sendNum = 0;
+            row.inventory = 0;
           });
         });
       } else {
         row.historyList = [];
+        row.dot = null;
+        row.sendNum = 0;
+        row.inventory = 0;
       }
     },
     rowArea(row, index) {
-      let obj = {
-        shipId: this.form.id,
-        shipItemId: row.id,
-        goodsId: row.goodsId,
-        storageId: this.form.storageId,
-        dot: row.dot
-      };
-      this.$refs.viewArea.openDialog(obj, index, row.historyList, row.sendNum);
+      // let obj = {
+      //   shipId: this.form.id,
+      //   shipItemId: row.id,
+      //   goodsId: row.goodsId,
+      //   storageId: this.form.storageId,
+      //   dot: row.dot
+      // };
+      this.$refs.viewArea.openDialog(this.form, row, index);
     },
-    areaData(list, index) {
+    areaData(row, index) {
       // console.log(list, index);
-      this.form.shipItemsList[index].historyList = list;
+      this.form.shipItemsList[index].dot = row.dot;
+      this.form.shipItemsList[index].inventory = row.inventory;
+      this.form.shipItemsList[index].sendNum = row.sendNum;
+      this.form.shipItemsList[index].historyList = row.historyList;
     },
     // 撤销出库
     revoke() {

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

@@ -0,0 +1,258 @@
+<template>
+  <div>
+    <el-dialog title="查看库区" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+      <avue-crud
+        v-if="dialogVisible"
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        ref="crud"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+      >
+        <template slot-scope="{ scope, row }" slot="menuLeft">
+          <div style="display: flex;">
+            <el-button type="primary" size="small" @click="addRow">新增</el-button>
+            <dic-select
+              v-if="dialogVisible"
+              style="width: 300px;"
+              v-model="query.dot"
+              placeholder="批次号"
+              label="dot"
+              :disabled="disabled || query.historyList.length"
+              :url="'/blade-sales-part/stockDesc/dotList?storageId=' + form.storageId + '&goodsId=' + query.goodsId"
+              :filterable="true"
+              :allowCreate="true"
+            ></dic-select>
+          </div>
+        </template>
+        <template slot="reservoirAreaName" slot-scope="{ row }">
+          <dic-select
+            v-model="row.reservoirAreaName"
+            placeholder="库区"
+            label="cname"
+            res="records"
+            :url="'/blade-sales-part/reservoirarea/list?current=1&size=5&storageId=' + form.storageId"
+            :filterable="true"
+            :remote="true"
+            dataName="cname"
+            @selectChange="rowDicChange('reservoirAreaName', $event, row)"
+            :slotRight="true"
+            rightLabel="balanceQuantity"
+          ></dic-select>
+        </template>
+        <template slot="quantity" slot-scope="{ row }">
+          <el-input-number
+            v-model="row.quantity"
+            size="small"
+            :controls="false"
+            style="width: 100%"
+            :max="qtyMax"
+            :disabled="disabled"
+            @change="qtyChange(row)"
+          />
+        </template>
+        <template slot-scope="{ row, index }" slot="menu">
+          <el-button icon="el-icon-delete" :disabled="disabled" type="text" @click="rowDel(row, index)">删除 </el-button>
+        </template>
+      </avue-crud>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
+        <el-button type="primary" @click="submit" size="mini">确 认</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import dicSelect from "@/components/dicSelect/main";
+import { itemRemove } from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
+export default {
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  components: {
+    dicSelect
+  },
+  data() {
+    return {
+      data: [],
+      dialogVisible: false,
+      loading: false,
+      option: {
+        height: 500,
+        calcHeight: 30,
+        menuWidth: 80,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        refreshBtn: false,
+        columnBtn: false,
+        // menu: false,
+        // header: false,
+        column: [
+          {
+            label: "库区",
+            prop: "reservoirAreaName",
+            overHidden: true
+          },
+          {
+            label: "库存",
+            prop: "balanceQuantity",
+            overHidden: true
+          },
+          {
+            label: "本次数量",
+            prop: "quantity",
+            overHidden: true
+          }
+        ]
+      },
+      form: {},
+      query: {},
+      index: 0,
+      qtyMax: 0
+    };
+  },
+  async created() {},
+  methods: {
+    rowDel(row, index) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        if (row.id) {
+          itemRemove({ ids: row.id }).then(res => {
+            this.data.splice(index, 1);
+            this.$message.success("操作成功!");
+          });
+        } else {
+          this.data.splice(index, 1);
+          this.$message.success("操作成功!");
+        }
+      });
+    },
+    addRow() {
+      this.data.push({
+        quantity: 0
+      });
+    },
+    rowDicChange(name, row, el) {
+      if (name == "reservoirAreaName") {
+        if (row) {
+          el.reservoirAreaId = row.id;
+          el.balanceQuantity = row.balanceQuantity;
+        } else {
+          el.reservoirAreaId = null;
+          el.reservoirAreaName = null;
+          el.balanceQuantity = null;
+        }
+      }
+    },
+    qtyChange(row) {
+      let sum = 0;
+      for (let item of this.data) {
+        sum += Number(item.quantity);
+      }
+      if (sum > this.qtyMax) {
+        return this.$message.error("总数量不能超过" + this.qtyMax);
+      }
+    },
+    openDialog(form, row, index) {
+      this.form = {};
+      this.query = {};
+      this.index = null;
+      this.data = [];
+      this.qtyMax = 0;
+      this.form = form;
+      this.query = row;
+      this.index = index;
+      this.data = row.historyList;
+      this.qtyMax = row.goodsNum;
+      this.dialogVisible = true;
+    },
+    submit() {
+      let sum = 0;
+      for (let item of this.data) {
+        if (!item.reservoirAreaId) {
+          return this.$message.error("请选择库区");
+        }
+        if (!item.quantity) {
+          return this.$message.error("本次数量不能为0");
+        }
+        sum += Number(item.quantity);
+      }
+      if (sum > this.qtyMax) {
+        return this.$message.error("总数量不能超过" + this.qtyMax);
+      }
+      let obj = {
+        ...this.query,
+        sendNum: sum,
+        historyList: this.data
+      };
+      this.$emit("areaData", obj, this.index);
+
+      this.dialogVisible = false;
+    },
+    //自定义列保存
+    async saveColumn(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        this.searchReset();
+      }
+    },
+    //自定义列重置
+    async resetColumn(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = "";
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one";
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two";
+        }
+      }
+      return back;
+    }
+  }
+};
+</script>
+
+<style scoped>
+::v-deep#out-table .back-one {
+  background: #ecf5ff !important;
+  text-align: center;
+  padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+  background: #ecf5ff !important;
+  text-align: center;
+  padding: 4px 0;
+}
+</style>

+ 78 - 29
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -82,6 +82,25 @@
               </template>
               <template slot-scope="{ type, size, row, index, disabled }" slot="menu">
                 <el-button
+                  v-if="reservoirArea == 1 && row.historyList.length"
+                  :size="size"
+                  :disabled="!row.id || form.statusName == '已入库' || isEdit || isEdits"
+                  type="text"
+                  @click="rowDelArea(row, index)"
+                >
+                  清空库区
+                </el-button>
+                <el-button
+                  v-if="reservoirArea == 1"
+                  :size="size"
+                  :disabled="!row.id || form.statusName == '已入库' || isEdit || isEdits"
+                  type="text"
+                  @click="rowArea(row, index)"
+                >
+                  {{ row.historyList.length ? "查看库区" : "选择库区" }}
+                </el-button>
+                <el-button
+                  v-if="reservoirArea != 1"
                   :size="size"
                   :disabled="disabled || isEdit"
                   :type="type"
@@ -197,6 +216,7 @@
         <el-button type="primary" @click="allClick('修改')" size="mini">修 改</el-button>
       </span>
     </el-dialog>
+    <view-area ref="viewArea" @areaData="areaData" :disabled="disabled || form.statusName == '已入库' || isEdit || isEdits"></view-area>
     <el-dialog title="导入明细" append-to-body :visible.sync="excelBox2" width="555px" :close-on-click-modal="false" v-dialog-drag>
       <avue-form
         v-if="excelBox2"
@@ -231,12 +251,14 @@ import {
   dotListAll,
   removeItem
 } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
+import { itemRemove } from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
 import { dateFormat } from "@/util/date";
 import { getToken } from "@/util/auth";
 import { getMenu } from "@/api/system/menu";
 import reportDialog from "@/components/report-dialog/main";
 import { corpsDescListAll } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { isProcurement } from "@/api/basicData/configuration";
+import viewArea from "./components/viewArea.vue";
 export default {
   name: "detailsPage",
   data() {
@@ -251,7 +273,6 @@ export default {
       // 上传附件的需要参数
       loadingBtn: false,
       filesList: [],
-
       switchDialog: false,
       isEdit: false,
       values: "",
@@ -470,7 +491,7 @@ export default {
         editBtn: false, // 修改按钮
         delBtn: false, //删除按钮
         border: true,
-        menuWidth: 160,
+        menuWidth: 250,
         stripe: true,
         span: 8,
         addRowBtn: false,
@@ -599,13 +620,6 @@ export default {
             // }, {
           },
           {
-            label: "库区",
-            prop: "reservoirAreaName",
-            width: 140,
-            hide: true,
-            overHidden: true
-          },
-          {
             label: "品牌",
             prop: "brandName",
             disabled: false,
@@ -809,9 +823,6 @@ export default {
       }
     });
     isProcurement({ param: "reservoir.area" }).then(res => {
-      if (res.data.data == 1) {
-        this.findObject(this.optionContacts.column, "reservoirAreaName").hide = false;
-      }
       this.reservoirArea = res.data.data;
     });
     this.findObject(this.optionContacts.column, "goodsId").change = ({ value, column }) => {
@@ -890,14 +901,57 @@ export default {
   },
   components: {
     reportDialog,
-    dicSelect
+    dicSelect,
+    viewArea
   },
   activated() {
     this.$store.commit("DOMIO_IN_DETAIL");
   },
   methods: {
+    rowDelArea(row, index) {
+      if (row.historyList.filter(item => item.id).length) {
+        this.$confirm("是否撤销库区?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let ids = [];
+          for (let item of row.historyList) {
+            ids.push(item.id);
+          }
+          itemRemove({ ids: ids.join(",") }).then(res => {
+            row.historyList = [];
+            row.reservoirAreaId = null;
+            row.reservoirAreaName = null;
+            row.dot = null;
+            row.sendNum = 0;
+          });
+        });
+      } else {
+        row.historyList = [];
+        row.reservoirAreaId = null;
+        row.reservoirAreaName = null;
+        row.dot = null;
+        row.sendNum = 0;
+      }
+    },
+    rowArea(row, index) {
+      this.$refs.viewArea.openDialog(this.form, row, index);
+    },
+    areaData(row, index) {
+      this.form.shipItemsList[index].reservoirAreaId = row.reservoirAreaId;
+      this.form.shipItemsList[index].reservoirAreaName = row.reservoirAreaName;
+      this.form.shipItemsList[index].dot = row.dot;
+      this.form.shipItemsList[index].sendNum = row.sendNum;
+      this.form.shipItemsList[index].historyList = row.historyList;
+    },
     allClick(name) {
       if (name == "修改库区") {
+        for (let item of this.selectionMultilist) {
+          if (item.historyList.length > 0) {
+            return this.$message.error("请选择没有选择库区的数据");
+          }
+        }
         this.fixForm = {
           reservoirAreaId: null,
           reservoirAreaName: null
@@ -913,8 +967,13 @@ export default {
           for (let item of this.selectionMultilist) {
             this.form.shipItemsList.forEach(row => {
               if (item.id == row.id) {
-                row.reservoirAreaId = this.fixForm.reservoirAreaId;
-                row.reservoirAreaName = this.fixForm.reservoirAreaName;
+                row.historyList.push({
+                  reservoirAreaId: this.fixForm.reservoirAreaId,
+                  reservoirAreaName: this.fixForm.reservoirAreaName,
+                  balanceQuantity:this.fixForm.balanceQuantity,
+                  quantity: row.goodsNum
+                });
+                row.sendNum = row.goodsNum;
               }
             });
           }
@@ -930,9 +989,11 @@ export default {
       if (name == "reservoirAreaName") {
         if (row) {
           this.fixForm.reservoirAreaId = row.id;
+          this.fixForm.balanceQuantity = row.balanceQuantity;
         } else {
           this.fixForm.reservoirAreaId = null;
           this.fixForm.reservoirAreaName = null;
+          this.fixForm.balanceQuantity = row.balanceQuantity;
         }
       }
     },
@@ -1105,8 +1166,8 @@ export default {
         if (valid) {
           if (this.reservoirArea == 1) {
             for (let item of this.form.shipItemsList) {
-              if (!item.reservoirAreaId) {
-                return this.$message.error("请选择入库明细的库区");
+              if (!item.historyList.length) {
+                return this.$message.error("请选择库区");
               }
             }
           }
@@ -1335,12 +1396,6 @@ export default {
           this.findObject(this.optionContacts.column, "pattern").label = "规格型号1";
         }
       });
-      isProcurement({ param: "reservoir.area" }).then(res => {
-        if (res.data.data == 1) {
-          this.findObject(this.optionContacts.column, "reservoirAreaName").hide = false;
-        }
-        this.reservoirArea = res.data.data;
-      });
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口b
@@ -1356,12 +1411,6 @@ export default {
           this.findObject(this.optionContacts.column, "pattern").label = "规格型号1";
         }
       });
-      isProcurement({ param: "reservoir.area" }).then(res => {
-        if (res.data.data == 1) {
-          this.findObject(this.optionContacts.column, "reservoirAreaName").hide = false;
-        }
-        this.reservoirArea = res.data.data;
-      });
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;

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

@@ -76,6 +76,8 @@ export default {
           {
             label: "库区",
             prop: "reservoirAreaName",
+              filters:true,
+              sortable:true,
             overHidden: true
           },
           {