Merge branch 'dev' into test

.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/'

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;

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;

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;

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;

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,

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -114,7 +114,6 @@
               <el-input size="small" v-model="scope.row.count"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
-                        @change="tableCountChange(scope.row)"
                         :disabled="scope.row.index !== selectedIndex"
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
@@ -127,6 +126,9 @@
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
               </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                         @click.native="tableCountChange(scope.row)">保存
+              </el-button>
               <el-button type="text" size="small" @click.stop="true"
                          @click.native="deleteCodeArray(scope.$index, scope.row)">删除
               </el-button>
@@ -397,6 +399,7 @@ export default {
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
         updateDetail(this.currentRow);
+        this.selectedIndex=""
       }
     },
     tableRowClassName({row, rowIndex}) {

src/views/thirdSys/api/DialogEditBusDown.vue

@@ -35,7 +35,7 @@
                 :value="item.action">
                 <span style="float: left;font-size: 13px">{{ item.name }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                    item.remark
+                    item.action
                   }}</span>
               </el-option>
             </el-select>

src/views/thirdSys/api/DialogEditBusUpload.vue

@@ -35,7 +35,7 @@
                 :value="item.action">
                 <span style="float: left;font-size: 13px">{{ item.name }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                    item.remark
+                    item.action
                   }}</span>
               </el-option>
             </el-select>