chenrui 2 rokov pred
rodič
commit
b4068ac987

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1666772655721
+  "version": 1666936436618
 }

+ 3 - 2
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -223,12 +223,13 @@ export default {
         productTypeSn3: undefined //  产品三级分类
       }
       this.time = []
+      this.productType = []
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
-      this.handleSearch()
       if (this.advanced) {
         this.$refs.scanDate.resetDate()
       }
+      this.handleSearch()
     },
     // 导出
     handleExport () {
@@ -239,7 +240,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           exportReport(params).then(res => {
-            downloadExcel(res, '适配产品统计报表')
+            downloadExcel(res, '适配产品统计')
             _this.exportLoading = false
             _this.spinning = false
           })

+ 7 - 6
src/views/numsGoodsShelves/vinAnalysis/vinList.vue

@@ -59,7 +59,7 @@
         </a-row>
       </a-form-model>
     </div>
-    <duv v-show="isSearch">
+    <div v-show="isSearch">
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px" v-if="queryCountData">
         <div class="ftext" slot="message">
@@ -100,7 +100,7 @@
           </div>
         </template>
       </s-table>
-    </duv>
+    </div>
     <div class="unChoose" v-show="!isSearch">
       <a-icon type="exclamation-circle" theme="filled" :style="{ fontSize: '18px', color: '#ff9900', verticalAlign: 'sub', marginRight: '5px' }" />
       <span>请选择一个货架后点击查询按钮</span>
@@ -187,13 +187,13 @@ export default {
       ]
       this.showCol.map(item => {
         if (item == 'kt') {
-          arr.push({ title: '空调滤清器适配', dataIndex: 'airConditionerFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+          arr.push({ title: '空调滤清器适配', dataIndex: 'airConditionerFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '120px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
         }
         if (item == 'kq') {
-          arr.push({ title: '空气滤清器适配', dataIndex: 'airFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+          arr.push({ title: '空气滤清器适配', dataIndex: 'airFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '120px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
         }
         if (item == 'jy') {
-          arr.push({ title: '机油滤清器适配', dataIndex: 'engineOilFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+          arr.push({ title: '机油滤清器适配', dataIndex: 'engineOilFilterFlagDesc', filters: this.filters, filterMultiple: false, width: '120px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
         }
       })
       return arr
@@ -240,6 +240,7 @@ export default {
       this.queryParam.shelfSn = undefined
       this.queryParam.brandName = undefined
       this.queryParam.modelName = undefined
+      this.time = []
       this.$refs.rangeDate.resetDate(this.time)
       this.$refs.ruleForm.resetFields()
       // this.$refs.table.refresh(true)
@@ -255,7 +256,7 @@ export default {
           _this.exportLoading = true
           _this.spinning = true
           exportVinLog(params).then(res => {
-            downloadExcel(res, 'VIN分析表')
+            downloadExcel(res, 'VIN扫描记录')
             _this.exportLoading = false
             _this.spinning = false
           })