|
|
|
@ -54,6 +54,95 @@
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</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="distributeLevel" label-width="160px">
|
|
|
|
|
|
|
|
|
|
<el-select v-model="editQuery.distributeLevel" size="small" style="width: 90%"
|
|
|
|
|
clearable
|
|
|
|
|
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="distributeMaxLevel" label-width="160px">
|
|
|
|
|
<el-select v-model="editQuery.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="editQuery.useLevel" size="small" style="width: 90%"
|
|
|
|
|
clearable
|
|
|
|
|
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="editQuery.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-card>
|
|
|
|
|
<el-card>
|
|
|
|
|
<!--<el-row type="flex" class="edit-row" style="margin-top: 20px">-->
|
|
|
|
@ -779,82 +868,80 @@
|
|
|
|
|
</div>
|
|
|
|
|
</el-collapse-item>
|
|
|
|
|
|
|
|
|
|
<el-collapse-item title="参数设置" name="2"
|
|
|
|
|
style="font-size: 19px;
|
|
|
|
|
margin-left: 25px;
|
|
|
|
|
font-weight: bold;">
|
|
|
|
|
<div style="width: 96%;margin: 0 auto">
|
|
|
|
|
<!-- <el-collapse-item title="参数设置" name="2"-->
|
|
|
|
|
<!-- style="font-size: 19px;-->
|
|
|
|
|
<!-- margin-left: 25px;-->
|
|
|
|
|
<!-- font-weight: bold;">-->
|
|
|
|
|
<!-- <div style="width: 96%;margin: 0 auto">-->
|
|
|
|
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
|
|
<el-col :span="11" class="el-col">
|
|
|
|
|
<el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">
|
|
|
|
|
<el-select v-model="editQuery.distributeLevelDi" size="small" style="width: 90%"
|
|
|
|
|
@change="distributeLevelDiChange"
|
|
|
|
|
clearable
|
|
|
|
|
placeholder="请选择流通计量层级标识">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in detailList"
|
|
|
|
|
:key="item.nameCode"
|
|
|
|
|
:value="item.nameCode"
|
|
|
|
|
:label="item.nameCode">
|
|
|
|
|
<span style="float: left">{{ item.nameCode }}</span>
|
|
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="11" class="el-col">
|
|
|
|
|
<el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">
|
|
|
|
|
<el-select v-model="editQuery.useLevelDi" size="small" style="width: 90%"
|
|
|
|
|
@change="useLevelDiChange"
|
|
|
|
|
clearable
|
|
|
|
|
disabled
|
|
|
|
|
placeholder="请选择流通计量层级标识">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in detailList"
|
|
|
|
|
:key="item.nameCode"
|
|
|
|
|
:value="item.nameCode"
|
|
|
|
|
:label="item.nameCode">
|
|
|
|
|
<span style="float: left">{{ item.nameCode }}</span>
|
|
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="11" class="el-col">
|
|
|
|
|
<el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">
|
|
|
|
|
<el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"
|
|
|
|
|
disabled
|
|
|
|
|
v-model="editQuery.distributeLevelUnit"
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="11" class="el-col">
|
|
|
|
|
<el-form-item label="使用计量层级标识:" prop="useLevelUnit" label-width="160px">
|
|
|
|
|
<el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"
|
|
|
|
|
disabled
|
|
|
|
|
v-model.trim="editQuery.useLevelUnit"
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="11" class="el-col">
|
|
|
|
|
<el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">
|
|
|
|
|
<el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"
|
|
|
|
|
v-model.trim="editQuery.distributeLevelCount"
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="11" class="el-col">
|
|
|
|
|
<el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">
|
|
|
|
|
<el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"
|
|
|
|
|
v-model.trim="editQuery.useLeverCount"
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!-- <el-row :gutter="20">-->
|
|
|
|
|
<!-- <el-col :span="11" class="el-col">-->
|
|
|
|
|
<!-- <el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">-->
|
|
|
|
|
<!-- <el-select v-model="editQuery.distributeLevelDi" size="small" style="width: 90%"-->
|
|
|
|
|
<!-- clearable-->
|
|
|
|
|
<!-- placeholder="请选择流通计量层级标识">-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in detailList"-->
|
|
|
|
|
<!-- :key="item.nameCode"-->
|
|
|
|
|
<!-- :value="item.nameCode"-->
|
|
|
|
|
<!-- :label="item.nameCode">-->
|
|
|
|
|
<!-- <span style="float: left">{{ item.nameCode }}</span>-->
|
|
|
|
|
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>-->
|
|
|
|
|
<!-- </el-option>-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- <el-col :span="11" class="el-col">-->
|
|
|
|
|
<!-- <el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">-->
|
|
|
|
|
<!-- <el-select v-model="editQuery.useLevelDi" size="small" style="width: 90%"-->
|
|
|
|
|
<!-- clearable-->
|
|
|
|
|
<!-- disabled-->
|
|
|
|
|
<!-- placeholder="请选择流通计量层级标识">-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in detailList"-->
|
|
|
|
|
<!-- :key="item.nameCode"-->
|
|
|
|
|
<!-- :value="item.nameCode"-->
|
|
|
|
|
<!-- :label="item.nameCode">-->
|
|
|
|
|
<!-- <span style="float: left">{{ item.nameCode }}</span>-->
|
|
|
|
|
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>-->
|
|
|
|
|
<!-- </el-option>-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- <el-col :span="11" class="el-col">-->
|
|
|
|
|
<!-- <el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">-->
|
|
|
|
|
<!-- <el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"-->
|
|
|
|
|
<!-- disabled-->
|
|
|
|
|
<!-- v-model="editQuery.distributeLevelUnit"-->
|
|
|
|
|
<!-- ></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- <el-col :span="11" class="el-col">-->
|
|
|
|
|
<!-- <el-form-item label="使用计量层级标识:" prop="useLevelUnit" label-width="160px">-->
|
|
|
|
|
<!-- <el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"-->
|
|
|
|
|
<!-- disabled-->
|
|
|
|
|
<!-- v-model.trim="editQuery.useLevelUnit"-->
|
|
|
|
|
<!-- ></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- <el-col :span="11" class="el-col">-->
|
|
|
|
|
<!-- <el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">-->
|
|
|
|
|
<!-- <el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"-->
|
|
|
|
|
<!-- v-model.trim="editQuery.distributeLevelCount"-->
|
|
|
|
|
<!-- ></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- <el-col :span="11" class="el-col">-->
|
|
|
|
|
<!-- <el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">-->
|
|
|
|
|
<!-- <el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"-->
|
|
|
|
|
<!-- v-model.trim="editQuery.useLeverCount"-->
|
|
|
|
|
<!-- ></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
</div>
|
|
|
|
|
</el-collapse-item>
|
|
|
|
|
<!-- </el-row>-->
|
|
|
|
|
<!-- </div>-->
|
|
|
|
|
<!-- </el-collapse-item>-->
|
|
|
|
|
</el-collapse>
|
|
|
|
|
<div style="text-align: center; margin-top: 12px">
|
|
|
|
|
<el-button
|
|
|
|
@ -956,7 +1043,7 @@ import {
|
|
|
|
|
updatetSingleUdiInfo, updatetUdiInfos
|
|
|
|
|
} from "@/api/basic/product/udiRelevance";
|
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
import {filterByUuid} from "@/api/basic/product/udiInfo";
|
|
|
|
|
import {filterByUuid, levelByUuid} from "@/api/basic/product/udiInfo";
|
|
|
|
|
import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
|
|
|
|
|
import selectErp from "./udiInfoselectErpUdi";
|
|
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
@ -1033,6 +1120,8 @@ export default {
|
|
|
|
|
classifyList: [],
|
|
|
|
|
addLoading: false,
|
|
|
|
|
onAddLoading: false,
|
|
|
|
|
levelUnitList: [],
|
|
|
|
|
maxLevel: 1,
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
components: {
|
|
|
|
@ -1048,6 +1137,13 @@ export default {
|
|
|
|
|
if (this.editQuery.isDateBy == 1) {
|
|
|
|
|
this.editQuery.recentDateTime = this.editQuery.recentDateTime / 24;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (this.editQuery.distributeMaxLevel == null) {
|
|
|
|
|
this.editQuery.distributeMaxLevel = 1
|
|
|
|
|
}
|
|
|
|
|
if (this.editQuery.useMaxLevel == null) {
|
|
|
|
|
this.editQuery.useMaxLevel = 1
|
|
|
|
|
}
|
|
|
|
|
this.getTreeselect();
|
|
|
|
|
let ttquery = {
|
|
|
|
|
id: this.relevanceEdit.id
|
|
|
|
@ -1059,6 +1155,7 @@ export default {
|
|
|
|
|
this.findHsflMethod(this.editQuery.basicPrductRemak8);
|
|
|
|
|
}
|
|
|
|
|
this.classifySearch("")
|
|
|
|
|
this.getDiLevel()
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
distributeLevelDiChange(val) {
|
|
|
|
@ -1418,6 +1515,31 @@ export default {
|
|
|
|
|
cancelSubmit() {
|
|
|
|
|
this.$emit("closePre", true);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
directives: {
|
|
|
|
|
'debounce-input': {
|
|
|
|
@ -1442,6 +1564,13 @@ export default {
|
|
|
|
|
width: 500px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.form-title2 {
|
|
|
|
|
font-size: 16px;
|
|
|
|
|
font-family: Noto Sans SC;
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
color: #303133;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.el-divider {
|
|
|
|
|
margin: 6px 0px 8px 0px;
|
|
|
|
|
background: 0 0;
|
|
|
|
|