master
271556543@qq.com 3 years ago
parent b542de9180
commit d4b2228cb3

@ -47,3 +47,9 @@
.el-range-separator {
box-sizing: content-box;
}
.el-table__body-wrapper{
z-index:2
}

@ -74,6 +74,25 @@
</div>
</div>
</template>
<template v-if="form.is_assurance" v-slot:assurance_money>
<div class="xy-table-item">
<div class="xy-table-item-label" style="width: 200px">保函金额
</div>
<div class="xy-table-item-content xy-table-item-price">
<el-input-number v-model="form.assurance_money" :controls="false" :precision="2" placeholder="请输入保函金额" style="width: 300px;"></el-input-number>
</div>
</div>
</template>
<template v-if="form.is_assurance" v-slot:assurance_expire>
<div class="xy-table-item">
<div class="xy-table-item-label" style="width: 200px">保函有效期
</div>
<div class="xy-table-item-content">
<el-date-picker value-format="yyyy-MM-dd" v-model="form.assurance_expire" placeholder="请输入保函有效期" style="width: 300px;"/>
</div>
</div>
</template>
<template v-slot:guaranteeMoney>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -214,7 +233,9 @@
guaranteeMoney: '',
guaranteeYear: '',
date: "",
is_assurance: false
is_assurance: false,
assurance_money:'',
assurance_expire:''
},
rules: {
number: [{
@ -349,6 +370,8 @@
end_date: this.form.time[1],
date: this.form.date,
is_assurance: this.form.is_assurance,
assurance_money:this.form.assurance_money,
assurance_expire:this.form.assurance_expire
}).then(res => {
this.isShow = false
Message({
@ -378,7 +401,9 @@
this.form.carryDepartment = res.carry_department;
this.form.guaranteeMoney = res.guarantee_money;
this.form.guaranteeYear = res.guarantee_year;
this.form.is_assurance = res.is_assurance === 1 ? true : false,
this.form.is_assurance = res.is_assurance === 1
this.form.assurance_expire = res.assurance_expire
this.form.assurance_money = res.assurance_money
console.log(this.form)
},
deleteContractSign(row) {
@ -473,7 +498,7 @@
}
.xy-table-item-label {
width: 140px;
width: 200px;
}
.xy-table-item-price {

@ -173,19 +173,19 @@
</Button>
</template>
<template
v-if="scope.row.invite_status === 1 && scope.row.purchase_status === 3 && scope.row.purchase_way.remark === 'true'">
v-if="scope.row.invite_status === 1 && scope.row.purchase_status === 3 && scope.row.purchase_way.remark === 'true' && !scope.row.is_substitute">
<Button class="slot-btns-item" size="small" type="primary" @click="bidding(scope.row)"></Button>
</template>
<!-- <Button class="slot-btns-item" type="primary" size="small">附件管理</Button>-->
<template v-if="scope.row.req_status === 1 && scope.row.is_plan === 0">
<template v-if="scope.row.req_status === 1 && scope.row.is_plan === 0 && !scope.row.is_substitute">
<Button class="slot-btns-item" size="small" type="primary" @click="askProcess(scope.row)"></Button>
</template>
<template
v-if="(scope.row.join_status === 1 && ((scope.row.invite_status === 3)||(scope.row.purchase_way.remark === 'false' && scope.row.purchase_status === 3))) ">
v-if="(scope.row.join_status === 1 && ((scope.row.invite_status === 3)||(scope.row.purchase_way.remark === 'false' && scope.row.purchase_status === 3)) || ( scope.row.is_substitute && scope.row.join_status === 1) ) ">
<Button class="slot-btns-item" size="small" type="primary" @click="signProcess(scope.row)"></Button>
</template>
<template
v-if="scope.row.purchase_status === 1 && ((scope.row.req_status === 3 && scope.row.is_plan === 0)||scope.row.is_plan === 1)">
v-if="scope.row.purchase_status === 1 && ((scope.row.req_status === 3 && scope.row.is_plan === 0)||scope.row.is_plan === 1)&& !scope.row.is_substitute ">
<Button class="slot-btns-item" size="small" type="primary" @click="buyProcess(scope.row)"></Button>
</template>
@ -308,6 +308,16 @@
</div>
</div>
</template>
<template v-slot:is_substitute>
<div class="xy-table-item">
<div class="xy-table-item-label" style="width: 200px;">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为代建项目
</div>
<div class="xy-table-item-content">
<el-switch v-model="form.is_substitute" active-text="" inactive-text="" :active-value="1" :inactive-value="0"/>
</div>
</div>
</template>
<template v-slot:plan>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -565,6 +575,9 @@
width: 140,
prop: 'req_status',
formatter: (cell, data, value) => {
if(cell.is_substitute){
return '无'
}
if (cell.is_plan === 1) {
return '无'
}
@ -589,6 +602,9 @@
width: 158,
prop: 'purchase_status',
formatter: (cell, data, value) => {
if(cell.is_substitute){
return '无'
}
switch (value) {
case 1:
return "待申请"
@ -610,6 +626,9 @@
width: 145,
prop: 'invite_status',
formatter: (cell, data, value) => {
if(cell.is_substitute){
return '无'
}
if (cell.purchase_way.remark === 'false') {
return '无'
}
@ -908,7 +927,8 @@
price: "",
fundingChannels: [],
isBudget: true,
plan: []
plan: [],
is_substitute:0,
},
plan: [],
rules: {
@ -983,6 +1003,8 @@
return
}
let money = Number(row.update_money) == 0 ? Number(row.money) : Number(row.update_money);
console.log(e,money,row.use_money_total)
console.log(e <= (money - Number(row.use_money_total)))
if (e <= (money - Number(row.use_money_total))) {
row.useMoney = e
this.plan.forEach(item => {
@ -1044,7 +1066,7 @@
columnIndex
}) {
if (column.property === 'req_status') {
if (row.is_plan === 1) {
if (row.is_plan === 1 || row.is_substitute) {
return {
'color': 'rgb(140,140,140)'
}
@ -1072,6 +1094,11 @@
}
}
if (column.property === 'purchase_status') {
if(row.is_substitute){
return {
'color': 'rgb(140,140,140)'
}
}
switch (row.purchase_status) {
case 1:
return {
@ -1095,7 +1122,7 @@
}
}
if (column.property === 'invite_status') {
if (row.purchase_way.remark === 'false') {
if (row.purchase_way.remark === 'false' || row.is_substitute) {
return {
'color': 'rgb(140,140,140)'
}
@ -1453,7 +1480,8 @@
name: this.form.name,
contract_plan_links: this.form.plan.map(item => {
return item.value
})
}),
is_substitute:this.form.is_substitute
}).then(res => {
this.isShowAdd = false
Message({

@ -151,7 +151,7 @@
</lx-header>
<xy-table ref="xyTable" :cell-style="cellStyle" :list="list" :show-summary="true" :summary-method="summary"
:table-item="table" @cellClick="showPaymentPlan" @delete="(row)=>deleteContract(row.id)" @editor="">
:table-item="type === 0 ? table : table1" @cellClick="showPaymentPlan" @delete="(row)=>deleteContract(row.id)" @editor="">
<template v-slot:btns>
<el-table-column fixed="right" header-align="center" label="操作" width="200">
<template slot-scope="scope">
@ -198,7 +198,7 @@
</div>
<div class="xy-table-item-content">
<el-select v-model="form.type" placeholder="请选择项目类型" style="width: 300px;">
<el-option v-for="item in type" :label="item.label" :value="item.value"></el-option>
<el-option v-for="item in types" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
</div>
@ -457,11 +457,11 @@
year: "",
plan_id: "",
plan_name: "请选择预算计划",
start_plan_price: "",
end_plan_price: "",
start_plan_price: null,
end_plan_price: null,
assurance_status: 0
},
type: [{
types: [{
label: '服务',
value: 1
}, {
@ -480,7 +480,7 @@
//
table: [{
label: "项目名称",
width: 380,
width: 340,
prop: 'name',
fixed: 'left',
align: 'left'
@ -755,6 +755,62 @@
}
}
],
//
table1:[
{
label: "项目名称",
width: 340,
prop: 'name',
fixed: 'left',
align: 'left'
},
{
label: "项目类型",
width: 120,
prop: 'type',
formatter: (cell, data, value) => {
switch (value) {
case 1:
return "服务"
break;
case 2:
return "货物"
break;
case 3:
return "工程"
break;
default:
return "未知"
}
}
},
{
prop:'assurance_expire',
label:'保函有效期',
width: 180
},
{
prop:'assurance_money',
label:'保函金额(元)',
width: 180
},
{
prop:'supply',
label:'承包商/供应商',
width: 200,
align:'left'
},
{
label: "业务科室",
width: 140,
prop: 'department.name'
},
{
label: "经办人",
width: 140,
prop: 'admin.name'
},
],
//
tableTotal: {
fundLogTotal: 0,

Loading…
Cancel
Save