From e6c0840afffa5418adb218be3913f83903d81b73 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 16 Jan 2026 12:03:42 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
=?UTF-8?q?=E7=90=86]=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95=E5=85=B3?=
=?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/business/study/studyFormPre.js | 30 ++++-
src/lang/en/business/form/form.js | 2 +
src/lang/en/business/study/studyFormPre.js | 6 +-
src/lang/zh/business/form/form.js | 4 +-
src/lang/zh/business/study/studyFormPre.js | 6 +-
src/views/business/form/drug/comp/ytbdList.vue | 23 +++-
src/views/business/form/nonTrial/comp/ytbdList.vue | 22 +++-
src/views/business/study/comp/tbbdList.vue | 1 -
src/views/business/study/comp/ytbd/Bj.vue | 4 +-
src/views/business/study/comp/ytbd/Gb.vue | 116 ++++++++++++++++++
src/views/business/study/comp/ytbd/Qrgb.vue | 132 +++++++++++++++++++++
src/views/business/study/comp/ytbdList.vue | 27 ++++-
12 files changed, 361 insertions(+), 12 deletions(-)
create mode 100644 src/views/business/study/comp/ytbd/Gb.vue
create mode 100644 src/views/business/study/comp/ytbd/Qrgb.vue
diff --git a/src/api/business/study/studyFormPre.js b/src/api/business/study/studyFormPre.js
index 4ef2280..0d190d3 100644
--- a/src/api/business/study/studyFormPre.js
+++ b/src/api/business/study/studyFormPre.js
@@ -107,4 +107,32 @@ export function studyFormPre_updateBdnr(data) {
method: 'post',
data: data
})
-}
\ No newline at end of file
+}
+
+//申请关闭
+export function studyFormPre_sqgb(data) {
+ return request({
+ url: '/system/business/studyFormPre/sqgb',
+ method: 'post',
+ data: data
+ })
+}
+
+//同意关闭
+export function studyFormPre_tygb(data) {
+ return request({
+ url: '/system/business/studyFormPre/tygb',
+ method: 'post',
+ data: data
+ })
+}
+
+//拒绝关闭
+export function studyFormPre_jjgb(data) {
+ return request({
+ url: '/system/business/studyFormPre/jjgb',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/lang/en/business/form/form.js b/src/lang/en/business/form/form.js
index d3a17da..0b21a84 100644
--- a/src/lang/en/business/form/form.js
+++ b/src/lang/en/business/form/form.js
@@ -18,6 +18,8 @@ export default {
statusYtj: 'Submitted',
statusYtg: 'Approved',
statusWtg: 'Rejected',
+ statusDgb: '待关闭',
+ statusYgb: '已关闭',
audit: 'Approve',
detail: 'Enter',
diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js
index 11a451a..dd4b031 100644
--- a/src/lang/en/business/study/studyFormPre.js
+++ b/src/lang/en/business/study/studyFormPre.js
@@ -35,5 +35,9 @@ export default {
fzyybd: 'Copy Existing Preset',
yes: 'Yes',
no: 'No',
- zztjyzbd: 'Submit Record Preset'
+ zztjyzbd: 'Submit Record Preset',
+ sqgb: '申请关闭',
+ qrgb: '确认关闭',
+ gbtgjj:'关闭通过/拒绝',
+ guanbi:'关闭'
}
diff --git a/src/lang/zh/business/form/form.js b/src/lang/zh/business/form/form.js
index d60dc2b..4b1941c 100644
--- a/src/lang/zh/business/form/form.js
+++ b/src/lang/zh/business/form/form.js
@@ -18,7 +18,9 @@ export default {
statusYtj: '已提交',
statusYtg: '已通过',
statusWtg: '未通过',
-
+ statusDgb: '待关闭',
+ statusYgb: '已关闭',
+
audit: '审核',
detail: '表单详情',
//填报表单
diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js
index 02e8853..207d91a 100644
--- a/src/lang/zh/business/study/studyFormPre.js
+++ b/src/lang/zh/business/study/studyFormPre.js
@@ -36,5 +36,9 @@ export default {
fzyybd: '复制已有表单',
yes: '是',
no: '否',
- zztjyzbd: '制作提交预制表单'
+ zztjyzbd: '制作提交预制表单',
+ sqgb: '申请关闭',
+ qrgb: '确认关闭',
+ gbtgjj:'关闭通过/拒绝',
+ guanbi:'关闭'
}
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 494972e..b727b96 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -71,6 +71,8 @@
{{ $t('page.business.form.statusTbz') }}
{{ $t('page.business.form.statusYtj') }}
{{ $t('page.business.form.statusYtg') }}
+ {{ $t('page.business.form.statusDgb') }}
+ {{ $t('page.business.form.statusYgb') }}
@@ -102,6 +104,12 @@
{{ $t('page.business.form.audit') }}
+
+ {{ $t('page.business.study.studyFormPre.guanbi') }}
+
+
+ {{ $t('page.business.study.studyFormPre.qrgb') }}
+
@@ -116,6 +124,10 @@
+
+
+
+
@@ -183,6 +195,8 @@ import TemplateTable from '@/views/business/comps/template/TemplateTable';
import Bj from "@/views/business/study/comp/ytbd/Bj";
import Xq from "@/views/business/study/comp/ytbd/Xq";
import Sh from "@/views/business/study/comp/ytbd/Sh";
+import Gb from "@/views/business/study/comp/ytbd/Gb";
+import Qrgb from "@/views/business/study/comp/ytbd/Qrgb";
import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
import Sign from './sign.vue'
import moment from "moment";
@@ -218,7 +232,7 @@ export default {
deep: true
}
},
- components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
+ components: { Qrgb,Gb,Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
data() {
return {
formCount: 0,
@@ -409,7 +423,12 @@ export default {
this.$emit('showDetail', this.showAudit)
this.$refs.Sh.show(row)
},
-
+ gb(row) {
+ this.$refs.Gb.show(row)
+ },
+ qrgb(row) {
+ this.$refs.Qrgb.show(row)
+ },
sdsy() {
this.$modal.loading()
drug_checkSd({
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index 447b16d..c5a52b3 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -72,6 +72,8 @@
{{ $t('page.business.form.statusTbz') }}
{{ $t('page.business.form.statusYtj') }}
{{ $t('page.business.form.statusYtg') }}
+ {{ $t('page.business.form.statusDgb') }}
+ {{ $t('page.business.form.statusYgb') }}
@@ -103,6 +105,12 @@
{{ $t('page.business.form.audit') }}
+
+ {{ $t('page.business.study.studyFormPre.guanbi') }}
+
+
+ {{ $t('page.business.study.studyFormPre.qrgb') }}
+
@@ -117,6 +125,10 @@
+
+
+
+
@@ -184,6 +196,8 @@ import TemplateTable from '@/views/business/comps/template/TemplateTable';
import Bj from "@/views/business/study/comp/ytbd/Bj";
import Xq from "@/views/business/study/comp/ytbd/Xq";
import Sh from "@/views/business/study/comp/ytbd/Sh";
+import Gb from "@/views/business/study/comp/ytbd/Gb";
+import Qrgb from "@/views/business/study/comp/ytbd/Qrgb";
import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
import Sign from './sign.vue'
import moment from "moment";
@@ -219,7 +233,7 @@ export default {
deep: true
}
},
- components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
+ components: { Qrgb,Gb,Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
data() {
return {
formCount: 0,
@@ -410,6 +424,12 @@ export default {
this.$emit('showDetail', this.showAudit)
this.$refs.Sh.show(row)
},
+ gb(row) {
+ this.$refs.Gb.show(row)
+ },
+ qrgb(row) {
+ this.$refs.Qrgb.show(row)
+ },
sdsy() {
this.$modal.loading()
nonTrial_checkSd({
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index d549a4f..307add3 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -340,7 +340,6 @@ export default {
studyId: this.searchForm.studyId,
formId:row.id
}))
- debugger
this.$tab.openPage(row.bdmc, '/study/formFillBj/' +params)
},
bjClose() {
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index c196d4d..b96bf6d 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -138,7 +138,7 @@
diff --git a/src/views/business/study/comp/ytbd/Qrgb.vue b/src/views/business/study/comp/ytbd/Qrgb.vue
new file mode 100644
index 0000000..9835b2a
--- /dev/null
+++ b/src/views/business/study/comp/ytbd/Qrgb.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 0c09825..3510d8f 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -69,6 +69,8 @@
{{ $t('page.business.form.statusYtj') }}
{{ $t('page.business.form.statusYtg') }}
{{ $t('page.business.form.statusWtg') }}
+ {{ $t('page.business.form.statusDgb') }}
+ {{ $t('page.business.form.statusYgb') }}
@@ -100,6 +102,14 @@
{{ $t('page.business.form.audit') }}
+
+ {{ $t('page.business.study.studyFormPre.guanbi')
+ }}
+
+
+ {{ $t('page.business.study.studyFormPre.qrgb')
+ }}
+
@@ -114,6 +124,11 @@
+
+
+
+
+
@@ -178,6 +193,8 @@ import TemplateTable from '@/views/business/comps/template/TemplateTable';
import Bj from "./ytbd/Bj";
import Xq from "./ytbd/Xq";
import Sh from "./ytbd/Sh";
+import Gb from "./ytbd/Gb";
+import Qrgb from "./ytbd/Qrgb";
import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
import moment from "moment";
import { mapGetters } from 'vuex'
@@ -211,7 +228,7 @@ export default {
deep: true
}
},
- components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
+ components: { Gb, Qrgb, Bj, Xq, Sh, SelectDeptUser, TemplateTable },
data() {
return {
isMatchSubject: false,
@@ -378,7 +395,7 @@ export default {
edit(row) {
this.showEdit = true
this.$emit('showDetail', this.showEdit)
- this.$refs.Bj.edit(row)
+ this.$refs.Bj.edit(_.merge({}, row, { permitForSecectUser: 'business:studyFormPre:sh' }))
},
bjClose() {
this.showEdit = false
@@ -400,6 +417,12 @@ export default {
this.$emit('showDetail', this.showDetail)
this.$refs.Xq.show(row, false)
},
+ gb(row) {
+ this.$refs.Gb.show(row)
+ },
+ qrgb(row) {
+ this.$refs.Qrgb.show(row)
+ },
audit(row) {
this.showAudit = true
this.$emit('showDetail', this.showAudit)