Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wms into dev

src/views/warehouseManagement/stockLedger/components/details/InWarehouse.vue

@@ -531,8 +531,8 @@ export default {
         categoryId: this.$route.query.id,
         size: this.size,
         pageNum: this.pageNum,
-        bizType: 1,
-        ...this.baseParams
+        ...this.baseParams,
+        type: 1
         // ...this.searchForm,
         // batchNum: this.baseParams.batchNum || this.searchForm.batchNum
       });

src/views/warehouseManagement/stockLedger/components/details/OutWarehouse.vue

@@ -513,8 +513,8 @@
           categoryId: this.$route.query.id,
           size: this.size,
           pageNum: this.pageNum,
-          bizType: 2,
-          ...this.baseParams
+          ...this.baseParams,
+          type: 2
           // ...this.searchForm,
           // batchNum: this.baseParams.batchNum || this.searchForm.batchNum
         });

src/views/warehouseManagement/stocktaking/plan/components/selectType.vue

@@ -41,6 +41,38 @@
               >
             </el-input>
           </el-col>
+          <el-col v-if="dimension == 2" :span="4">
+            <el-input
+              v-model="batchNo"
+              clearable
+              placeholder="批次号"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input
+              v-model="colorKey"
+              clearable
+              placeholder="颜色"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input
+              v-model="modelKey"
+              clearable
+              placeholder="机型"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input
+              v-model="warehouseName"
+              clearable
+              placeholder="仓库"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
         </el-row>
       </div>
       <div class="flex_info">
@@ -226,6 +258,10 @@
           }
         },
         deep: true
+      },
+      dimension() {
+        this.resetSearchFields();
+        this.pages.pageNum = 1;
       }
     },
     components: { AssetTree },
@@ -234,6 +270,10 @@
         factoryList: [],
         factoryId: '',
         value: '',
+        batchNo: '',
+        colorKey: '',
+        modelKey: '',
+        warehouseName: '',
         treeType: '',
         treeList: [],
         tableData: [],
@@ -281,6 +321,12 @@
         this.pages.pageNum = 1;
         this.initData();
       },
+      resetSearchFields() {
+        this.batchNo = '';
+        this.colorKey = '';
+        this.modelKey = '';
+        this.warehouseName = '';
+      },
       onConfirm() {
         this.$emit('selectTableData', [...this.multipleSelection]);
         this.closeWindows();
@@ -307,6 +353,7 @@
       },
       closeWindows() {
         this.multipleSelection = [];
+        this.resetSearchFields();
         this.$emit('update:loadTree', false);
         this.$emit('update:visibleDialog', false);
         this.pages.pageNum = 1;
@@ -326,9 +373,15 @@
         const params = {
           ...this.pages,
           keyWord: this.value,
+          colorKey: this.colorKey,
+          modelKey: this.modelKey,
+          warehouseName: this.warehouseName,
           warehouseId: this.warehouseId,
           categoryLevelId: this.classificationId
         };
+        if (this.dimension == 2) {
+          params.batchNo = this.batchNo;
+        }
         let res = null;
         if (this.dimension == 1) {
           res = await getProductList(params);

src/views/warehouseManagement/warehouseApplication/components/edit.vue

@@ -112,7 +112,6 @@
 <script>
   import storageApi from '@/api/warehouseManagement';
   import { getCode } from '@/api/codeManagement/index.js';
-  import { re } from 'mathjs';
   export default {
     props: {},
     data() {
@@ -124,7 +123,29 @@
           sourceType: '',
           remark: ''
         },
-        columns: [
+
+        rules: {
+          sourceType: [
+            { required: true, message: '请选择申请类型', trigger: 'change' }
+          ]
+        },
+        loading: false,
+        selectionList: [],
+        ids: [],
+        detailJnVOList: []
+      };
+    },
+    computed: {
+      readonlyMode() {
+        return this.title === '详情';
+      },
+      tableColumns() {
+        return this.title === '详情'
+          ? this.columns.filter((c) => c.type !== 'selection')
+          : this.columns;
+      },
+      columns() {
+        return [
           {
             columnKey: 'selection',
             type: 'selection',
@@ -208,9 +229,28 @@
             width: 160
           },
           {
-            prop: 'originalMeasureQuantity',
+            prop: 'stockCountBase',
             label: '库存数量',
             sortable: 'custom',
+            isNone: this.title == '详情',
+            showOverflowTooltip: true,
+            width: 130,
+            align: 'center'
+          },
+          {
+            prop: 'availableCountBase',
+            isNone: this.title == '详情',
+            label: '可用数量',
+            sortable: 'custom',
+            showOverflowTooltip: true,
+            width: 130,
+            align: 'center'
+          },
+          {
+            prop: 'lockQuantity',
+            isNone: this.title == '详情',
+            label: '锁定数量',
+            sortable: 'custom',
             showOverflowTooltip: true,
             width: 130,
             align: 'center'
@@ -246,26 +286,7 @@
             showOverflowTooltip: true,
             width: 130
           }
-        ],
-        rules: {
-          sourceType: [
-            { required: true, message: '请选择申请类型', trigger: 'change' }
-          ]
-        },
-        loading: false,
-        selectionList: [],
-        ids: [],
-        detailJnVOList: []
-      };
-    },
-    computed: {
-      readonlyMode() {
-        return this.title === '详情';
-      },
-      tableColumns() {
-        return this.title === '详情'
-          ? this.columns.filter((c) => c.type !== 'selection')
-          : this.columns;
+        ].filter((c) => !c.isNone);
       }
     },