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

代码备份

Browse Source
yanshishuju
yewj 9 months ago
parent 6b9791df4c
commit 529e370475
5 changed files with 271 additions and 108 deletions
Show Stats Download Patch File Download Diff File

6
.env.development
Unescape Escape View File

@ -6,9 +6,9 @@ ENV = 'development'
# 开发环境 # 开发环境
# VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/' # VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.166:9991' VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001" VUE_APP_SYNC_API ="http://127.0.0.1:10001"
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'
@ -18,5 +18,5 @@ VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
# xxl-job 控制台地址`` # xxl-job 控制台地址``
VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin' VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
# 路由懒加载 # 路由懒加载s
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

11
src/api/basic/product/udiInfo.js
Unescape Escape View File

@ -1,5 +1,5 @@
import axios from "@/utils/request"; import axios from "@/utils/request";
import { sysFilterOptimize } from '../udiRelevance' import {sysFilterOptimize} from '../udiRelevance'
export function getUdiInfos(query) { export function getUdiInfos(query) {
return axios({ return axios({
@ -49,3 +49,12 @@ export function selectOriginuuid(query) {
}); });
} }
export function levelByUuid(query) {
return axios({
url: "/udiwms/udi/local/levelByUuid",
method: "get",
params: query
});
}

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

@ -53,12 +53,24 @@
<el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip width="160"> <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.nameCode" style="width: 100%;margin: 4px;" <el-input size="small" v-model="scope.row.nameCode" style="width: 100%;margin: 4px;"
:disabled="scope.$index !== selectedIndex" :disabled="scope.$index !== selectedIndex"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip width="160"> <!-- 1.主标识，2，使用单元标识，3.本体标识，4，包装标识-->
<el-table-column label="标识类型" prop="diType" show-overflow-tooltip width="160">
<template slot-scope="scope">
<el-select v-model="scope.row.diType"
:disabled="scope.$index !== selectedIndex"
style="width: 90%" placeholder="选择标识类型" clearable>
<el-option label="最小销售标识" :value="1"></el-option>
<!-- <el-option label="使用单元标识" :value="2"></el-option>-->
<!-- <el-option label="本体标识" :value="3"></el-option>-->
<el-option label="外包装标识" :value="4"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.packLevel" style="width: 100%" <el-input size="small" v-model="scope.row.packLevel" style="width: 100%"
type="number" type="number"
@ -66,16 +78,24 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="100"> <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.packUnit" style="width: 100%" <el-input size="small" v-model="scope.row.packUnit" style="width: 100%"
:disabled="scope.$index !== selectedIndex" :disabled="scope.$index !== selectedIndex"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上级标识" prop="sjcpbm" show-overflow-tooltip width="160"> <el-table-column label="下级数量" prop="bhxjsl" show-overflow-tooltip width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.sjcpbm" style="width: 100%" <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
type="number"
:disabled="scope.$index !== selectedIndex"
></el-input>
</template>
</el-table-column>
<el-table-column label="下级单位" prop="xjdw" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.xjdw" style="width: 100%"
:disabled="scope.$index !== selectedIndex" :disabled="scope.$index !== selectedIndex"
></el-input> ></el-input>
</template> </template>
@ -87,14 +107,14 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="下级数量" prop="bhxjsl" show-overflow-tooltip width="100"> <el-table-column label="上级标识" prop="sjcpbm" show-overflow-tooltip width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%" <el-input size="small" v-model="scope.row.sjcpbm" style="width: 100%"
type="number"
:disabled="scope.$index !== selectedIndex" :disabled="scope.$index !== selectedIndex"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<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"
@ -122,6 +142,96 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<template>
<p class="form-title2">流通时采用的计量单位设置</p>
</template>
<el-row :gutter="20">
<el-col :span="11" class="el-col">
<el-form-item label="计量单位:" prop="distributeLevelDi" label-width="160px">
<el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
clearable
@change="distributeLevelDiChange"
placeholder="请选择计量单位"
>
<el-option
v-for="item in levelUnitList"
:key="item.packLevel"
:value="item.packLevel"
:label="item.packUnit"
>
<span style="float: left">{{ item.packLevel }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.packUnit }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">
<el-select v-model="newProductData.distributeMaxLevel" 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-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%"
clearable
@change="useLevelDiChange"
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-form-item label="允许采集的最大层级:" prop="useMaxLevel" 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-collapse-item> </el-collapse-item>
<el-collapse-item name="2"> <el-collapse-item name="2">
<template slot="title"> <template slot="title">
@ -370,83 +480,83 @@
</el-collapse-item> </el-collapse-item>
<el-collapse-item name="3"> <!-- <el-collapse-item name="3">-->
<template slot="title"> <!-- <template slot="title">-->
<p class="form-title">流通使用参数设置</p> <!-- <p class="form-title">流通使用参数设置</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="distributeLevelDi" label-width="160px"> <!-- <el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">-->
<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>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="11" class="el-col"> <!-- <el-col :span="11" class="el-col">-->
<el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px"> <!-- <el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">-->
<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-->
disabled <!-- disabled-->
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>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="11" class="el-col"> <!-- <el-col :span="11" class="el-col">-->
<el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px"> <!-- <el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">-->
<el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位" <!-- <el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"-->
disabled <!-- disabled-->
v-model="newProductData.distributeLevelUnit" <!-- v-model="newProductData.distributeLevelUnit"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="11" class="el-col"> <!-- <el-col :span="11" class="el-col">-->
<el-form-item label="使用计量层级单位:" prop="useLevelUnit" label-width="160px"> <!-- <el-form-item label="使用计量层级单位:" prop="useLevelUnit" label-width="160px">-->
<el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识" <!-- <el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"-->
disabled <!-- disabled-->
v-model.trim="newProductData.useLevelUnit" <!-- v-model.trim="newProductData.useLevelUnit"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="11" class="el-col"> <!-- <el-col :span="11" class="el-col">-->
<el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px"> <!-- <el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">-->
<el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量" <!-- <el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"-->
v-model.trim="newProductData.distributeLevelCount" <!-- v-model.trim="newProductData.distributeLevelCount"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="11" class="el-col"> <!-- <el-col :span="11" class="el-col">-->
<el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px"> <!-- <el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">-->
<el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量" <!-- <el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"-->
v-model.trim="newProductData.useLeverCount" <!-- v-model.trim="newProductData.useLeverCount"-->
></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="4"> <el-collapse-item name="4">
<template slot="title"> <template slot="title">
<p class="form-title">高级设置</p> <p class="form-title">高级设置</p>
@ -552,7 +662,7 @@ 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} 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'
@ -607,7 +717,7 @@ export default {
status: false, status: false,
relId: null, relId: null,
drugLevelLists: [], drugLevelLists: [],
productId:null, productId: null,
useLevelDi: null, useLevelDi: null,
distributeLevelDi: null, distributeLevelDi: null,
@ -665,7 +775,15 @@ export default {
}, },
detailList: [ detailList: [
// 初始化一个空对象或包含默认值的对象 // 初始化一个空对象或包含默认值的对象
{productId: null ,nameCode: '', packLevel: null, bhxjsl: null, isDisabled: false, isUpDisabled: true, rowDisabled: false} {
productId: null,
nameCode: '',
packLevel: null,
bhxjsl: null,
isDisabled: false,
isUpDisabled: true,
rowDisabled: false
}
], ],
status: false, status: false,
rowDisabled: false, rowDisabled: false,
@ -676,7 +794,9 @@ export default {
sysList: [], sysList: [],
chooseHouseDrugVisible: false, chooseHouseDrugVisible: false,
isImport: false, isImport: false,
defaultSys: null defaultSys: null,
levelUnitList: [],
maxLevel: 1,
} }
}, },
@ -837,7 +957,6 @@ export default {
//层级保存 //层级保存
levelSave(row) { levelSave(row) {
if (isBlank(row.nameCode)) { if (isBlank(row.nameCode)) {
this.$message.error('层级标识不能为空') this.$message.error('层级标识不能为空')
return return
@ -850,7 +969,6 @@ export default {
this.$message.error('层级单位不能为空') this.$message.error('层级单位不能为空')
return return
} }
console.log("djfjfjjf",row.productId)
let editQuery = { let editQuery = {
nameCode: row.nameCode, nameCode: row.nameCode,
packLevel: row.packLevel, packLevel: row.packLevel,
@ -860,7 +978,9 @@ export default {
bhxjsl: row.bhxjsl, bhxjsl: row.bhxjsl,
relId: this.newProductData.id, relId: this.newProductData.id,
uuid: this.newProductData.uuid, uuid: this.newProductData.uuid,
productId:row.productId productId: row.productId,
diType: row.diType,
xjdw: row.xjdw
} }
updateLevelDrug(editQuery).then(res => { updateLevelDrug(editQuery).then(res => {
this.saveLoading = false this.saveLoading = false
@ -869,6 +989,7 @@ export default {
this.$message.success('保存成功！') this.$message.success('保存成功！')
this.selectedIndex = null this.selectedIndex = null
this.getDetailList() this.getDetailList()
this.getDiLevel();
} else { } else {
this.isSave = true this.isSave = true
this.$message.error(res.message) this.$message.error(res.message)
@ -973,6 +1094,32 @@ export default {
} }
}) })
}, },
getDiLevel() {
let query = {
id: this.relId
}
this.loading = true
levelByUuid(query)
.then((response) => {
this.loading = false
this.levelUnitList = response.data || []
this.findMaxLevelObject()
})
.catch(() => {
this.loading = false
this.levelUnitList = []
})
},
findMaxLevelObject() {
this.maxLevel = 1;
for (const obj of this.levelUnitList) {
if (obj.packLevel > this.maxLevel) {
this.maxLevel = Number(obj.packLevel);
}
}
},
/** /**
* 选择收费项目 * 选择收费项目
*/ */
@ -1070,11 +1217,11 @@ export default {
} else { } else {
this.status = false this.status = false
} }
this.getDiLevel()
this.getDetailList() this.getDetailList()
this.getThirdSysDetail() this.getThirdSysDetail()
} else { } else {
this.selectedIndex = 0 this.selectedIndex = 0
} }
}, },
directives: { directives: {
@ -1103,4 +1250,11 @@ export default {
padding-top: 17px; padding-top: 17px;
} }
.form-title2 {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
}
</style> </style>

2
src/views/collect/ioSplitFifoCode.vue
Unescape Escape View File

@ -50,7 +50,7 @@ export default {
} }
}, },
created() { created() {
if (this.$route.query.workplaceId != null){ if (this.$route.query.workplaceId != null) {
this.isLinkDisabled = true this.isLinkDisabled = true
this.workPlaceCode = Number(this.$route.query.workplaceId); this.workPlaceCode = Number(this.$route.query.workplaceId);
} }

14
src/views/inout/codeRel/ioCodeRel.vue
Unescape Escape View File

@ -3,11 +3,11 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-if="showSearch"> <el-form :model="filterQuery" class="query-form" label-width="100px" v-if="showSearch">
<el-row> <el-row>
<!-- <el-col :span="10">--> <!-- <el-col :span="10">-->
<!-- <el-form-item label="udi">--> <!-- <el-form-item label="udi">-->
<!-- <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入udi" clearable></el-input>--> <!-- <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入udi" clearable></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="10"> <el-col :span="10">
<el-form-item label="产品编码"> <el-form-item label="产品编码">
@ -48,7 +48,7 @@
<el-table v-loading="loading" :data="list" border highlight-current-row <el-table v-loading="loading" :data="list" border highlight-current-row
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
style="width: 100%" row-key="id" > style="width: 100%" row-key="id">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="上级编码" prop="parentCode"></el-table-column> <el-table-column label="上级编码" prop="parentCode"></el-table-column>
<el-table-column label="产品编码" prop="nameCode"></el-table-column> <el-table-column label="产品编码" prop="nameCode"></el-table-column>
@ -199,7 +199,7 @@ export default {
this.detailList = []; this.detailList = [];
}, },
deleteDialog(row) { deleteDialog(row) {
delIoCodeRel({parentCode:row.parentCode}) delIoCodeRel({parentCode: row.parentCode})
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();

Write Preview
Loading…
Cancel
Save