查询条件缓存

src/BIZComponents/seekPage.vue

@@ -2,38 +2,71 @@
   <div class="index_box">
     <el-form label-width="90px" :inline="true">
       <el-form-item v-for="(item, i) in seekList" :key="i">
-        <el-form-item :label="item.label" :label-width="item.labelWidth + 'px'" v-if="i <= formLength - 1">
+        <el-form-item
+          :label="item.label"
+          :label-width="item.labelWidth + 'px'"
+          v-if="i <= formLength - 1"
+        >
           <!-- input 输入 -->
           <div>
             <div v-if="item.type == 'input'">
-              <el-input clearable v-model="defaultWhere[item.value]" :placeholder="item.placeholder || '请输入内容'"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }" />
+              <el-input
+                clearable
+                v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请输入内容'"
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+              />
             </div>
             <div v-if="item.type == 'select'">
-              <el-select clearable v-model="defaultWhere[item.value]" :placeholder="item.placeholder || '请输入内容'"
-                :multiple="item.multiple ? item.multiple : false" :filterable="item.filterable ? item.filterable : true"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }">
-                <el-option v-for="(op, i) in item.planList" :label="op.label" :value="op.value" :key="i"></el-option>
+              <el-select
+                clearable
+                v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请输入内容'"
+                :multiple="item.multiple ? item.multiple : false"
+                :filterable="item.filterable ? item.filterable : true"
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+              >
+                <el-option
+                  v-for="(op, i) in item.planList"
+                  :label="op.label"
+                  :value="op.value"
+                  :key="i"
+                ></el-option>
               </el-select>
             </div>
             <div v-if="item.type == 'date'">
-              <el-date-picker v-model="defaultWhere[item.value]" @visible-change="change"
-                :type="item.dateType || 'daterange'" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: item.width ? item.width + 'px' : '220px' }">
+              <el-date-picker
+                v-model="defaultWhere[item.value]"
+                @visible-change="change"
+                :type="item.dateType || 'daterange'"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+              >
               </el-date-picker>
             </div>
             <div v-if="item.type == 'DictSelection'">
-              <DictSelection v-model="defaultWhere[item.value]" :placeholder="item.placeholder || '请选择内容'"
+              <DictSelection
+                v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请选择内容'"
                 :multiple="item.multiple ? item.multiple : false"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }" :dictName="item.dictName" />
-
+                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                :dictName="item.dictName"
+              />
             </div>
           </div>
         </el-form-item>
       </el-form-item>
 
       <el-form-item>
-        <el-dropdown ref="dropdownref" trigger="click" :hide-on-click="false" v-model="dropdownVisible">
+        <el-dropdown
+          ref="dropdownref"
+          trigger="click"
+          :hide-on-click="false"
+          v-model="dropdownVisible"
+        >
           <div v-if="seekList.length > formLength">
             <span class="el-dropdown-link">
               更多选项<i class="el-icon-arrow-down el-icon--right"></i>
@@ -41,46 +74,86 @@
             <el-dropdown-menu slot="dropdown">
               <div class="padding">
                 <el-form label-position="left">
-                  <el-form-item v-for="(item, i) in deboListRow" :key="i" :inline="true" label-position="left">
-                    <el-form-item :label-width="item.labelWidth ? item.labelWidth : '90' + 'px'
-                      " :inline="true" :label="item.label">
+                  <el-form-item
+                    v-for="(item, i) in deboListRow"
+                    :key="i"
+                    :inline="true"
+                    label-position="left"
+                  >
+                    <el-form-item
+                      :label-width="
+                        item.labelWidth ? item.labelWidth : '90' + 'px'
+                      "
+                      :inline="true"
+                      :label="item.label"
+                    >
                       <div v-if="item.type == 'input'">
-                        <el-input clearable v-model="defaultWhere[item.value]"
-                          :placeholder="item.placeholder || '请输入内容'" :style="{
+                        <el-input
+                          clearable
+                          v-model="defaultWhere[item.value]"
+                          :placeholder="item.placeholder || '请输入内容'"
+                          :style="{
                             width: item.width ? item.width + 'px' : '220px'
-                          }" />
+                          }"
+                        />
                       </div>
                       <div v-if="item.type == 'select'">
-                        <el-select clearable v-model="defaultWhere[item.value]"
+                        <el-select
+                          clearable
+                          v-model="defaultWhere[item.value]"
                           :multiple="item.multiple ? item.multiple : false"
                           :filterable="item.filterable ? item.filterable : true"
-                          :placeholder="item.placeholder || '请输入内容'" :style="{
+                          :placeholder="item.placeholder || '请输入内容'"
+                          :style="{
                             width: item.width ? item.width + 'px' : '220px'
-                          }" @visible-change="change" @change="handerChange">
-                          <el-option v-for="(op, i) in item.planList" :label="op.label" :value="op.value"
-                            :key="i"></el-option>
+                          }"
+                          @visible-change="change"
+                          @change="handerChange"
+                        >
+                          <el-option
+                            v-for="(op, i) in item.planList"
+                            :label="op.label"
+                            :value="op.value"
+                            :key="i"
+                          ></el-option>
                         </el-select>
                       </div>
 
                       <div v-if="item.type == 'date'">
-                        <el-date-picker v-model="defaultWhere[item.value]" @blur="change"
-                          :type="item.dateType || 'daterange'" range-separator="至" start-placeholder="开始日期"
-                          end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :style="{
+                        <el-date-picker
+                          v-model="defaultWhere[item.value]"
+                          @blur="change"
+                          :type="item.dateType || 'daterange'"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          :style="{
                             width: item.width ? item.width + 'px' : '220px'
-                          }">
+                          }"
+                        >
                         </el-date-picker>
                       </div>
                       <div v-if="item.type == 'DictSelection'">
-                        <DictSelection v-model="defaultWhere[item.value]" :placeholder="item.placeholder || '请选择内容'"
+                        <DictSelection
+                          v-model="defaultWhere[item.value]"
+                          :placeholder="item.placeholder || '请选择内容'"
                           :multiple="item.multiple ? item.multiple : false"
-                          :style="{ width: item.width ? item.width + 'px' : '220px' }" :dictName="item.dictName" />
-
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                          :dictName="item.dictName"
+                        />
                       </div>
                       <div v-if="item.type == 'picker'">
-                        <el-date-picker v-model="defaultWhere[item.value]" @blur="change"
-                          value-format="yyyy-MM-dd" :style="{
+                        <el-date-picker
+                          v-model="defaultWhere[item.value]"
+                          @blur="change"
+                          value-format="yyyy-MM-dd"
+                          :style="{
                             width: item.width ? item.width + 'px' : '220px'
-                          }">
+                          }"
+                        >
                         </el-date-picker>
                       </div>
                     </el-form-item>
@@ -93,111 +166,130 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="ele-btn-icon"
+          @click="search"
+        >
           查询
         </el-button>
-        <el-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
+        <el-button @click="reset" icon="el-icon-refresh-left" type="primary"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
-let defaultWhere = {};
-export default {
-  props: {
-    seekList: {
-      type: Array,
-      default: () => []
+  export default {
+    props: {
+      seekList: {
+        type: Array,
+        default: () => []
+      },
+      formLength: {
+        type: [Number],
+        default: 3
+      },
+      keyValue:''
     },
-    formLength: {
-      type: [Number],
-      default: 3
+    mounted() {
+      let whereObj = sessionStorage[this.keyValue];
+      if (whereObj) {
+        this.defaultWhere = JSON.parse(whereObj);
+        this.search();
+      }
+    },
+    components: {},
+    watch: {
+      seekList: {
+        handler(val) {
+          this.$nextTick(() => {
+            if (Array.isArray(val) && val.length <= this.formLength) {
+              this.seekListRow = val;
+            } else if (Array.isArray(val) && val.length >= this.formLength) {
+              this.seekListRow = val.slice(0, this.formLength);
+              this.deboListRow = val.slice(this.formLength);
+            }
+          });
+        },
+        deep: true,
+        immediate: true
+      },
+      defaultWhere: {
+        handler(val) {
+          if (this.keyValue) {
+            sessionStorage[this.keyValue] = JSON.stringify(val);
+            if (Object.keys(val).length === 0) {
+              sessionStorage.removeItem(this.keyValue);
+            }
+          }
+        },
+        deep: true
+        // immediate: true
+      }
     },
 
+    data() {
+      return {
+        defaultWhere: {},
+        dropdownVisible: true,
+        deboListRow: [],
+        seekListRow: []
+      };
+    },
 
-  },
+    computed: {
+      info() {
+        return this.$store.state.user.info;
+      }
+    },
 
-  components: {},
-  watch: {
-    seekList: {
-      handler(val) {
-        val.forEach((item) => {
-          defaultWhere[item.value] = null;
-        });
+    created() {},
+    methods: {
+      change(visible) {
+        this.dropdownVisible = visible;
+        this.$refs.dropdownref.show();
+      },
+      handerChange() {
+        this.$refs.dropdownref.show();
+      },
 
-        this.$nextTick(() => {
-          if (Array.isArray(val) && val.length <= this.formLength) {
-            this.seekListRow = val;
-          } else if (Array.isArray(val) && val.length >= this.formLength) {
-            this.seekListRow = val.slice(0, this.formLength);
-            this.deboListRow = val.slice(this.formLength);
+      search() {
+        let valueAr = this.seekList.filter((item) => item.valueAr);
+        valueAr.forEach((item) => {
+          let data = this.defaultWhere[item.value];
+          if (data) {
+            this.defaultWhere[item.valueAr[0]] = data[0];
+            this.defaultWhere[item.valueAr[1]] = data[1];
           }
+          delete this.defaultWhere[item.value];
         });
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-
-  data() {
-    return {
-      defaultWhere: {},
-      dropdownVisible: true,
-      deboListRow: [],
-      seekListRow: []
-    };
-  },
-
-  computed: {
-    info() {
-      return this.$store.state.user.info;
-    }
-  },
-
-  created() { },
-  methods: {
-    change(visible) {
-      this.dropdownVisible = visible;
-      this.$refs.dropdownref.show();
-    },
-    handerChange() {
-      this.$refs.dropdownref.show();
-    },
 
-    search() {
-      let valueAr = this.seekList.filter((item) => item.valueAr);
-      valueAr.forEach((item) => {
-        let data = this.defaultWhere[item.value];
-        if (data) {
-          this.defaultWhere[item.valueAr[0]] = data[0];
-          this.defaultWhere[item.valueAr[1]] = data[1];
-        }
-        delete this.defaultWhere[item.value];
-      });
+        this.$emit('search', this.defaultWhere);
+      },
+      // 重置
+      reset() {
+        this.defaultWhere = {};
+        this.search();
+      }
 
-      this.$emit('search', this.defaultWhere);
-    },
-    // 重置
-    reset() {
-      this.defaultWhere = {};
-      this.search();
+      //  折叠悬浮中样式调整
     }
-
-    //  折叠悬浮中样式调整
-  }
-};
+  };
 </script>
 
-<style scoped lang="scss" >
-.index_box {
-  display: flex;
-}
+<style scoped lang="scss">
+  .index_box {
+    display: flex;
+  }
 
-.padding {
-  padding: 20px;
-}
-:deep(.el-form-item){
- margin-bottom: 5px !important;
-}
+  .padding {
+    padding: 20px;
+  }
+  :deep(.el-form-item) {
+    margin-bottom: 5px !important;
+  }
 </style>

src/views/purchasingManage/inquiryManage/components/searchIndex.vue

@@ -1,6 +1,6 @@
 <!-- 搜索表单 -->
 <template>
-  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
+  <seekPage :seekList="seekList" :formLength="3" @search="search" keyValue="eos-purchasingManage-inquiryManage-searchIndex"></seekPage>
 </template>
 <script>
 import { reviewStatusSelect } from '@/enum/dict';

src/views/saleManage/saleOrder/invoice/components/orderListDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <ele-modal
     title="选择订单"
     custom-class="ele-dialog-form long-dialog-form"
     :visible.sync="visible"
@@ -45,7 +45,7 @@
       <el-button type="primary" size="small" @click="selected">选择</el-button>
       <el-button size="small" @click="handleClose">关闭</el-button>
     </div>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>
@@ -195,7 +195,23 @@
             showOverflowTooltip: true,
             minWidth: 130
           },
-
+          {
+            prop: 'inventoryQuantity',
+            label: '库存数',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 140
+          },
+          {
+            prop: 'inventoryQuantity',
+            label: '库存状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 140,
+            formatter: (_row, _column, cellValue) => {
+              return _row.inventoryQuantity ? '有库存' : '无库存';
+            }
+          },
           {
             prop: 'partaTel',
             label: '客户联系电话',

src/views/saleManage/saleOrder/invoiceConfirm/components/addInvoiceDialog.vue

@@ -116,7 +116,7 @@
       </el-row>
     </el-form>
     <el-tabs v-model="activeName" style="margin-top: 15px" type="border-card">
-      <el-tab-pane label="收货产品明细" name="first">
+      <el-tab-pane label="发货产品明细" name="first">
         <ele-pro-table
           ref="table"
           :needPage="false"

src/views/saleManage/saleOrder/invoiceConfirm/components/detailDialog.vue

@@ -89,7 +89,7 @@
         </el-row>
       </el-form>
       <el-tabs type="border-card">
-        <el-tab-pane label="收货物品明细">
+        <el-tab-pane label="发货物品明细">
           <ele-pro-table
             ref="table"
             :needPage="false"