@@ -462,14 +463,14 @@
date: '',
is_assurance: false,
assurance_money: '',
- assurance_expire: '',
- other_tender_name:[],
- quotation_situation:'',
- audit_situation:'',
- payment_content:'',
- project_end_time:'',
- is_acceptance:'',
- change_visa_amount:0,
+ assurance_expire: '',
+ other_tender_name:[],
+ quotation_situation:'',
+ audit_situation:'',
+ payment_content:'',
+ project_end_time:'',
+ is_acceptance:'',
+ change_visa_amount:'',
},
rules: {
@@ -503,23 +504,23 @@
message: '必选'
}],
guaranteeMoney: [],
- guaranteeYear: [],
- // other_tender_name: [{
- // required: true,
- // message: '必填'
- // }],
- // quotation_situation: [{
- // required: true,
- // message: '必填'
- // }],
- // audit_situation: [{
- // required: true,
- // message: '必填'
- // }],
- // payment_content: [{
- // required: true,
- // message: '必填'
- // }],
+ guaranteeYear: [],
+ // other_tender_name: [{
+ // required: true,
+ // message: '必填'
+ // }],
+ // quotation_situation: [{
+ // required: true,
+ // message: '必填'
+ // }],
+ // audit_situation: [{
+ // required: true,
+ // message: '必填'
+ // }],
+ // payment_content: [{
+ // required: true,
+ // message: '必填'
+ // }],
},
@@ -607,12 +608,12 @@
this.planMonthLists()
},
- // 签订合同
- addRow() {
- this.form.other_tender_name.push('')
- },
- delRow(obj, index) {
- this.form.other_tender_name.splice(index, 1);
+ // 签订合同
+ addRow() {
+ this.form.other_tender_name.push('')
+ },
+ delRow(obj, index) {
+ this.form.other_tender_name.splice(index, 1);
},
// 合同签订
sign() {
@@ -634,53 +635,53 @@
})
return
}
- console.log("other",this.form.other_tender_name)
- if(this.contract.is_contract===1){
- // if(this.form.other_tender_name.length<1){
- // this.$Message.warning(`请添加其他参与投标单位名称`)
- // return
- // }
- // if(!this.form.quotation_situation){
- // this.$Message.warning(`事前询价情况不能为空`)
- // return
- // }
- // if(!this.form.audit_situation){
- // this.$Message.warning(`事后审计情况不能为空`)
- // return
- // }
- // if(!this.form.payment_content){
- // this.$Message.warning(`合同内的支付条款不能为空`)
- // return
- // }
- // if (this.form.other_tender_name.length > 0) {
- // // 判断属性中是否为空
- // for (var p of this.form.other_tender_name) {
- // if (!p) {
- // this.$Message.warning(`投标单位名称不能为空，请补充或删除`)
- // return
- // }
- // }
- // }
- }
-
- if(this.contract.is_end===1){
- if(!this.form.project_end_time){
- this.$Message.warning(`项目完成（竣工）时间不能为空`)
- return
- }
- if(!this.form.is_acceptance){
- this.$Message.warning(`请选择是否验收`)
- return
- }
- if (this.form.change_visa_amount === null || this.form.change_visa_amount === undefined ||
- this.form.change_visa_amount === '') {
- // 未设置的逻辑（例如提示用户输入）
- this.$Message.warning(`请填写变更签证(增加内容的补充合同)金额`)
- return
- }
-
- }
-
+ console.log("other",this.form.other_tender_name)
+ if(this.contract.is_contract===1){
+ // if(this.form.other_tender_name.length<1){
+ // this.$Message.warning(`请添加其他参与投标单位名称`)
+ // return
+ // }
+ // if(!this.form.quotation_situation){
+ // this.$Message.warning(`事前询价情况不能为空`)
+ // return
+ // }
+ // if(!this.form.audit_situation){
+ // this.$Message.warning(`事后审计情况不能为空`)
+ // return
+ // }
+ // if(!this.form.payment_content){
+ // this.$Message.warning(`合同内的支付条款不能为空`)
+ // return
+ // }
+ // if (this.form.other_tender_name.length > 0) {
+ // // 判断属性中是否为空
+ // for (var p of this.form.other_tender_name) {
+ // if (!p) {
+ // this.$Message.warning(`投标单位名称不能为空，请补充或删除`)
+ // return
+ // }
+ // }
+ // }
+ }
+
+ if(this.contract.is_end===1){
+ if(!this.form.project_end_time){
+ this.$Message.warning(`项目完成（竣工）时间不能为空`)
+ return
+ }
+ if(this.form.is_acceptance === null || this.form.is_acceptance === undefined || this.form.is_acceptance === ''){
+ this.$Message.warning(`请选择是否验收`)
+ return
+ }
+ if (this.form.change_visa_amount === null || this.form.change_visa_amount === undefined ||
+ this.form.change_visa_amount === '') {
+ // 未设置的逻辑（例如提示用户输入）
+ this.$Message.warning(`请填写变更签证(增加内容的补充合同)金额`)
+ return
+ }
+
+ }
+
// return
editorContract({
id: this.contractId,
@@ -697,13 +698,13 @@
date: this.form.date,
is_assurance: this.form.is_assurance,
assurance_money: this.form.assurance_money,
- assurance_expire: this.form.assurance_expire,
- other_tender_name:this.form.other_tender_name,
- project_end_time:this.form.project_end_time,
- is_acceptance:this.form.is_acceptance,
- quotation_situation:this.form.quotation_situation,
- audit_situation:this.form.audit_situation,
- change_visa_amount:this.form.change_visa_amount,
+ assurance_expire: this.form.assurance_expire,
+ other_tender_name:this.form.other_tender_name,
+ project_end_time:this.form.project_end_time,
+ is_acceptance:this.form.is_acceptance,
+ quotation_situation:this.form.quotation_situation,
+ audit_situation:this.form.audit_situation,
+ change_visa_amount:this.form.change_visa_amount,
payment_content:this.form.payment_content
}).then(res => {
this.isShow = false
@@ -711,7 +712,7 @@
type: 'success',
message: '操作成功'
})
- this.$emit('signSuccess')
+ this.$emit('signSuccess')
this.handleOperationSuccess()
})
},
@@ -757,7 +758,7 @@
this.form.guaranteeYear = res.guarantee_year
this.form.is_assurance = res.is_assurance === 1
this.form.assurance_expire = res.assurance_expire
- this.form.assurance_money = res.assurance_money
+ this.form.assurance_money = res.assurance_money
this.form.other_tender_name = res.other_tender_name?res.other_tender_name:[]
// 动态设置质保金和质保期校验规则
if (res.contract_type !== 160) {
@@ -980,10 +981,10 @@
::v-deep .el-input__inner {
text-align: left;
- }
- ::v-deep .other_tender_name_input{
- display: flex;
- align-items: center;
- margin-bottom:5px
}
-
+ ::v-deep .other_tender_name_input{
+ display: flex;
+ align-items: center;
+ margin-bottom:5px
+ }
+
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index b21fc52..a65a878 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -488,7 +488,7 @@
-
-
+ -->
@@ -1044,7 +1044,7 @@ export default {
label: '合同分类',
width: 120,
prop: 'contract_category.category',
- fixed: 'left',
+ // fixed: 'left',
align: 'center',
formatter: (row) => this.categoryIdNameMap?.[row.contract_category?.category] || ''
},
@@ -1052,7 +1052,7 @@ export default {
label: '事务类型',
width: 120,
prop: 'contract_category.work_type',
- fixed: 'left',
+ // fixed: 'left',
align: 'center',
formatter: (row) => this.categoryIdNameMap?.[row.contract_category?.work_type] || ''
},
@@ -1060,15 +1060,15 @@ export default {
label: '合同类型',
width: 120,
prop: 'contract_category.contract_type',
- fixed: 'left',
+ // fixed: 'left',
align: 'center',
formatter: (row) => this.categoryIdNameMap?.[row.contract_category?.contract_type] || '-'
},{
label: '项目名称',
- width: 120,
+ width: 240,
prop: 'name',
fixed: 'left',
- align: 'center'
+ align: 'left'
},
{
label: '采购形式',
diff --git a/src/views/contract/paymentPlan.vue b/src/views/contract/paymentPlan.vue
index 480887e..156d8c2 100644
--- a/src/views/contract/paymentPlan.vue
+++ b/src/views/contract/paymentPlan.vue
@@ -8,13 +8,13 @@
付款计划日期
-
@@ -25,10 +25,10 @@
-
@@ -36,11 +36,11 @@
-
@@ -85,7 +85,7 @@ export default {
table: [{
prop: 'contract.name',
label: '项目名称',
- width: 170,
+ width: 240,
align: 'left',
fixed: 'left'
},
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index e0639c6..6abaefd 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -21,99 +21,99 @@
预算计划
-
签订年份
-
-
-
-
- 预算金额
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
- 合同分类
-
-
-
-
-
-
- 事务类型
-
-
-
-
-
-
- 合同类型
-
-
+
+
+
+ 预算金额
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合同分类
+
+
+
+
+
+
+ 事务类型
+
+
+
+
+
+
+ 合同类型
+
+
创建日期
-
保函有效期
-
@@ -169,10 +169,10 @@
合同状态
@@ -183,10 +183,10 @@
履约保函状态
@@ -229,15 +229,15 @@
-
+
-
@@ -246,44 +246,44 @@
-
-
-
-
@@ -298,14 +298,14 @@
-
@@ -410,22 +410,22 @@
-
已选择：{{ select.plan_name }}
清空选择
-
@@ -445,25 +445,25 @@
-
-
@@ -485,13 +485,13 @@
-
@@ -565,7 +565,7 @@ export default {
}
}
return {
- pageTitle: '合同列表',
+ pageTitle: '合同列表',
showMoreSearch:false,
type: 0, // pageType 合同列表_0 和 履约保函收取登记_1 公用
userList: ['liuxiangyu', 'zhushulan', 'admin', 'jiangjiao'],
@@ -640,7 +640,7 @@ export default {
// 表格
table: [{
label: '项目名称',
- width: 340,
+ width: 240,
prop: 'name',
fixed: 'left',
align: 'left'
@@ -654,7 +654,7 @@ export default {
label: '项目类型',
width: 120,
prop: 'type',
- formatter: (cell, data, value) => {
+ formatter: (cell, data, value) => {
switch (value) {
case 1:
return '服务'
@@ -779,7 +779,7 @@ export default {
item.value
}
+
+
+
+
+
{{ moneyFormat(statistic.progress.money_total_1) }}
+
年初预算合计金额
+
+
+
+
+
+
{{ moneyFormat(statistic.progress.money_total_2) }}
+
调整后预算合计金额
+
+
+
+
+
+
{{ moneyFormat(statistic.progress.use_money_total) }}
+
已支付金额
+
+
+
+
+
-
- 统计查看
-
-
-
- 执行统计
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ moneyFormat(sitem[0].money_total_1) }}
-
年初预算合计金额
-
-
-
-
-
-
{{ moneyFormat(sitem[0].money_total_2) }}
-
调整后预算合计金额
-
-
-
-
-
-
{{ moneyFormat(sitem[0].use_money_total) }}
-
已支付金额
-
-
-
-
-
-
-
-
-
-
-
-
{{ moneyFormat(sitem[1].money_total_1) }}
-
年初预算合计金额
-
-
-
-
-
-
{{ moneyFormat(sitem[1].money_total_2) }}
-
调整后预算合计金额
-
-
-
-
-
-
{{ moneyFormat(sitem[1].use_money_total) }}
-
已支付金额
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 统计查看
+
+
+
+ 执行统计
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ moneyFormat(sitem[0].money_total_1) }}
+
年初预算合计金额
+
+
+
+
+
+
{{ moneyFormat(sitem[0].money_total_2) }}
+
调整后预算合计金额
+
+
+
+
+
+
{{ moneyFormat(sitem[0].use_money_total) }}
+
已支付金额
+
+
+
+
+
+
+
+
+
+
+
+
{{ moneyFormat(sitem[1].money_total_1) }}
+
年初预算合计金额
+
+
+
+
+
+
{{ moneyFormat(sitem[1].money_total_2) }}
+
调整后预算合计金额
+
+
+
+
+
+
{{ moneyFormat(sitem[1].use_money_total) }}
+
已支付金额
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -340,10 +340,10 @@
-
-
+
diff --git a/src/views/finance/financialEvaluation.vue b/src/views/finance/financialEvaluation.vue
index a62cc85..9082524 100644
--- a/src/views/finance/financialEvaluation.vue
+++ b/src/views/finance/financialEvaluation.vue
@@ -221,7 +221,7 @@ export default {
},
{
label: '项目名称',
- minWidth: 220,
+ width: 240,
align: 'left',
prop: 'project_name'
},
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index be67a69..87b60a9 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -3,6 +3,18 @@
+ 项目名称
+
+
+
年份
重置
@@ -106,7 +118,8 @@ export default {
showDatePicker: '',
start_created_at: '',
end_created_at: '',
- sort_type: 'asc'
+ sort_type: 'asc',
+ name: ''
},
rateTotal: '0%',
moneyTotal: 0,
@@ -308,8 +321,9 @@ export default {
type: this.select.type,
plan_department_id: this.select.department,
top_pid: 1,
+ name: this.select.name,
...this.select
- })
+ })
// for (var m of res.list.data) {
// m.pid_info_name = m.pid_info?.name
// }
diff --git a/src/views/statisticalReport/govProcure.vue b/src/views/statisticalReport/govProcure.vue
index dcf750a..0e35d00 100644
--- a/src/views/statisticalReport/govProcure.vue
+++ b/src/views/statisticalReport/govProcure.vue
@@ -157,7 +157,7 @@ export default {
{
prop: 'name',
label: '项目名称',
- width: 180,
+ width: 240,
align: 'left',
fixed: 'left'
},
@@ -169,9 +169,9 @@ export default {
customFn: row => {
return (
- { row.public_act_date ? (
采购意向公开已完成) : (
采购意向公开未完成) }
- { row.invite_act_date ?
招标文件挂网已完成 : (
招标文件挂网未完成) }
- { row.open_act_date ?
项目开标已完成 : (
项目开标未完成) }
+
{ row.public_act_date ? (采购意向公开已完成) : (采购意向公开未完成) }
+
{ row.invite_act_date ? 招标文件挂网已完成 : (招标文件挂网未完成) }
+
{ row.open_act_date ? 项目开标已完成 : (项目开标未完成) }