master
xy 2 years ago
parent b70db122cd
commit abf23397c0

@ -1,6 +1,10 @@
<script> <script>
export default { export default {
props:{ props:{
stripe: {
type: Boolean,
default: true
},
highlightCurrentRow: { highlightCurrentRow: {
type: Boolean, type: Boolean,
default: false default: false
@ -177,6 +181,7 @@ export default {
default-expand-all={defaultExpandAll} default-expand-all={defaultExpandAll}
tree-props={treeProps} tree-props={treeProps}
fit={true} fit={true}
stripe={this.stripe}
on={{ on={{
['row-click']: rowClick, ['row-click']: rowClick,
['select']: selectClick, ['select']: selectClick,

@ -1,7 +1,7 @@
<template> <template>
<div v-if="registration"> <div v-if="registration">
<xy-dialog title="打印预览" :is-show.sync="isShow" :width="70" @on-ok="print" ok-text=""> <xy-dialog title="打印预览" :is-show.sync="isShow" :width="70" @on-ok="print" ok-text="">
<template v-slot:normalContent> <template>
<div class="print-table1" id="printtable1" ref="printtable"> <div class="print-table1" id="printtable1" ref="printtable">
<div class="print-table1-title">苏州市河道管理处资金划拨审批单</div> <div class="print-table1-title">苏州市河道管理处资金划拨审批单</div>

@ -245,24 +245,24 @@
</Option> </Option>
</Select> </Select>
</div> </div>
<div> <!-- <div>-->
<span style="padding: 0 6px; word-break: keep-all"> <!-- <span style="padding: 0 6px; word-break: keep-all">-->
请示流程状态 <!-- 请示流程状态-->
</span> <!-- </span>-->
<Select <!-- <Select-->
v-model="select.req_status" <!-- v-model="select.req_status"-->
clearable <!-- clearable-->
placeholder="请选择" <!-- placeholder="请选择"-->
style="width: 100px" <!-- style="width: 100px"-->
> <!-- >-->
<Option <!-- <Option-->
v-for="item in options" <!-- v-for="item in options"-->
:key="item.value" <!-- :key="item.value"-->
:value="item.value" <!-- :value="item.value"-->
>{{ item.label }} <!-- >{{ item.label }}-->
</Option> <!-- </Option>-->
</Select> <!-- </Select>-->
</div> <!-- </div>-->
</div> </div>
</xy-selectors> </xy-selectors>
@ -381,21 +381,21 @@
> >
</template> </template>
<!-- <Button class="slot-btns-item" type="primary" size="small">附件管理</Button>--> <!-- <Button class="slot-btns-item" type="primary" size="small">附件管理</Button>-->
<template <!-- <template-->
v-if=" <!-- v-if="-->
scope.row.req_status === 1 && <!-- scope.row.req_status === 1 &&-->
scope.row.is_plan === 0 && <!-- scope.row.is_plan === 0 &&-->
!scope.row.is_substitute <!-- !scope.row.is_substitute-->
" <!-- "-->
> <!-- >-->
<Button <!-- <Button-->
class="slot-btns-item" <!-- class="slot-btns-item"-->
size="small" <!-- size="small"-->
type="primary" <!-- type="primary"-->
@click="askProcess(scope.row)" <!-- @click="askProcess(scope.row)"-->
>请示流程 <!-- >请示流程-->
</Button> <!-- </Button>-->
</template> <!-- </template>-->
<!-- 中标--> <!-- 中标-->
<!-- <template v-if="false">--> <!-- <template v-if="false">-->

@ -155,15 +155,15 @@
</Option> </Option>
</Select> </Select>
</div> </div>
<div v-if="type!=1"> <!-- <div v-if="type!=1">-->
<span style="padding: 0 6px;word-break: keep-all;"> <!-- <span style="padding: 0 6px;word-break: keep-all;">-->
请示流程状态 <!-- 请示流程状态-->
</span> <!-- </span>-->
<Select v-model="select.req_status" clearable placeholder="请选择" style="width:100px;"> <!-- <Select v-model="select.req_status" clearable placeholder="请选择" style="width:100px;">-->
<Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }} <!-- <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}-->
</Option> <!-- </Option>-->
</Select> <!-- </Select>-->
</div> <!-- </div>-->
</div> </div>
</xy-selectors> </xy-selectors>
@ -313,7 +313,7 @@
<!-- 搜索使用 预算计划 --> <!-- 搜索使用 预算计划 -->
<xy-dialog :is-show.sync="isShowPlanForSearch" title="预算计划" :width="720" @on-ok="planSelectForSearch"> <xy-dialog :is-show.sync="isShowPlanForSearch" title="预算计划" :width="720" @on-ok="planSelectForSearch">
<template v-slot:normalContent> <template>
<Input v-model="planSearch.name" search enter-button=" " placeholder="搜索预算计划.." @on-search="getBudgets" /> <Input v-model="planSearch.name" search enter-button=" " placeholder="搜索预算计划.." @on-search="getBudgets" />
<div style="margin: 10px 0;display: flex;justify-content: space-between; <div style="margin: 10px 0;display: flex;justify-content: space-between;
align-items: center;"> align-items: center;">
@ -340,7 +340,7 @@
<!-- 新增表 预算计划 --> <!-- 新增表 预算计划 -->
<xy-dialog :is-show.sync="isShowPlan" :width="720" title="预算计划" @on-ok="planSelect"> <xy-dialog :is-show.sync="isShowPlan" :width="720" title="预算计划" @on-ok="planSelect">
<template v-slot:normalContent> <template>
<div style="display: flex;"> <div style="display: flex;">
<el-select placeholder="科室选择" clearable size="small" v-model="planSearch.plan_department_id" <el-select placeholder="科室选择" clearable size="small" v-model="planSearch.plan_department_id"
style="width: 160px;"> style="width: 160px;">
@ -568,30 +568,31 @@
}, },
{ {
label: "采购流程", label: "采购流程",
multiHd: [{ multiHd: [
label: "请示流程", // {
width: 140, // label: "",
prop: 'req_status', // width: 140,
formatter: (cell, data, value) => { // prop: 'req_status',
if (cell.is_plan === 1) { // formatter: (cell, data, value) => {
return '无' // if (cell.is_plan === 1) {
} // return ''
switch (value) { // }
case 1: // switch (value) {
return "待申请" // case 1:
break; // return ""
case 2: // break;
return "流转中" // case 2:
break; // return ""
case 3: // break;
return "已办结" // case 3:
break; // return ""
default: // break;
return "异常" // default:
break; // return ""
} // break;
} // }
}, // }
// },
{ {
label: "采购业务审批流程", label: "采购业务审批流程",
width: 158, width: 158,

@ -12,7 +12,7 @@
<div class="payment-registration-row-title">合同名称</div> <div class="payment-registration-row-title">合同名称</div>
<div class="payment-registration-row-content">{{contract.name}}</div> <div class="payment-registration-row-content">{{contract.name}}</div>
</div> </div>
<div class="payment-registration-row"> <div class="payment-registration-row">
<div class="payment-registration-row-title">合同金额</div> <div class="payment-registration-row-title">合同金额</div>
<div class="payment-registration-row-content">{{moneyFormat(contract.money)}} </div> <div class="payment-registration-row-content">{{moneyFormat(contract.money)}} </div>
@ -493,13 +493,13 @@
total += Number(item.use_money) total += Number(item.use_money)
}) })
console.log(Number(this.paymentRegistrationForm.actMoney).toFixed(2), total.toFixed(2)) console.log(Number(this.paymentRegistrationForm.actMoney).toFixed(2), total.toFixed(2))
if (Number(this.paymentRegistrationForm.actMoney).toFixed(2) !== total.toFixed(2)) { // if (Number(this.paymentRegistrationForm.actMoney).toFixed(2) !== total.toFixed(2)) {
Message({ // Message({
type: 'warning', // type: 'warning',
message: '实际付款金额与计划总金额不符' // message: ''
}) // })
return // return
} // }
console.log({ console.log({
id: this.registrationId, id: this.registrationId,
contract_id: this.contract.id, contract_id: this.contract.id,

Loading…
Cancel
Save