|
|
|
@ -58,7 +58,6 @@
|
|
|
|
prop="name"
|
|
|
|
prop="name"
|
|
|
|
label="仓库名称"
|
|
|
|
label="仓库名称"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
prop="advanceType"
|
|
|
|
prop="advanceType"
|
|
|
|
@ -67,6 +66,16 @@
|
|
|
|
<span>{{ enableMap[scope.row.advanceType] }}</span>
|
|
|
|
<span>{{ enableMap[scope.row.advanceType] }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column
|
|
|
|
|
|
|
|
prop="level"
|
|
|
|
|
|
|
|
label="仓库等级"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column
|
|
|
|
|
|
|
|
prop="pcode"
|
|
|
|
|
|
|
|
label="上级仓库"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</el-table-column>
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
<!-- prop="isDefault"-->
|
|
|
|
<!-- prop="isDefault"-->
|
|
|
|
<!-- label="是否默认库存">-->
|
|
|
|
<!-- label="是否默认库存">-->
|
|
|
|
@ -89,7 +98,6 @@
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="text"
|
|
|
|
type="text"
|
|
|
|
size="small"
|
|
|
|
size="small"
|
|
|
|
|
|
|
|
|
|
|
|
@click.native.stop="handleForm(node, scope.row, 'edit')"
|
|
|
|
@click.native.stop="handleForm(node, scope.row, 'edit')"
|
|
|
|
>编辑
|
|
|
|
>编辑
|
|
|
|
</el-button
|
|
|
|
</el-button
|
|
|
|
@ -145,13 +153,14 @@
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item label="仓库编码" prop="title" class="query-form-item">
|
|
|
|
<el-form-item label="货位编码" prop="title" class="query-form-item">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
|
|
|
|
disabled
|
|
|
|
v-model="formData.code" style="width: 80%"
|
|
|
|
v-model="formData.code" style="width: 80%"
|
|
|
|
auto-complete="off"
|
|
|
|
auto-complete="off"
|
|
|
|
></el-input>
|
|
|
|
></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="仓库名称" prop="name" class="query-form-item">
|
|
|
|
<el-form-item label="货位名称" prop="name" class="query-form-item">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="formData.name" style="width: 80%"
|
|
|
|
v-model="formData.name" style="width: 80%"
|
|
|
|
auto-complete="off"
|
|
|
|
auto-complete="off"
|
|
|
|
@ -160,7 +169,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item class="query-form-item" label="仓库类型:">
|
|
|
|
<el-form-item class="query-form-item" label="仓库类型:">
|
|
|
|
<el-select v-model="formData.advanceType" placeholder="仓库类型" clearable>
|
|
|
|
<el-select v-model="formData.advanceType" placeholder="仓库类型" clearable disabled>
|
|
|
|
<el-option label="寄售" :value=true></el-option>
|
|
|
|
<el-option label="寄售" :value=true></el-option>
|
|
|
|
<el-option label="仓库" :value=false></el-option>
|
|
|
|
<el-option label="仓库" :value=false></el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
@ -171,22 +180,6 @@
|
|
|
|
<el-radio :label="1">正常</el-radio>
|
|
|
|
<el-radio :label="1">正常</el-radio>
|
|
|
|
</el-radio-group>
|
|
|
|
</el-radio-group>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <el-form-item v-if="formData.pid == 0">-->
|
|
|
|
|
|
|
|
<!-- <el-row :gutter="20" class="el-row" type="flex">-->
|
|
|
|
|
|
|
|
<!-- <el-col :span="4" class="el-col">-->
|
|
|
|
|
|
|
|
<!-- <div class="text item">-->
|
|
|
|
|
|
|
|
<!-- <el-checkbox v-model="formData.advanceType">是否寄售仓库</el-checkbox>-->
|
|
|
|
|
|
|
|
<!-- </div>-->
|
|
|
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
|
|
|
<!-- <el-col :span="4" class="el-col">-->
|
|
|
|
|
|
|
|
<!-- <div class="text item">-->
|
|
|
|
|
|
|
|
<!-- <el-checkbox v-model="formData.isDefault">是否设为默认仓库</el-checkbox>-->
|
|
|
|
|
|
|
|
<!-- </div>-->
|
|
|
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
|
|
|
<!-- </el-row>-->
|
|
|
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<el-button @click.native="hideForm">取消</el-button>
|
|
|
|
<el-button @click.native="hideForm">取消</el-button>
|
|
|
|
@ -199,8 +192,6 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</el-dialog>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
<el-dialog
|
|
|
|
:title="formMap[formName]"
|
|
|
|
:title="formMap[formName]"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
@ -211,33 +202,70 @@
|
|
|
|
top="5vh"
|
|
|
|
top="5vh"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-form :model="formData" :rules="formRules" ref="dataForm">
|
|
|
|
<el-form :model="formData" :rules="formRules" ref="dataForm">
|
|
|
|
|
|
|
|
<el-row :gutter="20" class="el-row" type="flex">
|
|
|
|
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
<el-form-item label="仓库编码" prop="title" class="query-form-item">
|
|
|
|
<el-form-item label="仓库编码" prop="title" class="query-form-item">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="formData.code" style="width: 80%"
|
|
|
|
v-model="formData.code" style="width: 80%"
|
|
|
|
auto-complete="off"
|
|
|
|
auto-complete="off"
|
|
|
|
|
|
|
|
disabled
|
|
|
|
></el-input>
|
|
|
|
></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
<el-form-item label="仓库名称" prop="name" class="query-form-item">
|
|
|
|
<el-form-item label="仓库名称" prop="name" class="query-form-item">
|
|
|
|
<el-input
|
|
|
|
<el-input
|
|
|
|
v-model="formData.name" style="width: 80%"
|
|
|
|
v-model="formData.name" style="width: 80%"
|
|
|
|
auto-complete="off"
|
|
|
|
auto-complete="off"
|
|
|
|
></el-input>
|
|
|
|
></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
<el-row :gutter="20" class="el-row" type="flex">
|
|
|
|
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
|
|
|
|
<el-form-item class="query-form-item" label="仓库等级:">
|
|
|
|
|
|
|
|
<el-select v-model="formData.level" placeholder="仓库等级" clearable @change="changeLevel">
|
|
|
|
|
|
|
|
<el-option label="1 级库" :value='1'></el-option>
|
|
|
|
|
|
|
|
<el-option label="2 级库" :value='2'></el-option>
|
|
|
|
|
|
|
|
<el-option label="3 级库" :value='3'></el-option>
|
|
|
|
|
|
|
|
<el-option label="4 级库" :value='4'></el-option>
|
|
|
|
|
|
|
|
<el-option label="5 级库" :value='5'></el-option>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
|
|
|
|
<el-form-item class="query-form-item" label="上级仓库:">
|
|
|
|
|
|
|
|
<el-select v-model="formData.pcode" placeholder="请选择当前仓库" clearable="true" size="mini">
|
|
|
|
|
|
|
|
<el-option
|
|
|
|
|
|
|
|
v-for="item in pCodes"
|
|
|
|
|
|
|
|
:key="item.name"
|
|
|
|
|
|
|
|
:label="item.name"
|
|
|
|
|
|
|
|
:value="item.code">
|
|
|
|
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
|
|
|
|
</el-option>
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
<el-row :gutter="20" class="el-row" type="flex">
|
|
|
|
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
<el-form-item class="query-form-item" label="仓库类型:">
|
|
|
|
<el-form-item class="query-form-item" label="仓库类型:">
|
|
|
|
<el-select v-model="formData.advanceType" placeholder="仓库类型" clearable>
|
|
|
|
<el-select v-model="formData.advanceType" placeholder="仓库类型" clearable>
|
|
|
|
<el-option label="寄售" :value='true'></el-option>
|
|
|
|
<el-option label="寄售" :value='true'></el-option>
|
|
|
|
<el-option label="仓库" :value='false'></el-option>
|
|
|
|
<el-option label="仓库" :value='false'></el-option>
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="12" class="el-col">
|
|
|
|
<el-form-item label="状态:" prop="status" class="query-form-item">
|
|
|
|
<el-form-item label="状态:" prop="status" class="query-form-item">
|
|
|
|
<el-radio-group v-model="formData.status">
|
|
|
|
<el-radio-group v-model="formData.status">
|
|
|
|
<el-radio :label="0">禁用</el-radio>
|
|
|
|
<el-radio :label="0">禁用</el-radio>
|
|
|
|
<el-radio :label="1">正常</el-radio>
|
|
|
|
<el-radio :label="1">正常</el-radio>
|
|
|
|
</el-radio-group>
|
|
|
|
</el-radio-group>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <el-form-item v-if="formData.pid == 0">-->
|
|
|
|
<!-- <el-form-item v-if="formData.pid == 0">-->
|
|
|
|
<!-- <el-row :gutter="20" class="el-row" type="flex">-->
|
|
|
|
<!-- <el-row :gutter="20" class="el-row" type="flex">-->
|
|
|
|
@ -271,7 +299,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
<script>
|
|
|
|
import {
|
|
|
|
import {
|
|
|
|
filterList,
|
|
|
|
filterList, filterAll,
|
|
|
|
saveWarehouse,
|
|
|
|
saveWarehouse,
|
|
|
|
deleteWarehouse, exportJson
|
|
|
|
deleteWarehouse, exportJson
|
|
|
|
} from "../../api/basic/invWarehouse";
|
|
|
|
} from "../../api/basic/invWarehouse";
|
|
|
|
@ -309,6 +337,7 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
treeList: [],
|
|
|
|
treeList: [],
|
|
|
|
fileList: [],
|
|
|
|
fileList: [],
|
|
|
|
|
|
|
|
pCodes: [],
|
|
|
|
uploadData: {},
|
|
|
|
uploadData: {},
|
|
|
|
loading: true,
|
|
|
|
loading: true,
|
|
|
|
index: null,
|
|
|
|
index: null,
|
|
|
|
@ -423,44 +452,44 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// 显示表单
|
|
|
|
// 显示表单
|
|
|
|
handleForm(node, data, formName) {
|
|
|
|
handleForm(node, data, formName) {
|
|
|
|
this.formVisible = true;
|
|
|
|
|
|
|
|
let no = this.getProjectNum() + Math.floor(Math.random() * 10000)
|
|
|
|
// let no = this.getProjectNum() + Math.floor(Math.random() * 10000)
|
|
|
|
this.pidData = data || null;
|
|
|
|
this.pidData = data || null;
|
|
|
|
formJson.pid = (data && parseInt(data.id)) || "";
|
|
|
|
formJson.pid = (data && parseInt(data.id)) || "";
|
|
|
|
this.formData = JSON.parse(JSON.stringify(formJson));
|
|
|
|
this.formData = JSON.parse(JSON.stringify(formJson));
|
|
|
|
if (formName === "edit") {
|
|
|
|
if (formName === "edit") {
|
|
|
|
|
|
|
|
if (data.pid == 0) {
|
|
|
|
|
|
|
|
this.formVisible = true;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.subFormVisible = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
this.formData = Object.assign({}, data);
|
|
|
|
this.formData = Object.assign({}, data);
|
|
|
|
this.node = node;
|
|
|
|
this.node = node;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.formData.code = no;
|
|
|
|
// this.formData.code = no;
|
|
|
|
|
|
|
|
this.formVisible = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
this.formData.pid = !this.formData.pid ? "" : this.formData.pid;
|
|
|
|
|
|
|
|
this.formName = formName;
|
|
|
|
this.formName = formName;
|
|
|
|
if (data && data.id) {
|
|
|
|
// if (data && data.id) {
|
|
|
|
this.index = this.mergeList.findIndex((d) => d.id === data.id);
|
|
|
|
// this.index = this.mergeList.findIndex((d) => d.id === data.id);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
handleSubForm(node, data, formName) {
|
|
|
|
handleSubForm(node, data, formName) {
|
|
|
|
this.subFormVisible = true;
|
|
|
|
this.subFormVisible = true;
|
|
|
|
|
|
|
|
|
|
|
|
this.pidData = data || null;
|
|
|
|
this.pidData = data || null;
|
|
|
|
formJson.pid = (data && parseInt(data.id)) || "";
|
|
|
|
formJson.pid = (data && parseInt(data.id)) || "";
|
|
|
|
this.formData = JSON.parse(JSON.stringify(formJson));
|
|
|
|
this.formData = JSON.parse(JSON.stringify(formJson));
|
|
|
|
if (formName === "edit") {
|
|
|
|
if (formName === "edit") {
|
|
|
|
this.formData = Object.assign({}, data);
|
|
|
|
this.formData = Object.assign({}, data);
|
|
|
|
this.node = node;
|
|
|
|
this.node = node;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
let no = this.getProjectNum() + Math.floor(Math.random() * 10000);
|
|
|
|
|
|
|
|
this.formData.code = no;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.formData.pid = !this.formData.pid ? "" : this.formData.pid;
|
|
|
|
this.formData.pid = !this.formData.pid ? "" : this.formData.pid;
|
|
|
|
|
|
|
|
|
|
|
|
this.formName = formName;
|
|
|
|
this.formName = formName;
|
|
|
|
if (data && data.id) {
|
|
|
|
// if (data && data.id) {
|
|
|
|
this.index = this.mergeList.findIndex((d) => d.id === data.id);
|
|
|
|
// this.index = this.mergeList.findIndex((d) => d.id === data.id);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
},
|
|
|
|
},
|
|
|
|
formSubmit() {
|
|
|
|
formSubmit() {
|
|
|
|
this.$refs["dataForm"].validate((valid) => {
|
|
|
|
this.$refs["dataForm"].validate((valid) => {
|
|
|
|
@ -470,6 +499,7 @@ export default {
|
|
|
|
saveWarehouse(data, this.formName)
|
|
|
|
saveWarehouse(data, this.formName)
|
|
|
|
.then((response) => {
|
|
|
|
.then((response) => {
|
|
|
|
this.formLoading = false;
|
|
|
|
this.formLoading = false;
|
|
|
|
|
|
|
|
this.subFormVisible = false;
|
|
|
|
if (response.code !== 20000) {
|
|
|
|
if (response.code !== 20000) {
|
|
|
|
this.$message.error(response.message);
|
|
|
|
this.$message.error(response.message);
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
@ -500,6 +530,7 @@ export default {
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch(() => {
|
|
|
|
.catch(() => {
|
|
|
|
this.formLoading = false;
|
|
|
|
this.formLoading = false;
|
|
|
|
|
|
|
|
this.subFormVisible = false;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
@ -602,6 +633,20 @@ export default {
|
|
|
|
ADMIN_TOKEN: store.getters.token,
|
|
|
|
ADMIN_TOKEN: store.getters.token,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
getParentInv(data) {
|
|
|
|
|
|
|
|
this.pCodes = [];
|
|
|
|
|
|
|
|
let query = {level: data - 1};
|
|
|
|
|
|
|
|
filterAll(query)
|
|
|
|
|
|
|
|
.then((response) => {
|
|
|
|
|
|
|
|
this.pCodes = response.data || [];
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.catch(() => {
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
changeLevel(row) {
|
|
|
|
|
|
|
|
this.getParentInv(this.formData.level);
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
filters: {
|
|
|
|
filters: {
|
|
|
|
statusFilterType(status) {
|
|
|
|
statusFilterType(status) {
|
|
|
|
|
anthonywj
3 years ago