From 22bfe5e10d330c4926a610cd3c80ae587092ca3c Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Tue, 2 Apr 2024 16:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E4=B8=BB=E5=86=99=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/heavyTable/index.vue           |   1 +
 src/views/libraryManage/components/goods.vue  | 217 +++++++++---------
 .../apply/ProductBatchNumberLocked.vue        |   7 +-
 .../inventoryLock/apply/ProductLock.vue       |   7 +-
 .../apply/heLotNumberOfTheProductIsLocked.vue |   7 +-
 vue.config.js                                 |   4 +-
 6 files changed, 129 insertions(+), 114 deletions(-)

diff --git a/src/components/heavyTable/index.vue b/src/components/heavyTable/index.vue
index 722d10d..a265e0b 100644
--- a/src/components/heavyTable/index.vue
+++ b/src/components/heavyTable/index.vue
@@ -31,6 +31,7 @@
       :class="tableClass"
       v-bind="tableProps"
       :data="data"
+      height="500px"
       v-loading="loading"
       @selection-change="handleSelectionChange"
       @sort-change="sortChange"
diff --git a/src/views/libraryManage/components/goods.vue b/src/views/libraryManage/components/goods.vue
index 780165f..a8e088f 100644
--- a/src/views/libraryManage/components/goods.vue
+++ b/src/views/libraryManage/components/goods.vue
@@ -10,7 +10,10 @@
     @closed="closed"
   >
     <div class="search-box">
-      <el-form :inline="true" :model="query">
+      <el-form
+        :inline="true"
+        :model="query"
+      >
         <el-form-item label="商品信息">
           <el-input
             v-model="query.keyword"
@@ -33,7 +36,10 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <rrOpt @query="toQuery" @reset="toReset" />
+          <rrOpt
+            @query="toQuery"
+            @reset="toReset"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -56,214 +62,213 @@
         :disabled="!handleSelectId.length != 0"
         @click="onSave"
         :loading="btnLoading"
-        >确定</el-button
-      >
+      >确定</el-button>
     </div>
   </el-dialog>
 </template>
 <script>
-import { queryGoodsAndLocation } from "@/api/libraryManage/common.js";
-import { getTableHeader } from "@/api/system/table";
+import { queryGoodsAndLocation } from '@/api/libraryManage/common.js'
+import { getTableHeader } from '@/api/system/table'
 export default {
-  dicts: ["goods_unit", "goods_classify"],
-  props: ["queryParams"],
+  dicts: ['goods_unit', 'goods_classify'],
+  props: ['queryParams'],
   data() {
-    const _that = this;
+    const _that = this
     return {
       btnLoading: false,
       dialogVisible: false,
       query: {
-        goodsMnemonic: "",
+        goodsMnemonic: ''
       },
       loading: false,
       handleSelectId: [],
       handleSelect: [],
       handleSelectMap: [],
       tableProps: {
-        "row-key": "stockId",
-        "max-height": 460,
+        'row-key': 'stockId',
+        'max-height': 460
       },
       tableConfig: {
         config: [
           {
-            label: "复选框",
-            type: "selection",
-            prop: "selection",
-            istrue: true,
+            label: '复选框',
+            type: 'selection',
+            prop: 'selection',
+            istrue: true
           },
 
           {
-            label: "业主编号",
-            prop: "consignorCode",
-            istrue: true,
+            label: '业主编号',
+            prop: 'consignorCode',
+            istrue: true
           },
           {
-            label: "业主名称",
-            prop: "consignorName",
-            istrue: true,
+            label: '业主名称',
+            prop: 'consignorName',
+            istrue: true
           },
           {
-            label: "商品编号",
-            prop: "goodNo",
-            istrue: true,
+            label: '商品编号',
+            prop: 'goodNo',
+            istrue: true
           },
           {
-            label: "商品名称",
-            prop: "goodName",
-            istrue: true,
+            label: '商品名称',
+            prop: 'goodName',
+            istrue: true
           },
           {
-            label: "单位",
-            prop: "unit",
+            label: '单位',
+            prop: 'unit',
             istrue: true,
             filter(row, value) {
-              return _that.getDictLabel(value, _that.dict.type.goods_unit);
-            },
+              return _that.getDictLabel(value, _that.dict.type.goods_unit)
+            }
           },
           {
-            label: "商品规格",
-            prop: "specifications",
-            istrue: true,
+            label: '商品规格',
+            prop: 'specifications',
+            istrue: true
           },
           {
-            label: "件装量",
-            prop: "packageQty",
-            istrue: true,
+            label: '件装量',
+            prop: 'packageQty',
+            istrue: true
           },
           {
-            label: "厂家",
-            prop: "factory",
-            istrue: true,
+            label: '厂家',
+            prop: 'factory',
+            istrue: true
           },
           {
-            label: "产品分类",
-            prop: "classify",
+            label: '产品分类',
+            prop: 'classify',
             istrue: true,
             filter(row, value) {
-              return _that.getDictLabel(value, _that.dict.type.goods_classify);
-            },
+              return _that.getDictLabel(value, _that.dict.type.goods_classify)
+            }
           },
           {
-            label: "存储分类",
-            prop: "storageClassify",
+            label: '存储分类',
+            prop: 'storageClassify',
             istrue: true,
             filter(row, value) {
-              return value === "1" ? "整散合一" : "整散分开";
-            },
+              return value === '1' ? '整散合一' : '整散分开'
+            }
           },
           {
-            label: "库存数量",
-            prop: "qty",
-            istrue: true,
+            label: '库存数量',
+            prop: 'qty',
+            istrue: true
           },
           {
-            label: "批号",
-            prop: "batchNo",
-            istrue: true,
+            label: '批号',
+            prop: 'batchNo',
+            istrue: true
           },
           {
-            label: "生产日期",
-            prop: "productionDate",
-            istrue: true,
+            label: '生产日期',
+            prop: 'productionDate',
+            istrue: true
           },
           {
-            label: "有效期",
-            prop: "expiredDate",
-            istrue: true,
+            label: '有效期',
+            prop: 'expiredDate',
+            istrue: true
           },
           {
-            label: "显示货位",
-            prop: "locationName",
-            istrue: true,
+            label: '显示货位',
+            prop: 'locationName',
+            istrue: true
           },
           {
-            label: "库别",
-            prop: "storageName",
-            istrue: true,
+            label: '库别',
+            prop: 'storageName',
+            istrue: true
           },
           {
-            label: "件数",
-            prop: "caseQty",
-            istrue: true,
+            label: '件数',
+            prop: 'caseQty',
+            istrue: true
           },
           {
-            label: "零散数",
-            prop: "pieceQty",
-            istrue: true,
-          },
-        ],
+            label: '零散数',
+            prop: 'pieceQty',
+            istrue: true
+          }
+        ]
       },
       tableData: [],
       paging: {
         page: 1, // 当前页
         size: 10, // 页面大小
-        total: 0,
-      },
-    };
+        total: 0
+      }
+    }
   },
 
   methods: {
     async open() {
-      await this.getTableHeaderCom("busin_lock_goods", {
-        config: this.tableConfig.config,
-      });
-      this.toReset();
+      await this.getTableHeaderCom('busin_lock_goods', {
+        config: this.tableConfig.config
+      })
+      this.toReset()
     },
     closed() {
-      this.btnLoading = false;
+      this.btnLoading = false
     },
     // 取消
     closeDialog() {
-      this.dialogVisible = false;
+      this.dialogVisible = false
     },
     // 保存
     onSave() {
       if (this.handleSelectId.length === 0) {
-        this.$message.warning("请至少选择一行数据");
-        return;
+        this.$message.warning('请至少选择一行数据')
+        return
       }
-      this.btnLoading = true;
-      this.$emit("getGoodsInfo", this.handleSelect);
-      this.closeDialog();
+      this.btnLoading = true
+      this.$emit('getGoodsInfo', this.handleSelect)
+      this.closeDialog()
     },
     // 搜索
     toQuery() {
-      this.paging.page = 1;
-      this.queryTable();
+      this.paging.page = 1
+      this.queryTable()
     },
     // 重置
     toReset() {
-      this.query = {};
-      this.queryTable();
+      this.query = {}
+      this.queryTable()
     },
     //列表的请求
     queryTable() {
-      this.loading = true;
+      this.loading = true
       let obj = {
         pageSize: this.paging.size,
         pageNum: this.paging.page,
         ...this.query,
-        ...this.queryParams,
-      };
+        ...this.queryParams
+      }
       queryGoodsAndLocation(obj)
         .then((res) => {
           if (res.code === 200) {
-            this.tableData = res.rows;
-            this.paging.total = res.total;
+            this.tableData = res.rows
+            this.paging.total = res.total
           }
-          this.loading = false;
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 表格复选框选中
     handleselection(val) {
-      this.handleSelectId = val.map((ele) => ele.id);
-      this.handleSelect = val;
-    },
-  },
-};
+      this.handleSelectId = val.map((ele) => ele.id)
+      this.handleSelect = val
+    }
+  }
+}
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 .search-box {
diff --git a/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue b/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue
index 075266d..7f92e97 100644
--- a/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue
+++ b/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue
@@ -126,7 +126,7 @@ export default {
       options: [],
       options2: [],
       enterForm: {
-        consignorId: '',
+        consignorId: 2,
         userId: ''
       },
       goodsData: [],
@@ -193,7 +193,10 @@ export default {
     },
     // 重置按钮
     resetQuery() {
-      this.enterForm = {}
+      this.enterForm = {
+        consignorId: 2,
+        userId: ''
+      }
     },
     // 表格复选框选中
     handleselection(val) {
diff --git a/src/views/libraryManage/inventoryLock/apply/ProductLock.vue b/src/views/libraryManage/inventoryLock/apply/ProductLock.vue
index 96fbfd7..2819591 100644
--- a/src/views/libraryManage/inventoryLock/apply/ProductLock.vue
+++ b/src/views/libraryManage/inventoryLock/apply/ProductLock.vue
@@ -127,7 +127,7 @@ export default {
       options: [], //货主资料列表
       options2: [], // 当前用户
       enterForm: {
-        consignorId: '',
+        consignorId: 2,
         userId: ''
       },
       goodsData: [],
@@ -195,7 +195,10 @@ export default {
     },
     // 重置按钮
     resetQuery() {
-      this.enterForm = {}
+      this.enterForm = {
+        consignorId: 2,
+        userId: ''
+      }
     },
     // 表格复选框选中
     handleselection(val) {
diff --git a/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue b/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue
index 8619b0c..f95158f 100644
--- a/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue
+++ b/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue
@@ -126,7 +126,7 @@ export default {
       options: [], //货主资料列表
       options2: [], // 当前用户
       enterForm: {
-        consignorId: '',
+        consignorId: 2,
         userId: ''
       },
       goodsData: [],
@@ -193,7 +193,10 @@ export default {
     },
     // 重置按钮
     resetQuery() {
-      this.enterForm = {}
+      this.enterForm = {
+        consignorId: 2,
+        userId: ''
+      }
     },
     // 表格复选框选中
     handleselection(val) {
diff --git a/vue.config.js b/vue.config.js
index a92caae..83c63d9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:8030`, 
-        // target: `http://192.168.0.110:8030`, 
+        // target: `http://127.0.0.1:8030`, 
+        target: `http://192.168.0.110:8030`, 
         // target: `http://120.77.94.227:8030`,
         // target: `http://xiaowen.vaiwan.com`,
         changeOrigin: true,