opt:优化查询

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java

@@ -100,7 +100,7 @@ public class OutChargeServiceImpl implements OutChargeService {
             map.put("flag", "151");
         }
 
-        JSONObject json = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.iostorinv_id DESC");
+        JSONObject json = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iostorinv_id desc");
         return json;
     }
 

lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue

@@ -45,7 +45,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"
@@ -53,7 +53,8 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
+              @input="onInput()"
+              @change="mytoQuery"
             />
           </el-form-item>
           <el-form-item label="厚度幅宽">
@@ -175,6 +176,7 @@ export default {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
       storlist: [],
+      query_flag: true,
       showDtlLoading: false
     }
   },
@@ -188,8 +190,30 @@ export default {
     crudUserStor.getUserStor().then(res => {
       this.storlist = res
     })
+    this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
   },
   methods: {
+    /* 搜索框创建时间默认最近一周*/
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.query_flag) {
+        this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
+        this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
+        this.query_flag = false
+      }
+    },
+    onInput() {
+      this.$forceUpdate()
+    },
+    mytoQuery(array1) {
+      if (array1 === null) {
+        this.crud.query.begin_time = ''
+        this.crud.query.end_time = ''
+      } else {
+        this.crud.query.begin_time = array1[0]
+        this.crud.query.end_time = array1[1]
+      }
+      this.crud.toQuery()
+    },
     bill_typeFormat(row, column) {
       return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
     },