From 204fb46f07a445062854498a4627bdc235feb946 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 17 Apr 2026 15:56:10 +0800 Subject: [PATCH] =?UTF-8?q?1.1.21=20=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=89=E6=97=A0=E5=90=88=E5=90=8C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 2 +- src/views/oa/erp/contractChange/edit.vue | 7 ------- src/views/oa/erp/contractInfo/edit.vue | 9 --------- src/views/oa/erp/contractInfo/index.vue | 2 +- src/views/oa/erp/contractInfo/orderActivate.vue | 2 +- .../oa/erp/orderLedger/contractOrderTodoIndex.vue | 10 +++++----- src/views/oa/erp/orderLedger/index.vue | 2 +- 7 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 7ffc493..4bfd73e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -145,7 +145,7 @@ export const constantRoutes: RouteRecordRaw[] = [ path: 'orderLedger/:projectId', component: () => import('@/views/oa/erp/orderLedger/index.vue'), name: 'OrderLedger', - meta: { title: '合同订单台账', activeMenu: '/contract/contractInfo/contractOrder' } + meta: { title: '销售合同订单台账', activeMenu: '/contract/contractInfo/contractOrder' } }, { path: 'budgetInfo/edit', diff --git a/src/views/oa/erp/contractChange/edit.vue b/src/views/oa/erp/contractChange/edit.vue index cd173c4..8eb39aa 100644 --- a/src/views/oa/erp/contractChange/edit.vue +++ b/src/views/oa/erp/contractChange/edit.vue @@ -99,13 +99,6 @@ - - - - {{ dict.label }} - - - diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue index b6e6b1b..cadc9e5 100644 --- a/src/views/oa/erp/contractInfo/edit.vue +++ b/src/views/oa/erp/contractInfo/edit.vue @@ -29,14 +29,6 @@ - - - - {{ dict.label }} - - - - @@ -1010,7 +1002,6 @@ const initFormData: ContractInfoFormEx = { const data = reactive<{ form: ContractInfoFormEx; rules: any }>({ form: { ...initFormData }, rules: { - contractFlag: [{ required: true, message: '有无合同不能为空', trigger: 'blur' }], contractCode: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }], contractName: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }], businessDirection: [{ required: true, message: '业务方向不能为空', trigger: 'blur' }], diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue index 44a6d52..9e94967 100644 --- a/src/views/oa/erp/contractInfo/index.vue +++ b/src/views/oa/erp/contractInfo/index.vue @@ -376,7 +376,7 @@ const queryFormRef = ref(); const columns = ref([ { key: 0, label: `合同ID`, visible: false }, { key: 1, label: `租户编号`, visible: false }, - { key: 2, label: `有无合同`, visible: true }, + { key: 2, label: `有无合同`, visible: false }, { key: 3, label: `合同编号`, visible: true }, { key: 4, label: `合同名称`, visible: true }, { key: 5, label: `合同大类`, visible: true }, diff --git a/src/views/oa/erp/contractInfo/orderActivate.vue b/src/views/oa/erp/contractInfo/orderActivate.vue index 4a6f3cd..2cf98cd 100644 --- a/src/views/oa/erp/contractInfo/orderActivate.vue +++ b/src/views/oa/erp/contractInfo/orderActivate.vue @@ -1025,7 +1025,7 @@ const loadContractInfo = async () => { if (contractRes.data) { const contractData = contractRes.data; form.value.contractId = contractData.contractId; - form.value.projectName = contractData.contractName + '订单'; + form.value.projectName = contractData.contractName; form.value.businessDirection = contractData.businessDirection; form.value.deptId = contractData.contractDeptId; form.value.contractCode = contractData.contractCode; diff --git a/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue b/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue index e2abf6f..83d2f21 100644 --- a/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue +++ b/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue @@ -45,11 +45,11 @@ - - - + + + + +