UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11/12 界面优化1.0

Browse Source
dev_unify
wangwei 8 months ago
parent 3350e1f6a6
commit e9d527c063
2 changed files with 105 additions and 68 deletions
Show Stats Download Patch File Download Diff File

142
src/views/basic/product/drug/drugAdd.vue
Unescape Escape View File

@ -66,7 +66,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.diType" <el-select v-model="scope.row.diType"
:disabled="scope.$index !== selectedIndex" :disabled="scope.$index !== selectedIndex"
style="width: 90%" placeholder="选择标识类型" clearable> style="width: 90%" placeholder="选择标识类型" clearable
>
<el-option label="最小销售标识" :value="1"></el-option> <el-option label="最小销售标识" :value="1"></el-option>
<!-- <el-option label="使用单元标识" :value="2"></el-option>--> <!-- <el-option label="使用单元标识" :value="2"></el-option>-->
<!-- <el-option label="本体标识" :value="3"></el-option>--> <!-- <el-option label="本体标识" :value="3"></el-option>-->
@ -524,9 +525,10 @@
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="selectDrugLevelVisible" v-if="selectDrugLevelVisible"
@close="closeSelectDrugLevelVisible"
> >
<el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px" > <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="层级标识:"> <el-form-item label="层级标识:">
@ -555,7 +557,7 @@
</el-form> </el-form>
<el-table :data="selectDrugLevelList" style="width: 100%; margin-bottom: 8px" key="2" border> <el-table :data="selectDrugLevelList" style="width: 100%; margin-bottom: 8px" key="2" border>
<el-table-column label="序号" type="index" ></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip></el-table-column> <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="药品类型" prop="type" show-overflow-tooltip></el-table-column> <el-table-column label="药品类型" prop="type" show-overflow-tooltip></el-table-column>
<el-table-column label="批准文号" prop="approvalNum" show-overflow-tooltip></el-table-column> <el-table-column label="批准文号" prop="approvalNum" show-overflow-tooltip></el-table-column>
@ -569,7 +571,7 @@
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column> <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="selectDrugLevelItem(scope.row)" > <el-button type="text" @click="selectDrugLevelItem(scope.row)">
选入 选入
</el-button> </el-button>
</template> </template>
@ -595,16 +597,16 @@ import {
updatetDrug, updatetDrug,
delDrugLevel, delDrugLevel,
updateLevelDrug, calculateDistCount, calculateUseCount, updateLevelDrug, calculateDistCount, calculateUseCount,
getDrugLevelList,getDrugLevelListBycode getDrugLevelList, getDrugLevelListBycode
} from '@/api/basic/product/drugUdiinfos' } from '@/api/basic/product/drugUdiinfos'
import {getCodeRelDetail} from '@/api/basic/product/udiRelevance' import { getCodeRelDetail } from '@/api/basic/product/udiRelevance'
import {isBlank} from "@/utils/strUtil"; import { isBlank } from '@/utils/strUtil'
import { import {
getYbDrugDetail, removeRl, thirdSysDetail getYbDrugDetail, removeRl, thirdSysDetail
} from '@/api/basic/product/udiRelevance' } from '@/api/basic/product/udiRelevance'
import {filterClassify} from '@/api/purchase/classifyCode' import { filterClassify } from '@/api/purchase/classifyCode'
import {filterByUuid, levelByUuid} from '@/api/basic/product/udiInfo' import { filterByUuid, levelByUuid } from '@/api/basic/product/udiInfo'
// import selectChargesProjectDialog from './selectChargesProjectDialog' // import selectChargesProjectDialog from './selectChargesProjectDialog'
import chooseHouseDrug from './chooseHouseDrug' import chooseHouseDrug from './chooseHouseDrug'
@ -642,18 +644,18 @@ export default {
} }
}, },
// components: {selectChargesProjectDialog, chooseHouseDrug}, // components: {selectChargesProjectDialog, chooseHouseDrug},
components: { chooseHouseDrug}, components: { chooseHouseDrug },
data() { data() {
return { return {
ybDrugDetail: {}, ybDrugDetail: {},
productData: {}, productData: {},
filterQueryDrugLevel: { filterQueryDrugLevel: {
nameCode: "", nameCode: '',
cpmctymc: "", cpmctymc: '',
page: 1, page: 1,
limit: 20, limit: 20,
total: 0, total: 0,
approvalNum:"", approvalNum: ''
}, },
newProductData: { newProductData: {
cpmctymc: null, cpmctymc: null,
@ -690,49 +692,49 @@ export default {
activeNames: ['0', '1', '2'], activeNames: ['0', '1', '2'],
formRules: { formRules: {
cpmctymc: [ cpmctymc: [
{required: true, message: '请输入药品通用名', trigger: 'blur'} { required: true, message: '请输入药品通用名', trigger: 'blur' }
], ],
prepnSpec: [ prepnSpec: [
{required: true, message: '请输入制剂规格', trigger: 'blur'} { required: true, message: '请输入制剂规格', trigger: 'blur' }
], ],
packUnit: [ packUnit: [
{required: true, message: '请输入包装单位', trigger: 'blur'} { required: true, message: '请输入包装单位', trigger: 'blur' }
], ],
prepnUnit: [ prepnUnit: [
{required: true, message: '请输入制剂单位', trigger: 'blur'} { required: true, message: '请输入制剂单位', trigger: 'blur' }
], ],
// packRatio: [ // packRatio: [
// {required: true, message: '请输入包装比例', trigger: 'blur'} // {required: true, message: '请输入包装比例', trigger: 'blur'}
// ], // ],
packMatrial: [ packMatrial: [
{required: true, message: '请输入包装材质', trigger: 'blur'} { required: true, message: '请输入包装材质', trigger: 'blur' }
], ],
zczbhhzbapzbh: [ zczbhhzbapzbh: [
{required: true, message: '请输入批准文号', trigger: 'blur'} { required: true, message: '请输入批准文号', trigger: 'blur' }
], ],
manufactory: [ manufactory: [
{required: true, message: '生产企业不能为空', trigger: 'blur'} { required: true, message: '生产企业不能为空', trigger: 'blur' }
], ],
physicType: [ physicType: [
{required: true, message: '药品类型不能为空', trigger: 'blur'} { required: true, message: '药品类型不能为空', trigger: 'blur' }
], ],
ybbm: [ ybbm: [
{required: true, message: '医保编码不能为空', trigger: 'blur'} { required: true, message: '医保编码不能为空', trigger: 'blur' }
], ],
price: [ price: [
{required: true, message: '药品价格不能为空', trigger: 'blur'} { required: true, message: '药品价格不能为空', trigger: 'blur' }
], ],
majorStatus: [ majorStatus: [
{required: true, message: '请选择药品状态', trigger: 'blur'} { required: true, message: '请选择药品状态', trigger: 'blur' }
], ],
distributeLevel: [ distributeLevel: [
{required: true, message: '请选择计量单位', trigger: 'blur'} { required: true, message: '请选择计量单位', trigger: 'blur' }
], ],
// distributeMaxLevel: [ // distributeMaxLevel: [
// {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'} // {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
// ], // ],
useLevel: [ useLevel: [
{required: true, message: '请选择计量单位', trigger: 'blur'} { required: true, message: '请选择计量单位', trigger: 'blur' }
], ],
detailSort: [ detailSort: [
{required: true, message: '请选择明细分类', trigger: 'blur'} {required: true, message: '请选择明细分类', trigger: 'blur'}
@ -803,7 +805,7 @@ export default {
this.newProductData.zczbhhzbapzbh = this.ybDrugDetail.approvalCode this.newProductData.zczbhhzbapzbh = this.ybDrugDetail.approvalCode
this.newProductData.cpmctymc = this.ybDrugDetail.registeredProductName this.newProductData.cpmctymc = this.ybDrugDetail.registeredProductName
this.newProductData.spmc = this.ybDrugDetail.goodsName this.newProductData.spmc = this.ybDrugDetail.goodsName
this.newProductData.bzgg = this.ybDrugDetail.factor + this.ybDrugDetail.minUnit + "/" + this.ybDrugDetail.unit this.newProductData.bzgg = this.ybDrugDetail.factor + this.ybDrugDetail.minUnit + '/' + this.ybDrugDetail.unit
this.newProductData.matrial = this.ybDrugDetail.materialName this.newProductData.matrial = this.ybDrugDetail.materialName
this.newProductData.packMatrial = this.ybDrugDetail.materialName this.newProductData.packMatrial = this.ybDrugDetail.materialName
this.newProductData.packUnit = this.ybDrugDetail.unit this.newProductData.packUnit = this.ybDrugDetail.unit
@ -811,12 +813,12 @@ export default {
this.newProductData.manufactory = this.ybDrugDetail.companyNameSc this.newProductData.manufactory = this.ybDrugDetail.companyNameSc
this.newProductData.prepnUnit = this.ybDrugDetail.realityMedicinemodel this.newProductData.prepnUnit = this.ybDrugDetail.realityMedicinemodel
if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null) { if (this.ybDrugDetail.productInsuranceType != '' && this.ybDrugDetail.productInsuranceType != null) {
if ("甲" == this.ybDrugDetail.productInsuranceType) { if ('甲' == this.ybDrugDetail.productInsuranceType) {
this.newProductData.medicareType = 1 this.newProductData.medicareType = 1
} else if ("乙" == this.ybDrugDetail.productInsuranceType) { } else if ('乙' == this.ybDrugDetail.productInsuranceType) {
this.newProductData.medicareType = 2 this.newProductData.medicareType = 2
} else if ("丙" == this.ybDrugDetail.productInsuranceType) { } else if ('丙' == this.ybDrugDetail.productInsuranceType) {
this.newProductData.medicareType = 3 this.newProductData.medicareType = 3
} else { } else {
this.newProductData.medicareType = null this.newProductData.medicareType = null
@ -835,7 +837,7 @@ export default {
}, },
saveNewProduct() { saveNewProduct() {
if (!this.isSave) { if (!this.isSave) {
return this.$message.error("请先保存药品层级") return this.$message.error('请先保存药品层级')
} }
this.addProductDialogVisible = false this.addProductDialogVisible = false
this.newProductData.registerNo = this.newProductData.zczbhhzbapzbh this.newProductData.registerNo = this.newProductData.zczbhhzbapzbh
@ -969,15 +971,15 @@ export default {
this.$message.success('保存成功！') this.$message.success('保存成功！')
this.selectedIndex = null this.selectedIndex = null
this.getDetailList() this.getDetailList()
this.getDiLevel(); this.getDiLevel()
//如果都为空 进行补充 //如果都为空 进行补充
if (!this.$isNotBlank(this.newProductData.sptm) && !this.$isNotBlank(this.newProductData.ybbm)) { if (!this.$isNotBlank(this.newProductData.sptm) && !this.$isNotBlank(this.newProductData.ybbm)) {
getCodeRelDetail({drugCode:row.nameCode}).then((response) => { getCodeRelDetail({ drugCode: row.nameCode }).then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
if (response.data != null && response.data.length > 0) { if (response.data != null && response.data.length > 0) {
this.newProductData.sptm = response.data[0].sptm; this.newProductData.sptm = response.data[0].sptm
this.newProductData.ybbm = response.data[0].ybbm; this.newProductData.ybbm = response.data[0].ybbm
this.getYbDrugData() this.getYbDrugData()
} }
} }
@ -996,7 +998,7 @@ export default {
row.isUpDisabled = true row.isUpDisabled = true
row.rowDisabled = false row.rowDisabled = false
}, },
selectDrugLevel(){ selectDrugLevel() {
//获取分页列表 //获取分页列表
this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
getDrugLevelList(this.filterQueryDrugLevel).then((response) => { getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
@ -1008,20 +1010,20 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
selectDrugLevelItem(row){ selectDrugLevelItem(row) {
getDrugLevelListBycode({nameCode:row.nameCode}).then((response) => { getDrugLevelListBycode({ nameCode: row.nameCode }).then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
if (response.data.length > 0){ if (response.data.length > 0) {
response.data.forEach( item => { response.data.forEach(item => {
//新增层级 //新增层级
let parts = item.bzgg.split('/'); let parts = item.bzgg.split('/')
// 首先，根据 ':' 分割字符串 // 首先，根据 ':' 分割字符串
const ratioParts = item.packRatio.split(':'); const ratioParts = item.packRatio.split(':')
let selectedValue; let selectedValue
if (item.packLevel >= 0 && item.packLevel < ratioParts.length) { if (item.packLevel >= 0 && item.packLevel < ratioParts.length) {
selectedValue = ratioParts[item.packLevel]; selectedValue = ratioParts[item.packLevel]
} else { } else {
selectedValue = null; // 或者你可以设置一个默认值 selectedValue = null // 或者你可以设置一个默认值
} }
let editQuery = { let editQuery = {
@ -1032,7 +1034,7 @@ export default {
relId: this.newProductData.id, relId: this.newProductData.id,
uuid: this.newProductData.uuid, uuid: this.newProductData.uuid,
productId: item.productId, productId: item.productId,
diType: item.packLevel == 1?1:4, diType: item.packLevel == 1 ? 1 : 4,
xjdw: item.xjdw xjdw: item.xjdw
} }
updateLevelDrug(editQuery).then(res => { updateLevelDrug(editQuery).then(res => {
@ -1043,7 +1045,7 @@ export default {
packLevel: item.packLevel, packLevel: item.packLevel,
packUnit: parts[1] || '', packUnit: parts[1] || '',
bhxjsl: selectedValue, bhxjsl: selectedValue,
diType: item.packLevel == 1?1:4, diType: item.packLevel == 1 ? 1 : 4,
isDisabled: false, isDisabled: false,
rowDisabled: false, rowDisabled: false,
isUpDisabled: true isUpDisabled: true
@ -1062,8 +1064,26 @@ export default {
this.selectedIndex = this.detailList.length - 1 this.selectedIndex = this.detailList.length - 1
this.isSave = false this.isSave = false
this.selectDrugLevelVisible = false this.selectDrugLevelVisible = false
this.filterQueryDrugLevel = {
nameCode: '',
cpmctymc: '',
page: 1,
limit: 20,
total: 0,
approvalNum: ''
}
}, },
handleCurrentChange(){ closeSelectDrugLevelVisible(){
this.filterQueryDrugLevel = {
nameCode: '',
cpmctymc: '',
page: 1,
limit: 20,
total: 0,
approvalNum: ''
}
},
handleCurrentChange() {
this.selectDrugLevel() this.selectDrugLevel()
}, },
addDrugLevel() { addDrugLevel() {
@ -1082,8 +1102,7 @@ export default {
rowChange(index, val) { rowChange(index, val) {
if (this.editRowSwitch == true) {
if(this.editRowSwitch == true ){
this.$message.error('请先保存当前产品标识编辑') this.$message.error('请先保存当前产品标识编辑')
return return
} }
@ -1100,7 +1119,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
if (row.id != null) { if (row.id != null) {
let params = {nameCode: row.nameCode} let params = { nameCode: row.nameCode }
delDrugLevel(params).then((res) => { delDrugLevel(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.isSave = true this.isSave = true
@ -1122,7 +1141,6 @@ export default {
}) })
}, },
//设置层级 //设置层级
// setDefaultLevel(){ // setDefaultLevel(){
// //判断流通 最大层级 // //判断流通 最大层级
@ -1147,7 +1165,7 @@ export default {
uuid: this.newProductData.uuid, uuid: this.newProductData.uuid,
id: this.newProductData.id, id: this.newProductData.id,
nameCode: this.newProductData.nameCode, nameCode: this.newProductData.nameCode,
productType: this.newProductData.productsType, productType: this.newProductData.productsType
} }
this.loading = true this.loading = true
filterByUuid(query) filterByUuid(query)
@ -1207,10 +1225,10 @@ export default {
}, },
findMaxLevelObject() { findMaxLevelObject() {
this.maxLevel = 1; this.maxLevel = 1
for (const obj of this.levelUnitList) { for (const obj of this.levelUnitList) {
if (obj.packLevel > this.maxLevel) { if (obj.packLevel > this.maxLevel) {
this.maxLevel = Number(obj.packLevel); this.maxLevel = Number(obj.packLevel)
} }
} }
}, },
@ -1300,13 +1318,13 @@ export default {
this.chooseHouseDrugVisible = false this.chooseHouseDrugVisible = false
this.getThirdSysDetail() this.getThirdSysDetail()
}, },
handleInput(index, value,type){ handleInput(index, value, type) {
const intValue = parseInt(value, 10); const intValue = parseInt(value, 10)
// 更新行的数据 // 更新行的数据
if (type == 1){ if (type == 1) {
this.$set(this.detailList[index], 'packLevel', intValue); this.$set(this.detailList[index], 'packLevel', intValue)
}else { } else {
this.$set(this.detailList[index], 'bhxjsl', intValue); this.$set(this.detailList[index], 'bhxjsl', intValue)
} }
} }

19
src/views/supplier/companyDrug/basicCompanyproductEdit.vue
Unescape Escape View File

@ -695,6 +695,7 @@
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="selectDrugLevelVisible" v-if="selectDrugLevelVisible"
@close="closeSelectDrugLevelVisible"
> >
<el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px"> <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px">
@ -1236,6 +1237,24 @@ export default {
this.selectedIndex = this.detailList.length - 1 this.selectedIndex = this.detailList.length - 1
this.isSave = false this.isSave = false
this.selectDrugLevelVisible = false this.selectDrugLevelVisible = false
this.filterQueryDrugLevel = {
nameCode: '',
cpmctymc: '',
page: 1,
limit: 20,
total: 0,
approvalNum: ''
}
},
closeSelectDrugLevelVisible(){
this.filterQueryDrugLevel = {
nameCode: '',
cpmctymc: '',
page: 1,
limit: 20,
total: 0,
approvalNum: ''
}
}, },
addDrugLevel() { addDrugLevel() {
this.detailList.push({ this.detailList.push({

Write Preview
Loading…
Cancel
Save