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

预验收按货位出库，库存查询新增货位，同步相关修改

Browse Source
prod
anthonywj 2 years ago
parent 9ddcd677ab
commit f0d3d119ab
10 changed files with 534 additions and 296 deletions
Show Stats Download Patch File Download Diff File

4
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -696,9 +696,10 @@ export default {
},
//获取预验收仓库
findPreInInvList() {
findPreInInvList(val) {
let query = {
advanceType: 2,
code: this.orderFormData.checkPreInInvCode,
}
filterSubAll(query)
.then((response) => {
@ -713,6 +714,7 @@ export default {
let query = {
invStorageCode: val,
status: 1,
code: this.orderFormData.checkPreInSpaceCode,
}
getInvSpaceList(query).then((res) => {
this.curPreInSpaceOptions = res.data.list || [];

8
src/views/inventory/InvPreInProductsDetail.vue
Unescape Escape View File

@ -58,7 +58,7 @@
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
@ -83,6 +83,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="货位"
prop="invSpaceName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"

63
src/views/inventory/InvPreProducts.vue
Unescape Escape View File

@ -62,6 +62,7 @@
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
@ -73,7 +74,36 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属货位:">
<el-select
v-model="filterQuery.invSpaceCode"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择所属货位"
:remote-method="getSpaceList"
size="mini"
:loading="corpLoading"
style="width: 90%"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
@ -193,6 +223,7 @@ import {getInvPreProduct, deleteInvPreProduct} from "@/api/inventory/invPreProdu
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {isBlank} from "@/utils/strUtil";
import invPreProductsDetail from "@/views/inventory/InvPreProductsDetail.vue";
import {getInvSpaceList} from "@/api/inventory/invSpace";
export default {
name: "InvPreProducts",
@ -208,12 +239,15 @@ export default {
zczbhhzbapzbh: null,
ylqxzcrbarmc: null,
invCode: null,
invSpaceCode: null,
page: 1,
limit: 10,
},
list: [],
total: 0,
invList: [],
invId: null,
spaceList: [],
loading: false,
deleteData: {
id: "",
@ -306,6 +340,7 @@ export default {
.then((response) => {
this.invList = response.data || [];
this.getList();
this.getSpaceList();
})
.catch(() => {
});
@ -371,7 +406,35 @@ export default {
}).catch((error) => {
this.$message.error(error.message);
});
},
getSpaceList() {
if (isBlank(this.filterQuery.invCode)) {
return;
}
let params = {
invWarehouseCode: this.filterQuery.invCode,
status: 1
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
querySearchAsync(queryString, cb) {
let restaurants = this.spaceList;
restaurants.forEach((item) => {
item.value = item.name;
})
let results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
if (!isBlank(queryString)) {
this.spaceSearchResult = results;
}
cb(results);
},
invChange() {
this.getSpaceList();
},
},
components: {
invPreProductsDetail

8
src/views/inventory/InvPreProductsDetail.vue
Unescape Escape View File

@ -58,7 +58,7 @@
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
@ -83,6 +83,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="货位"
prop="invSpaceName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"

65
src/views/inventory/InvProducts.vue
Unescape Escape View File

@ -62,6 +62,7 @@
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
@ -73,6 +74,35 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属货位:">
<el-select
v-model="filterQuery.invSpaceCode"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择所属货位"
:remote-method="getSpaceList"
size="mini"
:loading="corpLoading"
style="width: 90%"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
@ -100,7 +130,6 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
@ -208,6 +237,7 @@ import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {isBlank} from "@/utils/strUtil";
import invProductsDetail from "@/views/inventory/InvProductsDetail.vue";
import addInvRemindSetDialog from "@/views/inventory/addInvRemindSetDialog.vue";
import {getInvSpaceList} from "@/api/inventory/invSpace";
export default {
name: "InvProducts",
@ -223,6 +253,7 @@ export default {
zczbhhzbapzbh: null,
ylqxzcrbarmc: null,
invCode: null,
invSpaceCode: null,
page: 1,
limit: 10,
udiCode: null,
@ -252,7 +283,8 @@ export default {
invCode: null
},
addInvRemindSetDialogVisible: false,
invId: null
invId: null,
spaceList: [],
};
},
methods: {
@ -324,6 +356,7 @@ export default {
.then((response) => {
this.invList = response.data || [];
this.getList();
this.getSpaceList();
})
.catch(() => {
});
@ -398,6 +431,34 @@ export default {
this.invId = null;
this.addInvRemindSetDialogVisible = false;
},
getSpaceList() {
if (isBlank(this.filterQuery.invCode)) {
return;
}
let params = {
invWarehouseCode: this.filterQuery.invCode,
status: 1
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
querySearchAsync(queryString, cb) {
let restaurants = this.spaceList;
restaurants.forEach((item) => {
item.value = item.name;
})
let results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
if (!isBlank(queryString)) {
this.spaceSearchResult = results;
}
cb(results);
},
invChange() {
this.getSpaceList();
},
},
components: {
invProductsDetail,

6
src/views/inventory/InvProductsDetail.vue
Unescape Escape View File

@ -81,6 +81,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="货位"
prop="invSpaceName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"

61
src/views/inventory/InvSupPreInProducts.vue
Unescape Escape View File

@ -62,6 +62,7 @@
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
@ -73,7 +74,35 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属货位:">
<el-select
v-model="filterQuery.invSpaceCode"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择所属货位"
:remote-method="getSpaceList"
size="mini"
:loading="corpLoading"
style="width: 90%"
>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
@ -187,6 +216,7 @@ import {getInvPreInProduct, deleteInvPreInProduct} from "@/api/inventory/invPreI
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {isBlank} from "@/utils/strUtil";
import invPreProductsDetail from "@/views/inventory/InvPreInProductsDetail.vue";
import {getInvSpaceList} from "@/api/inventory/invSpace";
export default {
name: "InvPreProducts",
@ -202,12 +232,14 @@ export default {
zczbhhzbapzbh: null,
ylqxzcrbarmc: null,
invCode: null,
invSpaceCode: null,
page: 1,
limit: 10,
},
list: [],
total: 0,
invList: [],
spaceList: [],
loading: false,
deleteData: {
id: "",
@ -300,6 +332,7 @@ export default {
.then((response) => {
this.invList = response.data || [];
this.getList();
this.getSpaceList();
})
.catch(() => {
});
@ -365,7 +398,35 @@ export default {
}).catch((error) => {
this.$message.error(error.message);
});
},
getSpaceList() {
if (isBlank(this.filterQuery.invCode)) {
return;
}
let params = {
invWarehouseCode: this.filterQuery.invCode,
status: 1
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
})
},
querySearchAsync(queryString, cb) {
let restaurants = this.spaceList;
restaurants.forEach((item) => {
item.value = item.name;
})
let results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
if (!isBlank(queryString)) {
this.spaceSearchResult = results;
}
cb(results);
},
invChange() {
this.getSpaceList();
},
},
components: {
invPreProductsDetail

54
src/views/sync/SysUdimsConfig.vue
Unescape Escape View File

@ -6,7 +6,8 @@
<el-descriptions class="margin-top" :column="1" :size="100" border>
<template slot="extra">
<el-button type="primary" size="small" @click="saveConfig()"
>保存</el-button
>保存
</el-button
>
</template>
<el-descriptions-item>
@ -59,7 +60,7 @@
</el-descriptions>
</el-collapse-item>
<!-- 上传值UDI自助平台基础数据 -->
<el-collapse-item title="上传至UDI自助平台基础数据" name="2">
<el-collapse-item title="基础数据同步" name="2">
<el-descriptions class="margin-top" :column="1" :size="100" border>
<!-- 参数设置 -->
<el-descriptions-item>
@ -226,6 +227,27 @@
</el-form-item>
</el-form>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 其他数据</template>
<el-form label-positiom="right" label-width="200px" :inline="true">
<el-form-item label="UDI码补齐数据">
<el-select v-model="configQuery.udiCodeLost">
<el-option :value="0" label="不同步"></el-option>
<el-option :value="1" label="由内向外"></el-option>
<el-option :value="2" label="由外向内"></el-option>
</el-select>
</el-form-item>
<el-form-item label="UDI关联关系">
<el-select v-model="configQuery.udiCodeRel">
<el-option :value="0" label="不同步"></el-option>
<el-option :value="1" label="由内向外"></el-option>
<el-option :value="2" label="由外向内"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-descriptions-item>
<!-- 第三方基础信息 -->
<el-descriptions-item>
<template slot="label"> 第三方基础信息</template>
@ -505,9 +527,9 @@
v-model="scope.row.orderStatus"
placeholder="请选择单据状态"
>
<el-option label="待校验" :value="1">草稿</el-option>
<el-option label="待核对" :value="2">未审核</el-option>
<el-option label="待审核" :value="3">已审核</el-option>
<el-option label="草稿" :value="1">草稿</el-option>
<el-option label="未审核" :value="2">未审核</el-option>
<el-option label="已审核" :value="3">已审核</el-option>
</el-select>
</template>
</el-table-column>
@ -536,7 +558,8 @@
>
<div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addToInBusType()"
>选入</el-button
>选入
</el-button
>
</div>
<el-table
@ -581,7 +604,8 @@
>
<div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addBusType()"
>选入</el-button
>选入
</el-button
>
</div>
<el-table
@ -627,7 +651,8 @@
>
<div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addChangeBusType()"
>选入</el-button
>选入
</el-button
>
</div>
<el-table
@ -720,6 +745,8 @@ export default {
printConfig: null,
scanChangeConfig: null,
busChangeConfig: null,
udiCodeLost: null,
udiCodeRel: null,
},
checkedBusTypes: [],
checkedToInBusTypes: [],
@ -789,7 +816,8 @@ export default {
this.loading = false;
});
})
.catch(() => {});
.catch(() => {
});
},
testConnect() {
@ -822,7 +850,8 @@ export default {
this.busTypes = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {});
.catch(() => {
});
},
addBusTypeDialog() {
@ -887,9 +916,9 @@ export default {
let selectData = this.changeBusTypeSelection;
selectData.forEach((obj) => {
obj.outChange = false;
obj.orderStatus = 7;
obj.orderStatus = 3;
let isPut = true;
for (let i = 0; i < this.checkedBusTypes.length; i++) {
for (let i = 0; i < this.checkedChangeBusTypes.length; i++) {
if (this.checkedChangeBusTypes[i].action == obj.action) {
isPut = false;
}
@ -948,6 +977,7 @@ export default {
/deep/ .el-select {
width: 100px;
}
/deep/ .el-collapse-item__header {
font-size: 18px;
font-weight: bold;

5
src/views/sync/SysUdimsData.vue
Unescape Escape View File

@ -41,7 +41,7 @@
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="任务ID" prop="id" width="140" show-overflow-tooltip></el-table-column>
@ -58,9 +58,8 @@
</el-table-column>
<el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
<el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
<el-table-column label="同步文件" prop="cacheFilePath" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="同步信息" prop="remark" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="同步文件" prop="cacheFilePath" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">

16
src/views/sync/SysUdimsDownloadData.vue
Unescape Escape View File

@ -33,7 +33,7 @@
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="任务ID" prop="taskId" width="140" show-overflow-tooltip></el-table-column>
@ -50,8 +50,9 @@
</el-table-column>
<el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
<el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
<el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="同步文件" prop="cacheFilePath" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
@ -94,13 +95,14 @@
import {
downloadNow
} from "@/api/sync/spsSyncDownload";
import {infoByStatus} from "@/api/sync/spsSyncStatus";
export default {
data() {
return {
filterQuery: {
taskId: null,
status: "1",
status: null,
page: 1,
limit: 10,
syncTime: null,
@ -254,7 +256,8 @@
this.loading = false;
});
})
.catch(() => {});
.catch(() => {
});
},
handleChange(response, files, fileList) {
console.log(response);
@ -299,7 +302,7 @@
},
downFile(rows) {
downloadFile({
infoByStatus({
'id': rows.id
}).then(res => {
let blob = new Blob([res])
@ -316,7 +319,8 @@
},
},
mounted() {},
mounted() {
},
components: {
ShowText
},

Write Preview
Loading…
Cancel
Save