|
|
@@ -24,21 +24,21 @@
|
|
|
<el-row style="margin-bottom: 15px;">
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="录入时间">
|
|
|
- <el-date-picker v-model="queryForm.date" style="margin-left: 20px;width:90%" :size="overSize"
|
|
|
+ <el-date-picker value-format="yyyy-MM-dd" v-model="queryForm.date" style="margin-left: 20px;width:90%" :size="overSize"
|
|
|
type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-form-item label="协议状态">
|
|
|
- <el-select :size="overSize" v-model="queryForm.status" placeholder="请选择协议状态" clearable
|
|
|
+ <!-- <el-col :span="4">
|
|
|
+ <el-form-item label="审核状态">
|
|
|
+ <el-select :size="overSize" v-model="queryForm.status" placeholder="请选择审核状态" clearable
|
|
|
style="width: 100%;">
|
|
|
<el-option v-for="item in approvalStatusoptions" :key="item.dictValue" :label="item.dictTag"
|
|
|
:value="item.dictValue"></el-option>
|
|
|
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<el-col :span="4" style="display: flex;align-items: center;justify-content: center;">
|
|
|
<el-form-item>
|
|
|
<el-button :size="overSize" @click="queryEsmInfo">查询</el-button>
|
|
|
@@ -983,6 +983,8 @@ export default {
|
|
|
// 右侧列表查询数据Start
|
|
|
queryForm: {
|
|
|
status: "1",
|
|
|
+ startDate:'',//开始时间
|
|
|
+ endDate:'',//结束时间
|
|
|
},
|
|
|
containsSubChecked: true,
|
|
|
pageResult: [],
|
|
|
@@ -1266,6 +1268,7 @@ export default {
|
|
|
|
|
|
})
|
|
|
this.defaultattributionform = JSON.parse(JSON.stringify(this.attributionform))
|
|
|
+ console.log(this.approvalStatusoptions)
|
|
|
},
|
|
|
mounted() {
|
|
|
this.labelWidth='auto';
|
|
|
@@ -2174,21 +2177,11 @@ export default {
|
|
|
//通过查询条件查询分页数据Start
|
|
|
queryEsmInfo() {
|
|
|
if (this.queryForm.date != null) {
|
|
|
- var startdate = formatWithSeperator(
|
|
|
- this.queryForm.date[0],
|
|
|
- "-",
|
|
|
- ":"
|
|
|
- ).split(" ")[0];
|
|
|
- var enddate = formatWithSeperator(
|
|
|
- this.queryForm.date[1],
|
|
|
- "-",
|
|
|
- ":"
|
|
|
- ).split(" ")[0];
|
|
|
- this.pageRequest.columnFilters.startdate.value = startdate;
|
|
|
- this.pageRequest.columnFilters.enddate.value = enddate;
|
|
|
+ this.queryForm.startDate = this.queryForm.date[0];
|
|
|
+ this.queryForm.endDate = this.queryForm.date[1];
|
|
|
} else {
|
|
|
- this.pageRequest.columnFilters.startdate.value = "";
|
|
|
- this.pageRequest.columnFilters.enddate.value = "";
|
|
|
+ this.queryForm.startDate='';
|
|
|
+ this.queryForm.endDate='';
|
|
|
}
|
|
|
this.pageRequest.columnFilters.status.value = this.queryForm.status;
|
|
|
this.pageRequest.pageNum = 1;
|
|
|
@@ -2203,6 +2196,9 @@ export default {
|
|
|
pageSize: this.pageSize,
|
|
|
partnerCompaniesId: this.agreement.partnerCompaniesId,
|
|
|
companiesType: this.supplierType,
|
|
|
+ startDate: this.queryForm.startDate,
|
|
|
+ endDate: this.queryForm.endDate,
|
|
|
+ // auditStatus:this.queryForm.status
|
|
|
}
|
|
|
this.$api.insCompany.agreementPage(parmas).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -2210,6 +2206,8 @@ export default {
|
|
|
this.pageNum = res.data.pageNum;
|
|
|
this.pageSize = res.data.pageSize;
|
|
|
this.totalSize = res.data.totalSize;
|
|
|
+ }else{
|
|
|
+ this.$message.error(res.msg)
|
|
|
}
|
|
|
})
|
|
|
},
|
haizhouwang