Merge branch 'dev' into pre-production

src/components/edittablehead/index.vue

@@ -49,6 +49,7 @@ import { useRoute } from 'vue-router';
 
 const functions = inject('functions') as any;
 import Sortable from 'sortablejs';
+import { handleClearTableQuery } from '@/utils/util';
 interface TableColumnType {
   /** 表格列的key */
   prop: string;
@@ -131,6 +132,7 @@ const _arr = functions.getStorage($route.fullPath + props.columnListName);
 
 if (_arr) {
   columnRef.value = [..._arr];
+  handleClearTableQuery(_arr);
   emit('update:modelValue', _arr);
 }
 

src/views/distribution/artery/AddVehicleStowage.vue

@@ -355,7 +355,7 @@
                     <el-button type="primary" icon="el-icon-search" @click="searchChange"
                       >搜 索</el-button
                     >
-                    <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
+                    <el-button icon="el-icon-delete" @click="searchReset">重 置</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -425,7 +425,6 @@
                   :model="details.newQuery"
                   class="el-fr-d"
                 >
-                  <div class="fo-fl">
                   <!-- <el-form-item label="关键词" class="el-times">
                       <el-input></el-input>
                     </el-form-item>
@@ -457,13 +456,32 @@
                       @change="value => item.itemTimesc(value, { prop: 'createTimeArr' })"
                     />
                   </el-form-item>
-                    <!-- <el-form-item>
-                      <el-button type="primary" icon="el-icon-search" @click="searchReset()"
-                        >搜 索</el-button
+                  <el-form-item label="入库时间" class="el-times">
+                    <el-date-picker
+                      v-model="item.openTimeArr"
+                      type="daterange"
+                      unlink-panels
+                      range-separator="-"
+                      start-placeholder="开始时间"
+                      end-placeholder="结束时间"
+                      :shortcuts="shortcuts"
+                      clearable
+                      value-format="YYYY-MM-DD"
+                      @change="value => item.itemTimesc(value, { prop: 'openTimeArr' })"
+                    />
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button
+                      type="primary"
+                      icon="el-icon-search"
+                      @click="() => item.itemFilterData()"
                     >
-                      <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
-                    </el-form-item> -->
-                  </div>
+                      搜 索
+                    </el-button>
+                    <el-button icon="el-icon-delete" @click="() => item.itemClearQuery()">
+                      重 置
+                    </el-button>
+                  </el-form-item>
                 </el-form>
               </div>
 
@@ -619,6 +637,7 @@ import {
   isNumber,
   deepClone,
   debounce,
+  handleClearTableQuery,
 } from '@/utils/util';
 import {
   columnList,
@@ -1048,7 +1067,7 @@ const onLoad = async () => {
 
               if (!value) delete this.timeQuery[prop];
 
-              this.itemFilterData();
+              // this.itemFilterData();
             },
             /** 筛选数据 */
             itemFilterData() {
@@ -1086,6 +1105,13 @@ const onLoad = async () => {
 
               this.renderData = _filterArr;
             },
+            /** 清空搜索的值 */
+            itemClearQuery() {
+              this.query = {};
+              this.timeQuery = {};
+              handleClearTableQuery(this.newColumnList);
+              this.itemFilterData();
+            },
             MappingData: [],
           };
 
@@ -1171,10 +1197,8 @@ const searchChange = () => {
 const searchReset = () => {
   details.query = {};
   details.page.pageNum = 1;
-  for (let i = 0; i < details.columnList.length; i++) {
-    const value = details.columnList[i];
-    value.values = '';
-  }
+
+  handleClearTableQuery(details.columnList);
   initOriginWarehouseOrder();
 };
 
@@ -1392,7 +1416,7 @@ const handleAddNode = async (index: number) => {
 
       if (!value) delete this.timeQuery[prop];
 
-      this.itemFilterData();
+      // this.itemFilterData();
     },
     /** 筛选数据 */
     itemFilterData() {
@@ -1430,6 +1454,13 @@ const handleAddNode = async (index: number) => {
 
       this.renderData = _filterArr;
     },
+    /** 清空搜索的值 */
+    itemClearQuery() {
+      this.query = {};
+      this.timeQuery = {};
+      handleClearTableQuery(this.newColumnList);
+      this.itemFilterData();
+    },
     MappingData: [],
   });
 
@@ -1882,12 +1913,6 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 </script>
 
 <style scoped lang="scss">
-.fo-fl {
-  display: flex;
-  flex-wrap: wrap;
-  zoom: 0.9;
-}
-
 // 日期选择器
 :deep(.el-date-editor.el-input) {
   height: 100% !important;

src/views/waybill/TemporaryStorageList.vue

@@ -1246,7 +1246,7 @@ const handleSuccess = res => {
   details.loadingObj.UploadLoadong = false;
   const { msg, code } = res;
   if (code !== 200) return ElMessage.warning(msg || '上传失败');
-  ElMessage.success('上传成功');
+  ElMessage.success(msg || '上传成功');
   initOnLoad({}, true);
 };