UDI
/
udims-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改补录单据页面，注释编辑按钮，替换查询接口为补录单据查询接口

Browse Source 
2.修改库存查询详情页面
master
x_z 3 years ago
parent 955820ed75
commit 1f1af2c66d
5 changed files with 49 additions and 100 deletions
Show Stats Download Patch File Download Diff File

20
src/api/warehouse/order.js
Unescape Escape View File

@ -93,7 +93,7 @@ export function mergeOrder(query) {
export function updateUnit(query) { export function updateUnit(query) {
return axios({ return axios({
url: "/udiwms/inout/order/updateUnit", url: "/warehouse/inout/order/unit",
method: "post", method: "post",
data: query data: query
}); });
@ -314,4 +314,22 @@ export function getSupplementOrder(query) {
}); });
} }
//查询补录单据数据
export function additionalOrderList(query) {
return axios({
url: "/warehouse/inout/order/filterAdditionalOrder",
method: "get",
params: query
});
}
export function updateCodeBindSup(query) {
return axios(
{
url: "/udiwms/addCode/updateBindSup",
method: "post",
data: query
}
)
}

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

@ -1,12 +1,11 @@
<template> <template>
<div> <div>
<el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border> <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
产品名称 产品名称
</template> </template>
{{ idQuery.cpmctymc }} {{ idQuery.productsName }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -41,39 +40,6 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<!-- <el-descriptions style="margin-top: 15px" class="margin-top" title="库存统计" :column="3" :size="size" border>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 入库数量-->
<!-- </template>-->
<!-- {{ statData.inCount }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 出库数量-->
<!-- </template>-->
<!-- {{ statData.outCount }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 结余数量-->
<!-- </template>-->
<!-- {{ (statData.inCount - statData.outCount) }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 普通采购数量-->
<!-- </template>-->
<!-- {{ statData.commonCount }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">-->
<!-- 预入库数量-->
<!-- </template>-->
<!-- {{ statData.advanceCount }}-->
<!-- </el-descriptions-item>-->
<!-- </el-descriptions>-->
<el-form :inline="true" :model="query" class="query-form" size="mini"> <el-form :inline="true" :model="query" class="query-form" size="mini">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
@ -93,7 +59,7 @@
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="条码" label="条码"
prop="originCode" prop="code"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="单据类型" prop="action" width="150"> <el-table-column label="单据类型" prop="action" width="150">
@ -106,7 +72,8 @@
prop="mainActionStr" prop="mainActionStr"
width="150" width="150"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> >
</el-table-column>
<el-table-column <el-table-column
label="入库数量" label="入库数量"
prop="inCount" prop="inCount"
@ -121,12 +88,6 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!-- <el-table-column-->
<!-- label="数量"-->
<!-- prop="count"-->
<!-- width="150"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<el-table-column <el-table-column
label="订单日期" label="订单日期"
prop="updateTime" prop="updateTime"
@ -153,11 +114,12 @@
<script> <script>
import { import {
filterDetailProducts, statDetailProducts statDetailProducts
} from "../../api/inventory/InvPreProducts"; } from "../../api/inventory/InvPreProducts";
import {filterDetailProducts} from "../../api/warehouse/InvProducts";
import store from "../../store"; import store from "../../store";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import {getBussinessType} from "../../api/basic/bussinessType"; import { getBusTypeByUser} from "../../api/warehouse/BusRole";
export default { export default {
name: "idQuery", name: "idQuery",
@ -185,7 +147,7 @@ export default {
deleteLoading: false, deleteLoading: false,
orderNo: null, orderNo: null,
busTypes: [], busTypes: [],
statData: {}, statData: {}
}; };
}, },
components: { components: {
@ -266,15 +228,14 @@ export default {
} }
} }
}, },
getBusType() { getBusTypeByUser() {
let query = { let query = {
enabled: true, enabled: true
}; };
getBussinessType(query) getBusTypeByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action; this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -288,9 +249,9 @@ export default {
}; };
}, },
created() { created() {
this.getBusType();
this.getCodeList(); this.getCodeList();
this.getStat(); this.getStat();
this.getBusTypeByUser();
}, },
}; };
</script> </script>

33
src/views/warehouse/AdditionalOrder.vue
Unescape Escape View File

@ -95,13 +95,13 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180" fixed="right"> <el-table-column label="操作" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <!-- <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="addOrders(scope.row)" @click.native.stop="addOrders(scope.row)"
>编辑 >编辑
</el-button </el-button
> >-->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -240,8 +240,7 @@
<script> <script>
import { import {
orderListError, additionalOrderList,
getSupplementOrder,
deleteByOrderId, deleteByOrderId,
addCommitOrder, addCommitOrder,
updateUnit updateUnit
@ -250,9 +249,8 @@ import draggable from "vuedraggable";
import codeDetail from "./errorCode"; import codeDetail from "./errorCode";
import addOrder from "./addOrder"; import addOrder from "./addOrder";
import store from "../../store"; import store from "../../store";
import { getBasicUnitMaintains } from "@/api/basic/basicUnitMaintain"; import {getUnitMaintain} from "../../api/receipts/unitMaintain";
import { filterAllByUser } from "@/api/basic/invWarehouse"; import { filterAllByUser } from "@/api/basic/invWarehouse";
import { getLocalJoinByUser } from "@/api/basic/busLocalType";
import {getBusTypeByUser} from "@/api/warehouse/BusRole"; import {getBusTypeByUser} from "@/api/warehouse/BusRole";
const formJson = { const formJson = {
@ -268,6 +266,7 @@ export default {
return { return {
filterQuery: { filterQuery: {
id: "", id: "",
orderId: "",
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
@ -375,7 +374,7 @@ export default {
}, },
getUnitList() { getUnitList() {
this.loading = true; this.loading = true;
getBasicUnitMaintains(this.unitquery) getUnitMaintain(this.unitquery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.unitlist = response.data.page.list || []; this.unitlist = response.data.page.list || [];
@ -386,7 +385,6 @@ export default {
}, },
selectUnit(row) { selectUnit(row) {
console.log(row.id);
this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.id = this.curIndex;
this.unitUpdateQuery.fromCorp = row.name; this.unitUpdateQuery.fromCorp = row.name;
this.unitUpdateQuery.fromCorpId = row.erpId; this.unitUpdateQuery.fromCorpId = row.erpId;
@ -404,9 +402,8 @@ export default {
this.loading = true; this.loading = true;
this.filterQuery.status = 5; this.filterQuery.status = 5;
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
orderListError(this.filterQuery) additionalOrderList(this.filterQuery)
.then((response) => { .then((response) => {
console.log(response);
this.loading = false; this.loading = false;
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
@ -468,27 +465,18 @@ export default {
handleErrorDetail(poistion) { handleErrorDetail(poistion) {
var mOrder = this.list[poistion]; var mOrder = this.list[poistion];
var corpOrderId = mOrder.remark; var corpOrderId = mOrder.remark;
this.errorDetail = mOrder.remark; this.errorDetail = mOrder.remark;
console.log(corpOrderId + " " + mOrder + " " + mOrder.remark);
this.dialogVisible = true; this.dialogVisible = true;
}, },
intentDetail(row) { intentDetail(row) {
this.codeDetailVisible = true; this.codeDetailVisible = true;
this.idQuery.id = row.id; this.idQuery.id = row.orderId;
}, },
getBusType() { getBusType() {
let query = { let query = {
enabled: true enabled: true
}; };
/*getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
})
.catch(() => {
});*/
getBusTypeByUser(query).then((res) => { getBusTypeByUser(query).then((res) => {
this.busTypes = res.data.list || []; this.busTypes = res.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action; this.filterQuery.billAction = this.busTypes[0].action;
@ -518,13 +506,12 @@ export default {
} }
}, },
addOrders(row) { addOrders(row) {
console.log(row);
this.idQuery.id = ""; this.idQuery.id = "";
this.idQuery.actDate = ""; this.idQuery.actDate = "";
this.idQuery.corpOrderId = ""; this.idQuery.corpOrderId = "";
this.idQuery.billType = row.action; this.idQuery.billType = row.action;
if (row.id !== null && row.id !== undefined && row.id !== "") { if (row.id !== null && row.orderId !== undefined && row.orderId !== "") {
this.idQuery.id = row.id; this.idQuery.id = row.orderId;
this.idQuery.actDate = row.actDate; this.idQuery.actDate = row.actDate;
this.idQuery.corpOrderId = row.corpOrderId; this.idQuery.corpOrderId = row.corpOrderId;
} }

4
src/views/warehouse/InvProducts.vue
Unescape Escape View File

@ -67,7 +67,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
title="库存详情" title="库存码详情"
:visible.sync="codeDetailVisible" :visible.sync="codeDetailVisible"
width="65%" width="65%"
v-if="codeDetailVisible" v-if="codeDetailVisible"
@ -92,7 +92,7 @@ import {
deleteProducts deleteProducts
} from "../../api/warehouse/InvProducts"; } from "../../api/warehouse/InvProducts";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./InvProductsDetail"; import codeDetail from "../inventory/InvPreProductsDetail";
import store from "../../store"; import store from "../../store";
import { getBusType } from "../../api/warehouse/BusRole"; import { getBusType } from "../../api/warehouse/BusRole";

29
src/views/warehouse/addOrder.vue
Unescape Escape View File

@ -92,13 +92,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
:disabled="corpOrderIdDisabled"> :disabled="corpOrderIdDisabled">
<el-option <el-option
v-for="item in storageList" v-for="item in storageList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
@ -153,10 +149,6 @@
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350" <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
:row-style="rowStyle" :row-style="rowStyle"
ref="multipleTable"> ref="multipleTable">
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="55">-->
<!-- </el-table-column>-->
<el-table-column label="序号" type="index" width="45"></el-table-column> <el-table-column label="序号" type="index" width="45"></el-table-column>
<el-table-column <el-table-column
label="条码" label="条码"
@ -252,16 +244,13 @@ import {
addOrderWeb, addOrderWeb,
deleteCodesTempById, deleteCodesTempById,
submitOrderWeb, submitOrderWeb,
updateCodeBindSup, updateCodeBindSup
expireTimeCheck
} from "../../api/warehouse/order"; } from "../../api/warehouse/order";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import {saveAs} from "file-saver";
import {getBussinessType} from "../../api/basic/bussinessType";
import {parseTime} from "../../filtres/index"; import {parseTime} from "../../filtres/index";
import store from "../../store"; import store from "../../store";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; import { filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getBusTypeByUser} from "../../api/warehouse/BusRole";
import DialogSelectUnit from "./DialogSelectUnit"; import DialogSelectUnit from "./DialogSelectUnit";
import selectRlDialog from "./DialogSelectRl"; import selectRlDialog from "./DialogSelectRl";
@ -587,12 +576,11 @@ export default {
let query = { let query = {
enabled: true, enabled: true,
}; };
getLocalJoinBusType(query) getBusTypeByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.curAction = this.busTypes[0]; this.curAction = this.busTypes[0];
this.getStorage(this.formData.billType); this.getStorage(this.formData.billType);
// this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -601,13 +589,9 @@ export default {
this.$router.go(-1); this.$router.go(-1);
}, },
getStorage(event) { getStorage(event) {
let query = { let query = {};
// advanceType: this.getActionName(event),
isDefault: true,
};
this.storageList = []; this.storageList = [];
// this.formData.locStorageCode = null; filterAllByUser(query)
filterAll(query)
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })
@ -645,7 +629,6 @@ export default {
id: this.curRow.id, id: this.curRow.id,
relId: row.id, relId: row.id,
}; };
console.log("row.relId = " + row.id);
updateCodeBindSup(query).then((response) => { updateCodeBindSup(query).then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("绑定成功"); this.$message.success("绑定成功");

Write Preview
Loading…
Cancel
Save