From cb94a33bb69efb4d524ec17a99e5ac396173a3ca Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 8 Jan 2026 15:36:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
=?UTF-8?q?=E7=90=86][=E8=AE=A1=E5=88=92=E8=A1=A8=E5=8D=95]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/lang/en/business/resource/gyzj.js | 10 +++++-----
src/lang/en/business/resource/mjy.js | 10 +++++-----
src/lang/en/business/study/studyFormPlan.js | 1 +
src/lang/zh/business/study/studyFormPlan.js | 1 +
src/views/business/study/comp/jhbd/Bj.vue | 21 +++++++++++++++++----
5 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/lang/en/business/resource/gyzj.js b/src/lang/en/business/resource/gyzj.js
index dd69c2d..772aa0a 100644
--- a/src/lang/en/business/resource/gyzj.js
+++ b/src/lang/en/business/resource/gyzj.js
@@ -25,8 +25,8 @@ export default {
kgy2:'Warehouse Keeper 2',
plff:'批量发放',
- plczyj:'批量处置药剂',
- plczrq:'批量处置容器',
+ plczyj:'Batch Dispose Substance',
+ plczrq:'Batch Dispose Containers',
plsd:'Batch Lock',
plgd:'Batch Archive',
lock:'Lock',
@@ -38,14 +38,14 @@ export default {
guihuan:'Return',
fafang:'发放',
ysff:'Issue Key',
- czrq:'处置容器',
- czyj:'处置药剂',
+ czrq:'Dispose Container',
+ czyj:'Dispose Substance',
yuanyin:'Reason',
xgkc:'Change Inventory',
shxgkc:'Approve Inventory Change',
shbj:'Approve Edit',
clr:'Operator',
- czfs:'处置方式',
+ czfs:'Dispose Method',
fhr:'Reviewer',
xgbz:'修改备注',
jdr:'Supervisor',
diff --git a/src/lang/en/business/resource/mjy.js b/src/lang/en/business/resource/mjy.js
index b63450a..4907c72 100644
--- a/src/lang/en/business/resource/mjy.js
+++ b/src/lang/en/business/resource/mjy.js
@@ -24,8 +24,8 @@ export default {
kgy2:'Warehouse Keeper 2',
plff:'批量发放',
- plczyj:'批量处置药剂',
- plczrq:'批量处置容器',
+ plczyj:'Batch Dispose Substance',
+ plczrq:'Batch Dispose Containers',
plsd:'Batch Lock',
plgd:'Batch Archive',
lock:'Lock',
@@ -37,14 +37,14 @@ export default {
guihuan:'Return',
fafang:'发放',
ysff:'Issue Key',
- czrq:'处置容器',
- czyj:'处置药剂',
+ czrq:'Dispose Container',
+ czyj:'Dispose Substance',
yuanyin:'Reason',
xgkc:'Change Inventory',
shxgkc:'Approve Inventory Change',
shbj:'Approve Edit',
clr:'Operator',
- czfs:'处置方式',
+ czfs:'Dispose Method',
fhr:'Reviewer',
xgbz:'修改备注',
jdr:'Supervisor',
diff --git a/src/lang/en/business/study/studyFormPlan.js b/src/lang/en/business/study/studyFormPlan.js
index da876b1..7eb14fd 100644
--- a/src/lang/en/business/study/studyFormPlan.js
+++ b/src/lang/en/business/study/studyFormPlan.js
@@ -23,6 +23,7 @@ export default {
xzpzjhb:'新增配置计划表',
yes:'Yes',
no:'No',
+ shryId:'复核人员',
tjjl: '提交记录',
dcqbjcgj: '导出(全部稽查轨迹)',
dclcjcgj: '导出(流程稽查轨迹)',
diff --git a/src/lang/zh/business/study/studyFormPlan.js b/src/lang/zh/business/study/studyFormPlan.js
index e3ac624..2f4b844 100644
--- a/src/lang/zh/business/study/studyFormPlan.js
+++ b/src/lang/zh/business/study/studyFormPlan.js
@@ -22,6 +22,7 @@ export default {
cjjl: '创建记录',
xzpzjhb:'新增配置计划表',
yes: '是',
+ shryId:'复核人员',
no: '否',
tjjl: '提交记录',
dcqbjcgj: '导出(全部稽查轨迹)',
diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
index d91ccd6..ff92ea2 100644
--- a/src/views/business/study/comp/jhbd/Bj.vue
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -29,7 +29,7 @@
{{ $t('page.business.study.studyFormPlan.save') }}
- {{ $t('page.business.study.studyFormPlan.submit')
+ {{ $t('page.business.study.studyFormPlan.submit')
}}
{{ $t('page.business.study.studyFormPlan.pre') }}
@@ -71,9 +71,16 @@
-
+
+
+
+
+
+
+
@@ -209,16 +216,16 @@ export default {
this.resetForm("form")
},
selectDeptUserChange(val) {
- this.form.shryMc = val.name
+ this.form.fhryMc = val.name
},
edit(row) {
this.reset()
+ this.form.qmyy = '制作提交预制表单'
if (row && row.id) {
this.showIndex = 2
this.$modal.loading()
studyFormPlan_info({ id: row.id }).then(response => {
this.form = response.data
- this.form.qmyy = '制作提交预制表单'
this.open = true
this.$modal.closeLoading()
})
@@ -259,6 +266,12 @@ export default {
}
})
},
+ async showtijiao() {
+ let content = await this.$refs.templateTable.getFormData()
+ if (content) {
+ this.openSubmit = true
+ }
+ },
async dotj() {
let content = await this.$refs.templateTable.getFormData()
this.form.bdnr = JSON.stringify(content)