diff --git a/.env.development b/.env.development
index e15349a3..eed92e7d 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
-VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 203a0967..67d828e5 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -928,6 +928,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ }else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 213b3f31..ca8330b2 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -156,13 +156,14 @@
>打印
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
预览
+ >编辑
@@ -400,7 +400,8 @@
-
+
-
{
+ 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); // 禁止页面滑动
},
- showImgViewerCold(row){
+ showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
- console.log(this.certFileUrl+"========");
- this.imgListCold=[];
- previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
+ console.log(this.certFileUrl + "========");
+ this.imgListCold = [];
+ previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
- this.imgListCold=response.data;
+ this.imgListCold = response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = 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);
},
- closeImgViewerCold(){
+ closeImgViewerCold() {
this.imgViewerVisibleCold = 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;
},
- freshen(){
+ freshen() {
this.Upinvoice = false;
this.getOrderDetails();
},
- closeCheckDialog(){
+ closeCheckDialog() {
this.Upinvoice = false;
this.getOrderDetails();
},
@@ -958,7 +964,7 @@ export default {
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
- new Blob(binaryData, {type: "application/pdf"})
+ new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 95f251e7..dc79d2bd 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -150,6 +150,8 @@
+
+
-
+
{
+ console.log(this.certFileUrl + "========");
+ this.imgListCold = [];
+ previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
- this.imgListCold=response.data;
+ this.imgListCold = response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
@@ -776,9 +781,11 @@ export default {
document.removeEventListener("touchmove", m, true);
},
- closeImgViewerCold(){
+ closeImgViewerCold() {
this.imgViewerVisibleCold = false;
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
@@ -954,6 +961,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ } else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 23c4a795..4fb5d06c 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -732,6 +732,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ }else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 58b499d3..ad4ded14 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -266,7 +266,6 @@
-
-
-
+
{
+ console.log(this.certFileUrl + "========");
+ this.imgListCold = [];
+ previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
- this.imgListCold=response.data;
+ this.imgListCold = response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
-
closeImgViewer() {
this.imgViewerVisible = false;
const m = (e) => {
@@ -660,9 +660,11 @@ export default {
document.removeEventListener("touchmove", m, true);
},
- closeImgViewerCold(){
+ closeImgViewerCold() {
this.imgViewerVisibleCold = false;
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
@@ -787,7 +789,7 @@ export default {
page: 1,
limit: 10
};
- if(!isBlank(this.currentRow.billNo)) {
+ if (!isBlank(this.currentRow.billNo)) {
this.getBizDetailList();
}
},
@@ -910,7 +912,7 @@ export default {
page: 1,
limit: 10
};
- if(!isBlank(this.currentRow.billNo)) {
+ if (!isBlank(this.currentRow.billNo)) {
this.getResultDetailList();
}
},
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index c038959f..98425cea 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -134,7 +134,7 @@
-
+
{{ fromTypeMap[scope.row.fromType] }}
@@ -456,6 +456,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ } else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index 712fa88a..48acb738 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -119,7 +119,7 @@
-
+
{{ fromTypeMap[scope.row.fromType] }}
@@ -229,7 +229,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
- 9: "正在处理",10: "待审核", 11: "待配货",
+ 9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
@@ -406,6 +406,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ } else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 4623d7e2..12ca57c2 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -488,6 +488,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ } else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 5601f701..46d1c6df 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -122,7 +122,7 @@
-
+
{{ fromTypeMap[scope.row.fromType] }}
@@ -409,6 +409,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ } else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 23037cc8..0c31bfaa 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -574,6 +574,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ } else {
+ this.$message.error(response.message);
+ this.getList();
}
})
@@ -588,8 +591,8 @@ export default {
})
.then(() => {
this.deleteOrders(rowId);
- this.currentRow=null;
- this.bizDetailList=[];
+ this.currentRow = null;
+ this.bizDetailList = [];
})
.catch(() => {
});
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
index 4e9b6f71..78b5db4b 100644
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -535,6 +535,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
+ } else {
+ this.$message.error(response.message);
+ this.getList();
}
})
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index 9bf7bbd5..0492616f 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -161,9 +161,6 @@
-
- {{ scope.row.inCount - scope.row.outCount }}
-
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index b76515e2..eb1cc01a 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -161,11 +161,12 @@
-
+
+
-
- {{ scope.row.inCount - scope.row.outCount }}
-
+
+
+
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index f4a773b1..e5094dd4 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -162,9 +162,6 @@
-
- {{ scope.row.inCount - scope.row.outCount }}
-
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index cd8b801e..b5bf9c0f 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -294,7 +294,7 @@ export default {
},
idQuery: {
id: "",
- billNo:""
+ billNo: ""
},
curIndex: "",
adListNoDataText: "无数据",
@@ -468,28 +468,12 @@ export default {
intentDetail(row) {
this.codeDetailVisible = true;
this.idQuery.id = row.id;
- this.idQuery.billNo=row.billNo;
+ this.idQuery.billNo = row.billNo;
},
closeDialog() {
this.successOrderExportPDFSettingVisible = false;
this.getList();
},
-
- deleteOrders(data) {
- this.loading = true;
- this.deleteData.id = data;
- deleteByOrderId(this.deleteData)
- .then((response) => {
- this.getList();
- this.refresgOrderDetail();
- this.$message({
- type: "success",
- message: "删除成功！",
- });
- })
- .catch(() => {
- });
- },
tableRowClassName({row, rowIndex}) {
if (row.reCount === row.count) {
return "success-row";
@@ -497,7 +481,6 @@ export default {
return "warning-row";
}
},
-
exportDialog(value) {
var mOrder = value;
if (mOrder.exportStatus === "已上传") {
@@ -651,18 +634,6 @@ export default {
});
},
- deleteDialog(rowId) {
- this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- this.deleteOrders(rowId);
- })
- .catch(() => {
- });
- },
closeDetailDialog(val) {
this.codeDetailVisible = false;
},