ソースを参照

Merge branch 'develop_yh57' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh57

lilei 1 ヶ月 前
コミット
0cbd0354cc

BIN
public/templ/批量修改产品价格模板.xlsx


+ 1 - 1
public/version.json

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

+ 10 - 10
src/views/reportData/salesDetailReport/list.vue

@@ -335,14 +335,6 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.queryParam.time = []
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
-      this.$refs.outWareRangeDate.resetDate('')
-      this.outWareTime = []
-      this.queryParam.outWarehouseBeginDate = ''
-      this.queryParam.outWarehouseEndDate = ''
       this.$refs.creatDate.resetDate()
       this.creatTime = []
       this.queryParam.createBeginDate = ''
@@ -367,13 +359,21 @@ export default {
       this.queryParam.salesBillNo = ''
       this.queryParam.salesManName = ''
       this.productType = []
-      this.$refs.ruleForm.resetFields()
       this.totalData = null
-      this.$refs.table.clearTable()
       if (this.advanced) {
+        this.$refs.rangeDate.resetDate()
+        this.queryParam.time = []
+        this.queryParam.beginDate = ''
+        this.queryParam.endDate = ''
+        this.$refs.outWareRangeDate.resetDate('')
+        this.outWareTime = []
+        this.queryParam.outWarehouseBeginDate = ''
+        this.queryParam.outWarehouseEndDate = ''
         this.$refs.custSatelliteList.resetForm()
         this.$refs.areaList.clearData()
       }
+      this.$refs.ruleForm.resetFields()
+      this.$refs.table.clearTable()
     },
     // 导出
     handleExport () {

+ 8 - 9
src/views/reportData/salesReport/list.vue

@@ -278,19 +278,10 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.time = []
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
-      this.$refs.outWareRangeDate.resetDate('')
-      this.outWareTime = []
-      this.queryParam.outWarehouseBeginDate = ''
-      this.queryParam.outWarehouseEndDate = ''
       this.$refs.creatDate.resetDate()
       this.creatTime = []
       this.queryParam.createBeginDate = ''
       this.queryParam.createEndDate = ''
-
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSnCurrent = undefined
       this.queryParam.salesTargetType = undefined
@@ -305,6 +296,14 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       if (this.advanced) {
+        this.$refs.rangeDate.resetDate()
+        this.time = []
+        this.queryParam.beginDate = ''
+        this.queryParam.endDate = ''
+        this.$refs.outWareRangeDate.resetDate('')
+        this.outWareTime = []
+        this.queryParam.outWarehouseBeginDate = ''
+        this.queryParam.outWarehouseEndDate = ''
         this.$refs.custSatelliteList.resetForm()
         this.$refs.areaList.clearData()
       }