zhangdan 3 лет назад
Родитель
Сommit
e6d5a0e877
1 измененных файлов с 10 добавлено и 9 удалено
  1. 10 9
      src/views/reportData/regionTypeSalesReport/list.vue

+ 10 - 9
src/views/reportData/regionTypeSalesReport/list.vue

@@ -20,19 +20,19 @@
                 <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
               </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" v-model="queryParam.subareaSn"></subarea>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售状态">
-                <a-select v-model="queryParam.salesStatusType" allowClear placeholder="请选择">
+              <a-form-model-item label="销售状态" prop="salesStatusType">
+                <a-select v-model="queryParam.salesStatusType" allowClear placeholder="请选择销售状态">
                   <a-select-option v-for="item in salesStatusTypeList" :value="item.code" :key="item.code">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-model-item>
               </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" v-model="queryParam.subareaSn"></subarea>
+              </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="地区">
@@ -107,7 +107,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       rules: {
-        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }],
+        'salesStatusType': [{ required: true, message: '请选择销售状态', trigger: 'change' }]
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -233,6 +234,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
+      this.$refs.ruleForm.resetFields()
       this.queryParam.time = []
       this.$refs.rangeDate.resetDate(this.queryParam.time)
       this.queryParam.beginDate = ''
@@ -240,7 +242,6 @@ export default {
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.salesStatusType = 'REAL_SALES'
-      this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
     //  导出