锁定库存 盘点执行

src/components/heavyTable/index.vue

@@ -477,7 +477,7 @@ export default {
     },
     // 过滤改变事件
     sortChange(val) {
-      console.log(val)
+      // console.log(val)
       this.sortdata = val
       this.$emit('sortChange', val)
     },

src/views/libraryManage/inventory/InventoryEntry.vue

@@ -13,12 +13,14 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="物料">
+        <el-form-item
-          <el-input
+          label="盘点方式"
-            v-model="enterForm.invOrderNo"
+          prop="invWay"
-            placeholder="请输入物料"
+        >
-            clearable
+          <el-radio-group v-model="enterForm.invWay">
-          ></el-input>
+            <el-radio label="open">明盘</el-radio>
+            <el-radio label="close">盲盘</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="货位">
           <el-input
@@ -129,6 +131,7 @@ export default {
     return {
       enterForm: {
         invOrderNo: ''
+        // invWay: 'open'
       },
       selectData: [],
       tableForm: { tableData: [] },
@@ -154,7 +157,7 @@ export default {
       // if (!this.enterForm.invOrderNo) return this.$message("单据编号必填!");
       this.loading = true
       list({
-        invWay: 'open',
+        // invWay: 'open',
         ...this.enterForm
       })
         .then((response) => {

src/views/libraryManage/inventory/config.js

@@ -117,16 +117,16 @@ export function tableConfig() {
           return getDictLabel(value, _that.dict.type.inv_type_dict);
         },
       },
-      {
+      // {
-        label: "显示货位",
+      //   label: "显示货位",
-        prop: "locationName",
+      //   prop: "locationName",
-        istrue: true,
+      //   istrue: true,
-      },
+      // },
-      {
+      // {
-        label: "库别",
+      //   label: "库别",
-        prop: "storageName",
+      //   prop: "storageName",
-        istrue: true,
+      //   istrue: true,
-      },
+      // },
       // {
       //   label: "区域编号",
       //   prop: "areaCode",
@@ -152,14 +152,14 @@ export function tableConfig() {
       //   prop: "specifications",
       //   istrue: true,
       // },
-      {
+      // {
-        label: "包装单位",
+      //   label: "包装单位",
-        prop: "unit",
+      //   prop: "unit",
-        istrue: true,
+      //   istrue: true,
-        // filter(row, value) {
+      //   // filter(row, value) {
-        //   return getDictLabel(value, _that.dict.type.goods_unit);
+      //   //   return getDictLabel(value, _that.dict.type.goods_unit);
+      //   // },
       // },
-      },
       // {
       //   label: "包装数量",
       //   prop: "packageQty",
@@ -175,16 +175,16 @@ export function tableConfig() {
       //   prop: "waster",
       //   istrue: true,
       // },
-      {
+      // {
-        label: "件数",
+      //   label: "件数",
-        prop: "caseQty",
+      //   prop: "caseQty",
-        istrue: true,
+      //   istrue: true,
-      },
+      // },
-      {
+      // {
-        label: "零散数",
+      //   label: "零散数",
-        prop: "pieceQty",
+      //   prop: "pieceQty",
-        istrue: true,
+      //   istrue: true,
-      },
+      // },
       // {
       //   label: "数量",
       //   prop: "qty",
@@ -212,6 +212,65 @@ export function tableConfig() {
       //   type: "slot",
       //   slotName: "invQty",
       // },
+      {
+        label: "显示货位",
+        prop: "locationName",
+        istrue: true,
+      },
+      {
+        label: "库别",
+        prop: "storageName",
+        istrue: true,
+      },
+      {
+        label: "区域编号",
+        prop: "areaCode",
+        istrue: true,
+      },
+      {
+        label: "商品编号",
+        prop: "goodNo",
+        istrue: true,
+      },
+      {
+        label: "商品名称",
+        prop: "goodName",
+        istrue: true,
+      },
+      {
+        label: "货位分组",
+        prop: "locationGroup",
+        istrue: true,
+      },
+      {
+        label: "深位",
+        prop: "isDeep",
+        istrue: true,
+      },
+      {
+        label: "批号",
+        prop: "batchNo",
+        istrue: true,
+      },
+      {
+        label: "商品规格",
+        prop: "specifications",
+        istrue: true,
+      },
+      {
+        label: "库存数量",
+        prop: "quantity",
+        istrue: true,
+      },
+      {
+        label: "单位",
+        prop: "unit",
+        istrue: true,
+        "min-width": 100,
+        // filter(row, value) {
+        //   return getDictLabel(value, _that.dict.type.goods_unit);
+        // },
+      },
     ],
     rulesEntry: {
       invCase: [

src/views/libraryManage/inventory/inventory.vue

@@ -161,7 +161,7 @@ export default {
         storageId: '',
         areaId: '',
         locationCode: '',
-        invWay: '',
+        invWay: 'open',
         invType: ''
       },
       options: [],
@@ -246,7 +246,7 @@ export default {
     // 表格的数据
     queryTable() {
       // if (!this.enterForm.consignorId) return this.$message('业主名称必填!')
-      // if (!this.enterForm.invWay) return this.$message('盘点方式必选!')
+      if (!this.enterForm.invWay) return this.$message('盘点方式必选!')
       // if (!this.enterForm.invType) return this.$message('盘点类型必选!')
       this.loading = true
       queryGoods({

src/views/libraryManage/lockOutStore/index.vue

@@ -433,7 +433,8 @@ export default {
         id: tempRow.id,
         batch: tempRow.batch,
         ptPart: tempRow.ptPart,
-        lockNo: tempRow.lockNo
+        lockNo: tempRow.lockNo,
+        containerCode: tempRow.tempRow
       }
       this.form = data
       this.open = true