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

up

Browse Source
master
liuxy 2 years ago
parent 135609465b
commit 182f058933
2 changed files with 51 additions and 64 deletions
Show Stats Download Patch File Download Diff File

13
src/views/contract/components/addContractLedger.vue
Unescape View File

@ -4,12 +4,12 @@
ref="dialog" ref="dialog"
:is-show.sync="isShow" :is-show.sync="isShow"
type="form" type="form"
:title="type === 'add' ? '新增合同' : '编辑合同'" :title="type === 'add' ? '新增合同事项' : '编辑合同事项'"
:form="form" :form="form"
:rules="rules" :rules="rules"
@submit="submit" @submit="submit"
> >
<template #extraFormTop> <template #extraFormTop v-if="false">
<el-form-item size="small"> <el-form-item size="small">
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -58,7 +58,7 @@
</div> </div>
</div> </div>
</template> </template>
<template v-slot:number> <!--<template v-slot:number>
<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>合同编号
@ -67,7 +67,7 @@
<el-input placeholder="请填写合同编号" v-model="form.number" style="width: 300px;" /> <el-input placeholder="请填写合同编号" v-model="form.number" style="width: 300px;" />
</div> </div>
</div> </div>
</template> </template>-->
<template v-slot:supply> <template v-slot:supply>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -88,6 +88,7 @@
</div> </div>
</div> </div>
</template> </template>
<!--
<template v-slot:guarantee_money> <template v-slot:guarantee_money>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -141,7 +142,7 @@
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
</template> </template>-->
<template v-slot:is_framework> <template v-slot:is_framework>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -160,6 +161,7 @@
</div> </div>
</div> </div>
</template> </template>
<!--
<template v-slot:files> <template v-slot:files>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -200,6 +202,7 @@
</div> </div>
</div> </div>
</template> </template>
-->
</xy-dialog> </xy-dialog>
</div> </div>
</template> </template>

102
src/views/contract/contractLedger.vue
Unescape View File

@ -265,8 +265,6 @@
].isShowPaymentRegistration = true) ].isShowPaymentRegistration = true)
" "
> >
<!-- paying(scope.row) @click="$refs['paymentRegistration'].getContract(scope.row),$refs['paymentRegistration'].isShowPaymentRegistration = true"-->
付款登记 付款登记
</Button> </Button>
</template> </template>
@ -288,9 +286,9 @@
</Button> </Button>
</template> </template>
</template> </template>
<!--合同没有签订，合同审批完成，需要签订合同-->
<template <template
v-if="(scope.row.status === 1 && scope.row.join_status === 3 && !/contractLedger/g.test($route.path)) || !(!scope.row.is_framework && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城')" v-if="(scope.row.status === 1 && scope.row.join_status === 3&&scope.row.is_contract )"
> >
<Button <Button
class="slot-btns-item" class="slot-btns-item"
@ -304,40 +302,11 @@
签订合同 签订合同
</Button> </Button>
</template> </template>
<!-- 采购完成 -->
<template
v-if="
scope.row.invite_status === 1 &&
scope.row.purchase_status === 3 &&
(scope.row.purchase_way
? scope.row.purchase_way.remark === 'true'
: false) &&
!scope.row.is_substitute
"
>
<Button
class="slot-btns-item"
size="small"
type="primary"
@click="
$refs['biddingUpload'].setId(scope.row.id),
$refs['biddingUpload'].show()
"
>招标审查</Button
>
</template>
<!--不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签--> <!--不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签-->
<template <template
v-if=" v-if="(scope.row.join_status === 1&&scope.row.is_contract)"
(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 <Button
class="slot-btns-item" class="slot-btns-item"
@ -347,23 +316,7 @@
>合同审批 >合同审批
</Button> </Button>
</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
"
>
<Button
class="slot-btns-item"
size="small"
type="primary"
@click="buyProcess(scope.row)"
>采购流程
</Button>
</template>
<Poptip trigger="hover" placement="bottom" transfer> <Poptip trigger="hover" placement="bottom" transfer>
<Button ghost size="small" type="primary">更多</Button> <Button ghost size="small" type="primary">更多</Button>
@ -1198,7 +1151,8 @@ export default {
plan_name: "请选择预算计划", plan_name: "请选择预算计划",
start_plan_price: undefined, start_plan_price: undefined,
end_plan_price: undefined, end_plan_price: undefined,
is_myself: 0 is_myself: 0,
is_contract:1
}, },
selectCopy: { selectCopy: {
keyword: "", keyword: "",
@ -1295,7 +1249,41 @@ export default {
</div> </div>
); );
}, },
}, },{
label: "合同审批流程",
width: 145,
prop: "join_status",
customFn:row => {
if (row.is_simple || !row.is_contract) {
return (<span>无</span>);
}
const getDate = (value) => {
switch (value) {
case 1:
return "待申请";
break;
case 2:
return "流转中";
break;
case 3:
return "已办结";
break;
default:
return "异常";
break;
}
}
return (
<div>
<span>{ getDate(row.join_status) }</span>
<br/>
{
(row.is_simple || row.join_status === 1) ? '' : <a style="color: #333" on={{['click']:()=>this.toOaDetail('hetong',row)}}>查看</a>
}
</div>
)
}
},
{ {
label: "付款计划", label: "付款计划",
prop: "sign_plan_count", prop: "sign_plan_count",
@ -2112,11 +2100,7 @@ export default {
}, },
//获取合同列表 //获取合同列表
async getContracts(is_export,noloading=false) { async getContracts(is_export,noloading=false) {
if (/contractLedger/g.test(this.$route.path)) {
this.select.is_contract = 1
} else {
this.select.is_contract = ""
}
const res = await getContract({ const res = await getContract({
page_size: this.select.pageSize, page_size: this.select.pageSize,
page: this.select.pageIndex, page: this.select.pageIndex,

Write Preview
Loading…
Cancel
Save