From 41ebc173f31ab71b6477f7e3d287a33f5f0892a7 Mon Sep 17 00:00:00 2001 From: hyt <958868763@qq.com> Date: Thu, 31 Jul 2025 09:03:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=A1=E4=BA=8B=E9=A1=B9=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ItemEntryTemplate/index.vue | 83 +++++++++++++------ .../compoments/assistTableDialog.vue | 2 +- src/views/businessVoucher/index.vue | 3 +- src/views/relevance/index.vue | 2 +- 4 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/views/ItemEntryTemplate/index.vue b/src/views/ItemEntryTemplate/index.vue index 73f8134..b1d486a 100644 --- a/src/views/ItemEntryTemplate/index.vue +++ b/src/views/ItemEntryTemplate/index.vue @@ -19,9 +19,9 @@
-
{{ item.name }}
+
{{ item.name }}{{ item.def1 === 'Y' ? '①' : ''}}
@@ -702,6 +702,27 @@ >
+ + +
+
+
凭证类型名称：
+ +
+
+
单笔生成：
+ +
+
+
@@ -755,6 +776,7 @@ export default { //凭证相关 voucherClickId: '', voucherClickName: '', + voucherClickdef1: '', voucherDialogShow: false, voucherList: [], subClassOptions: [],//会计科目下啦 @@ -783,6 +805,7 @@ export default { width: '100' } ], + def1: 'N', pkglbookOptions: [], treePropsproperty: { children: 'sublistMdmModuleDbFileds', @@ -1002,27 +1025,27 @@ export default { exchangeRate: [ { required: true, message: '请输入汇率', trigger: 'change' } ], - jNumField: [ - { required: true, message: '请选择借方数量字段', trigger: 'change' } - ], - jYbSumField: [ - { required: true, message: '请选择借方原币金额字段', trigger: 'change' } - ], - jBbSumField: [ - { required: true, message: '请选择借方本币金额字段', trigger: 'change' } - ], - dNumField: [ - { required: true, message: '请选择贷方数量字段', trigger: 'change' } - ], - dYbSumField: [ - { required: true, message: '请选择贷方原币金额字段', trigger: 'change' } - ], - dBbSumField: [ - { required: true, message: '请选择贷方本币金额字段', trigger: 'change' } - ], - pkCashflow: [ - { required: true, message: '请选择现金流量项目主键', trigger: 'change' } - ] + // jNumField: [ + // { required: true, message: '请选择借方数量字段', trigger: 'change' } + // ], + // jYbSumField: [ + // { required: true, message: '请选择借方原币金额字段', trigger: 'change' } + // ], + // jBbSumField: [ + // { required: true, message: '请选择借方本币金额字段', trigger: 'change' } + // ], + // dNumField: [ + // { required: true, message: '请选择贷方数量字段', trigger: 'change' } + // ], + // dYbSumField: [ + // { required: true, message: '请选择贷方原币金额字段', trigger: 'change' } + // ], + // dBbSumField: [ + // { required: true, message: '请选择贷方本币金额字段', trigger: 'change' } + // ], + // pkCashflow: [ + // { required: true, message: '请选择现金流量项目主键', trigger: 'change' } + // ] }, fixedValueForm: [ @@ -1230,7 +1253,8 @@ export default { } let obj =this.$refs.baseChoice2.optionData this.$set(this.$refs.fixedValueFormRefsName.ruleForm, 'recordData', obj[this.fixedValueClickRow.namefieldname]) - this.textarea += `@@$${this.fixedValueClickRow.dbName}:${this.fixedValueClickRow.tablepkname}=${obj[this.fixedValueClickRow.tablepkname]}` + console.log(this.fixedValueClickRow,'this.fixedValueClickRow') + this.textarea += `@@$${this.fixedValueClickRow.dbName}:id=${obj.id}` // this.$set(this.clickRow, `factorid${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.key]) // this.$set(this.clickRow, `factorname${this.clickNum}`, this.$refs.baseChoice.optionData[this.clickObj.labelKey]) // this.$set(this.clickRow, `factorpk${this.clickNum}`, this.$refs.baseChoice.optionData['id']) @@ -1280,9 +1304,10 @@ export default { this.selected[0].assistEntityList.push({}) }, //凭证相关 - voucherCliclHandle(id, name) { + voucherCliclHandle(id, name,def1) { this.voucherClickId = id this.voucherClickName = name + this.voucherClickdef1 = def1 this.resetTable() }, voucherDialogDelHandle(item) { @@ -1301,6 +1326,7 @@ export default { voucherDialogEditHandle(item) { this.billTypeADDID = item.id this.billTypeADDName = item.name + this.def1 = item.def1 this.voucherDialogShow = true this.passwordDialogTitle = '编辑' }, @@ -1323,7 +1349,8 @@ export default { if (this.passwordDialogTitle === '新增') { const res = await typeSaveAPI({ name: this.billTypeADDName, - mdmId: this.billTypeClickID + mdmId: this.billTypeClickID, + def1: this.def1, }) this.$vmNews('保存成功', 'success') this.getVoucherListHandle() @@ -1331,7 +1358,8 @@ export default { const res = await typeUpdateAPI({ id: this.billTypeADDID, name: this.billTypeADDName, - mdmId: this.billTypeClickID + mdmId: this.billTypeClickID, + def1: this.def1, }) this.$vmNews('保存成功', 'success') this.getVoucherListHandle() @@ -1342,6 +1370,7 @@ export default { this.voucherDialogShow = true this.passwordDialogTitle = '新增' this.billTypeADDName = '' + this.def1 = 'N' this.billTypeADDID = '' }, //保存方法 diff --git a/src/views/businessVoucher/compoments/assistTableDialog.vue b/src/views/businessVoucher/compoments/assistTableDialog.vue index 95a813a..1f6aaf7 100644 --- a/src/views/businessVoucher/compoments/assistTableDialog.vue +++ b/src/views/businessVoucher/compoments/assistTableDialog.vue @@ -1,7 +1,7 @@