浏览代码

修改bug

chenrui 1 年之前
父节点
当前提交
9f8a22218f

+ 3 - 3
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -12,7 +12,7 @@
                 :model="queryParam">
                 <a-row :gutter="15">
                   <a-col :md="6" :sm="24">
-                    <a-form-model-item label="销售审核日期" prop="salesDate">
+                    <a-form-model-item label="销售审核时间" prop="salesDate">
                       <rangeDate ref="rangeDate" :value="queryParam.salesDate" @change="salesDateChange" />
                     </a-form-model-item>
                   </a-col>
@@ -328,7 +328,7 @@ export default {
     testForm (type) {
       const _this = this
       if (!_this.queryParam.salesDate[0] || !_this.queryParam.salesDate[1]) {
-        _this.$message.error('请选择销售审核日期')
+        _this.$message.error('请选择销售审核时间')
         return
       }
       _this.$refs.ruleForm.validate(valid => {
@@ -339,7 +339,7 @@ export default {
             _this.handleExport()
           }
         } else {
-          _this.$message.error('请选择销售审核日期')
+          _this.$message.error('请选择销售审核时间')
           return false
         }
       })

+ 2 - 2
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -481,7 +481,7 @@ export default {
     testForm (type) {
       const _this = this
       if (!_this.newQueryParam.salesDate && (!_this.newQueryParam.salesDate[0] || !_this.newQueryParam.salesDate[1])) {
-        _this.$message.error('请选择销售审核日期')
+        _this.$message.error('请选择下推时间')
         return
       }
       _this.$refs.ruleForm.validate(valid => {
@@ -492,7 +492,7 @@ export default {
             _this.handleExport()
           }
         } else {
-          _this.$message.error('请选择销售审核日期')
+          _this.$message.error('请选择下推时间')
           return false
         }
       })

+ 34 - 34
src/views/reportData/regionTypeSalesReport/list.vue

@@ -8,38 +8,38 @@
       <a-card size="small">
         <div class="table-page-search-wrapper newTableSearchName" ref="tableSearch">
           <a-form-model
-          id="returnGoodsPresentationList-form"
-          ref="ruleForm"
-          class="form-model-con"
-          layout="inline"
-          :rules="rules"
-          :model="queryParam"
-          @keyup.enter.native="handleSearch">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售审核时间" prop="time">
-                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售状态" prop="salesStatusType">
-                <v-select
-                  v-model="queryParam.salesStatusType"
-                  code="SALES_STATUS"
-                  placeholder="请选择销售状态"
-                  allowClear></v-select>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-if="activeKey==0">
-              <a-form-model-item label="所在区域">
-                <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="区域负责人">
-                <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-              </a-form-model-item>
-            </a-col>
+            id="returnGoodsPresentationList-form"
+            ref="ruleForm"
+            class="form-model-con"
+            layout="inline"
+            :rules="rules"
+            :model="queryParam"
+            @keyup.enter.native="handleSearch">
+            <a-row :gutter="15">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="销售审核时间" prop="time">
+                  <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="销售状态" prop="salesStatusType">
+                  <v-select
+                    v-model="queryParam.salesStatusType"
+                    code="SALES_STATUS"
+                    placeholder="请选择销售状态"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-if="activeKey==0">
+                <a-form-model-item label="所在区域">
+                  <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                  <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <!--  <template v-if="advanced && activeKey==0">
               <a-col :md="6" :sm="24">
                 <a-form-model-item prop="dealerProvinceSn" style="margin: 0;" label="地区">
@@ -127,7 +127,7 @@ export default {
       exportLoading: false,
       tableHeight: 0,
       rules: {
-        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }],
+        'time': [{ required: true, message: '请选择销售审核时间', trigger: 'change' }],
         'salesStatusType': [{ required: true, message: '请选择销售状态', trigger: 'change' }]
       },
       // 加载数据方法 必须为 Promise 对象
@@ -177,7 +177,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择审核时间和销售状态')
+          _this.$message.error('请选择销售审核时间和销售状态')
           return false
         }
       })

+ 2 - 2
src/views/reportData/salesDetails/list.vue

@@ -220,7 +220,7 @@ export default {
       },
       productType: [],
       rules: {
-        'time': [{ required: true, message: '请选择销售日期', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择下推日期', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -333,7 +333,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售日期')
+          _this.$message.error('请选择下推日期')
           return false
         }
       })

+ 2 - 2
src/views/reportData/salesOrderTotal/list.vue

@@ -215,7 +215,7 @@ export default {
       rules: {
         'time': [{
           required: true,
-          message: '请选择销售日期',
+          message: '请选择下推日期',
           trigger: 'change'
         }]
       },
@@ -354,7 +354,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售日期')
+          _this.$message.error('请选择下推日期')
           return false
         }
       })