Ver código fonte

修改显示bug

chenrui 2 anos atrás
pai
commit
72ae227254

+ 9 - 9
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -75,10 +75,10 @@
                   class="button-warning"
                   style="margin-left: 10px;"
                   id="vinAnaly-export-btn">导出</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
+                </a> -->
               </a-col>
             </a-row>
             </a-form>
@@ -141,7 +141,7 @@ export default {
   data () {
     return {
       spinning: false,
-      advanced: false,
+      // advanced: false,
       tableHeight: 0,
       time: [],
       orderTime: [],
@@ -272,12 +272,12 @@ export default {
     }
   },
   watch: {
-    advanced (newValue, oldValue) {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
-    },
+    // advanced (newValue, oldValue) {
+    //   const _this = this
+    //   this.$nextTick(() => { // 页面渲染完成后的回调
+    //     _this.setTableH()
+    //   })
+    // },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
       this.setTableH()
     }

+ 5 - 5
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -30,7 +30,7 @@
           </a-col>
           <a-col :md="4" :sm="24">
             <a-form-model-item label="原厂编码">
-              <a-input id="vinAnaly-VIN" v-model.trim="queryParam.origCode" allowClear placeholder="请输入VIN"/>
+              <a-input id="vinAnaly-VIN" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
@@ -45,7 +45,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="最近VIN扫描时间">
+              <a-form-model-item label="VIN扫描时间">
                 <rangeDate ref="scanDate" v-model="time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
@@ -116,7 +116,7 @@ export default {
       spinning: false,
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       productType: [],
       queryParam: { //  查询条件
@@ -173,8 +173,8 @@ export default {
         { title: '产品品牌', dataIndex: 'brandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', slots: { title: 'type' }, scopedSlots: { customRender: 'type' }, width: '10%', align: 'center' },
         { title: '适配有货次数', dataIndex: 'isStockCount', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '适配缺货次数', dataIndex: 'notStockCount', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '最近VIN扫描时间', dataIndex: 'scanVinDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true }
+        { title: '适配缺货次数', dataIndex: 'notStockCount', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true }
+        // { title: '最近VIN扫描时间', dataIndex: 'scanVinDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true }
       ]
       return arr
     }

+ 2 - 2
src/views/numsGoodsShelves/vinAnalysis/vinList.vue

@@ -25,7 +25,7 @@
           </a-col>
           <template v-if="advanced">
             <a-col :md="4" :sm="24">
-              <a-form-model-item label="vin">
+              <a-form-model-item label="VIN">
                 <a-input id="vinAnaly-VIN" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入VIN"/>
               </a-form-model-item>
             </a-col>
@@ -126,7 +126,7 @@ export default {
       spinning: false,
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         beginDate: '',