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

bug供应商修改

Browse Source
dev_unify
yewj 8 months ago
parent 9892e87c2b
commit 5ce05fe252
3 changed files with 110 additions and 107 deletions
Show Stats Download Patch File Download Diff File

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

@ -71,7 +71,7 @@
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>-->
<el-option label="外包装标识" :value="4"></el-option> <el-option label="外包装标识" :value="4"></el-option>
</el-select> </el-select>
</template> </template>
@ -1328,7 +1328,6 @@ export default {
}, },
methods: { methods: {
distributeLevelDiChange(val) { distributeLevelDiChange(val) {
console.log("gdgdgdgdgd",this.editQuery.distributeLevel)
const matchingItem = this.detailList.find(item => item.nameCode == val); const matchingItem = this.detailList.find(item => item.nameCode == val);
if (matchingItem) { if (matchingItem) {
this.editQuery.distributeLevelUnit = matchingItem.packUnit; this.editQuery.distributeLevelUnit = matchingItem.packUnit;
@ -1399,6 +1398,7 @@ export default {
}, },
addDrugLevel() { addDrugLevel() {
console.log('this.detailList',this.detailList)
this.detailList.push({ this.detailList.push({
nameCode: '', nameCode: '',
packLevel: null, packLevel: null,

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

@ -144,106 +144,105 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<template> <!-- <template>-->
<p class="form-title2">流通时采用的计量单位设置</p> <!-- <p class="form-title2">流通时采用的计量单位设置</p>-->
</template> <!-- </template>-->
<el-row :gutter="20"> <!-- <el-row :gutter="20">-->
<el-col :span="11" class="el-col"> <!-- <el-col :span="11" class="el-col">-->
<el-form-item label="计量单位:" prop="distributeLevel" label-width="160px"> <!-- <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">-->
<el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
@change="distributeLevelDiChange"
placeholder="请选择计量单位"
>
<el-option
v-for="item in levelUnitList"
:key="item.packLevel"
:value="item.packLevel"
:label="item.packUnit"
>
<span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
<span style="float: left">层级:{{ item.packLevel }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col"> <!-- <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"-->
<el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px"> <!-- @change="distributeLevelDiChange"-->
<el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%" <!-- placeholder="请选择计量单位"-->
placeholder="请选择允许采集的最大层级" <!-- >-->
> <!-- <el-option-->
<el-option <!-- v-for="item in levelUnitList"-->
v-for="item in levelUnitList" <!-- :key="item.packLevel"-->
:key="item.packLevel" <!-- :value="item.packLevel"-->
:value="item.packLevel" <!-- :label="item.packUnit"-->
:label="item.packLevel" <!-- >-->
> <!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span> <!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<span style="float: left">层级:{{ item.packLevel }}</span> <!-- </el-option>-->
</el-option> <!-- </el-select>-->
</el-select> <!-- </el-form-item>-->
</el-form-item> <!-- </el-col>-->
</el-col>
</el-row>
<el-divider></el-divider>
<template>
<p class="form-title2">使用时采用的计量单位设置</p>
</template>
<el-row :gutter="20">
<el-col :span="11" class="el-col">
<el-form-item label="计量单位:" prop="useLevel" label-width="160px">
<el-select v-model="newProductData.useLevel" size="small" style="width: 90%" <!-- <el-col :span="11" class="el-col">-->
clearable <!-- <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">-->
@change="useLevelDiChange" <!-- <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"-->
placeholder="请选择计量单位" <!-- placeholder="请选择允许采集的最大层级"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in levelUnitList" <!-- v-for="item in levelUnitList"-->
:key="item.packLevel" <!-- :key="item.packLevel"-->
:value="item.packLevel" <!-- :value="item.packLevel"-->
:label="item.packUnit" <!-- :label="item.packLevel"-->
> <!-- >-->
<span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span> <!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<span style="float: left">层级:{{ item.packLevel }}</span> <!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-divider></el-divider>-->
<!-- <template>-->
<!-- <p class="form-title2">使用时采用的计量单位设置</p>-->
<!-- </template>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="计量单位:" prop="useLevel" label-width="160px">-->
<el-col :span="11" class="el-col"> <!-- <el-select v-model="newProductData.useLevel" size="small" style="width: 90%"-->
<el-form-item label="允许采集的最大层级:" prop="useMaxLevel" label-width="160px"> <!-- clearable-->
<el-select v-model="newProductData.useMaxLevel" size="small" style="width: 90%" <!-- @change="useLevelDiChange"-->
clearable <!-- placeholder="请选择计量单位"-->
placeholder="请选择允许采集的最大层级" <!-- >-->
> <!-- <el-option-->
<el-option <!-- v-for="item in levelUnitList"-->
v-for="item in levelUnitList" <!-- :key="item.packLevel"-->
:key="item.packLevel" <!-- :value="item.packLevel"-->
:value="item.packLevel" <!-- :label="item.packUnit"-->
:label="item.packLevel" <!-- >-->
> <!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span> <!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<span style="float: left">层级:{{ item.packLevel }}</span> <!-- </el-option>-->
</el-option> <!-- </el-select>-->
</el-select> <!-- </el-form-item>-->
</el-form-item> <!-- </el-col>-->
</el-col>
</el-row>
<el-row :gutter="20"> <!-- <el-col :span="11" class="el-col">-->
<el-col :span="11" class="el-col"> <!-- <el-form-item label="允许采集的最大层级:" prop="useMaxLevel" label-width="160px">-->
<el-form-item label="拆包后可用时长(小时):" prop="unpackUseTime" label-width="160px"> <!-- <el-select v-model="newProductData.useMaxLevel" size="small" style="width: 90%"-->
<!-- clearable-->
<!-- placeholder="请选择允许采集的最大层级"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in levelUnitList"-->
<!-- :key="item.packLevel"-->
<!-- :value="item.packLevel"-->
<!-- :label="item.packLevel"-->
<!-- >-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="拆包后可用时长(小时):" prop="unpackUseTime" label-width="160px">-->
<el-input v-model="newProductData.unpackUseTime" size="small" style="width: 90%" <!-- <el-input v-model="newProductData.unpackUseTime" size="small" style="width: 90%"-->
clearable <!-- clearable-->
placeholder="请输入拆包后可用时长(小时)" <!-- placeholder="请输入拆包后可用时长(小时)"-->
> <!-- >-->
</el-input> <!-- </el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-collapse-item> </el-collapse-item>
<el-collapse-item name="2"> <el-collapse-item name="2">
<template slot="title"> <template slot="title">
@ -925,16 +924,16 @@ export default {
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
this.newProductData.relId = this.newProductData.rlId
addDrug(this.newProductData).then((res) => { updatetDrug(this.newProductData).then((res) => {
this.saveLoading = false this.saveLoading = false
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success('添加成功') this.$message.success('添加成功')

6
src/views/system/menu/index.vue
Unescape Escape View File

@ -450,9 +450,13 @@ export default {
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function () { this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function () {
return delMenu(row.menuId); return delMenu(row.menuId);
}).then(() => { }).then((res) => {
if (res.code == 20000) {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
} else {
this.$modal.msgSuccess(res.message);
}
}).catch(() => { }).catch(() => {
}); });
} }

Write Preview
Loading…
Cancel
Save