|
@@ -157,6 +157,10 @@
|
|
<el-date-picker v-model="listQuery4.month" type="month" value-format="yyyy-MM"
|
|
<el-date-picker v-model="listQuery4.month" type="month" value-format="yyyy-MM"
|
|
:picker-options={}></el-date-picker>
|
|
:picker-options={}></el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="日期">
|
|
|
|
+ <el-date-picker v-model="listQuery4.date" type="daterange" range-separator="至" start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期" value-format="yyyy-MM-dd" :picker-options="pickerOptions" @change="listQuery4.month=''"></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item label="服务者">
|
|
<el-form-item label="服务者">
|
|
<el-input v-model="listQuery4.serverName" placeholder="请输入服务者姓名"></el-input>
|
|
<el-input v-model="listQuery4.serverName" placeholder="请输入服务者姓名"></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -193,7 +197,7 @@
|
|
<el-table-column prop="stationImproveDes" label="城市改善动作描述"></el-table-column>
|
|
<el-table-column prop="stationImproveDes" label="城市改善动作描述"></el-table-column>
|
|
<el-table-column prop="stationImproveFeedback" label="城市差评反馈"></el-table-column>
|
|
<el-table-column prop="stationImproveFeedback" label="城市差评反馈"></el-table-column>
|
|
<el-table-column prop="appealTime" label="申诉时间"></el-table-column>
|
|
<el-table-column prop="appealTime" label="申诉时间"></el-table-column>
|
|
- <el-table-column prop="appealMemo" label="申诉备注"></el-table-column>
|
|
|
|
|
|
+ <el-table-column prop="appealMemo" label="申诉备注" width="120px"></el-table-column>
|
|
<el-table-column prop="secondTime" label="申诉处理时间"></el-table-column>
|
|
<el-table-column prop="secondTime" label="申诉处理时间"></el-table-column>
|
|
<el-table-column prop="secondDecide" label="二次判定结果"></el-table-column>
|
|
<el-table-column prop="secondDecide" label="二次判定结果"></el-table-column>
|
|
<el-table-column prop="userName1" label="二次判定人"></el-table-column>
|
|
<el-table-column prop="userName1" label="二次判定人"></el-table-column>
|
|
@@ -314,6 +318,7 @@ export default {
|
|
hemaWorkOrder: '',
|
|
hemaWorkOrder: '',
|
|
serverName: '',
|
|
serverName: '',
|
|
ticketSn: '',
|
|
ticketSn: '',
|
|
|
|
+ date:''
|
|
},
|
|
},
|
|
|
|
|
|
listData5: [],
|
|
listData5: [],
|
|
@@ -571,7 +576,11 @@ export default {
|
|
this.listQuery4.month = this_month;
|
|
this.listQuery4.month = this_month;
|
|
}
|
|
}
|
|
let temp = JSON.parse(JSON.stringify(list));
|
|
let temp = JSON.parse(JSON.stringify(list));
|
|
- if (this.listQuery4.month === this_month) {
|
|
|
|
|
|
+
|
|
|
|
+ if (this.listQuery4.date){
|
|
|
|
+ temp.startTime=this.listQuery4.date[0];
|
|
|
|
+ temp.endTime=this.listQuery4.date[1];
|
|
|
|
+ }else if (this.listQuery4.month === this_month) {
|
|
temp.startTime = moment().format('YYYY-MM-01');
|
|
temp.startTime = moment().format('YYYY-MM-01');
|
|
temp.endTime = moment().add(-1, "day").format('YYYY-MM-DD');
|
|
temp.endTime = moment().add(-1, "day").format('YYYY-MM-DD');
|
|
} else {
|
|
} else {
|
|
@@ -579,9 +588,10 @@ export default {
|
|
temp.endTime = moment(list.month).endOf('month').format('YYYY-MM-DD');
|
|
temp.endTime = moment(list.month).endOf('month').format('YYYY-MM-DD');
|
|
}
|
|
}
|
|
delete temp.month;
|
|
delete temp.month;
|
|
|
|
+ delete temp.date;
|
|
temp.citys = list.city.join(',');
|
|
temp.citys = list.city.join(',');
|
|
temp.pageNo = list.pageNo;
|
|
temp.pageNo = list.pageNo;
|
|
- if (null == temp.citys || temp.citys == []) {
|
|
|
|
|
|
+ if (null == temp.citys || temp.citys === []) {
|
|
delete temp.citys;
|
|
delete temp.citys;
|
|
}
|
|
}
|
|
delete temp.city;
|
|
delete temp.city;
|