1.1.21 合同信息去掉有无合同字段。

dev
yinq 3 days ago
parent 033279994a
commit 204fb46f07

@ -145,7 +145,7 @@ export const constantRoutes: RouteRecordRaw[] = [
path: 'orderLedger/:projectId', path: 'orderLedger/:projectId',
component: () => import('@/views/oa/erp/orderLedger/index.vue'), component: () => import('@/views/oa/erp/orderLedger/index.vue'),
name: 'OrderLedger', name: 'OrderLedger',
meta: { title: '合同订单台账', activeMenu: '/contract/contractInfo/contractOrder' } meta: { title: '销售合同订单台账', activeMenu: '/contract/contractInfo/contractOrder' }
}, },
{ {
path: 'budgetInfo/edit', path: 'budgetInfo/edit',

@ -99,13 +99,6 @@
</template> </template>
<el-form :model="form.changeInfo" label-width="120px"> <el-form :model="form.changeInfo" label-width="120px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="有无合同">
<el-radio-group v-model="form.changeInfo.contractFlag" :disabled="isFormDisabled">
<el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合同编号"> <el-form-item label="合同编号">
<el-input v-model="form.changeInfo.contractCode" placeholder="请输入合同编号" :disabled="isFormDisabled"> <el-input v-model="form.changeInfo.contractCode" placeholder="请输入合同编号" :disabled="isFormDisabled">

@ -29,14 +29,6 @@
<el-card shadow="never" style="margin-top: 0"> <el-card shadow="never" style="margin-top: 0">
<el-form ref="contractInfoFormRef" :model="form" :loading="buttonLoading" :rules="rules" label-width="120px"> <el-form ref="contractInfoFormRef" :model="form" :loading="buttonLoading" :rules="rules" label-width="120px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="有无合同" prop="contractFlag">
<el-radio-group v-model="form.contractFlag" :disabled="isFormDisabled">
<el-radio v-for="dict in contract_flag" :key="dict.value" :value="dict.value">{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合同编号" prop="contractCode"> <el-form-item label="合同编号" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同编号" :disabled="isFormDisabled"> <el-input v-model="form.contractCode" placeholder="请输入合同编号" :disabled="isFormDisabled">
@ -1010,7 +1002,6 @@ const initFormData: ContractInfoFormEx = {
const data = reactive<{ form: ContractInfoFormEx; rules: any }>({ const data = reactive<{ form: ContractInfoFormEx; rules: any }>({
form: { ...initFormData }, form: { ...initFormData },
rules: { rules: {
contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'blur' }],
contractCode: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }], contractCode: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }],
contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }], contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'blur' }], businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'blur' }],

@ -376,7 +376,7 @@ const queryFormRef = ref<ElFormInstance>();
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `合同ID`, visible: false }, { key: 0, label: `合同ID`, visible: false },
{ key: 1, label: `租户编号`, visible: false }, { key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `有无合同`, visible: true }, { key: 2, label: `有无合同`, visible: false },
{ key: 3, label: `合同编号`, visible: true }, { key: 3, label: `合同编号`, visible: true },
{ key: 4, label: `合同名称`, visible: true }, { key: 4, label: `合同名称`, visible: true },
{ key: 5, label: `合同大类`, visible: true }, { key: 5, label: `合同大类`, visible: true },

@ -1025,7 +1025,7 @@ const loadContractInfo = async () => {
if (contractRes.data) { if (contractRes.data) {
const contractData = contractRes.data; const contractData = contractRes.data;
form.value.contractId = contractData.contractId; form.value.contractId = contractData.contractId;
form.value.projectName = contractData.contractName + '订单'; form.value.projectName = contractData.contractName;
form.value.businessDirection = contractData.businessDirection; form.value.businessDirection = contractData.businessDirection;
form.value.deptId = contractData.contractDeptId; form.value.deptId = contractData.contractDeptId;
form.value.contractCode = contractData.contractCode; form.value.contractCode = contractData.contractCode;

@ -45,11 +45,11 @@
<el-card shadow="never"> <el-card shadow="never">
<el-table v-loading="loading" border :data="tableList" class="data-table"> <el-table v-loading="loading" border :data="tableList" class="data-table">
<el-table-column label="序号" type="index" align="center" width="70" /> <el-table-column label="序号" type="index" align="center" width="70" />
<el-table-column label="有无合同" align="center" prop="contractFlag" width="110"> <!-- <el-table-column label="有无合同" align="center" prop="contractFlag" width="110">-->
<template #default="scope"> <!-- <template #default="scope">-->
<dict-tag :options="contract_flag" :value="scope.row.contractFlag" /> <!-- <dict-tag :options="contract_flag" :value="scope.row.contractFlag" />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="订单编号" align="center" prop="projectCode" width="160" show-overflow-tooltip /> <el-table-column label="订单编号" align="center" prop="projectCode" width="160" show-overflow-tooltip />
<el-table-column label="订单名称" align="center" prop="projectName" width="200"> <el-table-column label="订单名称" align="center" prop="projectName" width="200">
<template #default="scope"> <template #default="scope">

@ -3,7 +3,7 @@
<el-card shadow="never" class="main-card"> <el-card shadow="never" class="main-card">
<template #header> <template #header>
<div class="card-header"> <div class="card-header">
<span class="header-title">合同订单台账</span> <span class="header-title">销售合同订单台账</span>
<el-button size="default" type="primary" icon="ArrowLeft" @click="handleBack"></el-button> <el-button size="default" type="primary" icon="ArrowLeft" @click="handleBack"></el-button>
</div> </div>
</template> </template>

Loading…
Cancel
Save