修改合并

master
linyongLynn 2 months ago
commit 8f38ae4680

@ -467,6 +467,7 @@
:rules="rules"
title="编辑"
type="form"
@submit="editorTable"
>
<template v-slot:name>
<div class="xy-table-item">
@ -654,9 +655,9 @@
</div>
</div>
</template>
<template v-slot:footerContent>
<Button type="primary" @click="editorTable"></Button>
</template>
// <template v-slot:footerContent>
// <Button type="primary" @click="editorTable"></Button>
// </template>
</xy-dialog>
</div>
</template>
@ -1078,13 +1079,13 @@ export default {
department_id: item
})
})
console.log(this.form)
addBudget({
name: this.form.name,
type: this.form.type,
year: this.form.year,
content: this.form.content,
money: moneyRecovery(this.form.money),
money:this.form.money? moneyRecovery(this.form.money):'',
plan_department_id: this.form.department,
plan_department_links: plan_department_links,
remark: this.form.remark,
@ -1115,9 +1116,10 @@ export default {
//
editorTable() {
this.$refs['editorDialog'].$refs['elForm']
.validate()
.then((res) => {
console.log(this.editorForm)
// this.$refs['editorDialog'].$refs['elForm']
// .validate()
// .then((res) => {
if (this.editorForm.plan_department_link_id.length == 0) {
Message({
message: '请选择可用部门',
@ -1137,8 +1139,8 @@ export default {
type: this.editorForm.type,
year: this.editorForm.year,
content: this.editorForm.content,
money: moneyRecovery(this.editorForm.money),
update_money: moneyRecovery(this.editorForm.update_money),
money: this.editorForm.money? moneyRecovery(this.editorForm.money):'',
update_money: this.editorForm.update_money? moneyRecovery(this.editorForm.update_money):'',
remark: this.editorForm.remark,
plan_department_id: this.editorForm.department,
plan_department_links: plan_department_links
@ -1150,13 +1152,13 @@ export default {
})
this.getBudgets()
})
})
.catch((err) => {
this.$message({
message: '请填写完整信息',
type: 'error'
})
})
// })
// .catch((err) => {
// this.$message({
// message: '',
// type: 'error'
// })
// })
},
showEditor(row) {
this.checkArr = []

@ -147,7 +147,7 @@ export default {
table: [{
label: '隶属项目',
prop: 'pid_info_name',
width: 200,
width: 120,
align: 'left',
sortable: false,
fixed: 'left'
@ -155,7 +155,7 @@ export default {
{
label: '项目名称',
prop: 'name',
width: 200,
width: 260,
align: 'left',
sortable: false,
fixed: 'left'

@ -244,8 +244,9 @@
<div class="xy-table-item-content xy-table-item-price">
<!-- <el-input-number v-model="form.change_visa_amount" :controls="false" placeholder="请填写变更签证(增加内容的补充合同)金额"
style="width: 300px;" /> -->
<el-input-number v-model="form.change_visa_amount" :precision="2" :controls="false" placeholder="请填写变更签证(增加内容的补充合同)金额"
style="width: 300px;" />
<!-- <el-input-number v-model="form.change_visa_amount" :precision="2" :controls="false" placeholder="请填写变更签证(增加内容的补充合同)金额"
style="width: 300px;" /> -->
<el-input type="number" v-model="form.change_visa_amount" placeholder="请填写变更签证(增加内容的补充合同)金额" style="width: 300px;" />
</div>
</div>
</template>
@ -469,7 +470,7 @@
payment_content:'',
project_end_time:'',
is_acceptance:'',
change_visa_amount:0,
change_visa_amount:'',
},
rules: {
@ -668,7 +669,7 @@
this.$Message.warning(`项目完成(竣工)时间不能为空`)
return
}
if(!this.form.is_acceptance){
if(this.form.is_acceptance === null || this.form.is_acceptance === undefined || this.form.is_acceptance === ''){
this.$Message.warning(`请选择是否验收`)
return
}

@ -253,8 +253,9 @@
签订合同
</Button>
</template>
<!-- (scope.row.purchase_way ? scope.row.purchase_way.remark === 'true' : false) -->
<!-- (scope.row.purchase_way ? scope.row.purchase_way.remark === 'true' : false) && -->
<template
v-if="scope.row.invite_status === 1 && scope.row.purchase_status === 3 && !scope.row.is_substitute && (!scope.row.contract_category || scope.row.invite_status === 1)"
>
<Button class="slot-btns-item" size="small" type="primary" @click="bidding(scope.row)"></Button>
@ -265,6 +266,7 @@
</Button>
</template>
<!--不需要走采购流程那么直接就是会签如果采购方式不需要招标的也是直接会签-->
<!-- (scope.row.purchase_way ? scope.row.purchase_way.remark === 'false' : false) -->
<template
v-if="(scope.row.has_charge && scope.row.req_status === 3 && scope.row.join_status === 1) || (scope.row.join_status === 1 && ((scope.row.invite_status === 3)||(scope.row.purchase_status === 3)) || ( scope.row.is_substitute && scope.row.join_status === 1) ) && (!scope.row.contract_category || scope.row.join_status === 1)"
>
@ -486,7 +488,7 @@
</el-form-item>
<!-- 新增承包商/供应商输入框 -->
<el-form-item
<!-- <el-form-item
v-show="true"
:label="formType === 'contract' ? '承包商/供应商' : '付款对象'"
prop="supply"
@ -496,6 +498,19 @@
v-model="form.supply"
:placeholder="formType === 'contract' ? '请输入承包商/供应商' : '请输入付款对象'"
/>
</el-form-item> -->
<el-form-item
v-show="formType != 'contract'"
:label="'付款对象'"
prop="supply"
:rules="[{ required: true, message: '请输入付款对象', trigger: 'submit' }]"
>
<el-input
v-model="form.supply"
:placeholder="'请输入付款对象'"
/>
</el-form-item>
<!-- 新增执行科室选择 -->
@ -1042,7 +1057,7 @@ export default {
label: '合同分类',
width: 120,
prop: 'contract_category.category',
fixed: 'left',
// fixed: 'left',
align: 'center',
formatter: (row) => this.categoryIdNameMap?.[row.contract_category?.category] || ''
},
@ -1050,7 +1065,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] || ''
},
@ -1058,15 +1073,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: '采购形式',

@ -85,7 +85,7 @@ export default {
table: [{
prop: 'contract.name',
label: '项目名称',
width: 170,
width: 240,
align: 'left',
fixed: 'left'
},

@ -640,7 +640,7 @@ export default {
//
table: [{
label: '项目名称',
width: 340,
width: 240,
prop: 'name',
fixed: 'left',
align: 'left'

@ -1091,7 +1091,7 @@ export default {
{
label: '进展情况',
sortable: false,
minWidth: 220,
width: 120,
align: 'left',
fixed: 'right',
customFn: (row) => {
@ -1114,7 +1114,7 @@ export default {
},
{
label: '年初预算数(元)',
width: 160,
width: 120,
align: 'right',
sortable: false,
prop: 'money_total_1',
@ -1124,7 +1124,7 @@ export default {
},
{
label: '调整后预算数(元)',
width: 160,
width: 120,
align: 'right',
sortable: false,
prop: 'money_total_2',
@ -1146,7 +1146,7 @@ export default {
typeTable: [{
label: '进展情况',
sortable: false,
minWidth: 220,
minWidth: 120,
align: 'left',
fixed: 'right',
customFn: (row) => {

@ -221,7 +221,7 @@ export default {
},
{
label: '项目名称',
minWidth: 220,
width: 240,
align: 'left',
prop: 'project_name'
},

@ -3,6 +3,18 @@
<lx-header icon="md-apps" text="预算进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content" />
<slot>
<span style="padding: 0 6px;word-break: keep-all;">项目名称</span>
<span>
<el-input
v-model="select.name"
placeholder="请输入项目名称"
type="text"
size="small"
clearable
placement="bottom-start"
style="width: 160px"
/>
</span>
<span style="padding: 0 6px;word-break: keep-all;">年份</span>
<span>
<DatePicker
@ -55,7 +67,7 @@
type="primary"
style="margin-left: 10px"
ghost
@click="select = {pageIndex:1,year:'',type:'',department:''}"
@click="select = {pageIndex:1,year:'',type:'',department:'',name:''}"
>重置</Button>
<Button type="primary" style="margin-left: 10px" @click="getPlanProgress"></Button>
</slot>
@ -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,6 +321,7 @@ 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) {

@ -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 (
<div>
{ row.public_act_date ? (<Tag color='success'>采购意向公开已完成</Tag>) : (<Tag color='warning'>采购意向公开未完成</Tag>) }
{ row.invite_act_date ? <Tag color='success'>招标文件挂网已完成</Tag> : (<Tag color='warning'>招标文件挂网未完成</Tag>) }
{ row.open_act_date ? <Tag color='success'>项目开标已完成</Tag> : (<Tag color='warning'>项目开标未完成</Tag>) }
<div>{ row.public_act_date ? (<Tag color='success'>采购意向公开已完成</Tag>) : (<Tag color='warning'>采购意向公开未完成</Tag>) }</div>
<div>{ row.invite_act_date ? <Tag color='success'>招标文件挂网已完成</Tag> : (<Tag color='warning'>招标文件挂网未完成</Tag>) }</div>
<div>{ row.open_act_date ? <Tag color='success'>项目开标已完成</Tag> : (<Tag color='warning'>项目开标未完成</Tag>) }</div>
</div>
)
}

Loading…
Cancel
Save