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

仓库字典修改

Browse Source
master
anthonywj 3 years ago
parent 8c44f12d02
commit 60f9ecfe5a
2 changed files with 83 additions and 54 deletions
Show Stats Download Patch File Download Diff File

58
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -46,7 +46,7 @@
</el-upload>
<el-button type="primary" icon="search" @click="exportInvwarehouse">导出</el-button>
<el-button type="primary" icon="search" @click="uploadInvwarehouse">同步至UDI管理系统</el-button>
<!-- <el-button type="primary" icon="search" @click="uploadInvwarehouse">同步至UDI管理系统</el-button>-->
</el-button-group>
</el-form-item>
@ -131,16 +131,6 @@
</el-table-column>
</el-table>
<!-- <el-tree-->
<!-- :data="mergeList"-->
<!-- :props="defaultProps"-->
<!-- node-key="id"-->
<!-- style="width: 50%"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- :render-content="renderContent"-->
<!-- >-->
<!-- </el-tree>-->
</el-card>
<div>
<el-card style="width: 49%; float: left; margin-right: 0px;">
@ -517,6 +507,23 @@
<el-dialog title="关联仓库" :visible.sync="thrWareHouseVisible">
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="thirdQuery.key"
clearable
placeholder="仓库名称"
style="width: 400px"
></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" icon="search" @click="intentSelect">查询</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table
:data="thrWarehouseData"
style="width: 100%;margin-top: 10px;"
@ -550,7 +557,13 @@
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
>
</el-pagination>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideThrWarehouseTable()">取消</el-button>
<el-button
@ -667,7 +680,14 @@ export default {
sysList: [],
checkThrWarehouseRow: null,
currentSysId: null,
thirdSysVisible: false
thirdSysVisible: false,
total: 0,
thirdQuery: {
key:null,
page: 1,
limit: 10
, thirdSysFk: "thirdId",
}
};
},
methods: {
@ -1220,17 +1240,27 @@ export default {
})
},
intentSelect(row) {
if (row != null)
this.currentSysId = row.sysId;
//加载第三方仓库数据
filterThrList().then((res) => {
this.thirdQuery.thirdSysFk = this.currentSysId;
filterThrList(this.thirdQuery).then((res) => {
this.thrWarehouseData = res.data.list;
this.total = res.data.total || 0;
this.thrWareHouseVisible = true;
}).catch((error) => {
this.thrWarehouseData = [];
this.total = 0;
this.thrWareHouseVisible = true;
this.$message.error("第三方仓库数据加载失败");
});
},
handleCurrentChange(val) {
this.thirdQuery.page = val;
this.intentSelect();
},
changeThrWarehouse(row) {
this.checkThrWarehouseRow = row;
},

75
src/views/thrsys/ThrInvWarehouse.vue
Unescape Escape View File

@ -4,9 +4,9 @@
<el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="query.name"
v-model="query.key"
clearable
placeholder="仓库名称"
placeholder="关键字搜索"
style="width: 400px"
></el-input>
</el-form-item>
@ -45,6 +45,7 @@
border
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column
prop="code"
label="仓库编码"
@ -54,7 +55,6 @@
prop="name"
label="仓库名称"
>
</el-table-column>
<el-table-column
prop="advanceType"
@ -63,14 +63,11 @@
<span>{{ enableMap[scope.row.advanceType] }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="isDefault"-->
<!-- label="是否默认库存">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ enableMap[scope.row.isDefault] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="thirdName" label="第三方系统名称"></el-table-column>
<el-table-column prop="thirdName" label="第三方系统名称">
<template slot-scope="scope">
<span>{{ getThirdSysFkName(scope.row.thirdSysFk) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
@ -90,22 +87,17 @@
</el-button
>
</template>
<!-- :disabled="scope.row.code==1000 ||scope.row.code==1001"-->
</el-table-column>
</el-table>
<!-- <el-tree-->
<!-- :data="mergeList"-->
<!-- :props="defaultProps"-->
<!-- node-key="id"-->
<!-- style="width: 50%"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- :render-content="renderContent"-->
<!-- >-->
<!-- </el-tree>-->
</el-card>
<el-pagination
:page-size="query.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
>
</el-pagination>
<!--表单界面-->
<el-dialog
:title="formMap[formName]"
@ -171,8 +163,6 @@
>
</div>
</el-dialog>
<el-dialog
:title="formMap[formName]"
:close-on-click-modal="false"
@ -184,7 +174,7 @@
>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-form-item label="仓库编码" prop="code" class="query-form-item">
<el-form-item label="仓库编码" prop="title" class="query-form-item">
<el-input
v-model="formData.code" style="width: 80%"
auto-complete="off"
@ -222,7 +212,6 @@
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
@ -253,7 +242,9 @@ const formJson = {
code: null,
status: 1,
advanceType: false,
isDefault: false
isDefault: false,
page: 1,
limit: 20,
};
export default {
data() {
@ -265,7 +256,9 @@ export default {
code: null,
status: null,
advanceType: null,
isDefault: null
isDefault: null,
page: 1,
limit: 20,
},
mergeList: [],
node: null,
@ -273,6 +266,7 @@ export default {
children: "children",
label: "name"
},
total: 0,
treeList: [],
loading: true,
index: null,
@ -307,16 +301,12 @@ export default {
};
},
methods: {
/*eslint-disable */
// <el-button
// style="font-size: 12px;"
// type="text"
// on-click={() => this.handleSubForm(node, data, "add")}
// >
// 添加货位
// </el-button>
handleCurrentChange(val) {
this.query.page = val;
this.getList();
},
renderContent(h, {node, data, store}) {
return (
<span
@ -368,12 +358,14 @@ export default {
.then((response) => {
this.loading = false;
this.mergeList = response.data.list || [];
this.total = response.data.total || 0;
this.treeList = response.data.tree_list || [];
this.getQueryThirdSysFkName(this.query.thirdSysFk);
})
.catch(() => {
this.loading = false;
this.mergeList = [];
this.total = 0;
this.treeList = [];
});
},
@ -391,6 +383,13 @@ export default {
}
})
},
getThirdSysFkName(thirdSys) {
for (let i = 0; i < this.thirdSys.length; i++) {
if (this.thirdSys[i].thirdId === thirdSys) {
return this.thirdSys[i].thirdName;
}
}
},
// 刷新表单
resetForm() {
if (this.$refs["dataForm"]) {
@ -597,8 +596,8 @@ export default {
},
created() {
// 加载表格数据
this.getList();
this.getBasicThirdSys();
this.getList();
},
};
</script>

Write Preview
Loading…
Cancel
Save