代码合并

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -11,22 +11,16 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="仓库">
-            <el-select
-              v-model="query.stor_id"
+          <el-form-item label="所属库区">
+            <el-cascader
+              placeholder="所属库区"
+              :options="sects"
+              :props="{ checkStrictly: true }"
               clearable
-              filterable
-              size="mini"
               class="filter-item"
               style="width: 200px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in storlist"
-                :label="item.stor_name"
-                :value="item.stor_id"
-              />
-            </el-select>
+              @change="sectQueryChange"
+            />
           </el-form-item>
           <el-form-item label="仓位搜索">
             <el-input
@@ -142,8 +136,6 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudPoint from '@/views/wms/sch/point/point'
-import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
@@ -167,7 +159,7 @@ export default {
   },
   data() {
     return {
-      storlist: [],
+      sects: [],
       permission: {
       },
       rules: {
@@ -175,8 +167,8 @@ export default {
     }
   },
   created() {
-    crudUserStor.getUserStor().then(res => {
-      this.storlist = res
+    crudUserStor.getSect({ 'stor_id': '' }).then(res => {
+      this.sects = res.content
     })
   },
   methods: {
@@ -191,6 +183,21 @@ export default {
     hand(value) {
       this.crud.toQuery()
     },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.query.stor_id = val[0]
+        this.query.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.query.sect_id = ''
+        this.query.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.query.stor_id = val[0]
+        this.query.sect_id = val[1]
+      }
+      this.crud.toQuery()
+    },
     downdtl() {
       if (this.currentRow !== null) {
         crud.downloadLoading = true

lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue

@@ -169,9 +169,12 @@
         <el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')"/>
         <el-table-column prop="bill_type" :formatter="bill_typeFormat" label="业务类型" :min-width="flexWidth('bill_type',crud.data,'业务类型')"/>
         <el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')"/>
-        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')"/>
+        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="135px"/>
         <el-table-column label="明细数" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')"/>
+        <el-table-column prop="input_optname" label="创建人" :min-width="flexWidth('input_optname',crud.data,'创建人')"/>
         <el-table-column prop="input_time" label="创建日期" :min-width="flexWidth('input_time',crud.data,'创建日期')"/>
+        <el-table-column prop="confirm_optname" label="变更人" :min-width="flexWidth('confirm_optname',crud.data,'变更人')"/>
+        <el-table-column prop="confirm_time" label="变更日期" :min-width="flexWidth('confirm_time',crud.data,'变更日期')"/>
       </el-table>
       <!--分页组件-->
       <pagination />