优化我的业绩筛选

src/views/ecw/coupon/edit.vue

@@ -471,10 +471,13 @@ export default {
 						item.combUnit = 'prodUnit_' + item.prodUnit
 					}else if(item.fullCurrencyId){
 						item.combUnit = 'fullCurrencyId_' + item.fullCurrencyId
+					}else{
+
 					}
 
 					this.fee[item.type].push({...item})
 				})
+				console.log(JSON.stringify(this.fee, null, 4))
 				/* if(this.costType != this.form.costType){
 					console.error(`费用类型冲突，计算出来的类型为${this.costType},接口费用类型为${res.data.costType}，类型为${res.data.type}`)
 					this.$alert(this.$t('费用类型冲突'))
@@ -491,7 +494,9 @@ export default {
 
 				// 对没有默认值的给一个空表单
 				[1,2].forEach(type => {
+					console.log(`fee${type}判断是否为空`, this.fee[type], this.fee[type].length)
 					if(!this.fee[type].length){
+						console.log(`fee${type}给默认值`, this.fee[type], this.fee[type].length)
 						this.fee[type] = [{type}]
 					}
 				})
@@ -519,6 +524,7 @@ export default {
 		},
 		// 满减活动如果选择的满多少金额减，则在选择满货币后需要同步减的货币，且禁用减的货币修改
 		checkReduceCurrency(item){
+			console.log('checkReduceCurrency', {...item}, this.form.type)
 			// 金额满减
 			if([2,4,5,7].indexOf(this.form.type) > -1){
 				// 只要不是按产品单位满减

src/views/ecw/deptTarget/myAchievement.vue

@@ -4,13 +4,13 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item :label="$t('关键字')" prop="transportType">
-        <el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" />
+        <el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" clearable/>
       </el-form-item>
       <el-form-item :label="$t('运输方式')" prop="transportType">
-        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number"/>
+        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable/>
       </el-form-item>
       <el-form-item :label="$t('唛头')" prop="transportType">
-        <el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" />
+        <el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" clearable />
       </el-form-item>
       <el-form-item :label="$t('资源类型')" prop="customerType">
         <!-- <el-select clearable  v-model="queryParams.customerType" :placeholder="$t('请选择资源类型')" clearable size="small">
@@ -40,6 +40,7 @@
 <!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="resetQuery">{{$t('重置')}}</el-button>
 <!--        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                   >{{$t('导出')}}</el-button> -->
       </el-form-item>
@@ -301,10 +302,12 @@
                 this.queryParams.pageNo = 1;
                 this.queryParams.beginStartTime=this.dateFilter[0];
                 this.queryParams.endStartTime=this.dateFilter[1];
+                
                 this.getList();
             },
             /** 重置按钮操作 */
             resetQuery() {
+                this.dateFilter = []
                 this.dateRangeCreateTime = [];
                 this.dateRangeStartTime = [];
                 this.dateRangeEndTime = [];