Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui
This commit is contained in:
commit
0013ca35a7
|
|
@ -1,11 +1,11 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 查询推送协议匹配列表
|
||||
export function getProtocolList(query) {
|
||||
export function getProtocolList(params) {
|
||||
return request({
|
||||
url: '/material/slt_agreement_info/getSltAgreementInfo4Project',
|
||||
method: 'get',
|
||||
params: query
|
||||
url: '/material/iws_cost_push/findAgreementPushMatchList',
|
||||
method: 'post',
|
||||
data: params
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
|
||||
<el-form-item label="是否匹配" prop="isMatch">
|
||||
<el-select v-model="queryParams.isMatch" placeholder="请选择" clearable>
|
||||
<el-option label="已匹配" value="0"></el-option>
|
||||
<el-option label="未匹配" value="1"></el-option>
|
||||
<el-option label="已匹配" value="1"></el-option>
|
||||
<el-option label="未匹配" value="0"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否结算" prop="isPay">
|
||||
<el-select v-model="queryParams.isPay" placeholder="请选择" clearable>
|
||||
<el-option label="已结算" value="0"></el-option>
|
||||
<el-option label="未结算" value="1"></el-option>
|
||||
<el-form-item label="是否结算" prop="isSettlement">
|
||||
<el-select v-model="queryParams.isSettlement" placeholder="请选择" clearable>
|
||||
<el-option label="已结算" value="1"></el-option>
|
||||
<el-option label="未结算" value="0"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
|
|
@ -81,17 +81,17 @@
|
|||
<el-table-column label="工程编号" align="center" prop="projectCode" sortable show-overflow-tooltip />
|
||||
<el-table-column label="是否匹配" align="center" prop="isMatch" sortable show-overflow-tooltip >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.isMatch==0" style="color: #67c23a">已匹配</span>
|
||||
<span v-if="scope.row.isMatch==1" style="color: #f56c6c">未匹配</span>
|
||||
<span v-if="scope.row.isMatch==1" style="color: #67c23a">已匹配</span>
|
||||
<span v-if="scope.row.isMatch==0" style="color: #f56c6c">未匹配</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否结算" align="center" prop="isPay" sortable show-overflow-tooltip >
|
||||
<el-table-column label="是否结算" align="center" prop="isSettlement" sortable show-overflow-tooltip >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.isPay==0" style="color: #67c23a">已结算</span>
|
||||
<span v-if="scope.row.isPay==1" style="color: #f56c6c">未结算</span>
|
||||
<span v-if="scope.row.isSettlement==1" style="color: #67c23a">已结算</span>
|
||||
<span v-if="scope.row.isSettlement==0" style="color: #f56c6c">未结算</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="结算时间" align="center" prop="payTime" sortable show-overflow-tooltip />
|
||||
<el-table-column label="结算时间" align="center" prop="settlementTime" sortable show-overflow-tooltip />
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
|
|
@ -144,7 +144,7 @@ export default {
|
|||
agreementId: '',
|
||||
agreementCode: '',
|
||||
isMatch: null,
|
||||
isPay: null,
|
||||
isSettlement: null,
|
||||
},
|
||||
|
||||
};
|
||||
|
|
@ -227,34 +227,11 @@ export default {
|
|||
/** 查询岗位列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
// getProtocolList(this.queryParams).then((response) => {
|
||||
// this.protocolList = response.rows;
|
||||
// this.total = response.total;
|
||||
// this.loading = false;
|
||||
// });
|
||||
this.protocolList = [
|
||||
{
|
||||
agreementCode: '123',
|
||||
unitName: '123',
|
||||
projectName: '123',
|
||||
projectId: '123',
|
||||
projectCode: '123',
|
||||
isMatch: '0',
|
||||
isPay: '0',
|
||||
payTime: '2022-09-09',
|
||||
},
|
||||
{
|
||||
agreementCode: '123',
|
||||
unitName: '123',
|
||||
projectName: '123',
|
||||
projectId: '123',
|
||||
projectCode: '123',
|
||||
isMatch: '1',
|
||||
isPay: '1',
|
||||
payTime: '2022-09-09',
|
||||
},
|
||||
]
|
||||
getProtocolList(this.queryParams).then((response) => {
|
||||
this.protocolList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
|
||||
/** 重置按钮操作 */
|
||||
|
|
@ -263,7 +240,7 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
isMatch: null,
|
||||
isPay: null,
|
||||
isSettlement: null,
|
||||
unitId: null,
|
||||
projectId: null,
|
||||
agreementId: '',
|
||||
|
|
@ -281,13 +258,13 @@ export default {
|
|||
|
||||
/** 导出 */
|
||||
handleExport() {
|
||||
// this.download(
|
||||
// 'material/complex_query/exportOutRecord',
|
||||
// {
|
||||
// ...this.queryParams,
|
||||
// },
|
||||
// `推送协议匹配记录_${new Date().getTime()}.xlsx`,
|
||||
// )
|
||||
this.download(
|
||||
'material/iws_cost_push/export',
|
||||
{
|
||||
...this.queryParams,
|
||||
},
|
||||
`推送协议匹配记录_${new Date().getTime()}.xlsx`,
|
||||
)
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -811,7 +811,7 @@ export default {
|
|||
|
||||
// 表单校验
|
||||
rules: {
|
||||
leasePrice: [
|
||||
typeName: [
|
||||
{
|
||||
required: true,
|
||||
message: "规格型号不能为空",
|
||||
|
|
|
|||
Loading…
Reference in New Issue