xiaoy
/
contract-business-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合同会签处理 接口换正式

Browse Source
master
lion 3 months ago
parent f1597cc1fe
commit 873bedd41a
5 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape View File

@ -4,6 +4,6 @@ ENV = 'production'
# base api
VUE_APP_DOMIAN=''
VUE_APP_BASE_API = ''
#VUE_APP_OUT_URL = http://192.168.60.18:2021
VUE_APP_OUT_URL = http://192.168.60.18:8001
VUE_APP_OUT_URL = http://192.168.60.18:2021
#VUE_APP_OUT_URL = http://192.168.60.18:8001
VUE_APP_UPLOAD=http://192.168.60.99:9003/api/admin/upload-file

58
src/views/contract/components/contractSign.vue
Unescape View File

@ -141,7 +141,7 @@
<template v-if="contract.is_contract===1" v-slot:other_tender_name>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>其他参与投标单位名称
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>其他参与投标单位名称
</div>
<div class="xy-table-item-content ">
<el-button type="primary" style="margin-bottom:10px" size="small" @click="addRow">新增</el-button>
@ -163,7 +163,7 @@
<template v-if="contract.is_contract===1" v-slot:quotation_situation>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>事前询价情况
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>事前询价情况
</div>
<div class="xy-table-item-content">
<el-select v-model="form.quotation_situation" placeholder="请选择" style="width:300px">
@ -182,7 +182,7 @@
<template v-if="contract.is_contract===1" v-slot:audit_situation>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>事后审计情况
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>事后审计情况
</div>
<div class="xy-table-item-content">
<el-select v-model="form.audit_situation" placeholder="请选择" style="width:300px">
@ -201,7 +201,7 @@
<template v-if="contract.is_contract===1" v-slot:payment_content>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>合同内的支付条款
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>合同内的支付条款
</div>
<div class="xy-table-item-content">
<el-input v-model="form.payment_content" type="textarea" placeholder="合同内的支付条款"
@ -636,31 +636,31 @@
}
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.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){

9
src/views/contract/contractList.vue
Unescape View File

@ -686,6 +686,8 @@
:value="item.id"
/>
</el-select>
<el-date-picker size="small" type="year" placeholder="请选择年份" v-model="planSearch.year"
format="yyyy" value-format="yyyy"></el-date-picker>
<Input
v-model="planSearch.name"
enter-button="搜 索"
@ -1526,7 +1528,8 @@ export default {
plans: [], // 预算数据
planSearch: {
name: '',
plan_department_id: [] // 修改为数组类型
plan_department_id: [], // 修改为数组类型
year: (new Date().getFullYear() )+ ''
},
planTotal: 0,
plansPageIndex: 1,
@ -1928,7 +1931,9 @@ export default {
page_size: 10,
page: this.plansPageIndex,
plan_department_id: this.planSearch.plan_department_id,
top_pid: 1
top_pid: 1,
year:this.planSearch.year
})
this.plans = res.list.data

8
src/views/dashboard/components/budgetStatic.vue
Unescape View File

@ -25,6 +25,7 @@
<div style="display: flex;justify-content: flex-end;">
<Page :total="total"
show-elevator
:page-size="select.page_size"
@on-change="e => {
select.page = e;
getPlanProgress();
@ -49,9 +50,11 @@ export default {
type: [],
drawer: false,
select: {
page_size: 10,
page_size: 100,
page: 1,
top_pid: 1,
sort_name:'pid',
sort_type:'ASC'
},
total: 0,
list: [],
@ -160,7 +163,7 @@ export default {
},
async getPlanProgress(val) {
const res = await getProgress({
year:val,
year:this.year,
...this.select
})
for (let m of res.list.data) {
@ -235,6 +238,7 @@ export default {
watch: {
year: {
handler:function(val) {
console.log("val",val)
this.getPlanProgress(val)
},
immediate: true

4
src/views/statisticalReport/budgetProgress.vue
Unescape View File

@ -150,6 +150,7 @@ export default {
return (
<a on={{
'click': _ => {
if(!row.isParent){
this.$router.push({
path: '/contract/paymentRegistrationList_1',
query: {
@ -158,6 +159,8 @@ export default {
}
})
}
}
}}>{ row.use_money_total }</a>
)
}
@ -354,6 +357,7 @@ export default {
pid_info_name: pidInfo.name,
money: parseFloat(pidInfo.money).toFixed(2),
type: pidInfo.type,
isParent:true,
update_money: parseFloat(pidInfo.update_money).toFixed(2),
use_money_total: parseFloat(useMoneyTotal).toFixed(2), // 子项总和
children: children // 保留所有子项

Write Preview
Loading…
Cancel
Save