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

添加是否为河道处收费类项目，是否为延续类项目

Browse Source
master
xy 2 years ago
parent 9fa4a0ef56
commit f4f9c05f9a
4 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -104,6 +104,16 @@
</div> </div>
</div> </div>
</template> </template>
<template #has_continue>
<div class="xy-table-item">
<div class="xy-table-item-label" style="width: 200px;">
是否为延续类项目
</div>
<div class="xy-table-item-content">
<el-switch v-model="form.has_continue" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
</div>
</div>
</template>
<template v-slot:date> <template v-slot:date>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -228,6 +238,7 @@
form: { form: {
number: '', number: '',
supply: '', supply: '',
has_continue: 0,
carryDepartment: '', carryDepartment: '',
money: '', money: '',
time: [], time: [],
@ -348,8 +359,6 @@
methods: { methods: {
//合同签订 //合同签订
sign() { sign() {
console.log(this.signList)
console.log(this.signList.length)
if (this.signList.length == 0) { if (this.signList.length == 0) {
Message({ Message({
type: 'error', type: 'error',
@ -362,6 +371,7 @@
id: this.contractId, id: this.contractId,
number: this.form.number, number: this.form.number,
supply: this.form.supply, supply: this.form.supply,
has_continue: this.form.has_continue,
carry_department: this.form.carryDepartment, carry_department: this.form.carryDepartment,
money: this.form.money, money: this.form.money,
status: 2, status: 2,

12
src/views/contract/components/editorContract.vue
Unescape View File

@ -36,6 +36,16 @@
<div>（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</div> <div>（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</div>
</div> </div>
</template> </template>
<template #has_charge>
<div class="xy-table-item">
<div class="xy-table-item-label" style="width: 200px;">
是否为河道处收费类项目
</div>
<div class="xy-table-item-content">
<el-switch v-model="detail.has_charge" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
</div>
</div>
</template>
<template v-slot:supply v-if="detail.is_simple"> <template v-slot:supply v-if="detail.is_simple">
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -632,6 +642,7 @@
this.detail = { this.detail = {
name: res.name, name: res.name,
is_simple:res?.is_simple, is_simple:res?.is_simple,
has_charge: res?.has_charge,
date: res.date, date: res.date,
req_status: res.req_status, req_status: res.req_status,
purchase_status: res.purchase_status, purchase_status: res.purchase_status,
@ -688,6 +699,7 @@
type: this.detail.type, type: this.detail.type,
is_plan: this.detail.isBudget ? 1 : 0, is_plan: this.detail.isBudget ? 1 : 0,
is_simple:this.detail?.is_simple, is_simple:this.detail?.is_simple,
has_charge: this.detail?.has_charge,
supply:this.detail?.supply, supply:this.detail?.supply,
purchase_type_id: this.detail.methods, purchase_type_id: this.detail.methods,
purchase_way_id: this.detail.modality, purchase_way_id: this.detail.modality,

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

@ -188,19 +188,19 @@
<Button class="slot-btns-item" size="small" type="primary" @click="bidding(scope.row)">招标审查</Button> <Button class="slot-btns-item" size="small" type="primary" @click="bidding(scope.row)">招标审查</Button>
</template> </template>
<!-- <Button class="slot-btns-item" type="primary" size="small">附件管理</Button>--> <!-- <Button class="slot-btns-item" type="primary" size="small">附件管理</Button>-->
<template v-if="scope.row.req_status === 1 && scope.row.is_plan === 0 && !scope.row.is_substitute"> <template v-if="scope.row.req_status === 1 && (scope.row.is_plan === 0 && !scope.row.is_substitute || scope.row.has_charge)">
<Button class="slot-btns-item" size="small" type="primary" @click="askProcess(scope.row)">请示流程 <Button class="slot-btns-item" size="small" type="primary" @click="askProcess(scope.row)">请示流程
</Button> </Button>
</template> </template>
<!--不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签--> <!--不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签-->
<template <template
v-if="(scope.row.join_status === 1 && ((scope.row.invite_status === 3)||((scope.row.purchase_way ? scope.row.purchase_way.remark === 'false' : false) && scope.row.purchase_status === 3)) || ( scope.row.is_substitute && scope.row.join_status === 1) ) "> 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_way ? scope.row.purchase_way.remark === 'false' : 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 class="slot-btns-item" size="small" type="primary" @click="signProcess(scope.row)">合同会签
</Button> </Button>
</template> </template>
<template <template
v-if="scope.row.is_simple !== 1 && scope.row.purchase_status === 1 && ((scope.row.req_status === 3 && scope.row.is_plan === 0)||scope.row.is_plan === 1)&& !scope.row.is_substitute "> v-if="!scope.row.has_charge && scope.row.is_simple !== 1 && 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 class="slot-btns-item" size="small" type="primary" @click="buyProcess(scope.row)">采购流程
</Button> </Button>
</template> </template>
@ -279,6 +279,16 @@
<div>（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</div> <div>（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</div>
</div> </div>
</template> </template>
<template #has_charge>
<div class="xy-table-item">
<div class="xy-table-item-label" style="width: 200px;">
是否为河道处收费类项目
</div>
<div class="xy-table-item-content">
<el-switch v-model="form.has_charge" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
</div>
</div>
</template>
<template v-slot:supply v-if="form.is_simple"> <template v-slot:supply v-if="form.is_simple">
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -740,10 +750,10 @@ export default {
width: 140, width: 140,
prop: 'req_status', prop: 'req_status',
formatter: (cell, data, value) => { formatter: (cell, data, value) => {
if (cell.is_substitute) { if (cell.is_substitute && !cell.has_charge) {
return '无' return '无'
} }
if (cell.is_plan === 1) { if (cell.is_plan === 1 && !cell.has_charge) {
return '无' return '无'
} }
switch (value) { switch (value) {
@ -1124,6 +1134,7 @@ export default {
form: { form: {
name: "", name: "",
is_simple:0, is_simple:0,
has_charge: 0,
supply: "", supply: "",
money:0, money:0,
type: "", type: "",
@ -1293,7 +1304,7 @@ export default {
columnIndex columnIndex
}) { }) {
if (column.property === 'req_status') { if (column.property === 'req_status') {
if (row.is_plan || row.is_substitute || row.is_simple) { if ((row.is_plan || row.is_substitute || row.is_simple) && !row.has_charge) {
return { return {
'color': 'rgb(140,140,140)' 'color': 'rgb(140,140,140)'
} }
@ -1748,6 +1759,7 @@ export default {
}), }),
is_substitute: this.form.is_substitute, is_substitute: this.form.is_substitute,
is_simple:this.form.is_simple, is_simple:this.form.is_simple,
has_charge: this.form.has_charge,
supply:this.form.supply, supply:this.form.supply,
money:this.form?.money, money:this.form?.money,
status:this.form?.is_simple ? 2 : 1, status:this.form?.is_simple ? 2 : 1,

2
src/views/finance/components/addPropertyPlan.vue
Unescape View File

@ -37,7 +37,7 @@
<span style="color: red; font-weight: 600; padding-right: 4px" <span style="color: red; font-weight: 600; padding-right: 4px"
>*</span >*</span
> >
项目 ： 项目库选择 ：
</div> </div>
<div class="xy-table-item-content"> <div class="xy-table-item-content">
<el-input <el-input

Write Preview
Loading…
Cancel
Save