eln_TD
/
eln_web
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix：[资源库管理][给药制剂归还]

master
15881625488@163.com 3 days ago
parent
efd18e65b4
commit
81df916994
8 changed files with 138 additions and 232 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +8
    -0
      src/api/business/gyzj/gyzj.js
  2. +14
    -13
      src/lang/en/business/resource/gyzj.js
  3. +11
    -12
      src/lang/zh/business/resource/gyzj.js
  4. +18
    -25
      src/views/business/resource/gyzj/comps/ffjl/Xq.vue
  5. +10
    -8
      src/views/business/resource/gyzj/comps/ffjlList.vue
  6. +23
    -52
      src/views/business/resource/gyzj/comps/gyzj/Gh.vue
  7. +30
    -97
      src/views/business/resource/gyzj/comps/gyzj/SqGh.vue
  8. +24
    -25
      src/views/business/study/comp/wzlb/gyzjList.vue

+ 8
- 0
src/api/business/gyzj/gyzj.js View File

@ -41,6 +41,14 @@ export function gh(data) {
data: data data: data
}) })
} }
//归还
export function sqgh(data) {
return request({
url: '/system/business/gyzj/sqgh',
method: 'post',
data: data
})
}
// 编辑 // 编辑
export function bj(data) { export function bj(data) {
return request({ return request({

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

@ -16,12 +16,12 @@ export default {
ccwz:'Storage Location', ccwz:'Storage Location',
cksj:'Out of Storage Date', cksj:'Out of Storage Date',
rksj:'Into Storage Date', rksj:'Into Storage Date',
ckjz:'出库净重',
rkjz:'入库净重',
ckjz:'出库量',
rkjz:'入库量',
syl:'Usage Amount', syl:'Usage Amount',
lqr1:'Recipient 1',
lqr1:'Recipient',
lqr2:'Recipient 2', lqr2:'Recipient 2',
kgy1:'Warehouse Keeper 1',
kgy1:'Warehouse Keeper',
kgy2:'Warehouse Keeper 2', kgy2:'Warehouse Keeper 2',
plff:'批量发放', plff:'批量发放',
@ -52,17 +52,16 @@ export default {
xgr:'Editor', xgr:'Editor',
czl:'Amount', czl:'Amount',
ffr:'Issuer', ffr:'Issuer',
ffr1:'Issuer 1',
ffr1:'Issuer',
ffr2:'Issuer 2', ffr2:'Issuer 2',
zytj:'Transfer Condition', zytj:'Transfer Condition',
md:'Purpose', md:'Purpose',
ckmz:'出库净重',
ckl:'Amount out', ckl:'Amount out',
ckldw:'出库单位', ckldw:'出库单位',
ffzytj:'发放转移条件', ffzytj:'发放转移条件',
ghzytj:'归还转移条件', ghzytj:'归还转移条件',
ckmz:'出库净重',
ckmzdw:'出库净重单位',
ckmz:'出库毛重',
ckmzdw:'出库毛重单位',
ys1lrq:'Key 1 User', ys1lrq:'Key 1 User',
ys2lrq:'Key 2 User', ys2lrq:'Key 2 User',
sssy:'In Study', sssy:'In Study',
@ -86,21 +85,23 @@ export default {
rkwz:'入库位置', rkwz:'入库位置',
rktj:'入库条件', rktj:'入库条件',
zytj:'转移条件', zytj:'转移条件',
rkmz:'入库净重',
rkmz:'入库净量',
jsl:'减少量', jsl:'减少量',
syl:'Usage Amount', syl:'Usage Amount',
ghr1Id:'Returner 1',
ghr1Id:'Returner',
ghr2Id:'Returner 2', ghr2Id:'Returner 2',
jsr1Id:'Warehouse Keeper 1',
jsr1Id:'Warehouse Keeper',
jsr2Id:'Warehouse Keeper 2', jsr2Id:'Warehouse Keeper 2',
tz:'台账', tz:'台账',
lqsj:'领取时间',
gdsqrId:'归档申请人',
lqsj:'领取时间',
jcgj:'Track Record', jcgj:'Track Record',
ffbz:'发放备注', ffbz:'发放备注',
ghbz:'归还备注', ghbz:'归还备注',
cjsj:'Creation Date', cjsj:'Creation Date',
rkl:'入库净重',
rkl:'入库量',
jysj:'Checkout Period', jysj:'Checkout Period',
ffjlxq:'In-and-Out Record Detail', ffjlxq:'In-and-Out Record Detail',
gyzjxq:'Dose Formulation Detail', gyzjxq:'Dose Formulation Detail',
sqguihuan:'Return'
} }

+ 11
- 12
src/lang/zh/business/resource/gyzj.js View File

@ -15,12 +15,12 @@ export default {
ccwz:'存储位置', ccwz:'存储位置',
cksj:'出库时间', cksj:'出库时间',
rksj:'入库时间', rksj:'入库时间',
ckjz:'出库净重',
rkjz:'入库净重',
ckjz:'出库量',
rkjz:'入库量',
syl:'使用量', syl:'使用量',
lqr1:'领取人1',
lqr1:'领取人',
lqr2:'领取人2', lqr2:'领取人2',
kgy1:'库管员1',
kgy1:'库管员',
kgy2:'库管员2', kgy2:'库管员2',
plff:'批量发放', plff:'批量发放',
@ -52,17 +52,14 @@ export default {
xgr:'修改人', xgr:'修改人',
czl:'处置量', czl:'处置量',
ffr:'发放人', ffr:'发放人',
ffr1:'发放人1',
ffr1:'发放人',
ffr2:'发放人2', ffr2:'发放人2',
zytj:'转移条件', zytj:'转移条件',
md:'目的', md:'目的',
ckmz:'出库净重',
ckl:'出库量', ckl:'出库量',
ckldw:'出库单位', ckldw:'出库单位',
ffzytj:'发放转移条件', ffzytj:'发放转移条件',
ghzytj:'归还转移条件', ghzytj:'归还转移条件',
ckmz:'出库净重',
ckmzdw:'出库净重单位',
ys1lrq:'钥匙1领取人', ys1lrq:'钥匙1领取人',
ys2lrq:'钥匙2领取人', ys2lrq:'钥匙2领取人',
sssy:'所属试验', sssy:'所属试验',
@ -86,21 +83,23 @@ export default {
rkwz:'入库位置', rkwz:'入库位置',
rktj:'入库条件', rktj:'入库条件',
zytj:'转移条件', zytj:'转移条件',
rkmz:'入库净重',
rkmz:'入库净量',
jsl:'减少量', jsl:'减少量',
syl:'使用量', syl:'使用量',
ghr1Id:'归还人1',
ghr1Id:'归还人',
ghr2Id:'归还人2', ghr2Id:'归还人2',
jsr1Id:'库管员1',
jsr1Id:'库管员',
jsr2Id:'库管员2', jsr2Id:'库管员2',
tz:'台账', tz:'台账',
gdsqrId:'归档申请人',
lqsj:'领取时间', lqsj:'领取时间',
jcgj:'稽查轨迹', jcgj:'稽查轨迹',
ffbz:'发放备注', ffbz:'发放备注',
ghbz:'归还备注', ghbz:'归还备注',
cjsj:'创建时间', cjsj:'创建时间',
rkl:'入库净重',
rkl:'入库量',
jysj:'借阅时间', jysj:'借阅时间',
ffjlxq:'发放回收记录详情', ffjlxq:'发放回收记录详情',
gyzjxq:'给药制剂详情', gyzjxq:'给药制剂详情',
sqguihuan:'归还'
} }

+ 18
- 25
src/views/business/resource/gyzj/comps/ffjl/Xq.vue View File

@ -60,18 +60,16 @@
</el-input> </el-input>
</div> </div>
<div class="right"> <div class="right">
<div class="right-title">{{ $t('page.business.resource.gyzj.ckmz') }}</div>
<el-input type="text" :value="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
<div class="right-title">{{ $t('page.business.resource.gyzj.lqsj') }}</div>
<el-input type="text" :value="form.ffrq" maxlength="50" disabled> <template slot="append">{{ form.ckldw
}}</template> }}</template>
</el-input> </el-input>
</div> </div>
</div> </div>
<div class="pal"> <div class="pal">
<div class="left"> <div class="left">
<div class="left-title">{{ $t('page.business.resource.gyzj.lqsj') }}</div>
<el-input type="text" :value="form.ffrq" maxlength="50" disabled> <template slot="append">{{ form.ckldw
}}</template>
</el-input>
<div class="left-title">{{ $t('page.business.resource.gyzj.ffzytj') }}</div>
<el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
</div> </div>
<div class="right"> <div class="right">
<div class="right-title">{{ $t('page.business.resource.gyzj.md') }}</div> <div class="right-title">{{ $t('page.business.resource.gyzj.md') }}</div>
@ -81,40 +79,35 @@
</div> </div>
<div class="pal"> <div class="pal">
<div class="left"> <div class="left">
<div class="left-title">{{ $t('page.business.resource.gyzj.ffzytj') }}</div>
<el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
<div class="left-title">{{ $t('page.business.resource.gyzj.lqr1') }}</div>
<el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
</div> </div>
<div class="right"> <div class="right">
<div class="right-title">{{ $t('page.business.resource.gyzj.lqr1') }}</div>
<el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
<div class="right-title">{{ $t('page.business.resource.gyzj.lqr2') }}</div>
<el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
</div> </div>
</div> </div>
<div class="pal"> <div class="pal">
<div class="left"> <div class="left">
<div class="left-title">{{ $t('page.business.resource.gyzj.lqr2') }}</div>
<el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
<div class="left-title">{{ $t('page.business.resource.gyzj.ghr1Id') }}</div>
<el-input type="text" :value="form.ghr1Mc" maxlength="50" disabled />
</div> </div>
<div class="right"> <div class="right">
<div class="right-title">{{ $t('page.business.resource.gyzj.ghr1Id') }}</div>
<el-input type="text" :value="form.ghr1Mc" maxlength="50" disabled />
<div class="right-title">{{ $t('page.business.resource.gyzj.ghr2Id') }}</div>
<el-input type="text" :value="form.ghr2Mc" maxlength="50" disabled />
</div> </div>
</div> </div>
<div class="pal"> <div class="pal">
<div class="left"> <div class="left">
<div class="left-title">{{ $t('page.business.resource.gyzj.ghr2Id') }}</div>
<el-input type="text" :value="form.ghr2Mc" maxlength="50" disabled />
</div>
<div class="right">
<div class="right-title">{{ $t('page.business.resource.gyzj.ghzytj') }}</div>
<div class="left-title">{{ $t('page.business.resource.gyzj.ghzytj') }}</div>
<el-input type="text" :value="form.ghzytj" maxlength="50" disabled /> <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
</div> </div>
</div>
<div class="pal">
<div class="left">
<div class="left-title">{{ $t('page.business.resource.gyzj.rkmz') }}</div>
<div class="right">
<div class="right-title">{{ $t('page.business.resource.gyzj.rkl') }}</div>
<el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw <el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw
}}</template> }}</template>
</el-input> </el-input>
</div> </div>
</div> </div>
<div class="pal"> <div class="pal">
@ -130,8 +123,8 @@
<div class="pal"> <div class="pal">
<div class="left"> <div class="left">
<div class="left-title">{{ $t('page.business.resource.gyzj.ghbz') }}</div>
<el-input type="text" :value="form.ghbz" maxlength="50" disabled />
<div class="left-title">{{ $t('page.business.resource.gyzj.gdsqrId') }}</div>
<el-input type="text" :value="form.gdsqrMc" maxlength="50" disabled />
</div> </div>
<div class="right"> <div class="right">
<div class="right-title">{{ $t('page.business.resource.gyzj.cjsj') }}</div> <div class="right-title">{{ $t('page.business.resource.gyzj.cjsj') }}</div>

+ 10
- 8
src/views/business/resource/gyzj/comps/ffjlList.vue View File

@ -87,10 +87,11 @@
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" fixed="left" width="55" align="center" :selectable="checkSelectable" /> <el-table-column type="selection" fixed="left" width="55" align="center" :selectable="checkSelectable" />
<el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
:show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh" <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
:show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="150px"> <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.mdOther && scope.row.mdOther != ''&&scope.row.mdMcs && scope.row.mdMcs != ''">{{ scope.row.mdMcs }}{{ scope.row.mdOther }}</span> <span v-if="scope.row.mdOther && scope.row.mdOther != ''&&scope.row.mdMcs && scope.row.mdMcs != ''">{{ scope.row.mdMcs }}{{ scope.row.mdOther }}</span>
@ -101,12 +102,12 @@
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.cksj')" align="center" prop="ffrq" width="150px" /> <el-table-column :label="$t('page.business.resource.gyzj.cksj')" align="center" prop="ffrq" width="150px" />
<el-table-column :label="$t('page.business.resource.gyzj.rksj')" align="center" prop="ghrq" width="150px" /> <el-table-column :label="$t('page.business.resource.gyzj.rksj')" align="center" prop="ghrq" width="150px" />
<el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" width="150px">
<el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.ckmz }} {{ scope.row.ckmzdw }} {{ scope.row.ckmz }} {{ scope.row.ckmzdw }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('page.business.resource.gyzj.rkmz')" align="center" width="150px">
<el-table-column :label="$t('page.business.resource.gyzj.rkl')" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.rkmz }} {{ scope.row.rkmzdw }} {{ scope.row.rkmz }} {{ scope.row.rkmzdw }}
</template> </template>
@ -116,14 +117,15 @@
{{ scope.row.syl }} {{ scope.row.syldw }} {{ scope.row.syl }} {{ scope.row.syldw }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
<el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="jsr1Mc"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"
<el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="jsr2Mc"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="jsr1Mc"
<el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="jsr2Mc"
<el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.zcg')" align="center" prop="zcgMc" <el-table-column :label="$t('page.business.resource.gyzj.zcg')" align="center" prop="zcgMc"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.jlzt')" align="center" width="100px" fixed="right"> <el-table-column :label="$t('page.business.resource.gyzj.jlzt')" align="center" width="100px" fixed="right">

+ 23
- 52
src/views/business/resource/gyzj/comps/gyzj/Gh.vue View File

@ -4,6 +4,18 @@
<el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :visible.sync="open" width="800px" append-to-body <el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :visible.sync="open" width="800px" append-to-body
:close-on-click-modal="false"> :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.mc')">
<el-input type="text" v-model="form.mc" maxlength="50" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.bh')">
<el-input type="text" v-model="form.bh" maxlength="50" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.sxrq')"> <el-form-item :label="$t('page.business.resource.gyzj.sxrq')">
@ -32,14 +44,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ckjz')">
<el-form-item :label="$t('page.business.resource.gyzj.ckl')">
<el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
}}</template> }}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.cksj')">
<el-form-item :label="$t('page.business.resource.gyzj.lqsj')">
<el-input type="text" v-model="form.ffrq" maxlength="50" disabled /> <el-input type="text" v-model="form.ffrq" maxlength="50" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -47,15 +59,13 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ckmz')">
<el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
}}</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.md')"> <el-form-item :label="$t('page.business.resource.gyzj.md')">
<el-input type="text" :value="(form.mdOthers&&form.mdOthers!='')?(form.mdMcs+','+form.mdMcs):form.mdMcs" maxlength="50" disabled /> <el-input type="text" :value="(form.mdOthers&&form.mdOthers!='')?(form.mdMcs+','+form.mdMcs):form.mdMcs" maxlength="50" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
<el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -73,30 +83,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
<el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.rkmz')" prop="rkmz">
<el-input type="number" v-model="form.rkmz" maxlength="50" :placeholder="$t('form.placeholderInput')">
<template slot="append">{{ form.ckldw }}</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.jsl')" prop="jsl">
<el-input type="number" v-model="form.jsl" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')">
<template slot="append">{{ form.ckldw }}</template>
</el-input>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.syl')" prop="syl">
<el-input type="number" v-model="form.syl" maxlength="50" :placeholder="$t('form.placeholderInput')">
<el-form-item :label="$t('page.business.resource.gyzj.rkmz')" prop="rkl">
<el-input type="number" v-model="form.rkl" maxlength="50" :placeholder="$t('form.placeholderInput')">
<template slot="append">{{ form.ckldw }}</template> <template slot="append">{{ form.ckldw }}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -216,7 +204,7 @@ export default {
message: ' ', message: ' ',
trigger: 'blur' trigger: 'blur'
}], }],
rkmz: [{
rkl: [{
required: true, required: true,
message: ' ', message: ' ',
trigger: 'blur' trigger: 'blur'
@ -317,24 +305,7 @@ export default {
this.reset() this.reset()
let that = this let that = this
info({ id: row.id }).then(response => { info({ id: row.id }).then(response => {
that.form.id = response.data.id
that.form.mc = response.data.mc
that.form.bh = response.data.bh
that.form.sxrq = response.data.sxrq
that.form.nd = response.data.nd
that.form.nddw = response.data.nddw
that.form.cctj = response.data.cctj
that.form.ccwz = response.data.ccwz
that.form.ckl = response.data.ckl
that.form.ckldw = response.data.ckldw
that.form.ffrq = response.data.ffrq
that.form.ckmz = response.data.ckmz
that.form.ckmzdw = response.data.ckldw
that.form.mdIds = response.data.mdIds
that.form.ghr1Mc = response.data.ghr1Mc
that.form.ghr2Mc = response.data.ghr2Mc
that.form.ghr1Id = response.data.ghr1Id
that.form.ghr2Id = response.data.ghr2Id
that.form = _.merge({},this.form,response.data)
that.open = true that.open = true
}) })
}, },

+ 30
- 97
src/views/business/resource/gyzj/comps/gyzj/SqGh.vue View File

@ -1,11 +1,23 @@
<template> <template>
<div> <div>
<!-- 归还弹窗 --> <!-- 归还弹窗 -->
<el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :visible.sync="open" width="800px" append-to-body
<el-dialog :title="$t('page.business.resource.gyzj.sqguihuan')" :visible.sync="open" width="800px" append-to-body
:close-on-click-modal="false"> :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.mc')">
<el-input type="text" v-model="form.mc" maxlength="50" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.bh')">
<el-input type="text" v-model="form.bh" maxlength="50" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.sxrq')"> <el-form-item :label="$t('page.business.resource.gyzj.sxrq')">
<el-input type="text" v-model="form.sxrq" maxlength="50" disabled /> <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
</el-form-item> </el-form-item>
@ -13,7 +25,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.nd')"> <el-form-item :label="$t('page.business.resource.gyzj.nd')">
<el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
}}</template>
}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -34,7 +46,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ckjz')"> <el-form-item :label="$t('page.business.resource.gyzj.ckjz')">
<el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
}}</template>
}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -47,15 +59,15 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ckmz')">
<el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
}}</template>
</el-input>
<el-form-item :label="$t('page.business.resource.gyzj.md')">
<el-input type="text" :value="(form.mdOthers && form.mdOthers != '') ? (form.mdMcs + ',' + form.mdMcs) : form.mdMcs"
maxlength="50" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.md')">
<el-input type="text" :value="(form.mdOthers&&form.mdOthers!='')?(form.mdMcs+','+form.mdMcs):form.mdMcs" maxlength="50" disabled />
<el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
<el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -72,37 +84,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
<el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.rkmz')" prop="rkmz">
<el-input type="number" v-model="form.rkmz" maxlength="50" :placeholder="$t('form.placeholderInput')">
<template slot="append">{{ form.ckldw }}</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.jsl')" prop="jsl">
<el-input type="number" v-model="form.jsl" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')">
<template slot="append">{{ form.ckldw }}</template>
</el-input>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.syl')" prop="syl">
<el-input type="number" v-model="form.syl" maxlength="50" :placeholder="$t('form.placeholderInput')">
<template slot="append">{{ form.ckldw }}</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('form.remark')" prop="remark"> <el-form-item :label="$t('form.remark')" prop="remark">
<el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500" <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
@ -111,59 +92,28 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')"> <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')">
<el-input type="text" v-model="form.ghr1Mc" maxlength="50" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')">
<el-input type="text" v-model="form.ghr2Mc" maxlength="50" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')+$t('form.password')" prop="ghr1mm">
<el-input type="password" v-model="form.ghr1mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')+$t('form.password')" prop="ghr2mm">
<el-input type="password" v-model="form.ghr2mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col> -->
</el-row>
<el-row>
<!-- <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')" prop="jsr1Id">
<SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')">
<el-input type="text" v-model="nickName" maxlength="50" disabled /> <el-input type="text" v-model="nickName" maxlength="50" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.jsr1Id') + $t('form.password')" prop="jsr1mm">
<el-input type="password" v-model="form.jsr1mm" maxlength="20"
<el-form-item :label="$t('page.business.resource.gyzj.ghr1Id') + $t('form.password')" prop="ghr1mm">
<el-input type="password" v-model="form.ghr1mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" /> :placeholder="$t('form.placeholderInput')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.jsr2Id')" prop="jsr2Id">
<SelectDeptUser v-model="form.jsr2Id" key="jsr2Id" />
<el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')" prop="ghr2Id">
<SelectDeptUser v-model="form.ghr2Id" key="ghr2Id" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.jsr2Id') + $t('form.password')" prop="jsr2mm">
<el-input type="password" v-model="form.jsr2mm" maxlength="20"
<el-form-item :label="$t('page.business.resource.gyzj.ghr2Id') + $t('form.password')" prop="ghr2mm">
<el-input type="password" v-model="form.ghr2mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" /> :placeholder="$t('form.placeholderInput')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -186,7 +136,7 @@
</template> </template>
<script> <script>
import { gh, info } from "@/api/business/gyzj/gyzj"
import { sqgh, info } from "@/api/business/gyzj/gyzj"
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
@ -317,24 +267,7 @@ export default {
this.reset() this.reset()
let that = this let that = this
info({ id: row.id }).then(response => { info({ id: row.id }).then(response => {
that.form.id = response.data.id
that.form.mc = response.data.mc
that.form.bh = response.data.bh
that.form.sxrq = response.data.sxrq
that.form.nd = response.data.nd
that.form.nddw = response.data.nddw
that.form.cctj = response.data.cctj
that.form.ccwz = response.data.ccwz
that.form.ckl = response.data.ckl
that.form.ckldw = response.data.ckldw
that.form.ffrq = response.data.ffrq
that.form.ckmz = response.data.ckmz
that.form.ckmzdw = response.data.ckldw
that.form.mdIds = response.data.mdIds
that.form.ghr1Mc = response.data.ghr1Mc
that.form.ghr2Mc = response.data.ghr2Mc
that.form.ghr1Id = response.data.ghr1Id
that.form.ghr2Id = response.data.ghr2Id
that.form = _.merge({}, this.form, response.data)
that.open = true that.open = true
}) })
}, },
@ -342,7 +275,7 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.$modal.loading() this.$modal.loading()
gh(this.form).then(response => {
sqgh(this.form).then(response => {
this.open = false this.open = false
this.$emit('callback') this.$emit('callback')
this.$modal.closeLoading() this.$modal.closeLoading()

+ 24
- 25
src/views/business/study/comp/wzlb/gyzjList.vue View File

@ -1,5 +1,5 @@
<template> <template>
<div >
<div>
<!-- 列表 --> <!-- 列表 -->
<div> <div>
<div class="gyzj" v-show="!showDetail"> <div class="gyzj" v-show="!showDetail">
@ -39,7 +39,7 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="list" >
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc" <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh" <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
@ -68,28 +68,27 @@
<el-table-column :label="$t('form.operate')" fixed="right" align="center" <el-table-column :label="$t('form.operate')" fixed="right" align="center"
class-name="small-padding fixed-width" width="250px"> class-name="small-padding fixed-width" width="250px">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
<!-- 详情 -->
<el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:gyzj:xq']">{{
<!-- 详情 -->
<el-button type="text" @click="handleXq(scope.row)"
v-hasPermi="['business:studyGyzj:xq', 'business:nonTrialGyzj:xq', 'business:drugGyzj:xq']">{{
$t('page.business.resource.gyzj.detail') }}</el-button> $t('page.business.resource.gyzj.detail') }}</el-button>
</template>
<template v-if="scope.row.zjzt == 1">
<template v-if="scope.row.zjzt == 3">
<!-- 处置药剂 --> <!-- 处置药剂 -->
<el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:gyzj:czyj']">{{
$t('page.business.resource.gyzj.czyj') }}</el-button>
<el-button type="text" @click="handleCzyj(scope.row)"
v-hasPermi="['business:studyGyzj:czyj', 'business:nonTrialGyzj:czyj', 'business:drugGyzj:czyj']">{{
$t('page.business.resource.gyzj.czyj') }}</el-button>
<!-- 编辑 --> <!-- 编辑 -->
<el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)" <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
v-hasPermi="['business:resource:gyzj:bj']">{{
v-hasPermi="['business:studyGyzj:bj', 'business:nonTrialGyzj:bj', 'business:drugGyzj:bj']">{{
$t('form.edit') }}</el-button> $t('form.edit') }}</el-button>
<!-- 修改库存 --> <!-- 修改库存 -->
<el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)" <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
v-hasPermi="['business:resource:gyzj:xgkc']">{{
v-hasPermi="['business:studyGyzj:xgkc', 'business:nonTrialGyzj:xgkc', 'business:drugGyzj:xgkc']">{{
$t('page.business.resource.gyzj.xgkc') }}</el-button> $t('page.business.resource.gyzj.xgkc') }}</el-button>
<template v-if="scope.row.zjzt == 3&&scope.row.ghzt == 3">
<!-- 归还 --> <!-- 归还 -->
<el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:gyzj:gh']">{{
$t('page.business.resource.gyzj.guihuan') }}</el-button>
</template>
<el-button type="text" v-if="scope.row.ghzt == 1" @click="handleGh(scope.row)"
v-hasPermi="['business:studyGyzj:gh', 'business:nonTrialGyzj:gh', 'business:drugGyzj:gh']">{{
$t('page.business.resource.gyzj.guihuan') }}</el-button>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
@ -103,7 +102,7 @@
<!-- 修改库存 --> <!-- 修改库存 -->
<Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" /> <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
<!-- 归还 --> <!-- 归还 -->
<Gh key="Gh" ref="Gh" @callback="handleQuery" />
<Sqgh key="Sqgh" ref="Sqgh" @callback="handleQuery" />
<!-- 处置药剂 --> <!-- 处置药剂 -->
<Czyj key="Czyj" ref="Czyj" @callback="handleQuery" /> <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
<!-- 详情 --> <!-- 详情 -->
@ -117,20 +116,20 @@ import { studyList } from "@/api/business/gyzj/gyzj"
import Xq from "@/views/business/resource/gyzj/comps/gyzj/Xq"; import Xq from "@/views/business/resource/gyzj/comps/gyzj/Xq";
import Bj from "@/views/business/resource/gyzj/comps/gyzj/Bj"; import Bj from "@/views/business/resource/gyzj/comps/gyzj/Bj";
import Xgkc from "@/views/business/resource/gyzj/comps/gyzj/Xgkc"; import Xgkc from "@/views/business/resource/gyzj/comps/gyzj/Xgkc";
import Gh from "@/views/business/resource/gyzj/comps/gyzj/Gh";
import Sqgh from "@/views/business/resource/gyzj/comps/gyzj/Sqgh";
import Czyj from "@/views/business/resource/gyzj/comps/gyzj/Czyj"; import Czyj from "@/views/business/resource/gyzj/comps/gyzj/Czyj";
import moment from "moment"; import moment from "moment";
export default { export default {
name: "GyzjList", name: "GyzjList",
components: { Xq, Bj, Xgkc, Gh, Czyj },
components: { Xq, Bj, Xgkc, Sqgh, Czyj },
data() { data() {
return { return {
daterange: [], daterange: [],
loading: true, loading: true,
single: true, single: true,
multiple: true, multiple: true,
showDetail:false,
showDetail: false,
total: 0, total: 0,
list: [], list: [],
//勾选列表 //勾选列表
@ -184,17 +183,17 @@ export default {
}, },
//归还 //归还
handleGh(row) { handleGh(row) {
this.$refs.Gh.show(row)
this.$refs.Sqgh.show(row)
}, },
closeXq(){
this.showDetail=false
closeXq() {
this.showDetail = false
this.handleQuery() this.handleQuery()
this.$emit('showDetail',this.showDetail)
this.$emit('showDetail', this.showDetail)
}, },
//详情 //详情
handleXq(row) { handleXq(row) {
this.showDetail=true
this.$emit('showDetail',this.showDetail)
this.showDetail = true
this.$emit('showDetail', this.showDetail)
this.$refs.Xq.show(row) this.$refs.Xq.show(row)
}, },
//获取列表 //获取列表

Write Preview
Loading…
Cancel
Save