diff --git a/src/api/business/study/study.js b/src/api/business/study/study.js
index c2775f3..5bac995 100644
--- a/src/api/business/study/study.js
+++ b/src/api/business/study/study.js
@@ -39,3 +39,32 @@ export function study_jcgjList(query) {
params: query
})
}
+
+export function study_gd(data) {
+ return request({
+ url: '/system/business/study/gd',
+ method: 'post',
+ data: data
+ })
+}
+export function study_js(data) {
+ return request({
+ url: '/system/business/study/js',
+ method: 'post',
+ data: data
+ })
+}
+export function study_jd(data) {
+ return request({
+ url: '/system/business/study/jd',
+ method: 'post',
+ data: data
+ })
+}
+export function study_jy(data) {
+ return request({
+ url: '/system/business/study/jy',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/lang/en.js b/src/lang/en.js
index 2b0cb4a..5c35156 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -67,8 +67,8 @@ export default {
endDate: 'End Date',
password: 'Password',
signer: 'Signer',
- signerPsw: '签名人密码',
- qmyy: '签名意义',
+ signerPsw: 'Password',
+ qmyy: 'Purpose',
signTime: '签名时间',
remark: 'remark',
@@ -116,18 +116,18 @@ export default {
},
business: {
resource: {
- resource:resource,
- zcg:zcg,
- mjy:mjy,
- yq:yq,
- sj:sj,
- gyzj:gyzj,
+ resource: resource,
+ zcg: zcg,
+ mjy: mjy,
+ yq: yq,
+ sj: sj,
+ gyzj: gyzj
},
study: {
study: study,
studyEnter: studyEnter,
- studyFormPre:studyFormPre,
- studyFormFill:studyFormFill
+ studyFormPre: studyFormPre,
+ studyFormFill: studyFormFill
},
form: form
}
diff --git a/src/lang/en/business/study/study.js b/src/lang/en/business/study/study.js
index 03d4942..cfe824b 100644
--- a/src/lang/en/business/study/study.js
+++ b/src/lang/en/business/study/study.js
@@ -53,6 +53,7 @@ export default {
jssy: 'Unlock Study',
sqjy: 'Apply for Check-out',
sqgd: 'Apply for Archiving',
+ sqjd: 'Apply for De-archiving',
jjjd: 'Reject De-archiving',
tyjd: 'Approve De-archiving',
jjgd: 'Reject Archiving',
@@ -63,5 +64,7 @@ export default {
qb: 'All',
lc: 'Milestone',
bj: 'Change',
- ry: 'User'
+ ry: 'User',
+
+ scsy: 'Remove Study'
}
diff --git a/src/lang/zh/business/study/study.js b/src/lang/zh/business/study/study.js
index 5d3d739..de8adf6 100644
--- a/src/lang/zh/business/study/study.js
+++ b/src/lang/zh/business/study/study.js
@@ -53,6 +53,7 @@ export default {
jssy: '解锁试验',
sqjy: '申请借阅',
sqgd: '申请归档',
+ sqjd: '申请解档',
jjjd: '拒绝解档',
tyjd: '同意解档',
jjgd: '拒绝归档',
@@ -63,5 +64,7 @@ export default {
qb: '全部',
lc: '流程',
bj: '编辑',
- ry: '人员'
+ ry: '人员',
+
+ scsy: '删除试验'
}
diff --git a/src/views/business/study/comp/edit.vue b/src/views/business/study/comp/edit.vue
index 4942198..05ee6ce 100644
--- a/src/views/business/study/comp/edit.vue
+++ b/src/views/business/study/comp/edit.vue
@@ -37,7 +37,7 @@
-