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

9/4 bug 修改

Browse Source
20240912_adapter_z
wangwei 10 months ago
parent 34d7c9240b
commit 0111f92c72
6 changed files with 328 additions and 295 deletions
Show Stats Download Patch File Download Diff File

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

@ -13,7 +13,7 @@
<el-table-column label="第三方系统药品编码" prop="thirdId" show-overflow-tooltip></el-table-column> <el-table-column label="第三方系统药品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="第三方系统药品名称" prop="thirdName" show-overflow-tooltip></el-table-column> <el-table-column label="第三方系统药品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="第三方系统包装规格" prop="spec" show-overflow-tooltip></el-table-column> <el-table-column label="第三方系统包装规格" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="批准文号" prop="registerNo" show-overflow-tooltip></el-table-column> <el-table-column label="注册号" prop="registerNo" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
@ -21,7 +21,8 @@
关联 关联
</el-button> </el-button>
<el-button type="text" @click.native.stop="removeErp(scope.row)" <el-button type="text" @click.native.stop="removeErp(scope.row)"
:disabled=" scope.row.thirdId==null || scope.row.thirdId==''">解绑 :disabled=" scope.row.thirdId==null || scope.row.thirdId==''"
>解绑
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -33,9 +34,11 @@
</template> </template>
<div style=" float: right; <div style=" float: right;
text-align: right; text-align: right;
margin-bottom: 8px;"> margin-bottom: 8px;"
>
<el-button type="primary" size="mini" icon="search" @click="addDrugLevel" <el-button type="primary" size="mini" icon="search" @click="addDrugLevel"
style="text-align:right">新增药品层级 style="text-align:right"
>新增药品层级
</el-button> </el-button>
</div> </div>
<el-table <el-table
@ -95,7 +98,8 @@
<el-table-column label="操作" width="180px" fixed="right"> <el-table-column label="操作" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" v-if="scope.$index == selectedIndex" @click.stop="true" <el-button type="text" size="small" v-if="scope.$index == selectedIndex" @click.stop="true"
@click.native="levelSave(scope.row)">保存 @click.native="levelSave(scope.row)"
>保存
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
@ -177,22 +181,23 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="11" class="el-col">-->
<!-- <el-form-item label="包装比例:" prop="packRatio">-->
<!-- <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"-->
<!-- v-model.trim="newProductData.packRatio"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="包装比例:" prop="packRatio"> <el-form-item label="批准文号:" prop="zczbhhzbapzbh">
<el-input style="width: 90%" size="small" placeholder="请输入制剂单位" <el-input style="width: 90%" size="small" placeholder="请输入批准文号"
v-model.trim="newProductData.packRatio" v-model="newProductData.zczbhhzbapzbh"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="批准文号:" prop="registerNo">
<el-input style="width: 90%" size="small" placeholder="请输入批准文号"
v-model.trim="newProductData.registerNo"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="生产企业:" prop="manufactory"> <el-form-item label="生产企业:" prop="manufactory">
<el-input style="width: 90%" size="small" placeholder="请输入生产企业" <el-input style="width: 90%" size="small" placeholder="请输入生产企业"
@ -200,8 +205,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="药品类型:" prop="physicType"> <el-form-item label="药品类型:" prop="physicType">
<el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型"> <el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型">
@ -212,6 +215,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="药品分类:" prop="majorType"> <el-form-item label="药品分类:" prop="majorType">
<el-select v-model="newProductData.majorType" style="width: 90%" placeholder="选择药品分类" clearable> <el-select v-model="newProductData.majorType" style="width: 90%" placeholder="选择药品分类" clearable>
@ -221,8 +227,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="医保编码:" prop="ybbm"> <el-form-item label="医保编码:" prop="ybbm">
<el-input style="width: 90%" size="small" placeholder="请输入医保编码" <el-input style="width: 90%" size="small" placeholder="请输入医保编码"
@ -230,6 +234,9 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="医保分类:" prop="medicareType"> <el-form-item label="医保分类:" prop="medicareType">
<el-select v-model="newProductData.medicareType" style="width: 90%" placeholder="选择医保分类" <el-select v-model="newProductData.medicareType" style="width: 90%" placeholder="选择医保分类"
@ -241,35 +248,34 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="药品价格:" prop="price"> <el-form-item label="药品价格:" prop="price">
<el-input <el-input
style="width: 90%" style="width: 90%"
size="small" size="small"
placeholder="请输入药品价格" placeholder="请输入药品价格"
type="number" type="text"
:precision="2" v-model="newProductData.price"
:min="0"
v-model.number="newProductData.price"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col">
<el-form-item label="有效期:" prop="indate">
<el-date-picker
style="width: 90%"
v-model="newProductData.indate"
type="datetime"
format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择有效期"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<!--<el-row type="flex">-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="有效期:" prop="indate">-->
<!-- <el-date-picker-->
<!-- style="width: 90%"-->
<!-- v-model="newProductData.indate"-->
<!-- type="datetime"-->
<!-- format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
<!-- placeholder="选择有效期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!--</el-row>-->
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="存储条件:" prop="ylqxzcrbarmc"> <el-form-item label="存储条件:" prop="ylqxzcrbarmc">
@ -312,27 +318,28 @@
placeholder="选择项目收费编码" placeholder="选择项目收费编码"
v-model="newProductData.payFeeCode" v-model="newProductData.payFeeCode"
></el-input> ></el-input>
<el-button type="primary" size="mini" style="margin-left: 10px" @click="selectPayFeecode">选入</el-button> <el-button type="primary" size="mini" style="margin-left: 10px" @click="selectPayFeecode">选入
</el-form-item> </el-button>
</el-col>
<el-col :span="11">
<el-form-item label="是否拆零:" prop="splitEnable">
<el-select v-model="newProductData.splitEnable" style="width: 90%" placeholder="是否拆零" clearable>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="11">-->
<!-- <el-form-item label="是否拆零:" prop="splitEnable">-->
<!-- <el-select v-model="newProductData.splitEnable" style="width: 90%" placeholder="是否拆零" clearable>-->
<!-- <el-option label="是" :value="true"></el-option>-->
<!-- <el-option label="否" :value="false"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
</el-row> </el-row>
<el-row type="flex" class="edit-row"> <el-row type="flex" class="edit-row">
<el-col :span="11"> <!--<el-col :span="11">-->
<el-form-item label="是否自动赋码:" prop="autoCode"> <!-- <el-form-item label="是否自动赋码:" prop="autoCode">-->
<el-select v-model="newProductData.autoCode" style="width: 90%" placeholder="是否自动赋码" clearable> <!-- <el-select v-model="newProductData.autoCode" style="width: 90%" placeholder="是否自动赋码" clearable>-->
<el-option label="是" :value="true"></el-option> <!-- <el-option label="是" :value="true"></el-option>-->
<el-option label="否" :value="false"></el-option> <!-- <el-option label="否" :value="false"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="23" class="el-col"> <el-col :span="23" class="el-col">
@ -356,12 +363,14 @@
<el-select v-model="newProductData.distributeLevelDi" size="small" style="width: 90%" <el-select v-model="newProductData.distributeLevelDi" size="small" style="width: 90%"
@change="distributeLevelDiChange" @change="distributeLevelDiChange"
clearable clearable
placeholder="请选择流通计量层级标识"> placeholder="请选择流通计量层级标识"
>
<el-option <el-option
v-for="item in detailList" v-for="item in detailList"
:key="item.nameCode" :key="item.nameCode"
:value="item.nameCode" :value="item.nameCode"
:label="item.nameCode"> :label="item.nameCode"
>
<span style="float: left">{{ item.nameCode }}</span> <span style="float: left">{{ item.nameCode }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
</el-option> </el-option>
@ -373,12 +382,14 @@
<el-select v-model="newProductData.useLevelDi" size="small" style="width: 90%" <el-select v-model="newProductData.useLevelDi" size="small" style="width: 90%"
@change="useLevelDiChange" @change="useLevelDiChange"
clearable clearable
placeholder="请选择流通计量层级标识"> placeholder="请选择流通计量层级标识"
>
<el-option <el-option
v-for="item in detailList" v-for="item in detailList"
:key="item.nameCode" :key="item.nameCode"
:value="item.nameCode" :value="item.nameCode"
:label="item.nameCode"> :label="item.nameCode"
>
<span style="float: left">{{ item.nameCode }}</span> <span style="float: left">{{ item.nameCode }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
</el-option> </el-option>
@ -522,8 +533,8 @@ import {
getYbHcflDetail, removeRl, thirdSysDetail getYbHcflDetail, 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} from "@/api/basic/product/udiInfo"; import { filterByUuid } from '@/api/basic/product/udiInfo'
import selectChargesProjectDialog from "./selectChargesProjectDialog" import selectChargesProjectDialog from './selectChargesProjectDialog'
import chooseHouseDrug from './chooseHouseDrug' import chooseHouseDrug from './chooseHouseDrug'
export default { export default {
@ -544,20 +555,20 @@ export default {
}, },
uuid: { uuid: {
type: Object, type: Object,
required: true, required: true
}, },
relId: { relId: {
type: Object, type: Object,
required: true, required: true
}, },
thisData: { thisData: {
type: Object, type: Object,
required: true, required: true
}, },
relevanceEdit: { relevanceEdit: {
type: Object, type: Object,
required: true, required: true
}, }
}, },
components: { selectChargesProjectDialog, chooseHouseDrug }, components: { selectChargesProjectDialog, chooseHouseDrug },
data() { data() {
@ -586,6 +597,7 @@ export default {
useLevelUnit: null, useLevelUnit: null,
distributeLevel: null, distributeLevel: null,
useLevel: null, useLevel: null,
}, },
thirdSys: [], thirdSys: [],
classifyList: [], classifyList: [],
@ -604,13 +616,13 @@ export default {
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' }
], ],
registerNo: [ zczbhhzbapzbh: [
{ required: true, message: '请输入批准文号', trigger: 'blur' } { required: true, message: '请输入批准文号', trigger: 'blur' }
], ],
manufactory: [ manufactory: [
@ -641,7 +653,7 @@ export default {
sysList: [], sysList: [],
chooseHouseDrugVisible: false, chooseHouseDrugVisible: false,
isImport: false, isImport: false,
defaultSys: null, defaultSys: null
} }
}, },
@ -690,6 +702,9 @@ export default {
}, },
saveNewProduct() { saveNewProduct() {
this.addProductDialogVisible = false this.addProductDialogVisible = false
this.newProductData.registerNo = this.newProductData.zczbhhzbapzbh
this.newProductData.splitEnable = true
this.newProductData.autoCode = true
//新增 //新增
if (this.type == 1) { if (this.type == 1) {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
@ -706,24 +721,24 @@ export default {
} else { } else {
const validateItem = (item, fieldName, errorMessage) => { const validateItem = (item, fieldName, errorMessage) => {
if (!item[fieldName]) { if (!item[fieldName]) {
this.$message.error(errorMessage); this.$message.error(errorMessage)
return false; return false
}
return true
} }
return true;
};
for (let i = 0; i < this.detailList.length; i++) { for (let i = 0; i < this.detailList.length; i++) {
const item = this.detailList[i]; const item = this.detailList[i]
if (!validateItem(item, 'nameCode', '药品层级标识不能为空！') || if (!validateItem(item, 'nameCode', '药品层级标识不能为空！') ||
!validateItem(item, 'packLevel', '包装级别不能为空') || !validateItem(item, 'packLevel', '包装级别不能为空') ||
!validateItem(item, 'packUnit', '层级单位不能为空')) { !validateItem(item, 'packUnit', '层级单位不能为空')) {
return; return
} }
} }
const isLevel1 = this.detailList.some(item => item.packLevel === 1); const isLevel1 = this.detailList.some(item => item.packLevel === 1)
if (!isLevel1) { if (!isLevel1) {
this.$message.error('药品层级缺少一级标识！'); this.$message.error('药品层级缺少一级标识！')
} }
this.newProductData.drugLevelLists = this.detailList; this.newProductData.drugLevelLists = this.detailList
} }
this.saveLoading = true this.saveLoading = true
@ -743,6 +758,10 @@ export default {
} }
}) })
} else { } else {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return this.$message.error('请补充必要数据')
}
if (this.status) { if (this.status) {
this.newProductData.requireScanCode = 1 this.newProductData.requireScanCode = 1
} else { } else {
@ -750,7 +769,7 @@ export default {
} }
this.newProductData.uuid = this.rowData.uuid this.newProductData.uuid = this.rowData.uuid
this.newProductData.nameCode = this.rowData.nameCode this.newProductData.nameCode = this.rowData.nameCode
this.newProductData.relId = this.newProductData.id; this.newProductData.relId = this.newProductData.id
updatetDrug(this.newProductData).then(res => { updatetDrug(this.newProductData).then(res => {
this.saveLoading = false this.saveLoading = false
if (res.code == 20000) { if (res.code == 20000) {
@ -761,6 +780,7 @@ export default {
this.$message.error(res.message) this.$message.error(res.message)
} }
}) })
})
} }
}, },
@ -771,15 +791,15 @@ export default {
//层级保存 //层级保存
levelSave(row) { levelSave(row) {
if (row.nameCode == null) { if (row.nameCode == null) {
this.$message.error("层级标识不能为空"); this.$message.error('层级标识不能为空')
return return
} }
if (row.packLevel == null) { if (row.packLevel == null) {
this.$message.error("包装级别不能为空"); this.$message.error('包装级别不能为空')
return return
} }
if (row.packUnit == null) { if (row.packUnit == null) {
this.$message.error("层级单位不能为空"); this.$message.error('层级单位不能为空')
return return
} }
let editQuery = { let editQuery = {
@ -795,10 +815,11 @@ export default {
updateLevelDrug(editQuery).then(res => { updateLevelDrug(editQuery).then(res => {
this.saveLoading = false this.saveLoading = false
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success("保存成功！"); this.$message.success('保存成功！')
this.selectedIndex = null this.selectedIndex = null
if (this.newProductData.id != null) if (this.newProductData.id != null) {
this.getDetailList(); this.getDetailList()
}
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
} }
@ -817,13 +838,12 @@ export default {
isDisabled: false, isDisabled: false,
rowDisabled: false, rowDisabled: false,
isUpDisabled: true isUpDisabled: true
}); })
this.selectedIndex = this.detailList.length - 1 this.selectedIndex = this.detailList.length - 1
}, },
rowChange(index, val) { rowChange(index, val) {
this.selectedIndex = index; this.selectedIndex = index
}, },
deleteLevel(index, row) { deleteLevel(index, row) {
@ -833,19 +853,19 @@ 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.$message.success("删除成功"); this.$message.success('删除成功')
this.getDetailList(); this.getDetailList()
} }
}) })
} else { } else {
this.detailList.splice(index, 1); this.detailList.splice(index, 1)
this.$message.success("删除成功"); this.$message.success('删除成功')
} }
}).catch(() => { }).catch(() => {
}); })
}, },
//获取层级标识 //获取层级标识
@ -855,44 +875,43 @@ export default {
uuid: this.newProductData.uuid, uuid: this.newProductData.uuid,
id: this.newProductData.id id: this.newProductData.id
} }
this.loading = true; this.loading = true
filterByUuid(query) filterByUuid(query)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false
this.detailList = response.data || []; this.detailList = response.data || []
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false
this.detailList = []; this.detailList = []
}); })
} }
}, },
distributeLevelDiChange(val) { distributeLevelDiChange(val) {
const matchingItem = this.detailList.find(item => item.nameCode == val); const matchingItem = this.detailList.find(item => item.nameCode == val)
if (matchingItem) { if (matchingItem) {
this.newProductData.distributeLevelUnit = matchingItem.packUnit; this.newProductData.distributeLevelUnit = matchingItem.packUnit
this.newProductData.distributeLevel = matchingItem.packLevel this.newProductData.distributeLevel = matchingItem.packLevel
} }
calculateDistCount(matchingItem).then((res) => { calculateDistCount(matchingItem).then((res) => {
this.newProductData = { this.newProductData = {
...this.newProductData, ...this.newProductData,
distributeLevelCount: res.data.distributeLevelCount, distributeLevelCount: res.data.distributeLevelCount
} }
}) })
}, },
useLevelDiChange(val) { useLevelDiChange(val) {
const matchingItem = this.detailList.find(item => item.nameCode == val); const matchingItem = this.detailList.find(item => item.nameCode == val)
if (matchingItem) { if (matchingItem) {
this.newProductData.useLevelUnit = matchingItem.packUnit; this.newProductData.useLevelUnit = matchingItem.packUnit
this.newProductData.useLevel = matchingItem.packLevel; this.newProductData.useLevel = matchingItem.packLevel
} }
calculateUseCount(matchingItem).then((res) => { calculateUseCount(matchingItem).then((res) => {
this.newProductData = { this.newProductData = {
...this.newProductData, ...this.newProductData,
useLeverCount: res.data.useLeverCount, useLeverCount: res.data.useLeverCount
} }
}) })
}, },
@ -912,31 +931,31 @@ export default {
*/ */
getThirdSysDetail() { getThirdSysDetail() {
let query = { let query = {
id: this.relevanceEdit.id, id: this.relevanceEdit.id
}; }
thirdSysDetail(query) thirdSysDetail(query)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false
this.sysList = response.data.list || []; this.sysList = response.data.list || []
this.resetThirdId(); this.resetThirdId()
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false
this.sysList = []; this.sysList = []
}); })
}, },
resetThirdId() { resetThirdId() {
this.sysList.forEach((item) => { this.sysList.forEach((item) => {
if (item.sysId === "thirdId") { if (item.sysId === 'thirdId') {
this.newProductData.thirdId = item.thirdId; this.newProductData.thirdId = item.thirdId
} else if (item.sysId === "thirdId1") { } else if (item.sysId === 'thirdId1') {
this.newProductData.thirdId1 = item.thirdId; this.newProductData.thirdId1 = item.thirdId
} else if (item.sysId === "thirdId2") { } else if (item.sysId === 'thirdId2') {
this.newProductData.thirdId2 = item.thirdId; this.newProductData.thirdId2 = item.thirdId
} else if (item.sysId === "thirdId3") { } else if (item.sysId === 'thirdId3') {
this.newProductData.thirdId3 = item.thirdId; this.newProductData.thirdId3 = item.thirdId
} else if (item.sysId === "thirdId4") { } else if (item.sysId === 'thirdId4') {
this.newProductData.thirdId4 = item.thirdId; this.newProductData.thirdId4 = item.thirdId
} }
}) })
}, },
@ -944,56 +963,56 @@ export default {
* 关联 第三方 * 关联 第三方
*/ */
addSelectErp(row) { addSelectErp(row) {
this.defaultSys = row.sysId; this.defaultSys = row.sysId
this.isImport = false; this.isImport = false
this.chooseHouseDrugVisible = true; this.chooseHouseDrugVisible = true
}, },
removeErp(row) { removeErp(row) {
this.$confirm("此操作将解除该绑定药品信息, 是否继续?", "提示", { this.$confirm('此操作将解除该绑定药品信息, 是否继续?', '提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning", type: 'warning'
}) })
.then(() => { .then(() => {
let query = { let query = {
relId: this.relId, relId: this.relId,
thirdSys: row.sysId thirdSys: row.sysId
}; }
removeRl(query) removeRl(query)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message({ this.$message({
type: "success", type: 'success',
message: "解绑成功！", message: '解绑成功！'
}); })
this.getThirdSysDetail(); this.getThirdSysDetail()
} else { } else {
this.$message.error(response.message); this.$message.error(response.message)
} }
}) })
.catch(() => { .catch(() => {
}); })
}) })
.catch(() => { .catch(() => {
}); })
}, },
closeUdi(val) { closeUdi(val) {
this.chooseHouseDrugVisible = false; this.chooseHouseDrugVisible = false
this.getThirdSysDetail(); this.getThirdSysDetail()
}, }
}, },
created() { created() {
if (this.rowData != null) { if (this.rowData != null) {
this.newProductData = this.rowData this.newProductData = this.rowData
this.newProductData.cpmctymc = this.rowData.cpmctymc this.newProductData.cpmctymc = this.rowData.cpmctymc
this.newProductData.registerNo = this.rowData.zczbhhzbapzbh this.newProductData.zczbhhzbapzbh = this.rowData.zczbhhzbapzbh
if (this.rowData.requireScanCode == 1) { if (this.rowData.requireScanCode == 1) {
this.status = true this.status = true
} else { } else {
this.status = false this.status = false
} }
this.getDetailList(); this.getDetailList()
this.getThirdSysDetail() this.getThirdSysDetail()
} else { } else {
this.selectedIndex = 0 this.selectedIndex = 0

2
src/views/basic/product/drug/drugMaintain.vue
Unescape Escape View File

@ -99,7 +99,7 @@
<el-table-column label="制剂单位" prop="prepnUnit" width="90"></el-table-column> <el-table-column label="制剂单位" prop="prepnUnit" width="90"></el-table-column>
<el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column> <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
<el-table-column label="包装单位" prop="packUnit" width="90"></el-table-column> <el-table-column label="包装单位" prop="packUnit" width="90"></el-table-column>
<el-table-column label="包装比例" prop="packRatio" width="90"></el-table-column> <!--<el-table-column label="包装比例" prop="packRatio" width="90"></el-table-column>-->
<el-table-column label="价格" prop="price" width="90"></el-table-column> <el-table-column label="价格" prop="price" width="90"></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh" width="90"></el-table-column> <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="90"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" width="90"></el-table-column> <el-table-column label="生产企业" prop="manufactory" width="90"></el-table-column>

68
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -726,39 +726,39 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <!--<el-row>-->
<el-col span="5"> <!-- <el-col span="5">-->
<span class="sptext">是否拆零</span> <!-- <span class="sptext">是否拆零</span>-->
</el-col> <!-- </el-col>-->
<el-divider direction="vertical"></el-divider> <!-- <el-divider direction="vertical"></el-divider>-->
<el-col span="5"> <!-- <el-col span="5">-->
<el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable> <!-- <el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable>-->
<el-option label="是" :value="true"></el-option> <!-- <el-option label="是" :value="true"></el-option>-->
<el-option label="否" :value="false"></el-option> <!-- <el-option label="否" :value="false"></el-option>-->
</el-select> <!-- </el-select>-->
</el-col> <!-- </el-col>-->
<el-divider direction="vertical"></el-divider> <!-- <el-divider direction="vertical"></el-divider>-->
<el-col span="13"> <!-- <el-col span="13">-->
<span class="sptext">是否拆零</span> <!-- <span class="sptext">是否拆零</span>-->
</el-col> <!-- </el-col>-->
</el-row> <!--</el-row>-->
<el-divider></el-divider> <!--<el-divider></el-divider>-->
<el-row> <!--<el-row>-->
<el-col span="5"> <!-- <el-col span="5">-->
<span class="sptext">是否自动赋码</span> <!-- <span class="sptext">是否自动赋码</span>-->
</el-col> <!-- </el-col>-->
<el-divider direction="vertical"></el-divider> <!-- <el-divider direction="vertical"></el-divider>-->
<el-col span="5"> <!-- <el-col span="5">-->
<el-select v-model="editQuery.autoCode" style="width: 65%" placeholder="是否自动赋码" clearable> <!-- <el-select v-model="editQuery.autoCode" style="width: 65%" placeholder="是否自动赋码" clearable>-->
<el-option label="是" :value="true"></el-option> <!-- <el-option label="是" :value="true"></el-option>-->
<el-option label="否" :value="false"></el-option> <!-- <el-option label="否" :value="false"></el-option>-->
</el-select> <!-- </el-select>-->
</el-col> <!-- </el-col>-->
<el-divider direction="vertical"></el-divider> <!-- <el-divider direction="vertical"></el-divider>-->
<el-col span="13"> <!-- <el-col span="13">-->
<span class="sptext">是否自动赋码</span> <!-- <span class="sptext">是否自动赋码</span>-->
</el-col> <!-- </el-col>-->
</el-row> <!--</el-row>-->
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row>
<el-col span="5"> <el-col span="5">
@ -1397,6 +1397,8 @@ export default {
}, },
onAddSubmit(relSubmit) { onAddSubmit(relSubmit) {
this.editQuery.relSubmit = relSubmit; this.editQuery.relSubmit = relSubmit;
this.editQuery.splitEnable = true;
this.editQuery.autoCode = true;
this.onAddLoading = true this.onAddLoading = true
updatetUdiInfos(this.editQuery) updatetUdiInfos(this.editQuery)
.then((response) => { .then((response) => {

40
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -395,17 +395,16 @@
style="width: 80%" style="width: 80%"
@change="handleInvChange" @change="handleInvChange"
> >
<el-option <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.code"/>
v-for="item in deptList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="所属部门:" class="query-form-item">-->
<!-- <deptSelect :value.sync="formData.deptCode" style="width: 80%" :changeValue.sync="handleInvChange"/>-->
<!-- &lt;!&ndash;<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>&ndash;&gt;-->
<!-- </el-form-item>-->
<!--</el-col>-->
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
@ -665,7 +664,7 @@ import {
deleteWorkplace, deleteWorkplace,
createWorkplaceId, printWorkLabel, getUsers createWorkplaceId, printWorkLabel, getUsers
} from '@/api/basic/workPlace/sysWorkplaceManage' } from '@/api/basic/workPlace/sysWorkplaceManage'
import {filterAllByUser, getInvListByUser} from '@/api/system/invWarehouse' import { filterAllByUser, filterList, getInvListByUser } from '@/api/system/invWarehouse'
import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage' import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage'
import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType' import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType'
import panelGroup from '@/views/dashboard/PanelGroup' import panelGroup from '@/views/dashboard/PanelGroup'
@ -1233,14 +1232,25 @@ export default {
}, },
getDeptList() { getDeptList() {
this.deptList = [] this.deptList = []
filterAllByUser() let data =
.then((response) => { {enable: true,
this.deptList = response.data || [] }
this.getInvList() filterList(data).then(res => {
}) if (res.code == 20000) {
.catch(() => { this.deptList = res.data.list || []
}
}) })
}, },
// getDeptList() {
//
// filterAllByUser()
// .then((response) => {
// this.deptList = response.data || []
// this.getInvList()
// })
// .catch(() => {
// })
// },
deptChange() { deptChange() {
this.getInvList() this.getInvList()
this.formData.invCode = '' this.formData.invCode = ''

16
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -181,14 +181,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="splitType=='out'"> <!--<el-col :span="6" v-if="splitType=='out'">-->
<el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:"> <!-- <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">-->
<el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange"> <!-- <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange">-->
<el-radio :label="1">拆零上货</el-radio> <!-- <el-radio :label="1">拆零上货</el-radio>-->
<el-radio :label="2">整取上货</el-radio> <!-- <el-radio :label="2">整取上货</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row>

8
src/views/collect/fieldOperation.vue
Unescape Escape View File

@ -7,7 +7,7 @@
<!-- 分割线 --> <!-- 分割线 -->
<el-form :model="query" class="query-form" size="mini" label-width="100px" :inline="true"> <el-form :model="query" class="query-form" size="mini" label-width="100px" :inline="true">
<el-form-item prop="key" label="工位信息:"> <el-form-item prop="key" label="工位信息:">
<el-input v-model="query.key" clearable placeholder="请输入或扫描工位二维码" style="width: 400px" ref="inputField" ></el-input> <el-input v-model="query.workKey" clearable placeholder="请输入或扫描工位二维码" style="width: 400px" ref="inputField" ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -54,14 +54,16 @@
<script> <script>
import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage.js"; import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage.js";
import QRCode from 'qrcodejs2' import QRCode from 'qrcodejs2'
import { getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
export default { export default {
name: 'fieldOperation', name: 'fieldOperation',
data() { data() {
return { return {
query:{ query:{
key: '', workKey: '',
workplaceStatus: 1, workplaceStatus: 1,
userId: this.$store.getters.adminId,
// invCode: this.$store.getters.locInvCode, // invCode: this.$store.getters.locInvCode,
page: 1, page: 1,
limit: 200 limit: 200
@ -94,7 +96,7 @@ export default {
window.open(url, '_blank'); window.open(url, '_blank');
}, },
getStationList() { getStationList() {
listPage(this.query).then(res => { getUserBindWork(this.query).then(res => {
this.stationList = res.data?.list || [] this.stationList = res.data?.list || []
// this.generateQRCodes // this.generateQRCodes
}) })

Write Preview
Loading…
Cancel
Save