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 # base api
VUE_APP_DOMIAN='' VUE_APP_DOMIAN=''
VUE_APP_BASE_API = '' VUE_APP_BASE_API = ''
#VUE_APP_OUT_URL = http://192.168.60.18:2021 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:8001
VUE_APP_UPLOAD=http://192.168.60.99:9003/api/admin/upload-file 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> <template v-if="contract.is_contract===1" v-slot:other_tender_name>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <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>
<div class="xy-table-item-content "> <div class="xy-table-item-content ">
<el-button type="primary" style="margin-bottom:10px" size="small" @click="addRow">新增</el-button> <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> <template v-if="contract.is_contract===1" v-slot:quotation_situation>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <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>
<div class="xy-table-item-content"> <div class="xy-table-item-content">
<el-select v-model="form.quotation_situation" placeholder="请选择" style="width:300px"> <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> <template v-if="contract.is_contract===1" v-slot:audit_situation>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <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>
<div class="xy-table-item-content"> <div class="xy-table-item-content">
<el-select v-model="form.audit_situation" placeholder="请选择" style="width:300px"> <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> <template v-if="contract.is_contract===1" v-slot:payment_content>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <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>
<div class="xy-table-item-content"> <div class="xy-table-item-content">
<el-input v-model="form.payment_content" type="textarea" placeholder="合同内的支付条款" <el-input v-model="form.payment_content" type="textarea" placeholder="合同内的支付条款"
@ -636,31 +636,31 @@
} }
console.log("other",this.form.other_tender_name) console.log("other",this.form.other_tender_name)
if(this.contract.is_contract===1){ if(this.contract.is_contract===1){
if(this.form.other_tender_name.length<1){ // if(this.form.other_tender_name.length<1){
this.$Message.warning(`请添加其他参与投标单位名称`) // this.$Message.warning(`请添加其他参与投标单位名称`)
return // return
} // }
if(!this.form.quotation_situation){ // if(!this.form.quotation_situation){
this.$Message.warning(`事前询价情况不能为空`) // this.$Message.warning(`事前询价情况不能为空`)
return // return
} // }
if(!this.form.audit_situation){ // if(!this.form.audit_situation){
this.$Message.warning(`事后审计情况不能为空`) // this.$Message.warning(`事后审计情况不能为空`)
return // return
} // }
if(!this.form.payment_content){ // if(!this.form.payment_content){
this.$Message.warning(`合同内的支付条款不能为空`) // this.$Message.warning(`合同内的支付条款不能为空`)
return // return
} // }
if (this.form.other_tender_name.length > 0) { // if (this.form.other_tender_name.length > 0) {
// 判断属性中是否为空 // // 判断属性中是否为空
for (var p of this.form.other_tender_name) { // for (var p of this.form.other_tender_name) {
if (!p) { // if (!p) {
this.$Message.warning(`投标单位名称不能为空，请补充或删除`) // this.$Message.warning(`投标单位名称不能为空，请补充或删除`)
return // return
} // }
} // }
} // }
} }
if(this.contract.is_end===1){ if(this.contract.is_end===1){

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

@ -686,6 +686,8 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
<el-date-picker size="small" type="year" placeholder="请选择年份" v-model="planSearch.year"
format="yyyy" value-format="yyyy"></el-date-picker>
<Input <Input
v-model="planSearch.name" v-model="planSearch.name"
enter-button="搜 索" enter-button="搜 索"
@ -1526,7 +1528,8 @@ export default {
plans: [], // 预算数据 plans: [], // 预算数据
planSearch: { planSearch: {
name: '', name: '',
plan_department_id: [] // 修改为数组类型 plan_department_id: [], // 修改为数组类型
year: (new Date().getFullYear() )+ ''
}, },
planTotal: 0, planTotal: 0,
plansPageIndex: 1, plansPageIndex: 1,
@ -1928,7 +1931,9 @@ export default {
page_size: 10, page_size: 10,
page: this.plansPageIndex, page: this.plansPageIndex,
plan_department_id: this.planSearch.plan_department_id, plan_department_id: this.planSearch.plan_department_id,
top_pid: 1 top_pid: 1,
year:this.planSearch.year
}) })
this.plans = res.list.data 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;"> <div style="display: flex;justify-content: flex-end;">
<Page :total="total" <Page :total="total"
show-elevator show-elevator
:page-size="select.page_size"
@on-change="e => { @on-change="e => {
select.page = e; select.page = e;
getPlanProgress(); getPlanProgress();
@ -49,9 +50,11 @@ export default {
type: [], type: [],
drawer: false, drawer: false,
select: { select: {
page_size: 10, page_size: 100,
page: 1, page: 1,
top_pid: 1, top_pid: 1,
sort_name:'pid',
sort_type:'ASC'
}, },
total: 0, total: 0,
list: [], list: [],
@ -160,7 +163,7 @@ export default {
}, },
async getPlanProgress(val) { async getPlanProgress(val) {
const res = await getProgress({ const res = await getProgress({
year:val, year:this.year,
...this.select ...this.select
}) })
for (let m of res.list.data) { for (let m of res.list.data) {
@ -235,6 +238,7 @@ export default {
watch: { watch: {
year: { year: {
handler:function(val) { handler:function(val) {
console.log("val",val)
this.getPlanProgress(val) this.getPlanProgress(val)
}, },
immediate: true immediate: true

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

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

Write Preview
Loading…
Cancel
Save