Merge remote-tracking branch 'origin/dev2.0' into dev2.0

src/views/inout/DialogCreateOrder.vue

@@ -277,10 +277,14 @@ export default {
       type: Object,
       required: true,
     },
-
+    isSupVesion: {
+      type: Object,
+      required: true,
+    },
   },
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       //查看帮助相关
       ioCreateOrderHelp500:{},
       // ioCreateOrderHelp502:{},
@@ -414,6 +418,9 @@ export default {
       //为url类型
       if (helpType == 1) {
         window.open(this["ioCreateOrderHelp"+code].urlPath, '_blank')
+      }else if(helpType == 0 ||helpType == null){
+          let certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+          window.open(certFileUrl + this["ioCreateOrderHelp"+code].filePath);
       }
     },
 

src/views/inout/IoReturnedSearchOrder.vue

@@ -1141,6 +1141,7 @@
         :closeDialog="closeDialog"
         :orderQuery="returnData"
         :viewType="viewType"
+        :isSupVesion="isSupVesion"
       ></addOrder>
     </el-dialog>
 
@@ -1331,6 +1332,7 @@ export default {
       addOrderVisible: false,
       returnData: null,
       viewType: 3,
+      isSupVesion: false,
     };
   },
   components: {AcceptOrder, addOrder},
@@ -1451,6 +1453,7 @@ export default {
             if (response.code == 20000) {
               _this.returnData = response.data;
               _this.addOrderVisible = true;
+              _this.isSupVesion = true;
             }
 
           })