1.0.66 合同修改业务方向、取消部门

dev
yinq 19 hours ago
parent e3dfaf1960
commit 0b1275229d

@ -66,10 +66,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门" prop="contractDeptId">
<el-select v-model="form.contractDeptId" :disabled="isFormDisabled" placeholder="请选择部门">
<el-option v-for="item in deptInfoList" :key="item.deptId" :label="item.deptName"
:value="item.deptId" />
<el-form-item label="合同负责人" prop="contractManagerId">
<el-select v-model="form.contractManagerId" placeholder="请选择该合同客户经理或签订人"
:disabled="isFormDisabled" filterable>
<el-option v-for="item in userInfoList" :key="item.userId" :label="item.nickName"
:value="item.userId" />
</el-select>
</el-form-item>
</el-col>
@ -169,17 +170,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同负责人" prop="contractManagerId">
<el-select v-model="form.contractManagerId" placeholder="请选择该合同客户经理或签订人"
:disabled="isFormDisabled" filterable>
<el-option v-for="item in userInfoList" :key="item.userId" :label="item.nickName"
:value="item.userId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同模板" prop="templateId" v-if="form.contractTemplateFlag !== '1'">
<el-col :span="12" v-if="form.contractTemplateFlag !== '1'">
<el-form-item label="合同模板" prop="templateId">
<el-select v-model="form.templateId" placeholder="请选择合同模板" :disabled="isFormDisabled" filterable>
<el-option
v-for="item in printTemplateList"
@ -212,6 +204,11 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="isFormDisabled" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="附件" prop="ossId">
<!-- <el-button type="primary" plain icon="Upload" @click="handleFile"></el-button>-->
@ -225,16 +222,6 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="isFormDisabled" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="付款方式" prop="paymentMethod">-->
<!-- <el-input v-model="form.paymentMethod" placeholder="3-3-3-1" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
</el-card>
@ -569,8 +556,7 @@
<el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
<el-form ref="ossFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="文件名">
<fileUpload v-if="type === 0" v-model="ossFileModel" />
<imageUpload v-if="type === 1" v-model="ossFileModel" />
<fileUpload v-model="ossFileModel" />
</el-form-item>
</el-form>
<template #footer>
@ -658,7 +644,6 @@ const submitFormData = ref<StartProcessBo>({
const taskVariables = ref<Record<string, any>>({});
const flowInstanceBizExtBo = ref<Record<string, any>>({});
const type = ref(0);
const dialog = reactive<DialogOption>({
visible: false,
title: ''
@ -928,7 +913,6 @@ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'blur' }],
contractManagerId: [{ required: true, message: '合同负责人不能为空', trigger: 'blur' }],
contractDeptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
contractTemplateFlag: [{ required: true, message: '合同模板标识不能为空', trigger: 'blur' }]
}
});
@ -1051,11 +1035,19 @@ const submitForm = (status: string, mode: boolean) => {
//
form.value.flowCode = FlowCodeEnum.CONTRACT_CODE;
//
/*
轮胎&制品 默认审批人佟强默认抄送陈海军张东辉
快递&新零售 默认审批人张东辉默认抄送陈海军
制造大集成 默认审批人祁海波默认抄送陈海军张东辉
工厂数字化 默认审批人尹治丰默认抄送陈海军张东辉*/
const recipientUserId = form.value.businessDirection == '3' ? '1985254723705556993,1985251968270127105' : '1985254723705556993';
form.value.variables = {
contractName: form.value.contractName,
totalPrice: form.value.totalPrice,
businessDirection: form.value.businessDirection,
contractDeptId: form.value.contractDeptId,
recipientUserId: recipientUserId,
contractCode: form.value.contractCode
};
//
@ -1465,12 +1457,12 @@ const submitMaterialInfoForm = async () => {
try {
materialInfoLoading.value = true;
const res = await contractAddMaterialInfo(materialInfoForm.value);
const newMaterial = res.data;
// const newMaterial = res.data;
//
if (!(form.value as any).contractMaterialList) {
(form.value as any).contractMaterialList = [];
}
// if (!(form.value as any).contractMaterialList) {
// (form.value as any).contractMaterialList = [];
// }
//
// const newContractMaterial = {

Loading…
Cancel
Save