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

1.调整货位管理功能，移动到仓库关联的分库下

Browse Source 
2.调整审核盘点单页面内容展示
feature-order-fix
x_z 3 years ago
parent 7caf4e9cd2
commit e87614fc58
5 changed files with 84 additions and 142 deletions
Show Stats Download Patch File Download Diff File

9
src/router/index.js
Unescape Escape View File

@ -1042,15 +1042,6 @@ export const asyncRouterMap = [
},
]
},
{
path: "invSpaceManage",
component: invSpaceManage,
name: "货位管理",
icon: "",
meta: {
authRule: ["inv/invSpaceManage"]
}
},
{
path: "/invCount",
component: Empty,

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

@ -171,6 +171,13 @@
>管理单据类型
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="invSpaceManage(scope.row)"
>管理货位
</el-button
>
<el-button
type="text"
size="small" :disabled="!configParms.basicInv"
@ -538,7 +545,8 @@
<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.advanceType" placeholder="仓库类型" :disabled="formName =='edit'">
<el-select v-model="formData.advanceType" placeholder="仓库类型"
:disabled="formName =='edit'">
<el-option label="寄售" :value='true'></el-option>
<el-option label="仓库" :value='false'></el-option>
</el-select>
@ -715,6 +723,18 @@
<relBusUserDialog :inputQuery="curSeleUser" :closeDialog="cancelRelBusDiaolog"></relBusUserDialog>
</el-dialog>
<!--货位管理-->
<el-dialog
title="货位管理"
:visible.sync="invSpaceManageVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="invSpaceManageVisible"
>
<invSpaceManage :invInfo="currentInvInfo" ></invSpaceManage>
</el-dialog>
</div>
</template>
@ -743,6 +763,7 @@ import {isBlank} from "@/utils/strUtil";
import relBusUserDialog from "./invWarehouseRelBusTypes";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterUserBusTypeList} from "@/api/inventory/invRelBusTypes";
import invSpaceManage from "@/views/inventory/InvSpaceManage";
const formJson = {
id: null,
@ -880,7 +901,12 @@ export default {
},
bussinessTypeTotal: 0,
curSeleUser: null,
busTableTitle: null
busTableTitle: null,
currentInvInfo: {
invStorageCode: null,
invWarehouseCode: null
},
invSpaceManageVisible: false
};
},
methods: {
@ -1698,6 +1724,13 @@ export default {
}).catch((error) => {
})
},
invSpaceManage(row) {
this.currentInvInfo = {
invStorageCode: row.parentId,
invWarehouseCode: row.code
};
this.invSpaceManageVisible = true;
},
},
filters: {
statusFilterType(status) {
@ -1719,6 +1752,7 @@ export default {
},
components: {
relBusUserDialog,
invSpaceManage
},
created() {
// 加载表格数据

134
src/views/inventory/InvSpaceManage.vue
Unescape Escape View File

@ -6,32 +6,6 @@
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.key" placeholder="请输入查询内容" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
:disabled="invWarehouseDisabled"
size="mini">
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
@ -52,7 +26,7 @@
<el-table-column label="所属仓库" prop="invStorageName" width="200"
show-overflow-tooltip></el-table-column>
<el-table-column label="所属分库" prop="invSubStorageName"
show-overflow-tooltip width="120"></el-table-column>
show-overflow-tooltip width="150"></el-table-column>
<el-table-column label="状态" prop="status"
show-overflow-tooltip width="150">
<template slot-scope="scope">
@ -61,6 +35,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="150"></el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
@ -89,9 +64,10 @@
<el-dialog
:title="formMap[formName]"
:visible.sync="modifySpaceVisible"
width="70%"
width="50%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="modifySpaceVisible"
>
<el-form :model="formData" :rules="rules" ref="formData">
@ -117,44 +93,6 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="2">
<span>所属仓库：</span>
</el-col>
<el-col :span="10">
<el-form-item prop="invStorageCode">
<el-select v-model="formData.invStorageCode"
placeholder="请选择"
@change="changeStorage"
>
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<span>所属分库：</span>
</el-col>
<el-col :span="10">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" :disabled="modifyWarehouseDisable" placeholder="请选择">
<el-option
v-for="item in modifySubInvList"
:key="item.name"
:label="item.name"
:value="item.code"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="2">
<span>备注：</span>
@ -196,11 +134,16 @@
import store from "../../store";
import {filterUplLocInv} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {userInfo} from "@/api/auth/login";
import {isBlank} from "@/utils/strUtil";
import {getInvSpaceList, saveSpace, deleteSpace} from "@/api/inventory/invSpace";
export default {
name: "invInfo",
props: {
invInfo: {
type: Object,
required: true
}
},
data() {
return {
filterQuery: {
@ -235,8 +178,8 @@ export default {
id: null,
code: null,
name: null,
invStorageCode: null,
invWarehouseCode: null,
invStorageCode: this.invInfo.invStorageCode,
invWarehouseCode: this.invInfo.invWarehouseCode,
status: 1,
remark: null
},
@ -247,12 +190,6 @@ export default {
name: [
{required: true, message: "请输入货位名称", trigger: "blur"}
],
invStorageCode: [
{required: true, message: "请选择所属仓库", trigger: "blur"}
],
invWarehouseCode: [
{required: true, message: "请选择所属分库", trigger: "blur"}
]
},
modifySubInvList: []
};
@ -264,8 +201,8 @@ export default {
});
this.filterQuery = {
customerId: null,
invWarehouseCode: null,
invStorageCode: null,
invWarehouseCode: this.invInfo.invWarehouseCode,
invStorageCode: this.invInfo.invStorageCode,
page: 1,
limit: 20,
};
@ -363,8 +300,8 @@ export default {
id: null,
code: null,
name: null,
invStorageCode: null,
invWarehouseCode: null,
invStorageCode: this.invInfo.invStorageCode,
invWarehouseCode: this.invInfo.invWarehouseCode,
status: 1,
remark: null
}
@ -384,44 +321,13 @@ export default {
}
})
},
changeStorage() {
this.formData.invWarehouseCode = null;
this.modifyWarehouseDisable = false;
let query = {
pcode: this.formData.invStorageCode
};
filterSubByInv(query)
.then((response) => {
this.modifySubInvList = response.data || [];
})
.catch(() => {
});
},
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getStorage();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.limit = parseInt(this.filterQuery.limit);
// 加载表格数据
//获取用户默认仓库信息
userInfo().then((res) => {
if (res.code === 20000) {
if (!isBlank(res.data.locInvCode)) {
this.filterQuery.invStorageCode = res.data.locInvCode;
this.invChange();
this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
}
//加载表格数据
this.filterQuery.invStorageCode = this.invInfo.invStorageCode;
this.filterQuery.invWarehouseCode = this.invInfo.invWarehouseCode;
this.getList();
}
}).catch((error) => {
});
},
};
</script>

33
src/views/inventory/invCountOrderAudit.vue
Unescape Escape View File

@ -63,7 +63,7 @@
@current-change="handleChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderId" width="180"></el-table-column>
<el-table-column label="盘点单号" prop="orderIdFk" width="180"></el-table-column>
<el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="分库" prop="invSubStorageName" width="180"
show-overflow-tooltip></el-table-column>
@ -82,8 +82,8 @@
<el-button
type="text"
size="small"
@click.native.stop="intentDetail(scope.row)"
>详情
@click.native.stop="auditCountOrder(scope.row)"
>审批
</el-button
>
@ -110,16 +110,19 @@
<el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="分库" prop="invSubStorageName" width="180"
<el-table-column label="产品名称" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="批次号" prop="invSubStorageName" width="180"
show-overflow-tooltip></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="120"></el-table-column>
<el-table-column label="盘点人" prop="createUser" width="120"></el-table-column>
<el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="状态" prop="status" width="120">
<el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="盘点数量" prop="countNum" width="150"></el-table-column>
<el-table-column label="账面数量" prop="invNum" width="150"></el-table-column>
<el-table-column label="盘盈数量" prop="profitNum" width="150"></el-table-column>
<el-table-column label="盘亏数量" prop="lossNum" width="150"></el-table-column>
<el-table-column label="盈亏状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag>
{{ statusMap[scope.row.status] }}
{{countStatusMap[scope.row.status]}}
</el-tag>
</template>
</el-table-column>
@ -196,6 +199,10 @@ export default {
1: "未审核",
2: "已审核"
},
countStatusMap: {
0: '亏损',
1: '盈利'
}
};
},
methods: {
@ -338,6 +345,12 @@ export default {
this.detailQuery.page = 1;
this.getCountOrderDetailList();
},
intentDetail(row) {
},
auditCountOrder(row) {
},
},
created() {
this.getStorage();

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

@ -76,11 +76,10 @@
<el-button
type="text"
size="small"
@click.native.stop="addCode(scope.row)"
>盘点
@click.native.stop="editOrder(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@ -88,7 +87,6 @@
>提交审核
</el-button
>
<el-button
type="text"
size="small"
@ -278,7 +276,7 @@ export default {
this.addCountOrderVisible = false;
this.getList();
},
addCode(row) {
editOrder() {
},
},

Write Preview
Loading…
Cancel
Save