lilei 2 年之前
父节点
当前提交
c144fb6e9a
共有 4 个文件被更改,包括 26 次插入7 次删除
  1. 1 1
      public/version.json
  2. 6 1
      src/views/common/warehouse.js
  3. 17 3
      src/views/inventoryManagement/inventoryQuery/list.vue
  4. 2 2
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675237363823
+  "version": 1675241779308
 }

+ 6 - 1
src/views/common/warehouse.js

@@ -3,6 +3,7 @@ const Warehouse = {
   template: `
         <a-cascader
           :size="size"
+          :changeOnSelect="changeOnSelect"
           @change="handleChange"
           :value="defaultVal"
           expand-trigger="hover"
@@ -31,7 +32,11 @@ const Warehouse = {
     size: {
       type: String,
       default: 'default'
-    }
+    },
+    changeOnSelect:{
+      type: Boolean,
+      default: false
+    },
   },
   data () {
     return {

+ 17 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -32,7 +32,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="仓库仓位">
-                <Warehouse id="inventoryQueryList-warehouse" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
+                <Warehouse id="inventoryQueryList-warehouse" :changeOnSelect="true" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -188,7 +188,9 @@ export default {
         productTypeSn1: '', //  产品分类1
         productTypeSn2: '', //  产品分类2
         productTypeSn3: '', //  产品分类3
-        warehouse: undefined,
+        warehouse: [],
+        warehouseSn: '',
+        warehouseLocationSn:'',
         zeroQtyFlag: false, //  库存情况
         enableFlag: true, // 显示禁用产品
         minUnsalableDays: undefined, // 滞销天数最小值
@@ -228,6 +230,11 @@ export default {
           params.product = {
             sysFlag: params.productSysFlag || undefined
           }
+          
+          // 仓库仓位
+          params.warehouseSn = params.warehouse[0]
+          params.warehouseLocationSn = params.warehouse[1]
+          
           return stockList(params).then(res => {
             let data
             if (res.status == 200) {
@@ -341,7 +348,9 @@ export default {
       this.queryParam.brandName = undefined
       this.queryParam.productTypeName = undefined
       this.queryParam.zeroQtyFlag = false
-      this.queryParam.warehouse = undefined
+      this.queryParam.warehouse = []
+      this.queryParam.warehouseSn =  ''
+      this.queryParam.warehouseLocationSn = ''
       this.$refs.warehouse.setDefaultVal()
       this.productTypeSn = []
       this.queryParam.minUnsalableDays = undefined // 滞销天数最小值
@@ -435,6 +444,11 @@ export default {
       })
       // 是否默认包括禁用产品
       this.queryParam.enableFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
+      
+      this.$nextTick(() => {
+        this.queryParam.warehouse = []
+        this.$refs.warehouse.setDefaultVal()
+      })
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.183:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.115:8503/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,