Browse Source

fix:[试验管理][计划表单]

master
15881625488@163.com 4 days ago
parent
commit
cb94a33bb6
5 changed files with 29 additions and 14 deletions
  1. +5
    -5
      src/lang/en/business/resource/gyzj.js
  2. +5
    -5
      src/lang/en/business/resource/mjy.js
  3. +1
    -0
      src/lang/en/business/study/studyFormPlan.js
  4. +1
    -0
      src/lang/zh/business/study/studyFormPlan.js
  5. +17
    -4
      src/views/business/study/comp/jhbd/Bj.vue

+ 5
- 5
src/lang/en/business/resource/gyzj.js View File

@ -25,8 +25,8 @@ export default {
kgy2:'Warehouse Keeper 2', kgy2:'Warehouse Keeper 2',
plff:'批量发放', plff:'批量发放',
plczyj:'批量处置药剂',
plczrq:'批量处置容器',
plczyj:'Batch Dispose Substance',
plczrq:'Batch Dispose Containers',
plsd:'Batch Lock', plsd:'Batch Lock',
plgd:'Batch Archive', plgd:'Batch Archive',
lock:'Lock', lock:'Lock',
@ -38,14 +38,14 @@ export default {
guihuan:'Return', guihuan:'Return',
fafang:'发放', fafang:'发放',
ysff:'Issue Key', ysff:'Issue Key',
czrq:'处置容器',
czyj:'处置药剂',
czrq:'Dispose Container',
czyj:'Dispose Substance',
yuanyin:'Reason', yuanyin:'Reason',
xgkc:'Change Inventory', xgkc:'Change Inventory',
shxgkc:'Approve Inventory Change', shxgkc:'Approve Inventory Change',
shbj:'Approve Edit', shbj:'Approve Edit',
clr:'Operator', clr:'Operator',
czfs:'处置方式',
czfs:'Dispose Method',
fhr:'Reviewer', fhr:'Reviewer',
xgbz:'修改备注', xgbz:'修改备注',
jdr:'Supervisor', jdr:'Supervisor',

+ 5
- 5
src/lang/en/business/resource/mjy.js View File

@ -24,8 +24,8 @@ export default {
kgy2:'Warehouse Keeper 2', kgy2:'Warehouse Keeper 2',
plff:'批量发放', plff:'批量发放',
plczyj:'批量处置药剂',
plczrq:'批量处置容器',
plczyj:'Batch Dispose Substance',
plczrq:'Batch Dispose Containers',
plsd:'Batch Lock', plsd:'Batch Lock',
plgd:'Batch Archive', plgd:'Batch Archive',
lock:'Lock', lock:'Lock',
@ -37,14 +37,14 @@ export default {
guihuan:'Return', guihuan:'Return',
fafang:'发放', fafang:'发放',
ysff:'Issue Key', ysff:'Issue Key',
czrq:'处置容器',
czyj:'处置药剂',
czrq:'Dispose Container',
czyj:'Dispose Substance',
yuanyin:'Reason', yuanyin:'Reason',
xgkc:'Change Inventory', xgkc:'Change Inventory',
shxgkc:'Approve Inventory Change', shxgkc:'Approve Inventory Change',
shbj:'Approve Edit', shbj:'Approve Edit',
clr:'Operator', clr:'Operator',
czfs:'处置方式',
czfs:'Dispose Method',
fhr:'Reviewer', fhr:'Reviewer',
xgbz:'修改备注', xgbz:'修改备注',
jdr:'Supervisor', jdr:'Supervisor',

+ 1
- 0
src/lang/en/business/study/studyFormPlan.js View File

@ -23,6 +23,7 @@ export default {
xzpzjhb:'新增配置计划表', xzpzjhb:'新增配置计划表',
yes:'Yes', yes:'Yes',
no:'No', no:'No',
shryId:'复核人员',
tjjl: '提交记录', tjjl: '提交记录',
dcqbjcgj: '导出(全部稽查轨迹)', dcqbjcgj: '导出(全部稽查轨迹)',
dclcjcgj: '导出(流程稽查轨迹)', dclcjcgj: '导出(流程稽查轨迹)',

+ 1
- 0
src/lang/zh/business/study/studyFormPlan.js View File

@ -22,6 +22,7 @@ export default {
cjjl: '创建记录', cjjl: '创建记录',
xzpzjhb:'新增配置计划表', xzpzjhb:'新增配置计划表',
yes: '是', yes: '是',
shryId:'复核人员',
no: '否', no: '否',
tjjl: '提交记录', tjjl: '提交记录',
dcqbjcgj: '导出(全部稽查轨迹)', dcqbjcgj: '导出(全部稽查轨迹)',

+ 17
- 4
src/views/business/study/comp/jhbd/Bj.vue View File

@ -29,7 +29,7 @@
</template> </template>
<template v-else> <template v-else>
<el-button @click="saveNext">{{ $t('page.business.study.studyFormPlan.save') }}</el-button> <el-button @click="saveNext">{{ $t('page.business.study.studyFormPlan.save') }}</el-button>
<el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormPlan.submit')
<el-button type="primary" @click="showtijiao">{{ $t('page.business.study.studyFormPlan.submit')
}}</el-button> }}</el-button>
<el-button type="primary" @click="pre">{{ $t('page.business.study.studyFormPlan.pre') }}</el-button> <el-button type="primary" @click="pre">{{ $t('page.business.study.studyFormPlan.pre') }}</el-button>
</template> </template>
@ -71,9 +71,16 @@
</div> </div>
<el-dialog :title="$t('page.business.study.studyFormApply.tjjl')" :visible.sync="openSubmit" width="500px"
<el-dialog :title="$t('page.business.study.studyFormPlan.tjjl')" :visible.sync="openSubmit" width="500px"
append-to-body :close-on-click-modal="false"> append-to-body :close-on-click-modal="false">
<el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px"> <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('page.business.study.studyFormPlan.shryId')" prop="fshryId">
<SelectDeptUser v-model="form.fshryId" :name="form.fhryMc" key="shryId" @change="selectDeptUserChange" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('form.qmyy')" prop="qmyy"> <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@ -209,16 +216,16 @@ export default {
this.resetForm("form") this.resetForm("form")
}, },
selectDeptUserChange(val) { selectDeptUserChange(val) {
this.form.shryMc = val.name
this.form.fhryMc = val.name
}, },
edit(row) { edit(row) {
this.reset() this.reset()
this.form.qmyy = '制作提交预制表单'
if (row && row.id) { if (row && row.id) {
this.showIndex = 2 this.showIndex = 2
this.$modal.loading() this.$modal.loading()
studyFormPlan_info({ id: row.id }).then(response => { studyFormPlan_info({ id: row.id }).then(response => {
this.form = response.data this.form = response.data
this.form.qmyy = '制作提交预制表单'
this.open = true this.open = true
this.$modal.closeLoading() 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() { async dotj() {
let content = await this.$refs.templateTable.getFormData() let content = await this.$refs.templateTable.getFormData()
this.form.bdnr = JSON.stringify(content) this.form.bdnr = JSON.stringify(content)

Loading…
Cancel
Save