|
|
|
|
@ -22,7 +22,8 @@
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item class="query-form-item" label="单据类型:">
|
|
|
|
|
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
|
|
|
|
|
style="width: 90%">
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in busTypes"
|
|
|
|
|
:key="item.name"
|
|
|
|
|
@ -83,7 +84,7 @@
|
|
|
|
|
>查询
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
<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-group>
|
|
|
|
|
</div>
|
|
|
|
|
@ -116,7 +117,7 @@
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="校验状态" prop="status" width="100">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{
|
|
|
|
|
<el-tag :type="statusFilterType(scope.row.status)">{{
|
|
|
|
|
checkStatus[scope.row.status]
|
|
|
|
|
}}
|
|
|
|
|
</el-tag>
|
|
|
|
|
@ -150,7 +151,7 @@
|
|
|
|
|
type="text"
|
|
|
|
|
size="small"
|
|
|
|
|
v-if="scope.row.status !== -1"
|
|
|
|
|
@click.native.stop="onUpload(scope.row.id)"
|
|
|
|
|
@click.native.stop="onUpload(scope.row.billNo)"
|
|
|
|
|
>立即处理
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
@ -260,19 +261,16 @@
|
|
|
|
|
<script>
|
|
|
|
|
import {
|
|
|
|
|
deleteByOrderId,
|
|
|
|
|
commitOrder,
|
|
|
|
|
submitOrderWeb,
|
|
|
|
|
updateUnit, mergeOrder,
|
|
|
|
|
getOrderList
|
|
|
|
|
} from "../../api/inout/order";
|
|
|
|
|
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
|
|
|
|
|
import draggable from "vuedraggable";
|
|
|
|
|
// import codeDetail from "./errorCode";
|
|
|
|
|
// import ioErrorOrder from "./IOErrorOrder";todo
|
|
|
|
|
import addOrder from "./IoCreateOrder";
|
|
|
|
|
import store from "../../store";
|
|
|
|
|
import {getInvListByUser} from "@/api/system/invWarehouse";
|
|
|
|
|
import {getLocalJoinByUser} from "@/api/basic/busType";
|
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
|
|
|
|
|
|
|
|
|
|
const formJson = {
|
|
|
|
|
@ -307,7 +305,8 @@ export default {
|
|
|
|
|
5: "校验成功",
|
|
|
|
|
6: "校验异常",
|
|
|
|
|
7: "审核通过",
|
|
|
|
|
8: "审核拒绝"
|
|
|
|
|
8: "审核拒绝",
|
|
|
|
|
9: "正在处理"
|
|
|
|
|
},
|
|
|
|
|
curIndex: "",
|
|
|
|
|
unitQuery: {key: "", page: 1, limit: 20},
|
|
|
|
|
@ -396,7 +395,6 @@ export default {
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
components: {
|
|
|
|
|
draggable,
|
|
|
|
|
// codeDetail,
|
|
|
|
|
addOrder,
|
|
|
|
|
// ioErrorOrder
|
|
|
|
|
@ -422,7 +420,6 @@ export default {
|
|
|
|
|
this.getList();
|
|
|
|
|
},
|
|
|
|
|
onSubmit() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
if (this.actDateRange !== null) {
|
|
|
|
|
this.filterQuery.startTime = this.actDateRange[0];
|
|
|
|
|
this.filterQuery.endTime = this.actDateRange[1];
|
|
|
|
|
@ -606,26 +603,18 @@ export default {
|
|
|
|
|
onUpload(data) {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
var idQuery = {
|
|
|
|
|
orderId: "",
|
|
|
|
|
billNo: "",
|
|
|
|
|
};
|
|
|
|
|
idQuery.orderId = data;
|
|
|
|
|
commitOrder(idQuery)
|
|
|
|
|
idQuery.billNo = data;
|
|
|
|
|
submitOrderWeb(idQuery)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
if (response.code == 20000) {
|
|
|
|
|
this.$message.success(response.data);
|
|
|
|
|
for (let i = 0; i < this.list.length; i++) {
|
|
|
|
|
if (this.list[i].id === idQuery.orderId) {
|
|
|
|
|
this.list.splice(i, 1);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.loading = false;
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
|
this.$message.success("提交成功");
|
|
|
|
|
} else {
|
|
|
|
|
this.loading = false
|
|
|
|
|
this.$message.error(response.message);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
handleErrorDetail(poistion) {
|
|
|
|
|
@ -667,15 +656,16 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
filters: {
|
|
|
|
|
statusFilterType(status) {
|
|
|
|
|
const statusMap = {
|
|
|
|
|
false: "success",
|
|
|
|
|
true: "warning",
|
|
|
|
|
2: "warning",
|
|
|
|
|
1: "warning",
|
|
|
|
|
4: "danger",
|
|
|
|
|
3: "success",
|
|
|
|
|
};
|
|
|
|
|
return statusMap[status];
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
mounted() {
|
|
|
|
|
document.body.ondrop = function (event) {
|
|
|
|
|
|
anthonywj
2 years ago