diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js index 293b126..a300ec0 100644 --- a/src/api/business/public/public.js +++ b/src/api/business/public/public.js @@ -59,3 +59,11 @@ export function public_sjList(query) { params: query }) } +// 试验列表 +export function public_studyList(query) { + return request({ + url: '/system/business/public/studyList', + method: 'get', + params: query + }) +} diff --git a/src/views/business/comps/template/comps/gy/MJYLQSQD.vue b/src/views/business/comps/template/comps/gy/MJYLQSQD.vue index 1c30a39..71ce077 100644 --- a/src/views/business/comps/template/comps/gy/MJYLQSQD.vue +++ b/src/views/business/comps/template/comps/gy/MJYLQSQD.vue @@ -176,6 +176,9 @@ export default { }, data() { return { + syId:null, + depId:null, + sdId:null, public_studyList:public_studyList, searchForm: { name: { @@ -220,6 +223,9 @@ export default { syNo: currentRow.sn, SD: currentRow.leaderName, }); + // this.syId='' todo + // this.depId='' + // this.sdId='' console.log(currentRow,"currentRow") this.$refs.selectReagentDialogRef.onCancel() }, @@ -233,7 +239,11 @@ export default { return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]) }, async getFormData() { - return await this.validFormFields(["baseInfoRef","remarkRef"]); + let content = await this.validFormFields(["baseInfoRef","remarkRef"]); + content.syId=this.syId + content.depId=this.depId + content.sdId=this.sdId + return content; }, async onSave() { const formData = await this.getFormData(); diff --git a/src/views/business/study/comp/sqbd/Xq.vue b/src/views/business/study/comp/sqbd/Xq.vue index d000481..7dc3b08 100644 --- a/src/views/business/study/comp/sqbd/Xq.vue +++ b/src/views/business/study/comp/sqbd/Xq.vue @@ -126,7 +126,7 @@ export default { open: false, formApprove: { id: null, - qmyy: $t('page.business.study.studyFormApply.cjjl'), + qmyy: this.$t('page.business.study.studyFormApply.cjjl'), remark: '', qmrmm: '', }, diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue index ae8debb..7e5a7fd 100644 --- a/src/views/business/study/comp/ytbd/Xq.vue +++ b/src/views/business/study/comp/ytbd/Xq.vue @@ -56,7 +56,7 @@ append-to-body :close-on-click-modal="false">
- +