diff --git a/src/api/business/study/studyFormPlan.js b/src/api/business/study/studyFormPlan.js new file mode 100644 index 0000000..c827759 --- /dev/null +++ b/src/api/business/study/studyFormPlan.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +//列表 +export function studyFormPlan_list(query) { + return request({ + url: '/system/business/studyFormPlan/list', + method: 'get', + params: query + }) +} diff --git a/src/lang/en.js b/src/lang/en.js index 5c35156..b121d6c 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -17,6 +17,8 @@ import studyEnter from './en/business/study/studyEnter' import studyFormPre from './en/business/study/studyFormPre' //填报表单 import studyFormFill from './en/business/study/studyFormFill' +//计划表单 +import studyFormPlan from './en/business/study/studyFormPlan' //表单 import form from './en/business/form/form' @@ -127,7 +129,8 @@ export default { study: study, studyEnter: studyEnter, studyFormPre: studyFormPre, - studyFormFill: studyFormFill + studyFormFill: studyFormFill, + studyFormPlan: studyFormPlan }, form: form } diff --git a/src/lang/en/business/study/studyFormPlan.js b/src/lang/en/business/study/studyFormPlan.js new file mode 100644 index 0000000..3ad0dd9 --- /dev/null +++ b/src/lang/en/business/study/studyFormPlan.js @@ -0,0 +1,12 @@ + +export default { + syxx: '试验信息', + symc: '试验名称', + sybh: '试验编号', + syfzr: '试验负责人', + sdsy: '锁定试验', + cjsj: '创建时间', + syjj: '试验简介', +xz:'新增配置计划表', +syxkxx:'试验学科信息' +} diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js index b89f1fa..db5af8b 100644 --- a/src/lang/en/business/study/studyFormPre.js +++ b/src/lang/en/business/study/studyFormPre.js @@ -23,5 +23,6 @@ export default { bzyy:'备注原因', jcgj:'稽查轨迹', cjjl:'创建记录', + xjbd:'新建表单', ts:'是否确定用该预填模板进行实际填报?', } diff --git a/src/lang/zh.js b/src/lang/zh.js index ba018e2..6e38f1d 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -17,6 +17,8 @@ import studyEnter from './zh/business/study/studyEnter' import studyFormPre from './zh/business/study/studyFormPre' //填报表单 import studyFormFill from './zh/business/study/studyFormFill' +//计划表单 +import studyFormPlan from './zh/business/study/studyFormPlan' //表单 import form from './zh/business/form/form' @@ -113,18 +115,19 @@ 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, + studyFormPlan: studyFormPlan }, form: form } diff --git a/src/lang/zh/business/study/studyFormPlan.js b/src/lang/zh/business/study/studyFormPlan.js new file mode 100644 index 0000000..1550a65 --- /dev/null +++ b/src/lang/zh/business/study/studyFormPlan.js @@ -0,0 +1,11 @@ +export default { + syxx: '试验信息', + symc: '试验名称', + sybh: '试验编号', + syfzr: '试验负责人', + cjsj: '创建时间', + sdsy: '锁定试验', + syjj: '试验简介', +xz:'新增配置计划表', +syxkxx:'试验学科信息' +} diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js index b89f1fa..db5af8b 100644 --- a/src/lang/zh/business/study/studyFormPre.js +++ b/src/lang/zh/business/study/studyFormPre.js @@ -23,5 +23,6 @@ export default { bzyy:'备注原因', jcgj:'稽查轨迹', cjjl:'创建记录', + xjbd:'新建表单', ts:'是否确定用该预填模板进行实际填报?', } diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue index 248aeb2..0239c18 100644 --- a/src/views/business/comps/common/JcgjList.vue +++ b/src/views/business/comps/common/JcgjList.vue @@ -84,14 +84,14 @@ export default { item.jcnrList = [] } // 稽查名称颜色:1:蓝色;3:红色;5:绿色;7:橙色 - if (item.jcgjlx == 1) { + if (item.jcmcys == 1) { item.color = '#409EFF' } - else if (item.jcgjlx == 3) { + else if (item.jcmcys == 3) { item.color = '#F56C6C' - } else if (item.jcgjlx == 5) { + } else if (item.jcmcys == 5) { item.color = '#67C23A' - } else if (item.jcgjlx == 7) { + } else if (item.jcmcys == 7) { item.color = '#E6A23C' } tmp.push(item) diff --git a/src/views/business/study/comp/enter.vue b/src/views/business/study/comp/enter.vue index 7e03000..22e5a9f 100644 --- a/src/views/business/study/comp/enter.vue +++ b/src/views/business/study/comp/enter.vue @@ -11,6 +11,7 @@
+
@@ -19,10 +20,11 @@ + diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue new file mode 100644 index 0000000..7a6de34 --- /dev/null +++ b/src/views/business/study/comp/syxx.vue @@ -0,0 +1,163 @@ + + + + diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue index 7e2a19c..361e55b 100644 --- a/src/views/business/study/comp/ytbdList.vue +++ b/src/views/business/study/comp/ytbdList.vue @@ -50,8 +50,9 @@
- {{ - $t('page.business.form.xzytbd') }} + {{ + $t('page.business.form.xzytbd') }} @@ -112,6 +113,19 @@ + + + + + 创建新表单 + + + 复制已有表单 + + + +
@@ -156,6 +170,7 @@ export default { components: { Bj, Xq, Sh, SelectDeptUser }, data() { return { + open: false, leader: null, showAudit: false, showEdit: false, @@ -182,6 +197,12 @@ export default { }, created() { }, methods: { + copy(){ + alert('todo') + }, + showAdd() { + this.open = true + }, userChange(val) { this.searchForm.userId = val.id this.searchForm.userMc = val.name @@ -211,6 +232,7 @@ export default { }) }, add() { + this.open = false this.showEdit = true this.$emit('showDetail', this.showEdit) this.$refs.Bj.edit({ studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })