wangyifang
/
cz-hjjc-ht
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面集成

Browse Source
master
lion 4 months ago
parent 5e19a7ebd8
commit d7ea9ff5c4
6 changed files with 2443 additions and 2049 deletions
Show Stats Download Patch File Download Diff File

11
src/components/contractIntegration/index.vue
Unescape View File

@ -131,7 +131,7 @@
</div> </div>
<div class="expense-info-item"> <div class="expense-info-item">
<span class="expense-info-label">已确认金额</span> <span class="expense-info-label">已确认金额</span>
<span class="expense-info-value"></span> <span class="expense-info-value">{{confirmedAmount}}</span>
</div> </div>
<!-- <div class="expense-info-item"> <!-- <div class="expense-info-item">
<span class="expense-info-label">当前状态</span> <span class="expense-info-label">当前状态</span>
@ -487,7 +487,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<Modal :z-index="9999999" v-model="showModal" :width="76" transfer :footer-hide="true" title="预览"> <Modal :z-index="9999999" v-model="showModal" :width="76" transfer :footer-hide="true" title="预览">
<template> <template>
<iframe style="width: 100%; height: 57vh" :src="codeUri" border="0" /> <iframe style="width: 100%; height: 57vh" :src="codeUri" border="0" />
@ -576,6 +575,14 @@ export default {
if (files && files.length > 0) return '已上传' if (files && files.length > 0) return '已上传'
return '待上传' return '待上传'
}, },
// 已确认金额：fundLogs中status=1的act_money之和
confirmedAmount() {
if (!this.fundLogs || !this.fundLogs.length) return 0
const total = this.fundLogs
.filter(item => item.status === 1)
.reduce((sum, item) => sum + (parseFloat(item.act_money) || 0), 0)
return total.toFixed(2)
},
// 采购/事前流程头部状态计算（与列表页按钮口径一致）： // 采购/事前流程头部状态计算（与列表页按钮口径一致）：
// - 无任何流程数据且需要走采购流程 => 显示“待申请” // - 无任何流程数据且需要走采购流程 => 显示“待申请”
// 需要采购的判定：detail.is_purchase 为真，且 // 需要采购的判定：detail.is_purchase 为真，且

85
src/views/contract/components/EditContract.vue
Unescape View File

@ -16,14 +16,37 @@
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="meeting_flow_id" label="资金上会流程"> <el-form-item
<el-select v-model="form.meeting_flow_id" style="width: 100%"> prop="meeting_flow_id"
:label="'资金上会流程' + (isMeetingFlowRequired ? ' *' : '')"
>
<!-- 调试信息 -->
<div style="font-size: 12px; color: #999; margin-bottom: 5px;">
调试: is_common_purchase={{form.is_common_purchase}},
total_money={{form.total_money}},
disabled={{isMeetingFlowDisabled}},
required={{isMeetingFlowRequired}}
</div>
<el-select
v-model="form.meeting_flow_id"
style="width: 100%"
:disabled="isMeetingFlowDisabled"
placeholder="请选择资金上会流程"
filterable
clearable
>
<el-option <el-option
v-for="item in shList" v-for="item in shList"
:key="item.id" :key="item.id"
:value="item.id" :value="item.id"
:label="item.title" :label="item.data.yiti+'-'+item.title"
></el-option> >
<span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
<span
style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;"
@click.stop="viewOaFlow('other',item.id)"
>查看</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -966,6 +989,26 @@ export default {
}, },
trigger: 'change' trigger: 'change'
} }
],
meeting_flow_id: [
{
validator: (rule, value, callback) => {
// 如果是一般采购，则不是必选
if (this.form.is_common_purchase) {
callback()
return
}
// 如果合同金额大于等于10万，则必选
if (this.form.total_money && Number(this.form.total_money) >= 100000) {
if (!value) {
callback(new Error('资金上会流程为必选项'))
return
}
}
callback()
},
trigger: 'change'
}
] ]
}, },
contractTypes: [ contractTypes: [
@ -1022,21 +1065,40 @@ export default {
} }
} }
}, },
// 资金上会流程是否必选
isMeetingFlowRequired() {
return !this.form.is_common_purchase && this.form.total_money && Number(this.form.total_money) >= 100000
},
// 资金上会流程是否禁用
isMeetingFlowDisabled() {
// 如果是一般采购，则不禁用
if (this.form.is_common_purchase) {
return false
}
// 如果不是一般采购，且金额小于10万，则禁用
return this.form.total_money && Number(this.form.total_money) < 100000
}
}, },
// 还原：不在此处强制加载上会列表，遵循原有调用链 // 还原：不在此处强制加载上会列表，遵循原有调用链
created() { created() {
this.getSh() this.getSh()
}, },
methods: { methods: {
// 查看OA流程
viewOaFlow(flowId) {
// 调用父组件的toOaDetail方法
this.$parent.toOaDetail('other', null, flowId)
},
// 获取上会列表 // 获取上会列表
async getSh(){ async getSh(){
const res = await getShList({ const res = await getShList({
page:1, page:1,
page_size:999, page_size:999,
custom_model_id:103, custom_model_id:103,
field_id:1225, sort_name:'created_at',
operator:'eq', sort_type:'DESC'
field_keyword:'采购事项'
}) })
this.shList = res.data.data this.shList = res.data.data
}, },
@ -1152,6 +1214,15 @@ export default {
}, },
submit() { submit() {
this.$refs['elForm'].validate().then(_ => { this.$refs['elForm'].validate().then(_ => {
// 验证资金上会流程
if (this.isMeetingFlowRequired && !this.form.meeting_flow_id) {
this.$message({
type: 'warning',
message: '资金上会流程为必选项'
})
return
}
this.form.contract_to_contracts = this.selections.map(i => { this.form.contract_to_contracts = this.selections.map(i => {
return { return {
contract_id: this.contrantId, contract_id: this.contrantId,

83
src/views/contract/components/detailPaymentRegistration.vue
Unescape View File

@ -23,20 +23,31 @@
<div class="payment-registration-row-content">{{ moneyFormat(form.contract.money) }} （元）</div> <div class="payment-registration-row-content">{{ moneyFormat(form.contract.money) }} （元）</div>
</div> </div>
<div class="payment-registration-row" style="align-items: center; margin-bottom: 5px"> <div class="payment-registration-row" style="align-items: center; margin-bottom: 5px">
<div class="payment-registration-row-title">资金上会流程</div> <div class="payment-registration-row-title">
资金上会流程
<span v-if="isMeetingFlowRequired" style="color: red; font-weight: 600; padding-right: 4px">*</span>
</div>
<div class="payment-registration-row-content"> <div class="payment-registration-row-content">
<el-select <el-select
v-model="form.meeting_flow_id" v-model="form.meeting_flow_id"
placeholder="请选择资金上会流程" placeholder="请选择资金上会流程"
clearable clearable
:disabled="isMeetingFlowDisabled"
style="width: 320px" style="width: 320px"
filterable
> >
<el-option <el-option
v-for="item in shList" v-for="item in shList"
:key="item.id" :key="item.id"
:value="item.id" :value="item.id"
:label="item.title" :label="item.data.yiti+'-'+item.title"
/> >
<span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
<span
style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;"
@click.stop="viewOaFlow(item.id)"
>查看</span>
</el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
@ -178,6 +189,21 @@
<!-- </div>--> <!-- </div>-->
</template> </template>
</xy-dialog> </xy-dialog>
<!-- OA流程Modal -->
<Modal
v-model="isShowOaModal"
:width="86"
class-name="oa-modal"
title="流程办理"
fullscreen
:mask-closable="false"
footer-hide
>
<div style="width: 100%;height: 100%;">
<iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0" />
</div>
</Modal>
</div> </div>
</template> </template>
@ -200,6 +226,7 @@ import {
Message Message
} from 'element-ui' } from 'element-ui'
import { getparameter } from '@/api/system/dictionary' import { getparameter } from '@/api/system/dictionary'
import { getToken } from '@/utils/auth'
export default { export default {
data() { data() {
return { return {
@ -295,15 +322,42 @@ export default {
type: [{ type: [{
required: true, required: true,
message: '必选' message: '必选'
}] }],
meeting_flow_id: [{
required: true,
message: '资金上会流程为必选项',
validator: (rule, value, callback) => {
// 如果申请付款金额大于等于5万，则必选
if (this.form.apply_money && Number(this.form.apply_money) >= 50000) {
if (!value) {
callback(new Error('资金上会流程为必选项'))
return
} }
} }
callback()
}
}]
},
// OA流程相关
oaUrl: '',
isShowOaModal: false
}
}, },
computed: { computed: {
moneyFormat() { moneyFormat() {
return function(money) { return function(money) {
return moneyFormatter(money) return moneyFormatter(money)
} }
},
// 资金上会流程是否必选
isMeetingFlowRequired() {
return this.form.apply_money && Number(this.form.apply_money) >= 50000
},
// 资金上会流程是否禁用
isMeetingFlowDisabled() {
return this.form.apply_money && Number(this.form.apply_money) < 50000
} }
}, },
mounted() { mounted() {
@ -311,6 +365,13 @@ export default {
this.getSh() this.getSh()
}, },
methods: { methods: {
// 查看OA流程
viewOaFlow(flowId) {
const url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${flowId}`
this.oaUrl = url
this.isShowOaModal = true
},
// 获取上会列表 // 获取上会列表
async getSh(){ async getSh(){
const { getShList } = await import('@/api/oatoken') const { getShList } = await import('@/api/oatoken')
@ -319,9 +380,8 @@ export default {
page: 1, page: 1,
page_size: 999, page_size: 999,
custom_model_id: 103, custom_model_id: 103,
field_id: 1225, sort_name: 'created_at',
operator: 'eq', sort_type: 'DESC'
field_keyword: '采购事项'
}) })
this.shList = res?.data?.data || [] this.shList = res?.data?.data || []
} catch (e) { } catch (e) {
@ -364,6 +424,15 @@ export default {
}, },
editor() { editor() {
// 验证资金上会流程
if (this.isMeetingFlowRequired && !this.form.meeting_flow_id) {
Message({
type: 'warning',
message: '资金上会流程为必选项'
})
return
}
editorFundLog(this.form).then(res => { editorFundLog(this.form).then(res => {
this.$emit('success') this.$emit('success')
this.isShow = false this.isShow = false

83
src/views/contract/components/paymentRegistration.vue
Unescape View File

@ -103,20 +103,31 @@
</div> </div>
<!-- 是否有 --> <!-- 是否有 -->
<div class="payment-registration-row" style="align-items: center;margin-bottom:5px"> <div class="payment-registration-row" style="align-items: center;margin-bottom:5px">
<div class="payment-registration-row-title">资金上会流程</div> <div class="payment-registration-row-title">
资金上会流程
<span v-if="isMeetingFlowRequired" style="color: red; font-weight: 600; padding-right: 4px">*</span>
</div>
<div class="payment-registration-row-content"> <div class="payment-registration-row-content">
<el-select <el-select
v-model="paymentRegistrationForm.meeting_flow_id" v-model="paymentRegistrationForm.meeting_flow_id"
placeholder="请选择资金上会流程" placeholder="请选择资金上会流程"
clearable clearable
:disabled="isMeetingFlowDisabled"
style="width: 320px" style="width: 320px"
filterable
> >
<el-option <el-option
v-for="item in shList" v-for="item in shList"
:key="item.id" :key="item.id"
:value="item.id" :value="item.id"
:label="item.title" :label="item.data.yiti+'-'+item.title"
/> >
<span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
<span
style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;"
@click.stop="viewOaFlow(item.id)"
>查看</span>
</el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
@ -381,6 +392,21 @@
</template> </template>
</xy-dialog> </xy-dialog>
<!-- OA流程Modal -->
<Modal
v-model="isShowOaModal"
:width="86"
class-name="oa-modal"
title="流程办理"
fullscreen
:mask-closable="false"
footer-hide
>
<div style="width: 100%;height: 100%;">
<iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0" />
</div>
</Modal>
</div> </div>
</template> </template>
@ -408,6 +434,7 @@ import {
parseTime parseTime
} from '@/utils' } from '@/utils'
import { getShList } from '@/api/oatoken' import { getShList } from '@/api/oatoken'
import { getToken } from '@/utils/auth'
export default { export default {
data() { data() {
@ -506,6 +533,20 @@ export default {
type: [{ type: [{
required: true, required: true,
message: '必选' message: '必选'
}],
meeting_flow_id: [{
required: true,
message: '资金上会流程为必选项',
validator: (rule, value, callback) => {
// 如果申请付款金额大于等于5万，则必选
if (this.paymentRegistrationForm.applyMoney && Number(this.paymentRegistrationForm.applyMoney) >= 50000) {
if (!value) {
callback(new Error('资金上会流程为必选项'))
return
}
}
callback()
}
}] }]
}, },
departments: [], departments: [],
@ -626,7 +667,10 @@ export default {
align: 'right', align: 'right',
formatter: (v1, v2, value) => formatter: (v1, v2, value) =>
value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : '' value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : ''
}] }],
// OA流程相关
oaUrl: '',
isShowOaModal: false
} }
}, },
computed: { computed: {
@ -648,6 +692,16 @@ export default {
} }
return '合同' return '合同'
} }
},
// 资金上会流程是否必选
isMeetingFlowRequired() {
return this.paymentRegistrationForm.applyMoney && Number(this.paymentRegistrationForm.applyMoney) >= 50000
},
// 资金上会流程是否禁用
isMeetingFlowDisabled() {
return this.paymentRegistrationForm.applyMoney && Number(this.paymentRegistrationForm.applyMoney) < 50000
} }
}, },
watch: { watch: {
@ -669,6 +723,13 @@ export default {
this.getDepartment() this.getDepartment()
}, },
methods: { methods: {
// 查看OA流程
viewOaFlow(flowId) {
const url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${flowId}`
this.oaUrl = url
this.isShowOaModal = true
},
// 获取上会列表 // 获取上会列表
async getSh(){ async getSh(){
try { try {
@ -676,9 +737,8 @@ export default {
page: 1, page: 1,
page_size: 999, page_size: 999,
custom_model_id: 103, custom_model_id: 103,
field_id: 1225, sort_name: 'created_at',
operator: 'eq', sort_type: 'DESC'
field_keyword: '采购事项'
}) })
this.shList = res?.data?.data || [] this.shList = res?.data?.data || []
} catch (e) { } catch (e) {
@ -852,6 +912,15 @@ export default {
}) })
}, },
submit() { submit() {
// 验证资金上会流程
if (this.isMeetingFlowRequired && !this.paymentRegistrationForm.meeting_flow_id) {
Message({
type: 'warning',
message: '资金上会流程为必选项'
})
return
}
const data = { const data = {
contract_id: this.contract.id, contract_id: this.contract.id,
apply_money: this.paymentRegistrationForm.applyMoney, apply_money: this.paymentRegistrationForm.applyMoney,

157
src/views/contract/contractEdit.vue
Unescape View File

@ -192,14 +192,32 @@
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="meeting_flow_id" label="资金上会流程"> <el-form-item
<el-select v-model="form.meeting_flow_id" style="width: 100%"> prop="meeting_flow_id"
:label="'资金上会流程' + (isMeetingFlowRequired ? ' *' : '')"
>
<!-- 调试信息 -->
<el-select
v-model="form.meeting_flow_id"
style="width: 100%"
:disabled="isMeetingFlowDisabled"
placeholder="请选择资金上会流程"
filterable
clearable
>
<el-option <el-option
v-for="item in shList" v-for="item in shList"
:key="item.id" :key="item.id"
:value="item.id" :value="item.id"
:label="item.title" :label="item.data.yiti+'-'+item.title"
></el-option> >
<span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
<span
style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;"
@click.stop="viewOaFlow('other', item.id)"
>查看</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<template v-if="!isLedger"> <template v-if="!isLedger">
@ -457,7 +475,6 @@
<el-form-item <el-form-item
prop="total_money" prop="total_money"
label="项目金额（元）" label="项目金额（元）"
v-if="!isWeixiu"
> >
<InputNumber <InputNumber
style="width: 100%" style="width: 100%"
@ -477,7 +494,6 @@
<el-form-item <el-form-item
prop="plan_price" prop="plan_price"
label="本年预算金额（元）" label="本年预算金额（元）"
v-if="!isWeixiu"
> >
<InputNumber <InputNumber
style="width: 100%" style="width: 100%"
@ -496,7 +512,6 @@
<el-form-item <el-form-item
prop="next_year_money" prop="next_year_money"
label="次年预算金额（元）" label="次年预算金额（元）"
v-if="!isWeixiu"
> >
<InputNumber <InputNumber
style="width: 100%" style="width: 100%"
@ -680,14 +695,32 @@
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="meeting_flow_id" label="资金上会流程"> <el-form-item
<el-select v-model="form.meeting_flow_id" style="width: 100%"> prop="meeting_flow_id"
:label="'资金上会流程' + (isMeetingFlowRequired ? ' *' : '')"
>
<!-- 调试信息 -->
<el-select
v-model="form.meeting_flow_id"
style="width: 100%"
:disabled="isMeetingFlowDisabled"
placeholder="请选择资金上会流程"
filterable
clearable
>
<el-option <el-option
v-for="item in shList" v-for="item in shList"
:key="item.id" :key="item.id"
:value="item.id" :value="item.id"
:label="item.title" :label="item.data.yiti+'-'+item.title"
></el-option> >
<span style="float: left">{{ item.data.yiti }}-{{ item.title }}</span>
<span
style="float: right; color: #8492a6; font-size: 13px; cursor: pointer;"
@click.stop="viewOaFlow('other', item.id)"
>查看</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="apply_user_id" label="申购人"> <el-form-item prop="apply_user_id" label="申购人">
@ -1227,6 +1260,22 @@
</div> </div>
</div> </div>
<otherPlan ref="otherPlan" @getPlan="getSelectionPlan"></otherPlan> <otherPlan ref="otherPlan" @getPlan="getSelectionPlan"></otherPlan>
<!-- OA流程Modal -->
<Modal
v-model="isShowOaModal"
:width="86"
class-name="oa-modal"
title="流程办理"
fullscreen
:mask-closable="false"
footer-hide
>
<div style="width: 100%;height: 100%;">
<iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0" />
</div>
</Modal>
<!-- <span>请选择类型</span> <!-- <span>请选择类型</span>
<span slot="footer" class="dialog-footer" style="display: flex;justify-content: flex-end;"> <span slot="footer" class="dialog-footer" style="display: flex;justify-content: flex-end;">
<el-button @click="step = 2,myPurchaseType = 2,isWeixiu=false,form.is_common_purchase = 1,form.flow_mod_id = 99,showTypes = false,showEdit=true">一般采购</el-button> <el-button @click="step = 2,myPurchaseType = 2,isWeixiu=false,form.is_common_purchase = 1,form.flow_mod_id = 99,showTypes = false,showEdit=true">一般采购</el-button>
@ -1254,6 +1303,7 @@ import {getShList} from "@/api/oatoken"
import { getInfo } from "@/api/me.js"; import { getInfo } from "@/api/me.js";
import { listdeptNoAuth } from "@/api/system/department"; import { listdeptNoAuth } from "@/api/system/department";
import { deepCopy } from "@/utils"; import { deepCopy } from "@/utils";
import { getToken } from "@/utils/auth";
import listAll from "@/views/contract/contractList.vue"; import listAll from "@/views/contract/contractList.vue";
import otherPlan from "@/components/PlanPicker/otherPlan.vue"; import otherPlan from "@/components/PlanPicker/otherPlan.vue";
@ -1353,6 +1403,9 @@ export default {
isShowPlan: false, isShowPlan: false,
detail: {}, detail: {},
plan: [], plan: [],
// OA流程相关
oaUrl: '',
isShowOaModal: false,
options: [ options: [
{ {
value: 1, value: 1,
@ -1538,6 +1591,26 @@ export default {
trigger: "change", trigger: "change",
}, },
], ],
meeting_flow_id: [
{
validator: (rule, value, callback) => {
// 如果是一般采购，则不是必选
if (this.form.is_common_purchase) {
callback()
return
}
// 如果合同金额大于等于10万，则必选
if (this.form.total_money && Number(this.form.total_money) >= 100000) {
if (!value) {
callback(new Error('资金上会流程为必选项'))
return
}
}
callback()
},
trigger: "change",
},
],
}, },
plans: [], plans: [],
planSelect: { planSelect: {
@ -1672,15 +1745,23 @@ export default {
}; };
}, },
methods: { methods: {
// 查看OA流程
viewOaFlow(flowId) {
// 调用本地的toOaDetail方法
let url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=${flowId}`
this.oaUrl = url
this.isShowOaModal = true
},
// 获取上会列表 // 获取上会列表
async getSh(){ async getSh(){
const res = await getShList({ const res = await getShList({
page:1, page:1,
page_size:999, page_size:999,
custom_model_id:103, custom_model_id:103,
field_id:1225, sort_name:'created_at',
operator:'eq', sort_type:'DESC'
field_keyword:'采购事项'
}) })
this.shList = res.data.data this.shList = res.data.data
}, },
@ -1962,6 +2043,15 @@ export default {
//submit //submit
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
// 验证资金上会流程
if (this.isMeetingFlowRequired && !this.form.meeting_flow_id) {
this.$message({
type: 'warning',
message: '资金上会流程为必选项'
})
return
}
this.btnLoading = true; this.btnLoading = true;
if (!this.form.use_framework_buy) { if (!this.form.use_framework_buy) {
this.form.contract_to_contracts = []; this.form.contract_to_contracts = [];
@ -2226,6 +2316,37 @@ export default {
let temp = this.form.contract_to_contracts; let temp = this.form.contract_to_contracts;
return this.$refs["contractToContractsTable"]?.getSelection() || []; return this.$refs["contractToContractsTable"]?.getSelection() || [];
}, },
// 资金上会流程是否必选
isMeetingFlowRequired() {
console.log("isMeetingFlowRequired triggered:", {
is_common_purchase: this.form.is_common_purchase,
total_money: this.form.total_money,
result: !this.form.is_common_purchase && this.form.total_money && Number(this.form.total_money) >= 100000
})
return !this.form.is_common_purchase && this.form.total_money && Number(this.form.total_money) >= 100000
},
// 资金上会流程是否禁用
isMeetingFlowDisabled() {
console.log("isMeetingFlowDisabled triggered:", {
is_common_purchase: this.form.is_common_purchase,
total_money: this.form.total_money,
is_common_purchase_result: this.form.is_common_purchase,
amount_check: this.form.total_money && Number(this.form.total_money) < 100000
})
// 如果是一般采购，则不禁用
if (this.form.is_common_purchase) {
console.log("is_common_purchase is true, returning false")
return false
}
// 如果不是一般采购，且金额小于10万，则禁用
const result = this.form.total_money && Number(this.form.total_money) < 100000
console.log("Final result:", result)
return result
}
}, },
created() { created() {
this.window.width = screen.availWidth * 0.95; this.window.width = screen.availWidth * 0.95;
@ -2323,10 +2444,10 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .ivu-input-group-append.ivu-input-search { ::v-deep .ivu-input-group-append.ivu-input-search {
background-color: #409eff; background-color: #409eff;
} }
::v-deep .allSelect .cell { ::v-deep .allSelect .cell {
display: none; display: none;
} }
.typeFlex { .typeFlex {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -2343,7 +2464,7 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
} }
.select-container { .select-container {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

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

@ -1199,15 +1199,43 @@ export default {
width: 158, width: 158,
prop: 'purchase_status', prop: 'purchase_status',
customFn: row => { customFn: row => {
const flows = row.contract_flow_links.filter(i => i.custom_model_id === 99)
return (
flows.length > 0
? flows.map((item, index) => {
return ( return (
<div> <div>
<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.caigou.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) || '无' }</span> <p style={{ 'text-align': 'left' }} >
<br/> <span>
{index + 1}、
{
item.flow_title
}
</span>
{
row.is_purchase ? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.caigou.getStatus()) }}>[{ this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) ?? '待申请' }]</span>):'-'
}
{ {
(row.FLOWSTATUS.caigou.getStatus() !== 2 && row.FLOWSTATUS.caigou.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('caigou', row) }}>查看</a> : '' (this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) ? <a style={{ 'color': 'blue', 'cursor': 'pointer', 'margin-left': '5px' }} on={{ 'click': () => this.toOaDetail('caigou', row, item.flow_id) }}>查看</a> : '')
} }
</p>
</div> </div>
) )
})
: <div>
{'-'}
</div>
)
// return (
// <div>
// <span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.caigou.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) || '无' }</span>
// <br/>
// {
// (row.FLOWSTATUS.caigou.getStatus() !== 2 && row.FLOWSTATUS.caigou.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('caigou', row) }}>查看</a> : ''
// }
// </div>
// )
} }
}, },
{ {
@ -1255,10 +1283,12 @@ export default {
width: 145, width: 145,
prop: 'join_status', prop: 'join_status',
customFn: row => { customFn: row => {
const flows = row.contract_flow_links.filter(i => i.tag === 'contract')
return ( return (
<div> <div>
<div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}> <div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
<span>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) }</span> <span>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus())==='待申请'?'待申请':'-' }</span>
{ {
row.is_purchase ? ( row.is_purchase ? (
<el-popover title='是否需要合同审批' placement='bottom-start' width='160'> <el-popover title='是否需要合同审批' placement='bottom-start' width='160'>
@ -1281,7 +1311,34 @@ export default {
} }
</div> </div>
{ {
(row.FLOWSTATUS.shenpi.getStatus() !== 2 && row.FLOWSTATUS.shenpi.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('hetong', row) }}>查看</a> : '' // (row.FLOWSTATUS.shenpi.getStatus() !== 2 && row.FLOWSTATUS.shenpi.getStatus() !== -2) ? <a style='color: #333' on={{ 'click': () => this.toOaDetail('hetong', row) }}>查看</a> : ''
flows.length > 0
? flows.map((item, index) => {
return (
<div>
<p style={{ 'text-align': 'left' }} >
<span>
{index + 1}、
{
item.flow_title
}
</span>
{
row.is_purchase ? (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()) }}>[{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) ?? '待申请' }]</span>):''
}
{
(this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) ? <a style={{ 'color': 'blue', 'cursor': 'pointer', 'margin-left': '5px' }} on={{ 'click': () => this.toOaDetail('hetong', row, item.flow_id) }}>查看</a> : '')
}
</p>
</div>
)
})
: <div>
{''}
</div>
} }
</div> </div>
) )

Write Preview
Loading…
Cancel
Save