|
|
@@ -25,16 +25,24 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="允许拆包" prop="isUnpack">
|
|
|
- <el-switch v-model="form.isUnpack" :active-value="1" :inactive-value="0">
|
|
|
+ <el-switch
|
|
|
+ v-model="form.isUnpack"
|
|
|
+ :active-value="1"
|
|
|
+ :inactive-value="0"
|
|
|
+ >
|
|
|
</el-switch>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="安全库存" prop="secureInventory" :rules="{
|
|
|
- required: this.form.isWarn == 1 ? true : false,
|
|
|
- message: '请输入安全库存',
|
|
|
- trigger: 'blur'
|
|
|
- }">
|
|
|
+ <el-form-item
|
|
|
+ label="安全库存"
|
|
|
+ prop="secureInventory"
|
|
|
+ :rules="{
|
|
|
+ required: this.form.isWarn == 1 ? true : false,
|
|
|
+ message: '请输入安全库存',
|
|
|
+ trigger: 'blur'
|
|
|
+ }"
|
|
|
+ >
|
|
|
<el-input v-model="form.secureInventory" @input="handleInput1">
|
|
|
<template #append>
|
|
|
{{ measuringUnit }}
|
|
|
@@ -43,11 +51,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="最小库存" prop="minInventory" :rules="{
|
|
|
- required: this.form.isWarn == 1 ? true : false,
|
|
|
- message: '请输入最小库存',
|
|
|
- trigger: 'blur'
|
|
|
- }">
|
|
|
+ <el-form-item
|
|
|
+ label="最小库存"
|
|
|
+ prop="minInventory"
|
|
|
+ :rules="{
|
|
|
+ required: this.form.isWarn == 1 ? true : false,
|
|
|
+ message: '请输入最小库存',
|
|
|
+ trigger: 'blur'
|
|
|
+ }"
|
|
|
+ >
|
|
|
<el-input v-model="form.minInventory" @input="handleInput2">
|
|
|
<template #append>
|
|
|
{{ measuringUnit }}
|
|
|
@@ -56,11 +68,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="最大库存" prop="maxInventory" :rules="{
|
|
|
- required: this.form.isWarn == 1 ? true : false,
|
|
|
- message: '请输入最大库存',
|
|
|
- trigger: 'blur'
|
|
|
- }">
|
|
|
+ <el-form-item
|
|
|
+ label="最大库存"
|
|
|
+ prop="maxInventory"
|
|
|
+ :rules="{
|
|
|
+ required: this.form.isWarn == 1 ? true : false,
|
|
|
+ message: '请输入最大库存',
|
|
|
+ trigger: 'blur'
|
|
|
+ }"
|
|
|
+ >
|
|
|
<el-input v-model="form.maxInventory" @input="handleInput3">
|
|
|
<template #append>
|
|
|
{{ measuringUnit }}
|
|
|
@@ -71,25 +87,57 @@
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="质保预警参考" prop="warrantyWarnRefer">
|
|
|
- <DictSelection dictName="质保预警参考" clearable v-model="form.warrantyWarnRefer">
|
|
|
+ <DictSelection
|
|
|
+ dictName="质保预警参考"
|
|
|
+ clearable
|
|
|
+ v-model="form.warrantyWarnRefer"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="保质期">
|
|
|
+ <el-form-item
|
|
|
+ label="保质期"
|
|
|
+ prop="warrantyPeriod"
|
|
|
+ :rules="{
|
|
|
+ required: clientEnvironmentId == 10 ? true : false,
|
|
|
+ message: '请输入保质期',
|
|
|
+ trigger: 'blur'
|
|
|
+ }"
|
|
|
+ >
|
|
|
<div class="form-line">
|
|
|
- <el-input v-model="form.warrantyPeriod" @input="handleInput4" style="width: calc(100% - 100px)" />
|
|
|
- <DictSelection dictName="保质期单位" clearable v-model="form.warrantyPeriodUnit" style="width: 100px">
|
|
|
+ <el-input
|
|
|
+ v-model="form.warrantyPeriod"
|
|
|
+ @input="handleInput4"
|
|
|
+ style="width: calc(100% - 100px)"
|
|
|
+ />
|
|
|
+ <DictSelection
|
|
|
+ dictName="保质期单位"
|
|
|
+ clearable
|
|
|
+ v-model="form.warrantyPeriodUnit"
|
|
|
+ style="width: 100px"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<div class="rules_box">
|
|
|
- <el-button type="primary" @click="addPackingRules">添加包装组</el-button>
|
|
|
- <el-tabs v-model="packingRules" editable @tab-click="handleClick" @edit="handleTabsEdit">
|
|
|
- <el-tab-pane v-for="(items, indexs) in packagingSpecification" :label="items.name" :name="items.code"
|
|
|
- :key="indexs">
|
|
|
+ <el-button type="primary" @click="addPackingRules"
|
|
|
+ >添加包装组</el-button
|
|
|
+ >
|
|
|
+ <el-tabs
|
|
|
+ v-model="packingRules"
|
|
|
+ editable
|
|
|
+ @tab-click="handleClick"
|
|
|
+ @edit="handleTabsEdit"
|
|
|
+ >
|
|
|
+ <el-tab-pane
|
|
|
+ v-for="(items, indexs) in packagingSpecification"
|
|
|
+ :label="items.name"
|
|
|
+ :name="items.code"
|
|
|
+ :key="indexs"
|
|
|
+ >
|
|
|
<div class="rules_box_tabs">
|
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="8">
|
|
|
@@ -104,7 +152,10 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="是否启用">
|
|
|
- <el-radio-group v-model="items.status" @input="statusChange($event, indexs)">
|
|
|
+ <el-radio-group
|
|
|
+ v-model="items.status"
|
|
|
+ @input="statusChange($event, indexs)"
|
|
|
+ >
|
|
|
<el-radio :label="1">是</el-radio>
|
|
|
<el-radio :label="0">否</el-radio>
|
|
|
</el-radio-group>
|
|
|
@@ -112,42 +163,82 @@
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="最小包装单元">
|
|
|
- <el-input class="packingUnit" v-model="items.minPackageCell" placeholder="请输入内容" type="number"></el-input>
|
|
|
+ <el-input
|
|
|
+ class="packingUnit"
|
|
|
+ v-model="items.minPackageCell"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ type="number"
|
|
|
+ ></el-input>
|
|
|
<div class="packingUnit">
|
|
|
- <DictSelection dictName="计量单位" clearable v-model="items.packageUnit" :isProhibit="true">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ clearable
|
|
|
+ v-model="items.packageUnit"
|
|
|
+ :isProhibit="true"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</div>
|
|
|
<span>/</span>
|
|
|
<div class="lastPackingUnit">
|
|
|
- <DictSelection dictName="计量单位" clearable v-model="items.minConversionUnit">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ clearable
|
|
|
+ v-model="items.minConversionUnit"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="内包装单元">
|
|
|
- <el-input class="packingUnit" v-model="items.inPackageCell" placeholder="请输入内容" type="number"></el-input>
|
|
|
+ <el-input
|
|
|
+ class="packingUnit"
|
|
|
+ v-model="items.inPackageCell"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ type="number"
|
|
|
+ ></el-input>
|
|
|
<div class="packingUnit">
|
|
|
- <DictSelection dictName="计量单位" clearable v-model="items.minConversionUnit">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ clearable
|
|
|
+ v-model="items.minConversionUnit"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</div>
|
|
|
<span>/</span>
|
|
|
<div class="lastPackingUnit">
|
|
|
- <DictSelection dictName="计量单位" clearable v-model="items.inConversionUnit">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ clearable
|
|
|
+ v-model="items.inConversionUnit"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="外包装单元">
|
|
|
- <el-input class="packingUnit" v-model="items.outPackageCell" placeholder="请输入内容" type="number"></el-input>
|
|
|
+ <el-input
|
|
|
+ class="packingUnit"
|
|
|
+ v-model="items.outPackageCell"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ type="number"
|
|
|
+ ></el-input>
|
|
|
<div class="packingUnit">
|
|
|
- <DictSelection dictName="计量单位" clearable v-model="items.inConversionUnit">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ clearable
|
|
|
+ v-model="items.inConversionUnit"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</div>
|
|
|
<span>/</span>
|
|
|
<div class="lastPackingUnit">
|
|
|
- <DictSelection dictName="计量单位" clearable v-model="items.outConversionUnit">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ clearable
|
|
|
+ v-model="items.outConversionUnit"
|
|
|
+ >
|
|
|
</DictSelection>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
@@ -182,176 +273,234 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import deptSelect from '@/components/CommomSelect/dept-select.vue';
|
|
|
-import personSelect from '@/components/CommomSelect/person-select.vue';
|
|
|
-import { deletePackageDisposition } from '@/api/material/list.js';
|
|
|
-import { getCode } from '@/api/codeManagement/index.js';
|
|
|
-export default {
|
|
|
- components: { deptSelect, personSelect },
|
|
|
- props: {
|
|
|
- form: {
|
|
|
- type: Object,
|
|
|
- default: () => { }
|
|
|
- },
|
|
|
- packageDispositionVOList: {
|
|
|
- type: Array,
|
|
|
- default: () => []
|
|
|
+ import deptSelect from '@/components/CommomSelect/dept-select.vue';
|
|
|
+ import personSelect from '@/components/CommomSelect/person-select.vue';
|
|
|
+ import { deletePackageDisposition } from '@/api/material/list.js';
|
|
|
+ import { getCode } from '@/api/codeManagement/index.js';
|
|
|
+ export default {
|
|
|
+ components: { deptSelect, personSelect },
|
|
|
+ props: {
|
|
|
+ form: {
|
|
|
+ type: Object,
|
|
|
+ default: () => {}
|
|
|
+ },
|
|
|
+ packageDispositionVOList: {
|
|
|
+ type: Array,
|
|
|
+ default: () => []
|
|
|
+ },
|
|
|
+ measuringUnit: {
|
|
|
+ type: String,
|
|
|
+ default() {
|
|
|
+ return '';
|
|
|
+ }
|
|
|
+ },
|
|
|
+ packingUnit: {
|
|
|
+ type: String,
|
|
|
+ default() {
|
|
|
+ return '';
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
- measuringUnit: {
|
|
|
- type: String,
|
|
|
- default() {
|
|
|
- return '';
|
|
|
+ watch: {
|
|
|
+ measuringUnit(val) {
|
|
|
+ this.packagingSpecification = this.packagingSpecification.map(
|
|
|
+ (item) => {
|
|
|
+ return { ...item, packageUnit: val };
|
|
|
+ }
|
|
|
+ );
|
|
|
+ },
|
|
|
+ packingUnit(val) {
|
|
|
+ this.packagingSpecification = this.packagingSpecification.map(
|
|
|
+ (item) => {
|
|
|
+ return { ...item, minConversionUnit: val };
|
|
|
+ }
|
|
|
+ );
|
|
|
+ },
|
|
|
+ packagingSpecification: {
|
|
|
+ handler(val) {
|
|
|
+ this.$emit('change', val);
|
|
|
+ },
|
|
|
+ deep: true
|
|
|
+ },
|
|
|
+ packageDispositionVOList: {
|
|
|
+ handler(packageDispositionVOList) {
|
|
|
+ if (packageDispositionVOList.length > 0) {
|
|
|
+ let codeList = new Set(
|
|
|
+ packageDispositionVOList.map((item) => item.code)
|
|
|
+ );
|
|
|
+ console.log(codeList);
|
|
|
+ let arr = [];
|
|
|
+ codeList.forEach((code) => {
|
|
|
+ let obj = {};
|
|
|
+ let filters = packageDispositionVOList.filter(
|
|
|
+ (item) => item.code == code
|
|
|
+ );
|
|
|
+ this.idsList.push({
|
|
|
+ code,
|
|
|
+ ids: filters.map((item) => item.id)
|
|
|
+ });
|
|
|
+ filters.map((item) => {
|
|
|
+ obj['id' + item.sort] = item.id;
|
|
|
+ switch (item.sort) {
|
|
|
+ case '0':
|
|
|
+ obj.code = item.code;
|
|
|
+ obj.name = item.name;
|
|
|
+ obj.status = Number(item.status);
|
|
|
+ break;
|
|
|
+ case '1':
|
|
|
+ obj.minPackageCell = item.packageCell;
|
|
|
+ obj.packageUnit = item.packageUnit;
|
|
|
+ obj.minConversionUnit = item.conversionUnit;
|
|
|
+ case '2':
|
|
|
+ obj.inPackageCell = item.packageCell;
|
|
|
+ obj.inConversionUnit = item.conversionUnit;
|
|
|
+ break;
|
|
|
+ case '3':
|
|
|
+ obj.outPackageCell = item.packageCell;
|
|
|
+ obj.outConversionUnit = item.conversionUnit;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ arr.push(obj);
|
|
|
+ });
|
|
|
+ this.packagingSpecification = arr;
|
|
|
+ this.packingRules = arr[0].code;
|
|
|
+ } else {
|
|
|
+ this.packagingSpecification = [];
|
|
|
+ }
|
|
|
+ },
|
|
|
+ deep: true
|
|
|
}
|
|
|
},
|
|
|
- packingUnit: {
|
|
|
- type: String,
|
|
|
- default() {
|
|
|
- return '';
|
|
|
+ data() {
|
|
|
+ return {
|
|
|
+ idsList: [],
|
|
|
+ packagingSpecification: [],
|
|
|
+ packingRules: '',
|
|
|
+ dialogVisible: false,
|
|
|
+ ruleItem: {
|
|
|
+ code: '',
|
|
|
+ name: '',
|
|
|
+ status: 0,
|
|
|
+ minPackageCell: '',
|
|
|
+ packageUnit: this.measuringUnit,
|
|
|
+ minConversionUnit: '',
|
|
|
+ inPackageCell: '',
|
|
|
+ inConversionUnit: '',
|
|
|
+ outPackageCell: '',
|
|
|
+ inConversionUnit: '',
|
|
|
+ outConversionUnit: ''
|
|
|
+ },
|
|
|
+ option: [
|
|
|
+ {
|
|
|
+ label: 'KG',
|
|
|
+ value: 'KG'
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ hasPushed: false
|
|
|
+ };
|
|
|
+ },
|
|
|
+ computed: {
|
|
|
+ clientEnvironmentId() {
|
|
|
+ return this.$store.state.user.info.clientEnvironmentId;
|
|
|
}
|
|
|
},
|
|
|
- },
|
|
|
- watch: {
|
|
|
- measuringUnit(val) {
|
|
|
- this.packagingSpecification = this.packagingSpecification.map(
|
|
|
- (item) => {
|
|
|
- return { ...item, packageUnit: val };
|
|
|
- }
|
|
|
+ created() {
|
|
|
+ console.log(
|
|
|
+ 'this.packageDispositionVOList------------------包装组',
|
|
|
+ this.packageDispositionVOList,
|
|
|
+ this.form
|
|
|
);
|
|
|
+ if (this.packageDispositionVOList.length == 0) {
|
|
|
+ this.hasPushed = false;
|
|
|
+ }
|
|
|
+ console.log(this.hasPushed, 'has');
|
|
|
},
|
|
|
- packingUnit(val) {
|
|
|
- this.packagingSpecification = this.packagingSpecification.map(
|
|
|
- (item) => {
|
|
|
- return { ...item, minConversionUnit: val };
|
|
|
+ mounted() {},
|
|
|
+ methods: {
|
|
|
+ changeNetWeight(val) {
|
|
|
+ console.log(val);
|
|
|
+ if (this.packagingSpecification.length > 0) {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.packagingSpecification[0].minPackageCell = val;
|
|
|
+ });
|
|
|
}
|
|
|
- );
|
|
|
- },
|
|
|
- packagingSpecification: {
|
|
|
- handler(val) {
|
|
|
- this.$emit('change', val);
|
|
|
},
|
|
|
- deep: true
|
|
|
- },
|
|
|
- packageDispositionVOList: {
|
|
|
- handler(packageDispositionVOList) {
|
|
|
- if (packageDispositionVOList.length > 0) {
|
|
|
- let codeList = new Set(
|
|
|
- packageDispositionVOList.map((item) => item.code)
|
|
|
- );
|
|
|
- console.log(codeList);
|
|
|
- let arr = [];
|
|
|
- codeList.forEach((code) => {
|
|
|
- let obj = {};
|
|
|
- let filters = packageDispositionVOList.filter(
|
|
|
- (item) => item.code == code
|
|
|
- );
|
|
|
- this.idsList.push({
|
|
|
- code,
|
|
|
- ids: filters.map((item) => item.id)
|
|
|
- });
|
|
|
- filters.map((item) => {
|
|
|
- obj['id' + item.sort] = item.id;
|
|
|
- switch (item.sort) {
|
|
|
- case '0':
|
|
|
- obj.code = item.code;
|
|
|
- obj.name = item.name;
|
|
|
- obj.status = Number(item.status);
|
|
|
- break;
|
|
|
- case '1':
|
|
|
- obj.minPackageCell = item.packageCell;
|
|
|
- obj.packageUnit = item.packageUnit;
|
|
|
- obj.minConversionUnit = item.conversionUnit;
|
|
|
- case '2':
|
|
|
- obj.inPackageCell = item.packageCell;
|
|
|
- obj.inConversionUnit = item.conversionUnit;
|
|
|
- break;
|
|
|
- case '3':
|
|
|
- obj.outPackageCell = item.packageCell;
|
|
|
- obj.outConversionUnit = item.conversionUnit;
|
|
|
- break;
|
|
|
- }
|
|
|
- });
|
|
|
- arr.push(obj);
|
|
|
- });
|
|
|
- this.packagingSpecification = arr;
|
|
|
- this.packingRules = arr[0].code;
|
|
|
+ handleInput1(value) {
|
|
|
+ this.form.secureInventory = this.$handleInputPublic(value);
|
|
|
+ },
|
|
|
+ handleInput2(value) {
|
|
|
+ this.form.minInventory = this.$handleInputPublic(value);
|
|
|
+ },
|
|
|
+ handleInput3(value) {
|
|
|
+ this.form.maxInventory = this.$handleInputPublic(value);
|
|
|
+ },
|
|
|
+ handleInput4(value) {
|
|
|
+ this.form.warrantyPeriod = this.$handleInputPublicHasPoint(value);
|
|
|
+ },
|
|
|
+
|
|
|
+ async defaultBuild(val) {
|
|
|
+ console.log(this.hasPushed, 'jjjjjjjjjjj');
|
|
|
+ if (!this.hasPushed) {
|
|
|
+ let code = await getCode('package_disposition');
|
|
|
+ this.ruleItem = {
|
|
|
+ code: code,
|
|
|
+ name: '默认包装组',
|
|
|
+ status: 1,
|
|
|
+ minPackageCell: '1',
|
|
|
+ packageUnit: this.measuringUnit,
|
|
|
+ minConversionUnit: this.packingUnit,
|
|
|
+ inPackageCell: '',
|
|
|
+ inConversionUnit: '',
|
|
|
+ outPackageCell: '',
|
|
|
+ inConversionUnit: '',
|
|
|
+ outConversionUnit: ''
|
|
|
+ };
|
|
|
+ this.packagingSpecification.push(this.ruleItem);
|
|
|
+ console.log('111111第一次添加');
|
|
|
+ this.packingRules = this.ruleItem.code;
|
|
|
+ this.hasPushed = true;
|
|
|
} else {
|
|
|
- this.packagingSpecification = [];
|
|
|
+ console.log('数组已经进行过push操作,无法再次添加元素。');
|
|
|
+ this.packagingSpecification = this.packagingSpecification.map(
|
|
|
+ (item) => {
|
|
|
+ return { ...item, minConversionUnit: val };
|
|
|
+ }
|
|
|
+ );
|
|
|
}
|
|
|
},
|
|
|
- deep: true
|
|
|
- }
|
|
|
- },
|
|
|
- data() {
|
|
|
- return {
|
|
|
- idsList: [],
|
|
|
- packagingSpecification: [],
|
|
|
- packingRules: '',
|
|
|
- dialogVisible: false,
|
|
|
- ruleItem: {
|
|
|
- code: '',
|
|
|
- name: '',
|
|
|
- status: 0,
|
|
|
- minPackageCell: '',
|
|
|
- packageUnit: this.measuringUnit,
|
|
|
- minConversionUnit: '',
|
|
|
- inPackageCell: '',
|
|
|
- inConversionUnit: '',
|
|
|
- outPackageCell: '',
|
|
|
- inConversionUnit: '',
|
|
|
- outConversionUnit: ''
|
|
|
+ statusChange(value, indexs) {
|
|
|
+ console.log(value);
|
|
|
+ if (value == 1) {
|
|
|
+ this.packagingSpecification = this.packagingSpecification.map(
|
|
|
+ (item, index) => {
|
|
|
+ if (indexs == index) {
|
|
|
+ item.status = 1;
|
|
|
+ } else {
|
|
|
+ item.status = 0;
|
|
|
+ }
|
|
|
+ return item;
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
},
|
|
|
- option: [
|
|
|
- {
|
|
|
- label: 'KG',
|
|
|
- value: 'KG'
|
|
|
+ ruleConig() {
|
|
|
+ console.log(this.ruleItem);
|
|
|
+ if (this.packagingSpecification.length == 0) {
|
|
|
+ this.ruleItem.status = 1;
|
|
|
+ } else {
|
|
|
+ this.ruleItem.status = 0;
|
|
|
}
|
|
|
- ],
|
|
|
- hasPushed: false
|
|
|
- };
|
|
|
- },
|
|
|
- created() {
|
|
|
- console.log(
|
|
|
- 'this.packageDispositionVOList------------------包装组',
|
|
|
- this.packageDispositionVOList, this.form
|
|
|
- );
|
|
|
- if (this.packageDispositionVOList.length == 0) {
|
|
|
- this.hasPushed = false;
|
|
|
- }
|
|
|
- console.log(this.hasPushed, 'has');
|
|
|
- },
|
|
|
- mounted() {
|
|
|
-
|
|
|
- },
|
|
|
- methods: {
|
|
|
- changeNetWeight(val) {
|
|
|
- console.log(val)
|
|
|
- if (this.packagingSpecification.length > 0) {
|
|
|
- this.$nextTick(() => {
|
|
|
- this.packagingSpecification[0].minPackageCell = val
|
|
|
- })
|
|
|
- }
|
|
|
- },
|
|
|
- handleInput1(value) {
|
|
|
- this.form.secureInventory = this.$handleInputPublic(value);
|
|
|
- },
|
|
|
- handleInput2(value) {
|
|
|
- this.form.minInventory = this.$handleInputPublic(value);
|
|
|
- },
|
|
|
- handleInput3(value) {
|
|
|
- this.form.maxInventory = this.$handleInputPublic(value);
|
|
|
- },
|
|
|
- handleInput4(value) {
|
|
|
- this.form.warrantyPeriod = this.$handleInputPublicHasPoint(value);
|
|
|
- },
|
|
|
-
|
|
|
- async defaultBuild(val) {
|
|
|
- console.log(this.hasPushed, 'jjjjjjjjjjj')
|
|
|
- if (!this.hasPushed) {
|
|
|
+ this.packagingSpecification.push(this.ruleItem);
|
|
|
+ this.dialogVisible = false;
|
|
|
+ this.packingRules = this.ruleItem.code;
|
|
|
+ },
|
|
|
+ async addPackingRules() {
|
|
|
let code = await getCode('package_disposition');
|
|
|
this.ruleItem = {
|
|
|
code: code,
|
|
|
- name: '默认包装组',
|
|
|
- status: 1,
|
|
|
+ name: '',
|
|
|
+ status: 0,
|
|
|
minPackageCell: '1',
|
|
|
packageUnit: this.measuringUnit,
|
|
|
minConversionUnit: this.packingUnit,
|
|
|
@@ -361,180 +510,126 @@ export default {
|
|
|
inConversionUnit: '',
|
|
|
outConversionUnit: ''
|
|
|
};
|
|
|
- this.packagingSpecification.push(this.ruleItem);
|
|
|
- console.log('111111第一次添加');
|
|
|
- this.packingRules = this.ruleItem.code;
|
|
|
- this.hasPushed = true;
|
|
|
- } else {
|
|
|
- console.log('数组已经进行过push操作,无法再次添加元素。');
|
|
|
- this.packagingSpecification = this.packagingSpecification.map(
|
|
|
- (item) => {
|
|
|
- return { ...item, minConversionUnit: val };
|
|
|
- }
|
|
|
- );
|
|
|
- }
|
|
|
- },
|
|
|
- statusChange(value, indexs) {
|
|
|
- console.log(value);
|
|
|
- if (value == 1) {
|
|
|
- this.packagingSpecification = this.packagingSpecification.map(
|
|
|
- (item, index) => {
|
|
|
- if (indexs == index) {
|
|
|
- item.status = 1;
|
|
|
- } else {
|
|
|
- item.status = 0;
|
|
|
- }
|
|
|
- return item;
|
|
|
- }
|
|
|
- );
|
|
|
- }
|
|
|
- },
|
|
|
- ruleConig() {
|
|
|
- console.log(this.ruleItem);
|
|
|
- if (this.packagingSpecification.length == 0) {
|
|
|
- this.ruleItem.status = 1;
|
|
|
- } else {
|
|
|
- this.ruleItem.status = 0;
|
|
|
- }
|
|
|
- this.packagingSpecification.push(this.ruleItem);
|
|
|
- this.dialogVisible = false;
|
|
|
- this.packingRules = this.ruleItem.code;
|
|
|
- },
|
|
|
- async addPackingRules() {
|
|
|
- let code = await getCode('package_disposition');
|
|
|
- this.ruleItem = {
|
|
|
- code: code,
|
|
|
- name: '',
|
|
|
- status: 0,
|
|
|
- minPackageCell: '1',
|
|
|
- packageUnit: this.measuringUnit,
|
|
|
- minConversionUnit: this.packingUnit,
|
|
|
- inPackageCell: '',
|
|
|
- inConversionUnit: '',
|
|
|
- outPackageCell: '',
|
|
|
- inConversionUnit: '',
|
|
|
- outConversionUnit: ''
|
|
|
- };
|
|
|
- this.dialogVisible = true;
|
|
|
- },
|
|
|
- handleClick(val) {
|
|
|
- console.log(val);
|
|
|
- this.packingRules = val.name;
|
|
|
- },
|
|
|
- // 删除tab
|
|
|
- handleTabsEdit(targetName, action) {
|
|
|
- if (action == 'remove') {
|
|
|
- let index = this.packagingSpecification.findIndex(
|
|
|
- (item) => item.code == targetName
|
|
|
- );
|
|
|
- let idsIndex = this.idsList.findIndex(
|
|
|
- (item) => item.code == targetName
|
|
|
- );
|
|
|
- if (this.idsList.length > 0 && idsIndex > -1) {
|
|
|
- let ids = this.idsList.filter(
|
|
|
- (item) => item.code == this.packagingSpecification[index].code
|
|
|
- )[0].ids;
|
|
|
- deletePackageDisposition(ids).then(() => {
|
|
|
- this.idsList = this.idsList.filter(
|
|
|
- (item) => item.code != this.packagingSpecification[index].code
|
|
|
- );
|
|
|
+ this.dialogVisible = true;
|
|
|
+ },
|
|
|
+ handleClick(val) {
|
|
|
+ console.log(val);
|
|
|
+ this.packingRules = val.name;
|
|
|
+ },
|
|
|
+ // 删除tab
|
|
|
+ handleTabsEdit(targetName, action) {
|
|
|
+ if (action == 'remove') {
|
|
|
+ let index = this.packagingSpecification.findIndex(
|
|
|
+ (item) => item.code == targetName
|
|
|
+ );
|
|
|
+ let idsIndex = this.idsList.findIndex(
|
|
|
+ (item) => item.code == targetName
|
|
|
+ );
|
|
|
+ if (this.idsList.length > 0 && idsIndex > -1) {
|
|
|
+ let ids = this.idsList.filter(
|
|
|
+ (item) => item.code == this.packagingSpecification[index].code
|
|
|
+ )[0].ids;
|
|
|
+ deletePackageDisposition(ids).then(() => {
|
|
|
+ this.idsList = this.idsList.filter(
|
|
|
+ (item) => item.code != this.packagingSpecification[index].code
|
|
|
+ );
|
|
|
+ this.packagingSpecification.splice(index, 1);
|
|
|
+ });
|
|
|
+ } else {
|
|
|
this.packagingSpecification.splice(index, 1);
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.packagingSpecification.splice(index, 1);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- },
|
|
|
- // inventoryModeChange(value) {
|
|
|
- // if (value == 1) {
|
|
|
- // this.form.isUnpack = 1;
|
|
|
- // } else {
|
|
|
- // this.form.isUnpack = 0;
|
|
|
- // }
|
|
|
- // },
|
|
|
- // 选择所属部门
|
|
|
- searchDeptNodeClick(id, info) {
|
|
|
- // 根据部门获取人员
|
|
|
- const params = { executeGroupId: id };
|
|
|
- this.$nextTick(() => {
|
|
|
- this.$refs.directorRef.getList(params);
|
|
|
- });
|
|
|
- },
|
|
|
- //选择负责人
|
|
|
- handleDirectorChange(id, info) { },
|
|
|
- getFormValid() {
|
|
|
- return new Promise((resolve, reject) => {
|
|
|
- this.$refs.form1.validate(async (valid) => {
|
|
|
- resolve(await valid);
|
|
|
+ },
|
|
|
+ // inventoryModeChange(value) {
|
|
|
+ // if (value == 1) {
|
|
|
+ // this.form.isUnpack = 1;
|
|
|
+ // } else {
|
|
|
+ // this.form.isUnpack = 0;
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // 选择所属部门
|
|
|
+ searchDeptNodeClick(id, info) {
|
|
|
+ // 根据部门获取人员
|
|
|
+ const params = { executeGroupId: id };
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.directorRef.getList(params);
|
|
|
});
|
|
|
- });
|
|
|
+ },
|
|
|
+ //选择负责人
|
|
|
+ handleDirectorChange(id, info) {},
|
|
|
+ getFormValid() {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ this.$refs.form1.validate(async (valid) => {
|
|
|
+ resolve(await valid);
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-};
|
|
|
+ };
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
-.other {
|
|
|
- background: #fff;
|
|
|
- padding: 1px 17px;
|
|
|
-}
|
|
|
+ .other {
|
|
|
+ background: #fff;
|
|
|
+ padding: 1px 17px;
|
|
|
+ }
|
|
|
|
|
|
-.divider {
|
|
|
- margin: 0px 0 20px;
|
|
|
+ .divider {
|
|
|
+ margin: 0px 0 20px;
|
|
|
|
|
|
- .title {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- margin-bottom: 10px;
|
|
|
+ .title {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ margin-bottom: 10px;
|
|
|
|
|
|
- div {
|
|
|
- width: 8px;
|
|
|
- height: 20px;
|
|
|
- margin-right: 10px;
|
|
|
- }
|
|
|
+ div {
|
|
|
+ width: 8px;
|
|
|
+ height: 20px;
|
|
|
+ margin-right: 10px;
|
|
|
+ }
|
|
|
|
|
|
- span {
|
|
|
- font-size: 20px;
|
|
|
+ span {
|
|
|
+ font-size: 20px;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- .ele-width {
|
|
|
- width: 100%;
|
|
|
- height: 2px;
|
|
|
+ .ele-width {
|
|
|
+ width: 100%;
|
|
|
+ height: 2px;
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
|
|
|
-.form-line {
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: space-between;
|
|
|
+ .form-line {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
|
|
|
- .line-select {
|
|
|
- margin-left: 15px;
|
|
|
+ .line-select {
|
|
|
+ margin-left: 15px;
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
|
|
|
-.rules_box {
|
|
|
- margin: 0px 20px 20px 0;
|
|
|
+ .rules_box {
|
|
|
+ margin: 0px 20px 20px 0;
|
|
|
|
|
|
- .rules_box_tabs {
|
|
|
- margin: 20px 0;
|
|
|
+ .rules_box_tabs {
|
|
|
+ margin: 20px 0;
|
|
|
|
|
|
- :deep(.el-form-item__content) {
|
|
|
- >div {
|
|
|
- display: inline-block;
|
|
|
+ :deep(.el-form-item__content) {
|
|
|
+ > div {
|
|
|
+ display: inline-block;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
|
|
|
-.packingUnit {
|
|
|
- width: 200px;
|
|
|
- margin-right: 10px;
|
|
|
-}
|
|
|
+ .packingUnit {
|
|
|
+ width: 200px;
|
|
|
+ margin-right: 10px;
|
|
|
+ }
|
|
|
|
|
|
-.lastPackingUnit {
|
|
|
- width: 200px;
|
|
|
- margin-left: 10px;
|
|
|
-}
|
|
|
+ .lastPackingUnit {
|
|
|
+ width: 200px;
|
|
|
+ margin-left: 10px;
|
|
|
+ }
|
|
|
</style>
|