diff --git a/src/api/oa/erp/contractInfo/types.ts b/src/api/oa/erp/contractInfo/types.ts
index 97f524c..4b51b84 100644
--- a/src/api/oa/erp/contractInfo/types.ts
+++ b/src/api/oa/erp/contractInfo/types.ts
@@ -104,6 +104,11 @@ export interface ContractInfoVO {
*/
ossId: string | number;
+ /**
+ * 付款账户ID
+ */
+ paymentAccountId?: string | number;
+
/**
* 付款方式
*/
@@ -292,6 +297,11 @@ export interface ContractInfoForm extends BaseEntity {
*/
ossId?: string | number;
+ /**
+ * 付款账户ID
+ */
+ paymentAccountId?: string | number;
+
/**
* 付款方式
*/
diff --git a/src/views/oa/base/printTemplate/index.vue b/src/views/oa/base/printTemplate/index.vue
index de7c346..05d21a2 100644
--- a/src/views/oa/base/printTemplate/index.vue
+++ b/src/views/oa/base/printTemplate/index.vue
@@ -294,7 +294,7 @@ const handleUpdate = async (row?: PrintTemplateVO) => {
const updateTemplate = (row) => {
const _templateId = row?.templateId || ids.value[0];
- router.push({ path: '/template/templateUpdate', query: { templateId: _templateId } });
+ router.push({ path: '/template/templateUpdate', query: { templateId: _templateId, templateType: row.templateType } });
};
/** 提交按钮 */
diff --git a/src/views/oa/base/templateVariable/index.vue b/src/views/oa/base/templateVariable/index.vue
index 9468542..b34dc5d 100644
--- a/src/views/oa/base/templateVariable/index.vue
+++ b/src/views/oa/base/templateVariable/index.vue
@@ -62,8 +62,8 @@
-
-
+
+
@@ -192,7 +192,7 @@ const columns = ref([
{ key: 8, label: `默认值`, visible: true },
{ key: 9, label: `排序号`, visible: true },
{ key: 10, label: `模板ID`, visible: false },
- { key: 11, label: `备注`, visible: true },
+ { key: 11, label: `备注`, visible: false },
{ key: 12, label: `激活标识`, visible: false },
{ key: 13, label: `删除标志`, visible: false },
{ key: 14, label: `创建部门`, visible: false },
diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index 3f43c60..2091d91 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -195,6 +195,23 @@
-->
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
@@ -209,13 +226,6 @@
-
-
-
- 元
-
-
-
@@ -608,6 +618,7 @@ import { contractAddMaterialInfo } from '@/api/oa/base/materialInfo';
import { MaterialInfoForm } from '@/api/oa/base/materialInfo/types';
import { listPaymentStage } from '@/api/oa/base/paymentStage';
import type { PaymentStageVO } from '@/api/oa/base/paymentStage/types';
+import { getCrmPaymentAccountList } from '@/api/oa/crm/paymentAccount';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
@@ -620,11 +631,12 @@ const {
business_direction,
contract_flag,
contract_type,
+ account_type,
contract_status,
material_flag,
contract_template_flag
} = toRefs(
- proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'contract_status', 'material_flag', 'contract_template_flag')
+ proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'account_type', 'contract_status', 'material_flag', 'contract_template_flag')
);
const buttonLoading = ref(false);
@@ -714,6 +726,13 @@ const getPaymentStageListSelect = async () => {
paymentStageList.value = res.rows || [];
};
+/** 付款账户下拉列表 */
+const paymentAccountList = ref([]);
+const getPaymentAccountListSelect = async () => {
+ const res = await getCrmPaymentAccountList({});
+ paymentAccountList.value = res.data || [];
+};
+
// 合同物料对话框
const materialDialog = reactive({
visible: false,
@@ -882,6 +901,7 @@ const initFormData: ContractInfoFormEx = {
flowStatus: undefined,
templateId: undefined,
ossId: undefined,
+ paymentAccountId: undefined,
paymentMethod: undefined,
signatureAppendix: undefined,
taxRate: undefined,
@@ -1329,6 +1349,7 @@ const loadSelectOptions = () => {
getDeptInfoListSelect();
getCustomerInfoListSelect();
getPrintTemplateListSelect();
+ getPaymentAccountListSelect();
getUserInfoListSelect();
getPaymentStageListSelect();
};