@@ -90,39 +107,47 @@
-
-
-
-
-
+
+
+
+
+
- {{ fromTypeMap[scope.row.fromType] }}
+
+ {{ scope.row.createTime }}
-
+
+
+
+
+ {{ scope.row.checkTime }}
+
-
+
+
+
-
+
-
+
-
+
+
-
- {{ scope.row.createTime }}
+ {{ fromTypeMap[scope.row.fromType] }}
-
-
-
-
-
-
-
-
-
+
+
+ {{
+ checkStatus[scope.row.status]
+ }}
+
+
+
+
撤回
-
- 删除
-
+
+
+
+
+
+
+
@@ -195,43 +219,45 @@
+
@@ -340,7 +366,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getResultDetailList} from "@/api/inout/orderDetailResult";
import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code";
-import {inspectionOrderPDFFromTemplateFile,orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
+import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
const formJson = {
@@ -372,10 +398,11 @@ export default {
2: "等待处理",
3: "等待校验",
4: "处理异常",
- 5: "校验成功",
+ 5: "待核对",
6: "校验异常",
7: "已审核",
- 8: "审核拒绝"
+ 8: "审核拒绝",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
invList: [],
list: [],
@@ -410,6 +437,7 @@ export default {
busTypes: [],
currentRow: {},
actDateRange: [],
+ auditDateRange: [],
pickerOptions: {
shortcuts: [
{
@@ -487,6 +515,8 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
+ this.actDateRange = [];
+ this.auditDateRange = [];
this.getList();
},
onSubmit() {
@@ -498,6 +528,15 @@ export default {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
+
+ if (this.auditDateRange !== null) {
+ this.filterQuery.startAduditTime = this.auditDateRange[0];
+ this.filterQuery.endAduditTime = this.auditDateRange[1];
+ } else {
+ this.filterQuery.startAduditTime = null;
+ this.filterQuery.endAduditTime = null;
+ }
+
this.filterQuery.page = 1;
this.getList();
},
@@ -784,16 +823,18 @@ export default {
// this.$message.info('回退失败');
});
},
- },
- filters: {
statusFilterType(status) {
const statusMap = {
- false: "success",
- true: "warning",
+ 5: "warning",
+ 1: "warning",
+ 6: "danger",
+ 7: "success",
};
return statusMap[status];
},
},
+ filters: {
+ },
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index ab22e94b..414a4269 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -95,7 +95,7 @@
border
@row-click="handleSelectionChange">
-
+
@@ -112,9 +112,9 @@
-
+
-
+
@@ -124,8 +124,6 @@
{{ fromTypeMap[scope.row.fromType] }}
-
-
{{
@@ -134,7 +132,7 @@
-
+
撤回
-
-
-
-
+
+
@@ -113,28 +113,22 @@
border
@cell-click="handleSelectionChange">
-
-
+
+
+
-
-
-
- {{ scope.row.createTime }}
-
-
-
+
-
+
-
+
-
-
+
+
{{ fromTypeMap[scope.row.fromType] }}
-
{{
@@ -207,46 +201,45 @@
@@ -291,48 +284,48 @@
>
@@ -489,10 +482,11 @@ export default {
2: "等待处理",
3: "等待校验",
4: "处理异常",
- 5: "校验成功",
+ 5: "待核对",
6: "校验异常",
7: "已审核",
- 8: "审核拒绝"
+ 8: "审核拒绝",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
storageList: [],
subInvList: [],
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 6074c6ae..f62f92f6 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -98,9 +98,9 @@
-
+
-
+
@@ -161,7 +161,7 @@
>
-
+
单据 {{ currentRow.billNo }}-单据详情
@@ -191,63 +191,51 @@
-
-
-
@@ -318,6 +306,7 @@
{
+ console.log(this.certFileUrl + "========");
+ this.imgList = [];
+ previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
- this.imgList=response.data;
+ this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
- closeImgViewer(){
+ closeImgViewer() {
this.imgViewerVisible = false;
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
-
- upload(row){
+ upload(row) {
this.currentManufacturer = row;
this.Upinvoice = true;
},
- closeCheckDialog(){
+ closeCheckDialog() {
this.Upinvoice = false;
this.getOrderDetails();
},
handleSelectionChange(val) {
- this.currentRow.billNo=val.billNo;
+ this.currentRow.billNo = val.billNo;
this.getOrderDetails();
},
// 获取单据 业务详情、扫码详情、扫码明细
@@ -857,7 +847,7 @@ export default {
this.loading = false;
});
},
- freshen(){
+ freshen() {
this.Upinvoice = false;
this.getOrderDetails();
},
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 5a088769..efa4089a 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -42,8 +42,8 @@
-
-
+
+
@@ -60,8 +60,8 @@
-
-
+
@@ -124,22 +124,22 @@
>
-
+
-
-
-
+
-
+
+
+
-
+
{{ fromTypeMap[scope.row.fromType] }}
-
+
{{
checkStatus[scope.row.status]
@@ -274,7 +274,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index b60ad64a..712fa88a 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -107,27 +107,21 @@
-
-
-
-
-
-
-
- {{ fromTypeMap[scope.row.fromType] }}
-
+
+
+
-
+
-
+
-
+
+
-
- {{ scope.row.createTime }}
+ {{ fromTypeMap[scope.row.fromType] }}
@@ -138,7 +132,7 @@
-
+
-
-
+
+
@@ -80,8 +80,8 @@
-
-
+
@@ -283,7 +283,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 53fc8abb..5601f701 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -37,8 +37,8 @@
-
-
+
+
@@ -112,8 +112,7 @@
>
-
-
+
@@ -123,12 +122,12 @@
-
+
{{ fromTypeMap[scope.row.fromType] }}
-
+
{{
checkStatus[scope.row.status]
@@ -233,7 +232,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 904a44f1..eb730af7 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -36,8 +36,8 @@
-
-
+
+
@@ -54,8 +54,8 @@
-
-
+
@@ -126,12 +126,12 @@
-
+
-
+
{{ fromTypeMap[scope.row.fromType] }}
@@ -372,7 +372,7 @@ export default {
6: "校验异常",
7: "审核通过",
8: "审核拒绝",
- 9: "正在处理", 10: "待审核",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 79f71949..43e9e1a6 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -21,26 +21,28 @@
border
@current-change="handleSelectionChange">
-
-
-
-
-
- {{ fromTypeMap[scope.row.fromType] }}
-
+
+
+
-
+
-
+
-
+
-
+
+
+
+ {{ fromTypeMap[scope.row.fromType] }}
+
-
+
-
- {{ scope.row.createTime }}
+ {{
+ checkStatus[scope.row.status]
+ }}
+
@@ -106,43 +108,45 @@
+
@@ -444,10 +448,11 @@ export default {
2: "等待处理",
3: "等待校验",
4: "处理异常",
- 5: "校验成功",
+ 5: "待核对",
6: "校验异常",
- 7: "审核通过",
- 8: "审核拒绝"
+ 7: "已审核",
+ 8: "审核拒绝",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
invList: [],
list: [],
@@ -805,15 +810,19 @@ export default {
this.order.billNo = row.billNo;
this.codeDialogVisible = true;
},
- },
- filters: {
+
statusFilterType(status) {
const statusMap = {
- false: "success",
- true: "warning",
+ 5: "warning",
+ 1: "warning",
+ 6: "danger",
+ 7: "success",
};
return statusMap[status];
},
+
+ },
+ filters: {
},
mounted() {
document.body.ondrop = function (event) {
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
new file mode 100644
index 00000000..4e9b6f71
--- /dev/null
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -0,0 +1,677 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ fromTypeMap[scope.row.fromType] }}
+
+
+
+
+
+ {{
+ checkStatus[scope.row.status]
+ }}
+
+
+
+
+
+ 编辑
+
+ 删除
+
+ 校验提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+