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

1.修改未校验页面

Browse Source
prod
x_z 3 years ago
parent 7962d62d10
commit 400a852ab4
3 changed files with 83 additions and 161 deletions
Show Stats Download Patch File Download Diff File

8
src/api/system/invWarehouse.js
Unescape Escape View File

@ -226,5 +226,13 @@ export function filterThridSubByInv(params) {
}); });
} }
export function getInvListByUser(params) {
return axios({
url: "/spms/inv/warehouse/findInvListByUser",
method: "get",
params: params
});
}

126
src/views/inout/IoNewOrder.vue
Unescape Escape View File

@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="单号:"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号:" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
@ -37,10 +37,10 @@
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="subInvChange" @change="invChange"
> >
<el-option <el-option
v-for="item in subInvList" v-for="item in invList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
@ -85,7 +85,6 @@
> >
<el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button> <el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>
<el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button> <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
<el-button type="primary" icon="el-icon-error" @click="errOrders">异常单据</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -139,6 +138,14 @@
>删除 >删除
</el-button </el-button
> >
<el-button
type="text"
size="small"
v-if="scope.row.status === 4"
@click.native.stop="errorMsgDialog(scope.row)"
>删除
</el-button
>
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -165,9 +172,9 @@
:close-on-press-escape="false" :close-on-press-escape="false"
width="70%" width="70%"
> >
<el-form :inline="true" :model="unitquery" class="query-form" size="mini"> <el-form :inline="true" :model="unitQuery" class="query-form" size="mini">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="unitquery.key" placeholder="搜索"></el-input> <el-input v-model="unitQuery.key" placeholder="搜索"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@ -182,7 +189,7 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="unitlist" :data="unitList"
style="width: 100%" style="width: 100%"
@row-click="selectUnit" @row-click="selectUnit"
> >
@ -210,16 +217,6 @@
<el-table-column label="类型" prop="type"></el-table-column> <el-table-column label="类型" prop="type"></el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
<el-dialog
title="异常订单"
:visible.sync="errOrderVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<ioErrorOrder
></ioErrorOrder>
</el-dialog>
<el-dialog <el-dialog
title="新增单据" title="新增单据"
:visible.sync="addOrderVisible" :visible.sync="addOrderVisible"
@ -273,9 +270,8 @@ import draggable from "vuedraggable";
// import ioErrorOrder from "./IOErrorOrder";todo // import ioErrorOrder from "./IOErrorOrder";todo
import addOrder from "./IoCreateOrder"; import addOrder from "./IoCreateOrder";
import store from "../../store"; import store from "../../store";
import {filterAllByUser} from "@/api/system/invWarehouse"; import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType"; import {getLocalJoinByUser} from "@/api/basic/busType";
import {filterSubByInv} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
@ -290,14 +286,14 @@ export default {
name: "IoNewOrder", name: "IoNewOrder",
data() { data() {
return { return {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null,
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
statusType: "draft", statusType: "newOrder",
limit: 10, limit: 10,
invCode: this.$store.getters.locInvCode invCode: this.$store.getters.locInvCode
}, },
@ -312,8 +308,8 @@ export default {
8: "审核拒绝" 8: "审核拒绝"
}, },
curIndex: "", curIndex: "",
unitquery: {key: "", page: 1, limit: 20}, unitQuery: {key: "", page: 1, limit: 20},
unitlist: [], unitList: [],
multipleSelection: [], multipleSelection: [],
unitUpdateQuery: { unitUpdateQuery: {
id: "", id: "",
@ -322,8 +318,7 @@ export default {
}, },
idQuery: {}, idQuery: {},
storageList: [], storageList: [],
subInvList: [], invList: [],
errOrderVisible: false,
list: [], list: [],
adId: [], adId: [],
adSelectList: [], adSelectList: [],
@ -336,7 +331,7 @@ export default {
loading: false, loading: false,
index: null, index: null,
formName: null, formName: null,
errorDetail: "1111111111111", errorDetail: "",
formMap: { formMap: {
add: "新增", add: "新增",
edit: "编辑", edit: "编辑",
@ -411,6 +406,7 @@ export default {
}); });
this.filterQuery = { this.filterQuery = {
id: "", id: "",
billNo: null,
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
@ -460,57 +456,24 @@ export default {
} }
}, },
getBusType() { getBusType() {
if (this.subInvList.length > 0) {
this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
}
let query = { let query = {
code: this.filterQuery.invWarehouseCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action; this.filterQuery.action = this.busTypes[0].action;
// this.getList(); this.getList();
})
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.getSubInvList();
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });
}, },
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
getSubStorageName(code) {
for (let i = 0; i < this.subInvList.length; i++) {
if (this.subInvList[i].code === code) {
return this.subInvList[i].name;
}
}
},
addOrders(row) { addOrders(row) {
this.idQuery = {}; this.idQuery = {};
this.idQuery = row; this.idQuery = row;
this.addOrderVisible = true; this.addOrderVisible = true;
}, },
errOrders() {
this.errOrderVisible = true;
},
closeDialog() { closeDialog() {
this.addOrderVisible = false; this.addOrderVisible = false;
this.addHosOrderVisible = false; this.addHosOrderVisible = false;
@ -518,10 +481,10 @@ export default {
}, },
getUnitList() { getUnitList() {
this.loading = true; this.loading = true;
getBasicUnitMaintains(this.unitquery) getBasicUnitMaintains(this.unitQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.unitlist = response.data.list || []; this.unitList = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -684,33 +647,17 @@ export default {
this.idQuery.id = row.id; this.idQuery.id = row.id;
}, },
invChange() { getInvList() {
this.subInvList = []; getInvListByUser()
this.filterQuery.invWarehouseCode = "";
let query = {
pcode: this.filterQuery.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
getSubInvList() {
let query = {
// pcode: this.filterQuery.locStorageCode
filter: 3,
};
filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.invList = response.data || [];
this.getList(); this.getList();
}) })
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() { invChange() {
this.filterQuery.action = null;
this.getBusType(); this.getBusType();
}, },
init() { init() {
@ -720,6 +667,13 @@ export default {
this.uploadFileUrl = response + "/udiwms/orders/file/upload"; this.uploadFileUrl = response + "/udiwms/orders/file/upload";
}); });
}, },
errorMsgDialog(row) {
this.$alert(row.remark, '错误信息', {
confirmButtonText: '确定',
callback: action => {
}
});
},
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {
@ -737,7 +691,7 @@ export default {
}; };
}, },
created() { created() {
this.getSubInvList(); this.getInvList();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);

110
src/views/inout/IoUnCheckedOrder.vue
Unescape Escape View File

@ -3,14 +3,14 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="单号:"> <el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号:" <el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -19,7 +19,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"> style="width: 90%">
@ -33,14 +33,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:"> <el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%" style="width: 90%"
@change="subInvChange" @change="invChange"
> >
<el-option <el-option
v-for="item in subInvList" v-for="item in invList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
@ -52,7 +52,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item class="query-form-item" label="创建时间:"> <el-form-item class="query-form-item" label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -452,8 +452,8 @@ import {
deleteByOrderId, deleteByOrderId,
getOrderList getOrderList
} from "../../api/inout/order"; } from "../../api/inout/order";
import {filterAllByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType"; import {getLocalJoinByUser} from "@/api/basic/busType";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {filterSubByInv} from "@/api/system/invSubWarehouse"; import {filterSubByInv} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
@ -475,10 +475,11 @@ export default {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null,
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
status: 10, statusType: "unCheck",
limit: 10, limit: 10,
startTime: null, startTime: null,
endTime: null, endTime: null,
@ -493,7 +494,8 @@ export default {
4: "校验成功", 4: "校验成功",
}, },
storageList: [], storageList: [],
subInvList: [], invList: [],
list: [],
total: 0, total: 0,
loading: false, loading: false,
index: null, index: null,
@ -520,7 +522,9 @@ export default {
formData: formJson, formData: formJson,
deleteLoading: false, deleteLoading: false,
busTypes: [], busTypes: [],
currentRow: {}, currentRow: {
billNo: ""
},
actDateRange: [], actDateRange: [],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
@ -587,9 +591,16 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
status: 10, id: "",
billNo: null,
mainAction: null,
action: null,
page: 1, page: 1,
statusType: "unCheck",
limit: 10, limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
}; };
this.getList(); this.getList();
}, },
@ -608,57 +619,24 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
handleSizeChange(val) { invChange() {
this.filterQuery.limit = val; this.filterQuery.action = null;
this.getList(); this.getBusType();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
}, },
getBusType() { getBusType() {
if (this.subInvList.length > 0) {
this.filterQuery.locStorageCode = this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId
}
let query = { let query = {
code: this.filterQuery.invWarehouseCode, code: this.filterQuery.invCode,
enabled: true, enabled: true,
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action; this.filterQuery.action = this.busTypes[0].action;
}) this.getList();
.catch(() => {
});
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.getSubInvList();
this.getList();
}
}) })
.catch(() => { .catch(() => {
}); });
}, },
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
getSubStorageName(code) {
for (let i = 0; i < this.subInvList.length; i++) {
if (this.subInvList[i].code === code) {
return this.subInvList[i].name;
}
}
},
handleSelectionChange(val) { handleSelectionChange(val) {
this.currentRow = val; this.currentRow = val;
this.getOrderDetails(); this.getOrderDetails();
@ -736,34 +714,16 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
invChange() { getInvList() {
this.subInvList = []; getInvListByUser()
this.filterQuery.invWarehouseCode = "";
let query = {
pcode: this.filterQuery.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
getSubInvList() {
let query = {
filter: 3,
};
filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.invList = response.data || [];
console.log(this.invList)
this.getList(); this.getList();
}) })
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() {
this.getBusType();
},
checkOrder(orderId) { checkOrder(orderId) {
}, },
onBizReset() { onBizReset() {
@ -903,7 +863,7 @@ export default {
}; };
}, },
created() { created() {
this.getSubInvList(); this.getInvList();
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);

Write Preview
Loading…
Cancel
Save