rev：页面增加查询条件，提升响应速度；出库管理界面增加显示内容、导出增加显示内容

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

@@ -237,7 +237,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-<!--        <el-table-column type="index" label="序号" width="50" align="center" />-->
+        <!--        <el-table-column type="index" label="序号" width="50" align="center" />-->
         <el-table-column show-overflow-tooltip prop="is_upload" label="是否回传" :formatter="formatIsUpload" width="80" />
         <el-table-column show-overflow-tooltip prop="upload_mes" label="回传MES" :formatter="formatUploadMes" width="80" />
         <el-table-column show-overflow-tooltip prop="upload_sap" label="回传SAP" :formatter="formatUploadSap" width="80" />
@@ -300,7 +300,8 @@ export default {
         reset: true,
         download: false
       },
-      query: { io_type: '0', bill_status: '99' }
+      query: { io_type: '0', bill_status: '99' },
+      queryOnPresenterCreated: false
     })
   },
   mixins: [presenter(), header(), crud()],
@@ -328,13 +329,20 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
-    debugger
+    // debugger
-    this.billtypelist = this.dict.ST_INV_IN_TYPE
+    this.billtypelist = this.dict.ST_INV_OUT_TYPE
+    this.initQuery()
   },
   methods: {
-    [CRUD.HOOK.beforeRefresh]() {
+    /* 搜索框出入类型 默认出库*/
-      return true
+    initQuery() {
+      this.query.io_type = '1'
+      this.query.is_upload = '0'
+      this.crud.toQuery()
     },
+    // [CRUD.HOOK.beforeRefresh]() {
+    //   return true
+    // },
     querytable() {
       this.onSelectAll()
       this.crud.toQuery()

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

@@ -91,7 +91,7 @@
             </el-select>
           </el-form-item>
 
-<!--          <el-form-item label="业务类型">
+          <!--          <el-form-item label="业务类型">
             <el-select
               v-model="query.bill_type"
               clearable
@@ -109,7 +109,7 @@
               />
             </el-select>
           </el-form-item>-->
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -173,16 +173,16 @@
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column :formatter="stateFormat" prop="bill_status" label="单据状态" :min-width="flexWidth('bill_status',crud.data,'单据状态')"/>
+        <el-table-column :formatter="stateFormat" prop="bill_status" label="单据状态" :min-width="flexWidth('bill_status',crud.data,'单据状态')" />
-        <el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')"/>
+        <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="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 prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')" />
-        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="135px"/>
+        <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 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_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="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_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-column prop="confirm_time" label="变更日期" :min-width="flexWidth('confirm_time',crud.data,'变更日期')" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -213,7 +213,9 @@ export default {
         del: false,
         reset: true,
         download: false
-      }})
+      },
+      queryOnPresenterCreated: false
+    })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
@@ -243,8 +245,25 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
+    this.initQuery()
   },
   methods: {
+    /* 搜索框创建时间默认最近一周*/
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      const endMonth = end.getMonth() + 1
+      const endDay = end.getDate()
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      const startMonth = start.getMonth() + 1
+      const startDay = start.getDate()
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
+    },
     canUd(row) {
       return row.bill_status !== '10'
     },
@@ -268,7 +287,7 @@ export default {
         this.buttonChange(row)
       } else if (val.length === 1) {
         this.buttonChange(row)
-      }else{
+      } else {
         this.handleCurrentChange(null)
       }
     },

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

@@ -38,7 +38,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -219,7 +219,9 @@ export default {
         del: false,
         reset: true,
         download: false
-      }})
+      },
+      queryOnPresenterCreated: false
+    })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
@@ -251,8 +253,25 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
+    this.initQuery()
   },
   methods: {
+    /* 搜索框创建时间默认最近一周*/
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      const endMonth = end.getMonth() + 1
+      const endDay = end.getDate()
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      const startMonth = start.getMonth() + 1
+      const startDay = start.getDate()
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
+    },
     canUd(row) {
       return row.status !== '1'
     },

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

@@ -38,7 +38,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -262,7 +262,8 @@ export default {
       optShow: { add: true, reset: true },
       idField: 'iostorinv_id',
       url: '/api/in/rawAssist',
-      crudMethod: { ...rawAssist }
+      crudMethod: { ...rawAssist },
+      queryOnPresenterCreated: false
     })
   },
   mixins: [presenter(), header(), crud()],
@@ -309,8 +310,25 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
+    this.initQuery()
   },
   methods: {
+    /* 搜索框创建时间默认最近一周*/
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      const endMonth = end.getMonth() + 1
+      const endDay = end.getDate()
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      const startMonth = start.getMonth() + 1
+      const startDay = start.getDate()
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
+    },
     fun(val) {
       return Number(val).toFixed(3)
     },

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

@@ -38,7 +38,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -79,8 +79,8 @@
             >
               <el-option
                 v-for="item in dict.ST_INV_IN_TYPE"
-                :disabled="item.value !== '0002'"
                 :key="item.value"
+                :disabled="item.value !== '0002'"
                 :label="item.label"
                 :value="item.value"
               />
@@ -189,7 +189,8 @@ export default {
         del: false,
         download: false,
         reset: false
-      }
+      },
+      queryOnPresenterCreated: false
     })
   },
   mixins: [presenter(), header(), crud()],
@@ -208,11 +209,28 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
+    this.initQuery()
   },
   methods: {
-    [CRUD.HOOK.beforeRefresh]() {
+    /* 搜索框创建时间默认最近一周*/
-      return true
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      const endMonth = end.getMonth() + 1
+      const endDay = end.getDate()
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      const startMonth = start.getMonth() + 1
+      const startDay = start.getDate()
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
     },
+    // [CRUD.HOOK.beforeRefresh]() {
+    //   return false
+    // },
     toView(index, row) {
       this.mstrow = row
       this.viewShow = true

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

@@ -23,11 +23,12 @@
           <el-form-item label="所属仓库">
             <el-select
               v-model="query.stor_id"
+              multiple
+              collapse-tags
               clearable
               size="mini"
               placeholder="全部"
               class="filter-item"
-              @change="crud.toQuery"
             >
               <el-option
                 v-for="item in storlist"
@@ -59,11 +60,12 @@
           <el-form-item label="单据状态">
             <el-select
               v-model="query.bill_status"
+              multiple
+              collapse-tags
               clearable
               size="mini"
               placeholder="单据状态"
               class="filter-item"
-              @change="crud.toQuery"
             >
               <el-option
                 v-for="item in dict.io_bill_status"
@@ -77,12 +79,13 @@
           <el-form-item label="业务类型">
             <el-select
               v-model="query.bill_type"
+              multiple
+              collapse-tags
               clearable
               filterable
               size="mini"
               placeholder="业务类型"
               class="filter-item"
-              @change="crud.toQuery"
             >
               <el-option
                 v-for="item in dict.ST_INV_OUT_TYPE"
@@ -154,7 +157,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -295,7 +298,13 @@
         <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
         <el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
         <el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />
-        <el-table-column show-overflow-tooltip label="总重量" align="center" prop="total_qty" width="100" />
+        <el-table-column show-overflow-tooltip label="计划重量" align="center" prop="total_qty" width="100" />
+        <el-table-column show-overflow-tooltip label="实际重量" align="center" prop="plan_qty" width="100" />
+        <el-table-column show-overflow-tooltip label="收货地址" align="center" prop="total_qty" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.bill_type === '1004' ? scope.row.stor_name : scope.row.receiptaddress }}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="客户" align="center" prop="cust_simple_name" width="100" />
         <el-table-column show-overflow-tooltip label="客户编码" align="center" prop="cust_code" width="100" />
         <el-table-column show-overflow-tooltip label="交货单号" align="center" prop="vbeln" width="100" />
@@ -349,7 +358,9 @@ export default {
         del: false,
         reset: true,
         download: false
-      }})
+      },
+      queryOnPresenterCreated: false
+    })
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
@@ -393,8 +404,25 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
+    this.initQuery()
   },
   methods: {
+    /* 搜索框创建时间默认最近一周*/
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      const endMonth = end.getMonth() + 1
+      const endDay = end.getDate()
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      const startMonth = start.getMonth() + 1
+      const startDay = start.getDate()
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
+    },
     canUd(row) {
       return row.bill_status !== '10'
     },

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

@@ -38,7 +38,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -78,8 +78,8 @@
             >
               <el-option
                 v-for="item in dict.ST_INV_OUT_TYPE"
-                :disabled="item.value !== '1001' && item.value !== '1009'"
                 :key="item.value"
+                :disabled="item.value !== '1001' && item.value !== '1009'"
                 :label="item.label"
                 :value="item.value"
               />
@@ -191,7 +191,8 @@ export default {
         del: false,
         download: false,
         reset: false
-      }
+      },
+      queryOnPresenterCreated: false
     })
   },
   mixins: [presenter(), header(), crud()],
@@ -214,11 +215,28 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
+    this.initQuery()
   },
   methods: {
-    [CRUD.HOOK.beforeRefresh]() {
+    /* 搜索框创建时间默认最近一周*/
-      return true
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      const endMonth = end.getMonth() + 1
+      const endDay = end.getDate()
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      const startMonth = start.getMonth() + 1
+      const startDay = start.getDate()
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
     },
+    // [CRUD.HOOK.beforeRefresh]() {
+    //   return false
+    // },
     toView(index, row) {
       this.mstrow = row
       this.viewShow = true