diff --git a/.env.production b/.env.production
index 9de78aa4..c1de6991 100644
--- a/.env.production
+++ b/.env.production
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index 4912f568..fb8bf616 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -455,6 +455,9 @@ export default {
return isJPG || isPNG;
},
showImgViewer(row) {
+ if(this.inputQuery.filePath.substr(-1) == ','){
+ this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
@@ -493,6 +496,9 @@ export default {
},
showImgViewerCold(row){
+ if(this.inputQuery.coldFilePath.substr(-1) == ','){
+ this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index b741b13b..621f5f75 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -654,6 +654,9 @@ export default {
this.getList();
},
showImgViewer(row) {
+ if(row.filePath.substr(-1) == ','){
+ row.filePath=row.filePath.slice(0, row.filePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -693,6 +696,9 @@ export default {
showImgViewerCold(row) {
+ if(row.coldFilePath.substr(-1) == ','){
+ row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index c8bf5c47..6e2bd66c 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -753,6 +753,9 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row) {
+ if(row.filePath.substr(-1) == ','){
+ row.filePath=row.filePath.slice(0, row.filePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -791,6 +794,9 @@ export default {
},
showImgViewerCold(row) {
+ if(row.coldFilePath.substr(-1) == ','){
+ row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index b2eec70b..9d317f6e 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -620,6 +620,9 @@ export default {
},
showImgViewer(row) {
+ if(row.filePath.substr(-1) == ','){
+ row.filePath=row.filePath.slice(0, row.filePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -658,6 +661,9 @@ export default {
},
showImgViewerCold(row) {
+ if(row.coldFilePath.substr(-1) == ','){
+ row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+ }
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
diff --git a/src/views/inout/uploadManage/uploadSetting.vue b/src/views/inout/uploadManage/uploadSetting.vue
index a346e122..a46515c8 100644
--- a/src/views/inout/uploadManage/uploadSetting.vue
+++ b/src/views/inout/uploadManage/uploadSetting.vue
@@ -330,6 +330,10 @@ export default {
},
addBusType() {
let selectedData = this.multipleSelection;
+
+ selectedData.forEach(item => {
+ item.id = null
+ });
this.addBusDialogVisible = false;
let query = {
busTypes: selectedData,
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index bf8ce623..a70d12ca 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -114,7 +114,6 @@
@@ -127,6 +126,9 @@
编辑
+ 保存
+
删除
@@ -397,6 +399,7 @@ export default {
tableCountChange(row) {
if (this.$isNotBlank(row)) {
updateDetail(this.currentRow);
+ this.selectedIndex=""
}
},
tableRowClassName({row, rowIndex}) {
diff --git a/src/views/thirdSys/api/DialogEditBusDown.vue b/src/views/thirdSys/api/DialogEditBusDown.vue
index 97837bec..44d8f451 100644
--- a/src/views/thirdSys/api/DialogEditBusDown.vue
+++ b/src/views/thirdSys/api/DialogEditBusDown.vue
@@ -35,7 +35,7 @@
:value="item.action">
{{ item.name }}
{{
- item.remark
+ item.action
}}
diff --git a/src/views/thirdSys/api/DialogEditBusUpload.vue b/src/views/thirdSys/api/DialogEditBusUpload.vue
index 2ff051db..3be68aee 100644
--- a/src/views/thirdSys/api/DialogEditBusUpload.vue
+++ b/src/views/thirdSys/api/DialogEditBusUpload.vue
@@ -35,7 +35,7 @@
:value="item.action">
{{ item.name }}
{{
- item.remark
+ item.action
}}