Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame
CTP
2 years ago
commit
9219743982
@ -0,0 +1,677 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card class="el-card">
|
||||
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="query-form-item" label="单号:">
|
||||
<el-input v-model="filterQuery.billNo" placeholder="单号"
|
||||
style="width: 90%"
|
||||
clearable="true"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item class="query-form-item" label="出入库类型:">
|
||||
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
|
||||
<el-option label="全部" value=""></el-option>
|
||||
<el-option label="入库" value="WareHouseIn"></el-option>
|
||||
<el-option label="出库" value="WareHouseOut"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item class="query-form-item" label="单据类型:">
|
||||
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
|
||||
style="width: 90%"
|
||||
clearable>
|
||||
<el-option
|
||||
v-for="item in busTypes"
|
||||
:key="item.name"
|
||||
:label="item.name"
|
||||
:value="item.action">
|
||||
<span style="float: left">{{ item.name }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="8">-->
|
||||
<!-- <el-form-item class="query-form-item" label="采购仓库:">-->
|
||||
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
|
||||
<!-- style="width: 90%"-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in deptList"-->
|
||||
<!-- :key="item.name"-->
|
||||
<!-- :label="item.name"-->
|
||||
<!-- :value="item.code">-->
|
||||
<!-- <span style="float: left">{{ item.name }}</span>-->
|
||||
<!-- </el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<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"
|
||||
:key="item.name"
|
||||
:label="item.name"
|
||||
:value="item.code">
|
||||
<span style="float: left">{{ item.name }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="8">
|
||||
|
||||
|
||||
<el-form-item class="query-form-item" label="创建时间:">
|
||||
<el-date-picker
|
||||
:picker-options="pickerOptions"
|
||||
v-model="actDateRange"
|
||||
type="daterange"
|
||||
format="yyyy 年 MM 月 dd 日"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
style="width: 90%"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div class="top-right-btn">
|
||||
<el-button-group>
|
||||
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-refresh"
|
||||
@click="onReset"
|
||||
>重置
|
||||
</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
|
||||
>查询
|
||||
</el-button
|
||||
>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<el-divider style="margin: 15px"></el-divider>
|
||||
<el-table v-loading="loading" :data="list" style="width: 100%"
|
||||
highlight-current-row
|
||||
@row-click="handleSelectionChange"
|
||||
border
|
||||
>
|
||||
<el-table-column label="序号" type="index"></el-table-column>
|
||||
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
|
||||
<el-table-column label="单据类型" prop="billTypeName" width="150">
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
<i class="el-icon-time"></i>
|
||||
<span>{{ scope.row.createTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="往来单位" prop="fromName" width="220">
|
||||
</el-table-column>
|
||||
<el-table-column label="所属部门" prop="deptName" width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="所属仓库" prop="invName" width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
|
||||
<el-table-column label="来源" prop="fromType" width="140">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="单据状态" prop="status" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-tag :type="statusFilterType(scope.row.status)">{{
|
||||
checkStatus[scope.row.status]
|
||||
}}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="text"
|
||||
size="small"
|
||||
@click.native.stop="addOrders(scope.row)"
|
||||
>编辑
|
||||
</el-button
|
||||
>
|
||||
<el-button
|
||||
type="text"
|
||||
size="small"
|
||||
@click.native.stop="deleteDialog(scope.row.billNo)"
|
||||
>删除
|
||||
</el-button
|
||||
>
|
||||
<el-button
|
||||
type="text"
|
||||
size="small"
|
||||
@click.native.stop="onUpload(scope.row.billNo)"
|
||||
>校验提交
|
||||
</el-button
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-dialog
|
||||
title="编辑单据"
|
||||
:visible.sync="addOrderVisible"
|
||||
width="85%"
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
v-if="addOrderVisible"
|
||||
@close='closeDialog'
|
||||
>
|
||||
<addOrder
|
||||
:closeDialog="closeDialog"
|
||||
:orderQuery="idQuery"
|
||||
:viewType="viewType"
|
||||
></addOrder>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
title="单号详情"
|
||||
:visible.sync="codeDetailVisible"
|
||||
:close-on-click-modal="false"
|
||||
:close-on-press-escape="false"
|
||||
width="80%"
|
||||
v-if="codeDetailVisible"
|
||||
>
|
||||
<codeDetail
|
||||
:idQuery="idQuery"
|
||||
v-on:closeDetailDialog="closeDetailDialog"
|
||||
></codeDetail>
|
||||
</el-dialog>
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="filterQuery.page"
|
||||
:limit.sync="filterQuery.limit"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-card>
|
||||
|
||||
|
||||
<el-tabs type="border-card" style="margin: 15px">
|
||||
<!--单据业务详情-->
|
||||
<el-tab-pane>
|
||||
<span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
|
||||
<!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
|
||||
<!-- <el-form-item class="query-form-item" label="物资名称:">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="bizQuery.productName"-->
|
||||
<!-- placeholder="请输入物资名称"-->
|
||||
<!-- clearable-->
|
||||
<!-- >-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <el-button-group>-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- icon="el-icon-refresh"-->
|
||||
<!-- @click="onBizReset"-->
|
||||
<!-- >重置-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <el-button type="primary" @click="onBizSubmit"-->
|
||||
<!-- icon="el-icon-search"-->
|
||||
<!-- >查询-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-button-group>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!--</el-form>-->
|
||||
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
|
||||
:row-style="rowStyle"
|
||||
row-key="id"
|
||||
>
|
||||
<el-table-column label="序号" type="index"></el-table-column>
|
||||
<el-table-column
|
||||
label="物资名称" width="150"
|
||||
prop="coName"
|
||||
show-overflow-tooltip
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="规格型号" width="150"
|
||||
prop="spec"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
header-align="center"
|
||||
label="单据数量" width="100"
|
||||
prop="count"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
header-align="center"
|
||||
label="扫码数量" width="100"
|
||||
prop="scanCount"
|
||||
></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
label="价格"
|
||||
prop="price" width="100"
|
||||
></el-table-column>
|
||||
<el-table-column width="100" label="计量单位" prop="measname">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="生产企业"
|
||||
prop="manufacturer" width="160"
|
||||
show-overflow-tooltip
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="注册/备案号" width="160"
|
||||
prop="certCode"
|
||||
show-overflow-tooltip
|
||||
></el-table-column>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
deleteByOrderId,
|
||||
submitOrderWeb,
|
||||
updateUnit, mergeOrder,
|
||||
getOrderList, submitAllocateBiz
|
||||
} from "../../api/inout/order";
|
||||
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
|
||||
import draggable from "vuedraggable";
|
||||
import addOrder from "./DialogCreateOrder";
|
||||
import store from "../../store";
|
||||
import {getInvListByUser} from "@/api/system/invWarehouse";
|
||||
import {getLocalJoinByUser} from "@/api/basic/busType";
|
||||
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
|
||||
import {isBlank} from "@/utils/strUtil";
|
||||
import {getBizDetailList, getWaitAllocateList} from "@/api/inout/orderDetailBiz";
|
||||
|
||||
|
||||
export default {
|
||||
name: "IoWaitAllocateOrder",
|
||||
data() {
|
||||
return {
|
||||
showSearch: true,
|
||||
filterQuery: {
|
||||
id: "",
|
||||
billNo: null,
|
||||
mainAction: null,
|
||||
action: null,
|
||||
statusType: "unAllocate",
|
||||
page: 1,
|
||||
limit: 10,
|
||||
startTime: null,
|
||||
endTime: null,
|
||||
invCode: this.$store.getters.locInvCode,
|
||||
},
|
||||
viewType: 4,
|
||||
checkStatus: {
|
||||
1: "草稿",
|
||||
2: "等待处理",
|
||||
3: "等待校验",
|
||||
4: "处理异常",
|
||||
5: "校验成功",
|
||||
6: "校验异常",
|
||||
7: "审核通过",
|
||||
8: "审核拒绝",
|
||||
9: "正在处理", 10: "待审核",
|
||||
11: "待配货",
|
||||
},
|
||||
curIndex: "",
|
||||
idQuery: {},
|
||||
storageList: [],
|
||||
invList: [],
|
||||
list: [],
|
||||
codeDetailVisible: false,
|
||||
addOrderVisible: false,
|
||||
total: 0,
|
||||
loading: false,
|
||||
index: null,
|
||||
formName: null,
|
||||
errorDetail: "",
|
||||
formMap: {
|
||||
add: "新增",
|
||||
edit: "编辑",
|
||||
},
|
||||
enableDept: false,
|
||||
fromTypeMap: {
|
||||
"1": "UDIMS平台",
|
||||
"2": "网页新增",
|
||||
"3": "pda即时校验",
|
||||
"4": "pda未校验",
|
||||
"5": "pc端扫码精灵",
|
||||
"6": "流转自动补单",
|
||||
"7": "UDI供应商平台",
|
||||
"8": "平衡补录单据",
|
||||
"10": "手动补单",
|
||||
"11": "仓库盘点",
|
||||
"12": "采购计划",
|
||||
"13": "领用单据",
|
||||
"14": "第三方系统单据",
|
||||
},
|
||||
deleteData: {
|
||||
billNo: "",
|
||||
status: 10,
|
||||
},
|
||||
dialogTableVisible: false,
|
||||
formLoading: false,
|
||||
deleteLoading: false,
|
||||
busTypes: [],
|
||||
actDateRange: [],
|
||||
pickerOptions: {
|
||||
shortcuts: [
|
||||
{
|
||||
text: "最近一周",
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||
picker.$emit("pick", [start, end]);
|
||||
},
|
||||
},
|
||||
{
|
||||
text: "最近一个月",
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
||||
picker.$emit("pick", [start, end]);
|
||||
},
|
||||
},
|
||||
{
|
||||
text: "最近三个月",
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
||||
picker.$emit("pick", [start, end]);
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
currentRow: {
|
||||
billNo: ""
|
||||
},
|
||||
bizQuery: {
|
||||
productName: null,
|
||||
orderIdFk: null,
|
||||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
bizTotal: 0,
|
||||
bizDetailLoading: false,
|
||||
bizDetailList: [],
|
||||
|
||||
};
|
||||
},
|
||||
components: {
|
||||
addOrder,
|
||||
},
|
||||
methods: {
|
||||
onReset() {
|
||||
this.$router.push({
|
||||
path: "",
|
||||
});
|
||||
this.filterQuery = {
|
||||
id: "",
|
||||
billNo: null,
|
||||
mainAction: null,
|
||||
action: null,
|
||||
statusType: "unAllocate",
|
||||
page: 1,
|
||||
limit: 10,
|
||||
startTime: null,
|
||||
endTime: null,
|
||||
invCode: this.$store.getters.locInvCode,
|
||||
};
|
||||
this.actDateRange = [];
|
||||
this.getList();
|
||||
},
|
||||
onSubmit() {
|
||||
if (this.actDateRange !== null) {
|
||||
this.filterQuery.startTime = this.actDateRange[0];
|
||||
this.filterQuery.endTime = this.actDateRange[1];
|
||||
} else {
|
||||
this.filterQuery.startTime = null;
|
||||
this.filterQuery.endTime = null;
|
||||
}
|
||||
this.filterQuery.page = 1;
|
||||
this.getList();
|
||||
},
|
||||
hideSearch() {
|
||||
this.showSearch = !this.showSearch;
|
||||
},
|
||||
|
||||
handleSizeChange(val) {
|
||||
this.filterQuery.limit = val;
|
||||
this.getList();
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.filterQuery.page = val;
|
||||
this.getList();
|
||||
},
|
||||
closeDetailDialog(val) {
|
||||
this.codeDetailVisible = false;
|
||||
},
|
||||
getBusType() {
|
||||
let query = {
|
||||
code: this.filterQuery.invCode,
|
||||
enabled: true,
|
||||
vueType: "supDelivery",
|
||||
};
|
||||
getLocalJoinByUser(query)
|
||||
.then((response) => {
|
||||
this.busTypes = response.data.list || [];
|
||||
this.getList();
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
addOrders(row) {
|
||||
this.currentRow = row;
|
||||
this.idQuery = {};
|
||||
this.idQuery = row;
|
||||
|
||||
this.addOrderVisible = true;
|
||||
},
|
||||
closeDialog() {
|
||||
this.addOrderVisible = false;
|
||||
this.addHosOrderVisible = false;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
//获取订单列表
|
||||
getList() {
|
||||
this.loading = true;
|
||||
getOrderList(this.filterQuery)
|
||||
.then((response) => {
|
||||
this.loading = false;
|
||||
if (response.code === 20000) {
|
||||
this.list = response.data.list || [];
|
||||
this.total = response.data.total || 0;
|
||||
if (this.list.length == 0) {
|
||||
this.bizDetailList = [];
|
||||
}
|
||||
} else {
|
||||
this.$message.error(response.message);
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
this.$message.error(error.message)
|
||||
this.loading = false;
|
||||
this.list = [];
|
||||
this.total = 0;
|
||||
});
|
||||
},
|
||||
deleteOrders(data) {
|
||||
this.loading = true;
|
||||
this.deleteData.billNo = data;
|
||||
deleteByOrderId(this.deleteData)
|
||||
.then((response) => {
|
||||
if (response.code == 20000) {
|
||||
this.getList();
|
||||
this.$message({
|
||||
type: "success",
|
||||
message: "删除成功！",
|
||||
});
|
||||
} else if (response.code == 520) {
|
||||
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
|
||||
this.getList();
|
||||
}
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
deleteDialog(rowId) {
|
||||
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
this.deleteOrders(rowId);
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
onUpload(data) {
|
||||
this.loading = true;
|
||||
var idQuery = {
|
||||
billNo: "",
|
||||
};
|
||||
idQuery.billNo = data;
|
||||
submitAllocateBiz(idQuery)
|
||||
.then((response) => {
|
||||
this.loading = false;
|
||||
if (response.code === 20000) {
|
||||
this.$message.success("提交成功");
|
||||
this.getList();
|
||||
this.bizDetailList = [];
|
||||
} else {
|
||||
this.$message.error(response.message);
|
||||
}
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
getInvList() {
|
||||
getInvListByUser()
|
||||
.then((response) => {
|
||||
this.invList = response.data || [];
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
invChange() {
|
||||
this.filterQuery.action = null;
|
||||
this.getBusType();
|
||||
},
|
||||
|
||||
statusFilterType(status) {
|
||||
const statusMap = {
|
||||
2: "warning",
|
||||
1: "warning",
|
||||
4: "danger",
|
||||
3: "success",
|
||||
};
|
||||
return statusMap[status];
|
||||
},
|
||||
|
||||
rowStyle({row, rowIndex}) {
|
||||
let rowBackground = {};
|
||||
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
|
||||
rowBackground.color = '#f60303';
|
||||
return rowBackground;
|
||||
}
|
||||
if (!row.checkSuccess) {
|
||||
rowBackground.color = '#f60303';
|
||||
}
|
||||
return rowBackground;
|
||||
},
|
||||
|
||||
|
||||
onBizReset() {
|
||||
this.bizQuery = {
|
||||
productName: null,
|
||||
orderIdFk: null,
|
||||
page: 1,
|
||||
limit: 10
|
||||
};
|
||||
this.getBizDetailList();
|
||||
},
|
||||
onBizSubmit() {
|
||||
this.bizQuery.page = 1;
|
||||
this.getBizDetailList();
|
||||
},
|
||||
|
||||
handleSelectionChange(val) {
|
||||
this.currentRow = val;
|
||||
this.getBizDetailList();
|
||||
},
|
||||
getBizDetailList() {
|
||||
if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
|
||||
this.$message.error("请先选择需要查询的单据！")
|
||||
return;
|
||||
}
|
||||
this.bizDetailLoading = true;
|
||||
this.bizQuery.orderIdFk = this.currentRow.billNo;
|
||||
getWaitAllocateList(this.bizQuery).then((res) => {
|
||||
this.bizDetailLoading = false;
|
||||
if (res.code === 20000) {
|
||||
this.bizDetailList = res.data || [];
|
||||
} else {
|
||||
this.$message.error(res.message);
|
||||
this.bizDetailList = [];
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.bizDetailLoading = false;
|
||||
this.$message.error(error.message);
|
||||
this.bizDetailList = [];
|
||||
this.bizTotal = 0;
|
||||
})
|
||||
},
|
||||
|
||||
},
|
||||
mounted() {
|
||||
document.body.ondrop = function (event) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getInvList();
|
||||
this.getBusType();
|
||||
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
|
||||
if (res.code === 20000) {
|
||||
if (res.data.paramValue === "0") {
|
||||
this.enableDept = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
this.getList();
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style type="text/scss" lang="scss">
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue