|
@@ -31,13 +31,7 @@
|
|
|
</el-input>
|
|
</el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
|
|
- <el-form-item label="高" prop="hight">
|
|
|
|
|
- <el-input v-model="form.hight" :disabled="form.positionList.length">
|
|
|
|
|
- <template slot="append">cm</template>
|
|
|
|
|
- </el-input>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="位置" prop="region">
|
|
<el-form-item label="位置" prop="region">
|
|
@@ -94,19 +88,9 @@
|
|
|
|
|
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="干燥区高(cm)" min-width="120">
|
|
|
|
|
- <template slot-scope="scope">
|
|
|
|
|
- <el-form-item :prop="'positionList.' +
|
|
|
|
|
- scope.$index +
|
|
|
|
|
- '.altitude'
|
|
|
|
|
- " :rules="tableFormRules.altitude">
|
|
|
|
|
- <el-input placeholder="请输入" type="number" v-model.number="scope.row.altitude"></el-input>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
-
|
|
|
|
|
- </template>
|
|
|
|
|
- </el-table-column>
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
- <el-table-column label="基本干燥区容积(cm³)" min-width="120">
|
|
|
|
|
|
|
+ <el-table-column label="基本干燥区面积(cm²)" min-width="120">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<el-form-item :prop="'positionList.' +
|
|
<el-form-item :prop="'positionList.' +
|
|
|
scope.$index +
|
|
scope.$index +
|
|
@@ -119,7 +103,7 @@
|
|
|
|
|
|
|
|
<el-table-column label="操作" fixed="right">
|
|
<el-table-column label="操作" fixed="right">
|
|
|
<template slot-scope="{ $index, row }">
|
|
<template slot-scope="{ $index, row }">
|
|
|
- <el-button type="text" @click="removeGoods($index, row)">删除货架</el-button>
|
|
|
|
|
|
|
+ <el-button type="text" @click="removeGoods($index, row)">删除干燥区</el-button>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
|
@@ -165,6 +149,8 @@
|
|
|
export default {
|
|
export default {
|
|
|
|
|
|
|
|
data() {
|
|
data() {
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
const defaultForm = {
|
|
const defaultForm = {
|
|
|
categoryId: null,
|
|
categoryId: null,
|
|
|
levelNum: null,
|
|
levelNum: null,
|
|
@@ -183,6 +169,7 @@
|
|
|
...defaultForm
|
|
...defaultForm
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ code: '',
|
|
|
|
|
|
|
|
hjCodeFalg: false,
|
|
hjCodeFalg: false,
|
|
|
|
|
|
|
@@ -198,11 +185,22 @@
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
tableFormRules: {
|
|
tableFormRules: {
|
|
|
- code: {
|
|
|
|
|
- required: true,
|
|
|
|
|
- message: '请输入干燥区编号',
|
|
|
|
|
- trigger: 'blur'
|
|
|
|
|
- },
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ code: [
|
|
|
|
|
+ {
|
|
|
|
|
+ validator: (_rule, value, callback) => {
|
|
|
|
|
+ if (!value) {
|
|
|
|
|
+ return callback(new Error('请输入干燥区编码'));
|
|
|
|
|
+ }
|
|
|
|
|
+ if (value == this.code+ '-') {
|
|
|
|
|
+ return callback(new Error('请完善干燥区编码'));
|
|
|
|
|
+ }
|
|
|
|
|
+ callback();
|
|
|
|
|
+ },
|
|
|
|
|
+ trigger: 'blur'
|
|
|
|
|
+ }
|
|
|
|
|
+ ]
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
};
|
|
};
|
|
@@ -222,7 +220,7 @@
|
|
|
|
|
|
|
|
this.visible = true;
|
|
this.visible = true;
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ this.code = row.code
|
|
|
this.form.categoryId = row.id
|
|
this.form.categoryId = row.id
|
|
|
this.getList()
|
|
this.getList()
|
|
|
},
|
|
},
|
|
@@ -247,10 +245,10 @@
|
|
|
|
|
|
|
|
removeGoods(idx, row) {
|
|
removeGoods(idx, row) {
|
|
|
if (this.form.positionList.length == 1) {
|
|
if (this.form.positionList.length == 1) {
|
|
|
- return this.$message.error('至少保留一个货架!');
|
|
|
|
|
|
|
+ return this.$message.error('至少保留一个干燥区!');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- this.$confirm(`是否删除这个货架?`).then(async () => {
|
|
|
|
|
|
|
+ this.$confirm(`是否删除这个干燥区?`).then(async () => {
|
|
|
this.form.positionList.splice(idx, 1)
|
|
this.form.positionList.splice(idx, 1)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -281,7 +279,7 @@
|
|
|
|
|
|
|
|
for (var i = 0; i < value; i++) {
|
|
for (var i = 0; i < value; i++) {
|
|
|
let obj1111 = {
|
|
let obj1111 = {
|
|
|
- code: '',
|
|
|
|
|
|
|
+ code: this.code + '-',
|
|
|
length: this.form.vehicleLen ? Number(this.form.vehicleLen / Number(this.form.lineNum)).toFixed(0) : '',
|
|
length: this.form.vehicleLen ? Number(this.form.vehicleLen / Number(this.form.lineNum)).toFixed(0) : '',
|
|
|
breadth: this.form.wilde,
|
|
breadth: this.form.wilde,
|
|
|
altitude: this.form.hight ? Number(this.form.hight / Number(this.form.levelNum)).toFixed(0) : '',
|
|
altitude: this.form.hight ? Number(this.form.hight / Number(this.form.levelNum)).toFixed(0) : '',
|
|
@@ -340,7 +338,7 @@
|
|
|
|
|
|
|
|
for (let j = 0; j < this.form.lineNum; j++) {
|
|
for (let j = 0; j < this.form.lineNum; j++) {
|
|
|
let obj1111 = {
|
|
let obj1111 = {
|
|
|
- code: code + (j + 1),
|
|
|
|
|
|
|
+ code: this.code + '-' + code + (j + 1),
|
|
|
length: this.form.vehicleLen ? Number(this.form.vehicleLen / Number(this.form.lineNum)).toFixed(0) : '',
|
|
length: this.form.vehicleLen ? Number(this.form.vehicleLen / Number(this.form.lineNum)).toFixed(0) : '',
|
|
|
breadth: this.form.wilde,
|
|
breadth: this.form.wilde,
|
|
|
altitude: this.form.hight ? Number(this.form.hight / Number(this.form.levelNum)).toFixed(0) : '',
|
|
altitude: this.form.hight ? Number(this.form.hight / Number(this.form.levelNum)).toFixed(0) : '',
|
|
@@ -389,7 +387,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
let obj1111 = {
|
|
let obj1111 = {
|
|
|
- code: this.hjForm.type === 1 ? code : ruleName + (i + 1),
|
|
|
|
|
|
|
+ code: this.hjForm.type === 1 ? this.code + '-' + code : this.code + '-' + ruleName + (i + 1),
|
|
|
length: this.form.vehicleLen ? Number(this.form.vehicleLen / Number(this.form.lineNum)).toFixed(0) : '',
|
|
length: this.form.vehicleLen ? Number(this.form.vehicleLen / Number(this.form.lineNum)).toFixed(0) : '',
|
|
|
breadth: this.form.wilde,
|
|
breadth: this.form.wilde,
|
|
|
altitude: this.form.levelNum ? Number(this.form.hight / Number(this.form.levelNum)).toFixed(0) : '',
|
|
altitude: this.form.levelNum ? Number(this.form.hight / Number(this.form.levelNum)).toFixed(0) : '',
|
|
@@ -417,6 +415,8 @@
|
|
|
save() {
|
|
save() {
|
|
|
this.$refs.tableForm.validate((valid) => {
|
|
this.$refs.tableForm.validate((valid) => {
|
|
|
if (valid) {
|
|
if (valid) {
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
categoryVehicle(this.form).then(res => {
|
|
categoryVehicle(this.form).then(res => {
|
|
|
this.cancel()
|
|
this.cancel()
|
|
|
})
|
|
})
|