Browse Source

fix:[资源库管理][试剂批量]

luojie
HanLong 3 weeks ago
parent
commit
ddf372c679
7 changed files with 72 additions and 17 deletions
  1. +1
    -0
      src/lang/en/business/resource/sj.js
  2. +1
    -0
      src/lang/zh/business/resource/sj.js
  3. +1
    -1
      src/views/business/resource/gsp/comps/gsp/Bj.vue
  4. +1
    -1
      src/views/business/resource/gsp/comps/gsp/Cz.vue
  5. +33
    -7
      src/views/business/resource/gsp/comps/gsp/CzBatch.vue
  6. +1
    -1
      src/views/business/resource/gsp/comps/gsp/Xz.vue
  7. +34
    -7
      src/views/business/resource/sj/comps/CzBatch.vue

+ 1
- 0
src/lang/en/business/resource/sj.js View File

@ -27,6 +27,7 @@ export default {
cz: 'Dispose',
sjczfs: 'Dispose Method',
czfs: 'Dispose Method',
czl: 'Amount',
yuanyin: 'Reason',
lock: 'Lock',

+ 1
- 0
src/lang/zh/business/resource/sj.js View File

@ -27,6 +27,7 @@ export default {
cz: '处置',
sjczfs: '试剂处置方式',
czfs: '处置方式',
czl: '处置量',
yuanyin: '原因',
lock: '锁定',

+ 1
- 1
src/views/business/resource/gsp/comps/gsp/Bj.vue View File

@ -49,7 +49,7 @@
<!-- 存储条件 -->
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
<BusinessSelect v-model="form.cctj" dictType="system_business_cctj" :multiple="true"></BusinessSelect>
<BusinessSelect v-model="form.cctj" dictType="business_cctj" :multiple="true"></BusinessSelect>
</el-form-item>
</el-col>
</el-row>

+ 1
- 1
src/views/business/resource/gsp/comps/gsp/Cz.vue View File

@ -25,7 +25,7 @@
<el-row>
<el-col :span="24">
<el-form-item :label="$t('page.business.resource.gsp.czfs')" prop="czfs">
<BusinessSelect v-model="form.czfs" dictType="system_business_czfs"></BusinessSelect>
<BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
</el-form-item>
</el-col>
</el-row>

+ 33
- 7
src/views/business/resource/gsp/comps/gsp/CzBatch.vue View File

@ -12,9 +12,9 @@
:show-overflow-tooltip="true" width="120px" />
<el-table-column :label="$t('page.business.resource.sj.bh')" align="left" prop="bh"
:show-overflow-tooltip="true" width="120px" />
<el-table-column :label="$t('page.business.resource.sj.sjczfs')" align="center" width="250px">
<el-table-column :label="$t('page.business.resource.sj.czfs')" align="center" width="250px">
<template slot-scope="scope">
<BusinessSelect v-model="scope.row.czfs" dictType="system_business_czfs"></BusinessSelect>
<BusinessSelect v-model="scope.row.czfs" dictType="business_czfs"></BusinessSelect>
</template>
</el-table-column>
<el-table-column :label="$t('page.business.resource.sj.yuanyin')" align="center">
@ -72,7 +72,7 @@
</template>
<script>
import { sj_plcz } from "@/api/business/sj/sj"
import { plcz } from "@/api/business/gsp/gsp"
import { mapGetters } from 'vuex'
import SelectList from "./SelectList";
import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
@ -147,10 +147,36 @@ export default {
save() {
this.$refs["form"].validate(valid => {
if (valid) {
sj_plcz(this.form).then(response => {
this.open = false
this.$emit('callback')
})
let params = this.form
params.list = this.selectList
if (this.selectList.length <= 0) {
this.$modal.msgError("请选择要操作的试剂")
} else {
for (var i = 0; i < params.list.length; i++) {
if (!params.list[i].czfs || params.list[i].czfs == '') {
this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
return
}
if (!params.list[i].czyy || params.list[i].czyy == '') {
this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
return
} else {
params.list[i].remark = params.list[i].czyy
}
if (!params.list[i].czl || params.list[i].czl == '') {
this.$modal.msgError(params.list[i].mc + "处置量不能为空")
return
}
}
this.$modal.loading()
plcz(params).then(response => {
this.open = false
this.$emit('callback')
this.$modal.closeLoading()
}).finally(() => {
this.$modal.closeLoading()
})
}
}
})
}

+ 1
- 1
src/views/business/resource/gsp/comps/gsp/Xz.vue View File

@ -61,7 +61,7 @@
<!-- 存储条件 -->
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
<BusinessSelect v-model="form.cctj" dictType="system_business_cctj" :multiple="true"></BusinessSelect>
<BusinessSelect v-model="form.cctj" dictType="business_cctj" :multiple="true"></BusinessSelect>
</el-form-item>
</el-col>
<!-- 接收日期 -->

+ 34
- 7
src/views/business/resource/sj/comps/CzBatch.vue View File

@ -56,7 +56,8 @@
<el-col :span="24">
<el-form-item :label="$t('form.password')" prop="qmrmm">
<div class="sbzdtcma"> <input type="text"></div>
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent v-model="form.qmrmm" maxlength="20" autocomplete="off" auto-complete="new-password" show-password
<el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
v-model="form.qmrmm" maxlength="20" autocomplete="off" auto-complete="new-password" show-password
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
@ -104,7 +105,7 @@ export default {
},
computed: {
...mapGetters([
'nickName','name'
'nickName', 'name'
]),
},
created() {
@ -146,13 +147,39 @@ export default {
save() {
this.$refs["form"].validate(valid => {
if (valid) {
sj_plcz(this.form).then(response => {
this.open = false
this.$emit('callback')
})
let params = this.form
params.list = this.selectList
if (this.selectList.length <= 0) {
this.$modal.msgError("请选择要操作的试剂")
} else {
for (var i = 0; i < params.list.length; i++) {
if (!params.list[i].czfs || params.list[i].czfs == '') {
this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
return
}
if (!params.list[i].czyy || params.list[i].czyy == '') {
this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
return
} else {
params.list[i].remark = params.list[i].czyy
}
if (!params.list[i].czl || params.list[i].czl == '') {
this.$modal.msgError(params.list[i].mc + "处置量不能为空")
return
}
}
this.$modal.loading()
sj_plcz(params).then(response => {
this.open = false
this.$emit('callback')
this.$modal.closeLoading()
}).finally(() => {
this.$modal.closeLoading()
})
}
}
})
}
}
}
}
</script>

Loading…
Cancel
Save