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

Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

luojie
luojie 3 weeks ago
parent
dc3c3efbf0 ca3dae947e
commit
3727255b98
7 changed files with 68 additions and 44 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -0
      src/views/business/comps/select/SelectStudy.vue
  2. +4
    -3
      src/views/business/comps/template/comps/dl/DL006.vue
  3. +4
    -3
      src/views/business/comps/template/comps/dl/DL011.vue
  4. +4
    -3
      src/views/business/comps/template/comps/dl/DL012.vue
  5. +4
    -3
      src/views/business/comps/template/comps/dl/DL022.vue
  6. +49
    -32
      src/views/business/resource/gyzj/comps/gyzj/Ff.vue
  7. +1
    -0
      src/views/business/resource/gyzj/comps/gyzj/SelectList.vue

+ 2
- 0
src/views/business/comps/select/SelectStudy.vue View File

@ -53,6 +53,8 @@ export default {
showStudy() { showStudy() {
if (!this.disabled) { if (!this.disabled) {
this.$refs.selectStudyDialog.show({ needPre: this.needPre }) this.$refs.selectStudyDialog.show({ needPre: this.needPre })
this.$emit('change', _.merge({}, { key: this.selectkey }))
this.$emit('input',null)
} }
}, },
handleChange(obj) { handleChange(obj) {

+ 4
- 3
src/views/business/comps/template/comps/dl/DL006.vue View File

@ -476,6 +476,7 @@ export default {
}, },
getResource() { getResource() {
let content = this.getFilledFormData(); let content = this.getFilledFormData();
let formData = this.formData;
let tmpResource = [] let tmpResource = []
let tmpYq = [] let tmpYq = []
let addYq = [] let addYq = []
@ -548,10 +549,10 @@ export default {
} }
} }
tmpYq.push({ tmpYq.push({
mc: content.pyxbhmc,
xh: content.pyxbhxh,
mc: content.pyxbhmc || formData.pyxbhmc,
xh: content.pyxbhxh || formData.pyxbhxh,
bh: content.pyxbh, bh: content.pyxbh,
jzrq: content.pyxbhjzrq,
jzrq: content.pyxbhjzrq || formData.pyxbhjzrq,
}) })
} }
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()

+ 4
- 3
src/views/business/comps/template/comps/dl/DL011.vue View File

@ -363,6 +363,7 @@ export default {
}, },
getResource() { getResource() {
const content = this.getFilledFormData() const content = this.getFilledFormData()
let formData = this.formData;
let tmpResource = [] let tmpResource = []
let tmpYq = [] let tmpYq = []
//生成细胞 //生成细胞
@ -405,10 +406,10 @@ export default {
}) })
//使用仪器 //使用仪器
tmpYq.push({ tmpYq.push({
mc: content.pyxbh_mc,
xh: content.pyxbh_xh,
mc: content.pyxbh_mc || formData.pyxbh_mc,
xh: content.pyxbh_xh || formData.pyxbh_xh,
bh: content.pyxbh, bh: content.pyxbh,
jzrq: content.pyxbh_jzrq
jzrq: content.pyxbh_jzrq || formData.pyxbh_jzrq,
}) })
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()

+ 4
- 3
src/views/business/comps/template/comps/dl/DL012.vue View File

@ -369,6 +369,7 @@ export default {
}, },
getResource() { getResource() {
const content = this.getFilledFormData() const content = this.getFilledFormData()
let formData = this.formData;
let tmpResource = [] let tmpResource = []
let tmpYq = [] let tmpYq = []
//生成细胞 //生成细胞
@ -413,10 +414,10 @@ export default {
}) })
//使用仪器 //使用仪器
tmpYq.push({ tmpYq.push({
mc: content.pyxbh_mc,
xh: content.pyxbh_xh,
mc: content.pyxbh_mc || formData.pyxbh_mc,
xh: content.pyxbh_xh || formData.pyxbh_xh,
bh: content.pyxbh, bh: content.pyxbh,
jzrq: content.pyxbh_jzrq,
jzrq: content.pyxbh_jzrq || formData.pyxbh_jzrq,
}) })
//使用的试剂、仪器 //使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource() const stepResource = this.$refs.stepRef.getStepResource()

+ 4
- 3
src/views/business/comps/template/comps/dl/DL022.vue View File

@ -343,12 +343,13 @@ export default {
}, },
getResource() { getResource() {
let content = this.getFilledFormData(); let content = this.getFilledFormData();
let formData = this.formData;
let tmpYq = [] let tmpYq = []
tmpYq.push({ tmpYq.push({
mc: content.wxjmc,
xh: content.wxjxh,
mc: content.wxjmc || formData.wxjmc,
xh: content.wxjxh || formData.wxjxh,
bh: content.xwj, bh: content.xwj,
jzrq: content.wxjjzrq,
jzrq: content.wxjjzrq || formData.wxjjzrq,
}) })
this.resourceTmp = [] this.resourceTmp = []

+ 49
- 32
src/views/business/resource/gyzj/comps/gyzj/Ff.vue View File

@ -3,8 +3,10 @@
<!-- 发放弹窗 --> <!-- 发放弹窗 -->
<el-dialog :title="$t('page.business.resource.gyzj.fafang')" :visible.sync="open" width="1200px" append-to-body <el-dialog :title="$t('page.business.resource.gyzj.fafang')" :visible.sync="open" width="1200px" append-to-body
:close-on-click-modal="false"> :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'" v-if="open">
<div class="sbzdtcma"> <input type="text"> <input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password> </div>
<el-form ref="form" :model="form" :rules="rules" :label-width="$i18n.locale === 'zh_CN' ? '120px' : '170px'"
v-if="open">
<div class="sbzdtcma"> <input type="text"> <input type="password" @contextmenu.native.prevent
@copy.native.prevent @cut.native.prevent show-password> </div>
<div :style="isBatch ? 'display:block' : 'display:none'"> <div :style="isBatch ? 'display:block' : 'display:none'">
<el-row style="margin:10px 0px;"> <el-row style="margin:10px 0px;">
<el-col :span="24"> <el-col :span="24">
@ -83,7 +85,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>
@ -104,7 +106,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ckl')"> <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>
@ -122,7 +124,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ckmz')" prop="ckmz"> <el-form-item :label="$t('page.business.resource.gyzj.ckmz')" prop="ckmz">
<SelectBalanceValue v-model="form.ckmz" :dw="form.ckmzdw" />
<SelectBalanceValue v-model="form.ckmz" :dw="form.ckmzdw" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -140,26 +142,26 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.lqr1')" prop="lqr1Id"> <el-form-item :label="$t('page.business.resource.gyzj.lqr1')" prop="lqr1Id">
<SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
<SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" @change="validateForm" />
</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.lqr1') + $t('form.password')" prop="lqr1mm"> <el-form-item :label="$t('page.business.resource.gyzj.lqr1') + $t('form.password')" prop="lqr1mm">
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.lqr1mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" />
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
show-password v-model="form.lqr1mm" maxlength="20" :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.lqr2')" prop="lqr2Id"> <el-form-item :label="$t('page.business.resource.gyzj.lqr2')" prop="lqr2Id">
<SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
<SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" @change="validateForm" />
</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.lqr2') + $t('form.password')" prop="lqr2mm"> <el-form-item :label="$t('page.business.resource.gyzj.lqr2') + $t('form.password')" prop="lqr2mm">
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.lqr2mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" />
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
show-password v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -172,21 +174,21 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('page.business.resource.gyzj.ffr1') + $t('form.password')" prop="ffr1mm"> <el-form-item :label="$t('page.business.resource.gyzj.ffr1') + $t('form.password')" prop="ffr1mm">
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.ffr1mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" />
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
show-password v-model="form.ffr1mm" maxlength="20" :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.ffr2')" prop="ffr2Id"> <el-form-item :label="$t('page.business.resource.gyzj.ffr2')" prop="ffr2Id">
<SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" />
<SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" @change="validateForm" />
</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.ffr2') + $t('form.password')" prop="ffr2mm"> <el-form-item :label="$t('page.business.resource.gyzj.ffr2') + $t('form.password')" prop="ffr2mm">
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.ffr2mm" maxlength="20"
:placeholder="$t('form.placeholderInput')" />
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
show-password v-model="form.ffr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -200,7 +202,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm') }}</el-button>
<el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm')
}}</el-button>
<el-button @click="cancel">{{ $t('form.cancel') }}</el-button> <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -218,7 +221,7 @@ import SelectBalanceValue from '@/views/business/comps/select/SelectBalanceValue
export default { export default {
name: "Ff", name: "Ff",
components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect,SelectBalanceValue },
components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect, SelectBalanceValue },
data() { data() {
return { return {
isBatch: false, isBatch: false,
@ -298,17 +301,27 @@ export default {
created() { created() {
}, },
methods: { methods: {
validateForm() {
setTimeout(() => {
this.$refs["form"].validate(valid => {
if (valid) { }
})
}, 200)
},
selectStudyChange(val) { selectStudyChange(val) {
this.form.mdMcs = val.name this.form.mdMcs = val.name
this.form.mdOther = val.mdOther this.form.mdOther = val.mdOther
}, },
selectStudyChangeBatch(val) { selectStudyChangeBatch(val) {
let that = this let that = this
if (val && val.id && val.id !== '') {
const _index = _.findIndex(that.selectList, function (o) { return o.id + '' === val.key })
if (_index > -1) {
const _index = _.findIndex(that.selectList, function (o) { return o.id + '' === val.key })
if (_index > -1) {
if (val && val.id && val.id !== '') {
that.selectList[_index].mdMcs = val.name that.selectList[_index].mdMcs = val.name
that.selectList[_index].mdOther = val.mdOther that.selectList[_index].mdOther = val.mdOther
} else {
that.selectList[_index].mdMcs = null
that.selectList[_index].mdOther = null
} }
} }
}, },
@ -340,7 +353,7 @@ export default {
sxrq: item.sxrq, sxrq: item.sxrq,
ccwz: item.ccwz, ccwz: item.ccwz,
zytj: null, zytj: null,
ckmz:null,
ckmz: null,
mdIds: null, mdIds: null,
ckmz: null, ckmz: null,
mdMcs: null, mdMcs: null,
@ -375,8 +388,8 @@ export default {
ffr1mm: null, ffr1mm: null,
ffr2Id: null, ffr2Id: null,
ffr2Mc: null, ffr2Mc: null,
ckmz:null,
ckl:null,
ckmz: null,
ckl: null,
ffr2mm: null, ffr2mm: null,
qmyy: this.$t('page.business.resource.gyzj.lqff'), qmyy: this.$t('page.business.resource.gyzj.lqff'),
qmrmm: null, qmrmm: null,
@ -412,23 +425,27 @@ export default {
if (this.selectList.length <= 0) { if (this.selectList.length <= 0) {
this.$modal.msgError("请选择要操作的给药制剂") this.$modal.msgError("请选择要操作的给药制剂")
} else { } else {
for (var i = 0; i < params.list.length; i++) {
for (var i = 0; i < params.list.length; i++) {
if (!params.list[i].zytj || params.list[i].zytj == '') { if (!params.list[i].zytj || params.list[i].zytj == '') {
this.$modal.msgError(params.list[i].mc + "转移条件不能为空")
return
}
if (!params.list[i].ckmz || params.list[i].ckmz == '') {
this.$modal.msgError(params.list[i].mc + "出库毛重不能为空")
// this.$modal.msgError(params.list[i].mc + "转移条件不能为空")
this.$modal.msgError( "转移条件不能为空")
return return
} }
if (!params.list[i].mdMcs || params.list[i].mdMcs == '') { if (!params.list[i].mdMcs || params.list[i].mdMcs == '') {
if (!params.list[i].mdOther || params.list[i].mdOther == '') { if (!params.list[i].mdOther || params.list[i].mdOther == '') {
this.$modal.msgError(params.list[i].mc + "目的不能为空")
// this.$modal.msgError(params.list[i].mc + "目的不能为空")
this.$modal.msgError( "目的不能为空")
} }
return return
} }
if (!params.list[i].ckmz || params.list[i].ckmz == '') {
// this.$modal.msgError(params.list[i].mc + "出库毛重不能为空")
this.$modal.msgError( "出库毛重不能为空")
return
}
if (!params.list[i].remark || params.list[i].remark == '') { if (!params.list[i].remark || params.list[i].remark == '') {
this.$modal.msgError(params.list[i].mc + "备注不能为空")
// this.$modal.msgError(params.list[i].mc + "备注不能为空")
this.$modal.msgError( "备注不能为空")
return return
} }
} }

+ 1
- 0
src/views/business/resource/gyzj/comps/gyzj/SelectList.vue View File

@ -6,6 +6,7 @@
<el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center"> <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span> <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
<span v-if="scope.row.zjzt == 2">{{ $t('page.business.resource.resource.zjzt.wrk') }}</span>
<span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span> <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
<span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span> <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span>
<span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span> <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span>

Write Preview
Loading…
Cancel
Save