|
@@ -89,31 +89,14 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
- <el-form-item label="审核开始时间" prop="approvalStartTime">
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="screenForm.approvalStartTime"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- type="date"
|
|
|
|
- placeholder="选择日期">
|
|
|
|
- </el-date-picker>
|
|
|
|
-
|
|
|
|
- </el-form-item>
|
|
|
|
- </el-col>
|
|
|
|
- <el-col :xs="24" :sm="12" :lg="6">
|
|
|
|
- <el-form-item label="审核结束时间" prop="approvalEndTime">
|
|
|
|
-
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="screenForm.approvalEndTime"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- type="date"
|
|
|
|
- placeholder="选择日期">
|
|
|
|
- </el-date-picker>
|
|
|
|
-
|
|
|
|
|
|
+ <el-form-item label="审核时间" prop="approvaTime">
|
|
|
|
+ <el-date-picker v-model="screenForm.approvaTime" type="datetimerange" range-separator="至"
|
|
|
|
+ style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期">
|
|
|
|
+ </el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :xs="24" :sm="24" :lg="6" class="tr">
|
|
|
|
|
|
+ <el-col :xs="24" :sm="24" :lg="12" class="tr">
|
|
<el-form-item label="">
|
|
<el-form-item label="">
|
|
<el-button @click="resetScreenForm">清空</el-button>
|
|
<el-button @click="resetScreenForm">清空</el-button>
|
|
<el-button type="primary" @click="submitScreenForm">搜索</el-button>
|
|
<el-button type="primary" @click="submitScreenForm">搜索</el-button>
|
|
@@ -402,7 +385,8 @@ export default {
|
|
k3ServiceId: '',
|
|
k3ServiceId: '',
|
|
mainOrderId: '',
|
|
mainOrderId: '',
|
|
approvalEndTime: '',
|
|
approvalEndTime: '',
|
|
- approvalStartTime: ''
|
|
|
|
|
|
+ approvalStartTime: '',
|
|
|
|
+ approvaTime:''
|
|
},
|
|
},
|
|
categoryList: [],
|
|
categoryList: [],
|
|
salesmanList: [],
|
|
salesmanList: [],
|
|
@@ -475,8 +459,8 @@ export default {
|
|
categoryName: this.screenForm.type,
|
|
categoryName: this.screenForm.type,
|
|
serviceId: this.screenForm.salesMan,
|
|
serviceId: this.screenForm.salesMan,
|
|
k3ServiceId: this.screenForm.k3ServiceId,
|
|
k3ServiceId: this.screenForm.k3ServiceId,
|
|
- approvalEndTime: this.screenForm.approvalEndTime,
|
|
|
|
- approvalStartTime: this.screenForm.approvalStartTime
|
|
|
|
|
|
+ approvalEndTime: this.screenForm.approvaTime[0],
|
|
|
|
+ approvalStartTime: this.screenForm.approvaTime[1]
|
|
}
|
|
}
|
|
},
|
|
},
|
|
comRefundableQty() {
|
|
comRefundableQty() {
|
|
@@ -594,8 +578,8 @@ export default {
|
|
serviceId: this.screenForm.salesMan,
|
|
serviceId: this.screenForm.salesMan,
|
|
k3ServiceId: this.screenForm.k3ServiceId,
|
|
k3ServiceId: this.screenForm.k3ServiceId,
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
mainOrderId: this.screenForm.mainOrderId,
|
|
- approvalEndTime: this.screenForm.approvalEndTime,
|
|
|
|
- approvalStartTime: this.screenForm.approvalStartTime
|
|
|
|
|
|
+ approvalEndTime: this.screenForm.approvaTime[0],
|
|
|
|
+ approvalStartTime: this.screenForm.approvaTime[1]
|
|
};
|
|
};
|
|
getSumList(params).then((res) => {
|
|
getSumList(params).then((res) => {
|
|
res.data.records.forEach(item => {
|
|
res.data.records.forEach(item => {
|