diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts
index 53f3ff7..774182e 100644
--- a/src/api/oa/erp/contractInfo/types.ts
+++ b/src/api/oa/erp/contractInfo/types.ts
@@ -139,6 +139,11 @@ export interface ContractInfoVO {
*/
projectContractCode: string;
+ /**
+ * 软控合同额（元）
+ */
+ mesnacContractPrice: number;
+
/**
* 交付启动期限
*/
@@ -357,6 +362,11 @@ export interface ContractInfoForm extends BaseEntity {
*/
projectContractCode?: string;
+ /**
+ * 软控合同额（元）
+ */
+ mesnacContractPrice?: number;
+
/**
* 交付启动期限
*/
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 17a0078..7d1894b 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -194,7 +194,7 @@
@click="handleContractTemplateDownload"
style="font-weight: 600"
>
- 合同模板查看
+ 合同查看
diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue
index 2afbf64..ea53fcf 100644
--- a/src/views/oa/erp/contractInfo/index.vue
+++ b/src/views/oa/erp/contractInfo/index.vue
@@ -158,10 +158,11 @@
-
-
-
-
+
+
+
+
+
@@ -243,27 +244,34 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -348,13 +356,14 @@ const columns = ref([
{ key: 31, label: `更新时间`, visible: false },
{ key: 32, label: `终版合同`, visible: true },
{ key: 33, label: `客户合同编号`, visible: true },
- { key: 34, label: `内部合同号`, visible: true },
- { key: 35, label: `外部合同号`, visible: true },
- { key: 36, label: `订单号`, visible: true },
- { key: 37, label: `项目号`, visible: true },
+ { key: 34, label: `海威SAP订单号`, visible: true },
+ { key: 35, label: `海威合同归档编号`, visible: true },
+ { key: 36, label: `软控SAP订单号`, visible: true },
+ { key: 37, label: `软控SAP项目号`, visible: true },
{ key: 38, label: `合同负责人`, visible: true },
{ key: 39, label: `合同大写金额`, visible: false },
- { key: 40, label: `合同模板标识`, visible: true }
+ { key: 40, label: `合同模板标识`, visible: true },
+ { key: 41, label: `软控合同额（元）`, visible: true }
]);
const data = reactive<{ queryParams: ContractInfoQuery }>({
@@ -417,7 +426,8 @@ const maintainDialog = reactive({
internalContractCode: undefined as string | undefined,
externalContractCode: undefined as string | undefined,
orderContractCode: undefined as string | undefined,
- projectContractCode: undefined as string | undefined
+ projectContractCode: undefined as string | undefined,
+ mesnacContractPrice: undefined as number | undefined
}
});
const maintainFormRef = ref();
@@ -538,7 +548,7 @@ const handleExport = () => {
const handleExportApprovalWord = async (row: ContractInfoVO) => {
try {
const res = await exportContractApprovalWord(row.contractId);
- const blob = new Blob([res as BlobPart], {
+ const blob = new Blob([res as unknown as BlobPart], {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
});
const url = window.URL.createObjectURL(blob);
@@ -586,7 +596,8 @@ const openMaintainDialog = () => {
internalContractCode: (row as any).internalContractCode,
externalContractCode: (row as any).externalContractCode,
orderContractCode: (row as any).orderContractCode,
- projectContractCode: (row as any).projectContractCode
+ projectContractCode: (row as any).projectContractCode,
+ mesnacContractPrice: (row as any).mesnacContractPrice
});
maintainDialog.visible = true;
};
@@ -601,7 +612,8 @@ const submitMaintain = async () => {
internalContractCode: maintainDialog.form.internalContractCode,
externalContractCode: maintainDialog.form.externalContractCode,
orderContractCode: maintainDialog.form.orderContractCode,
- projectContractCode: maintainDialog.form.projectContractCode
+ projectContractCode: maintainDialog.form.projectContractCode,
+ mesnacContractPrice: maintainDialog.form.mesnacContractPrice
} as any);
proxy?.$modal.msgSuccess('维护成功');
maintainDialog.visible = false;