From e2c8dd1aa7b98306b88b373e1e95dc6b9bed1c2d Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Thu, 11 Apr 2024 11:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=20=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busFunctions/reportForms/lockInStock.js   |  3 +-
 src/views/libraryManage/components/goods.vue  | 16 ++---
 .../inventory/InventoryEntry.vue              | 58 ++++++++++++++--
 src/views/libraryManage/inventory/config.js   | 67 ++++++++++---------
 .../libraryManage/inventory/inventory.vue     |  3 +-
 .../inventoryLock/apply/config.js             | 18 ++---
 .../inventoryLock/examine/config.js           |  6 +-
 .../libraryManage/lockOutStore/index.vue      | 13 ++--
 vue.config.js                                 |  4 +-
 9 files changed, 124 insertions(+), 64 deletions(-)

diff --git a/src/api/wms/busFunctions/reportForms/lockInStock.js b/src/api/wms/busFunctions/reportForms/lockInStock.js
index f7f0c8c..96b3674 100644
--- a/src/api/wms/busFunctions/reportForms/lockInStock.js
+++ b/src/api/wms/busFunctions/reportForms/lockInStock.js
@@ -70,7 +70,8 @@ export function getLockstockBatch(data) {
 //叫料确认
 export function addLockstockOut(data) {
   return request({
-    url: '/wms/lock/addLockstockOut',
+    // url: '/wms/lock/addLockstockOut',
+    url: 'wms/stock/lock/addLockstockOut',
     method: 'post',
     data: data
   })
diff --git a/src/views/libraryManage/components/goods.vue b/src/views/libraryManage/components/goods.vue
index 0c3300f..2ac15d5 100644
--- a/src/views/libraryManage/components/goods.vue
+++ b/src/views/libraryManage/components/goods.vue
@@ -120,10 +120,10 @@ export default {
           {
             label: '单位',
             prop: 'unit',
-            istrue: true,
-            filter(row, value) {
-              return _that.getDictLabel(value, _that.dict.type.goods_unit)
-            }
+            istrue: true
+            // filter(row, value) {
+            //   return _that.getDictLabel(value, _that.dict.type.goods_unit)
+            // }
           },
           {
             label: '商品规格',
@@ -143,10 +143,10 @@ export default {
           {
             label: '产品分类',
             prop: 'classify',
-            istrue: true,
-            filter(row, value) {
-              return _that.getDictLabel(value, _that.dict.type.goods_classify)
-            }
+            istrue: true
+            // filter(row, value) {
+            //   return _that.getDictLabel(value, _that.dict.type.goods_classify)
+            // }
           },
           {
             label: '存储分类',
diff --git a/src/views/libraryManage/inventory/InventoryEntry.vue b/src/views/libraryManage/inventory/InventoryEntry.vue
index 1838be8..1967a74 100644
--- a/src/views/libraryManage/inventory/InventoryEntry.vue
+++ b/src/views/libraryManage/inventory/InventoryEntry.vue
@@ -22,6 +22,22 @@
             <el-radio label="close">盲盘</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="盘点状态">
+          <el-select
+            v-model="enterForm.invType"
+            placeholder="请选择盘点状态"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in dict.type.inv_status"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="货位">
           <el-input
             v-model="enterForm.locationCode"
@@ -30,6 +46,29 @@
           ></el-input>
         </el-form-item>
 
+        <el-form-item label="生产计划日期">
+          <!-- <el-date-picker
+            v-model="value1"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker> -->
+          <el-date-picker
+            style="width: 280px"
+            v-model="value1"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '00:00:00']"
+          >
+          </el-date-picker>
+        </el-form-item>
+
         <el-form-item>
           <el-button
             type="primary"
@@ -124,14 +163,16 @@
 import { tableConfig } from './config.js'
 import { list, cancel, entrySave } from '@/api/libraryManage/inventory'
 import { Debounce, getDictLabel } from '@/utils/index'
+import moment from 'moment'
 export default {
   name: '',
-  dicts: ['goods_storage_conditions', 'goods_classify', 'goods_unit', 'inv_type_dict'],
+  dicts: ['goods_storage_conditions', 'goods_classify', 'goods_unit', 'inv_type_dict', 'inv_status'],
   data() {
     return {
       enterForm: {
-        invOrderNo: ''
+        invOrderNo: '',
         // invWay: 'open'
+        invStatus: 'init'
       },
       selectData: [],
       tableForm: { tableData: [] },
@@ -142,13 +183,13 @@ export default {
         page: 1, // 当前页
         size: 10, // 页面大小
         total: 0
-      }
+      },
+      value1: [moment().locale('zh-cn').format('yyyy-MM-DD 00:00:00'), moment().locale('zh-cn').add(1, 'days').format('yyyy-MM-DD 00:00:00')]
     }
   },
   mounted() {},
   async created() {
     this.queryTable()
-
     this.tableConfig = await this.getTableHeaderCom('busin_inventory_add', tableConfig.call(this), 'configEntry')
   },
   methods: {
@@ -156,6 +197,13 @@ export default {
     queryTable() {
       // if (!this.enterForm.invOrderNo) return this.$message("单据编号必填!");
       this.loading = true
+      if (this.value1 !== null && this.value1 !== 'null' && this.value1 !== undefined) {
+        this.enterForm.execTime = this.value1[0]
+        this.enterForm.endTime = this.value1[1]
+      } else {
+        this.enterForm.execTime = null
+        this.enterForm.endTime = null
+      }
       list({
         // invWay: 'open',
         ...this.enterForm
@@ -177,7 +225,9 @@ export default {
     },
     // 重置
     resetQuery() {
+      this.value1 = [moment().locale('zh-cn').format('yyyy-MM-DD'), moment().locale('zh-cn').format('yyyy-MM-DD')]
       this.enterForm = {}
+      this.queryTable()
     },
     onCalc3(row, prop) {
       if (row.storageClassify === '0') {
diff --git a/src/views/libraryManage/inventory/config.js b/src/views/libraryManage/inventory/config.js
index 1be65a1..9207b8d 100644
--- a/src/views/libraryManage/inventory/config.js
+++ b/src/views/libraryManage/inventory/config.js
@@ -61,11 +61,7 @@ export function tableConfig() {
         prop: "batchNo",
         istrue: true,
       },
-      {
-        label: "商品规格",
-        prop: "specifications",
-        istrue: true,
-      },
+  
       {
         label: "库存数量",
         prop: "quantity",
@@ -116,6 +112,15 @@ export function tableConfig() {
         filter(row, value) {
           return getDictLabel(value, _that.dict.type.inv_type_dict);
         },
+        
+      },
+      {
+        label: "盘点状态",
+        prop: "invStatus",
+        istrue: true,
+        filter(row, value) {
+          return getDictLabel(value, _that.dict.type.inv_status);
+        },
       },
       // {
       //   label: "显示货位",
@@ -147,11 +152,7 @@ export function tableConfig() {
       //   prop: "batchNo",
       //   istrue: true,
       // },
-      // {
-      //   label: "产品规格",
-      //   prop: "specifications",
-      //   istrue: true,
-      // },
+
       // {
       //   label: "包装单位",
       //   prop: "unit",
@@ -242,6 +243,17 @@ export function tableConfig() {
         prop: "locationGroup",
         istrue: true,
       },
+      {
+        label: "执行盘点时间",
+        prop: "execTime",
+        istrue: true,
+      },
+      {
+        label: "完成盘点时间",
+        prop: "endTime",
+        istrue: true,
+      },
+
       {
         label: "深位",
         prop: "isDeep",
@@ -252,11 +264,7 @@ export function tableConfig() {
         prop: "batchNo",
         istrue: true,
       },
-      {
-        label: "商品规格",
-        prop: "specifications",
-        istrue: true,
-      },
+
       {
         label: "库存数量",
         prop: "quantity",
@@ -316,6 +324,7 @@ export function tableConfig() {
         prop: "invType",
         istrue: true,
         filter(row, value) {
+          console.log(row);
           return getDictLabel(value, _that.dict.type.inv_type_dict);
         },
       },
@@ -349,11 +358,7 @@ export function tableConfig() {
         prop: "batchNo",
         istrue: true,
       },
-      {
-        label: "产品规格",
-        prop: "specifications",
-        istrue: true,
-      },
+
       {
         label: "包装单位",
         prop: "unit",
@@ -453,6 +458,7 @@ export function tableConfig() {
         prop: "productionDate",
         istrue: true,
       },
+
       {
         label: "盘点类型",
         prop: "invType",
@@ -461,6 +467,14 @@ export function tableConfig() {
           return getDictLabel(value, _that.dict.type.inv_type_dict);
         },
       },
+      {
+        label: "盘点状态",
+        prop: "invStatus",
+        istrue: true,
+        filter(row, value) {
+          return getDictLabel(value, _that.dict.type.inv_status);
+        },
+      },
       {
         label: "显示货位",
         prop: "locationName",
@@ -491,11 +505,7 @@ export function tableConfig() {
         prop: "batchNo",
         istrue: true,
       },
-      {
-        label: "产品规格",
-        prop: "specifications",
-        istrue: true,
-      },
+
       {
         label: "包装单位",
         prop: "unit",
@@ -583,6 +593,7 @@ export function tableConfig() {
         prop: "invType",
         istrue: true, //inv_type_dict
         filter(row, value) {
+          console.log(row);
           return getDictLabel(value, _that.dict.type.inv_type_dict);
         },
       },
@@ -616,11 +627,7 @@ export function tableConfig() {
         prop: "batchNo",
         istrue: true,
       },
-      {
-        label: "产品规格",
-        prop: "specifications",
-        istrue: true,
-      },
+
       {
         label: "包装单位",
         prop: "unit",
diff --git a/src/views/libraryManage/inventory/inventory.vue b/src/views/libraryManage/inventory/inventory.vue
index eeecc7d..cd24247 100644
--- a/src/views/libraryManage/inventory/inventory.vue
+++ b/src/views/libraryManage/inventory/inventory.vue
@@ -118,7 +118,8 @@
               type="primary"
               @click="generateThePlan"
               :disabled="!handleSelect.length != 0"
-            >生成计划</el-button>
+            >生成计划
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- <el-button type="primary" @click="exportBtn">导出</el-button> -->
diff --git a/src/views/libraryManage/inventoryLock/apply/config.js b/src/views/libraryManage/inventoryLock/apply/config.js
index fb1a49c..a98bdfa 100644
--- a/src/views/libraryManage/inventoryLock/apply/config.js
+++ b/src/views/libraryManage/inventoryLock/apply/config.js
@@ -44,9 +44,9 @@ export function tableConfig() {
         prop: "unit",
         istrue: true,
         "min-width": 100,
-        filter(row, value) {
-          return getDictLabel(value, _that.dict.type.goods_unit);
-        },
+        // filter(row, value) {
+        //   return getDictLabel(value, _that.dict.type.goods_unit);
+        // },
       },
       {
         label: "件装量",
@@ -138,9 +138,9 @@ export function tableConfig() {
         prop: "unit",
         istrue: true,
         "min-width": 100,
-        filter(row, value) {
-          return getDictLabel(value, _that.dict.type.goods_unit);
-        },
+        // filter(row, value) {
+        //   return getDictLabel(value, _that.dict.type.goods_unit);
+        // },
       },
       {
         label: "件装量",
@@ -227,9 +227,9 @@ export function tableConfig() {
         prop: "unit",
         istrue: true,
         "min-width": 100,
-        filter(row, value) {
-          return getDictLabel(value, _that.dict.type.goods_unit);
-        },
+        // filter(row, value) {
+        //   return getDictLabel(value, _that.dict.type.goods_unit);
+        // },
       },
       {
         label: "件装量",
diff --git a/src/views/libraryManage/inventoryLock/examine/config.js b/src/views/libraryManage/inventoryLock/examine/config.js
index b15851f..f4d6868 100644
--- a/src/views/libraryManage/inventoryLock/examine/config.js
+++ b/src/views/libraryManage/inventoryLock/examine/config.js
@@ -57,9 +57,9 @@ export function tableConfig() {
         label: "单位",
         prop: "unit",
         istrue: true,
-        filter(row, value) {
-          return getDictLabel(value, _that.dict.type.goods_unit);
-        },
+        // filter(row, value) {
+        //   return getDictLabel(value, _that.dict.type.goods_unit);
+        // },
       },
       {
         label: "件装量",
diff --git a/src/views/libraryManage/lockOutStore/index.vue b/src/views/libraryManage/lockOutStore/index.vue
index 6440454..ed624e9 100644
--- a/src/views/libraryManage/lockOutStore/index.vue
+++ b/src/views/libraryManage/lockOutStore/index.vue
@@ -124,7 +124,7 @@
           </el-select>
 
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="叫料位置"
           prop="trolleyType"
         >
@@ -143,7 +143,7 @@
             </el-option>
           </el-select>
 
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           label="需求量"
           prop="ptPart"
@@ -337,9 +337,9 @@ export default {
     // getItemDataBreakCat({ pageSize: 999, pageNum: 1 }).then((response) => {
     //   this.BreakCatList = response.data
     // })
-    getLockstockBatch({ pageSize: 999, pageNum: 1 }).then((response) => {
-      this.lockstockBatch = response.data
-    })
+    // getLockstockBatch({ pageSize: 999, pageNum: 1 }).then((response) => {
+    //   this.lockstockBatch = response.data
+    // })
   },
   methods: {
     // 分页
@@ -432,9 +432,10 @@ export default {
       let data = {
         id: tempRow.id,
         batch: tempRow.batch,
-        ptPart: tempRow.ptPart,
+        // ptPart: tempRow.taskPath,
         lockNo: tempRow.lockNo,
         lockId: tempRow.lockId
+        // taskPath:''
         // containerCode: tempRow.tempRow
       }
       this.form = data
diff --git a/vue.config.js b/vue.config.js
index f652fef..b75eff8 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:8031`, 
-        // target: `http://192.168.0.110:8030`, 
+        // target: `http://127.0.0.1:8031`, 
+        target: `http://192.168.0.110:8030`, 
         // target: `http://192.168.0.105:8030`, 
         // target: `http://120.77.94.227:8030`,
         // target: `http://xiaowen.vaiwan.com`,