Merge remote-tracking branch 'origin/master'

src/views/inout/DialogCreateOrder.vue

@@ -128,7 +128,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromCorpName"
+                v-model="orderFormData.fromCorp"
                 filterable
                 remote
                 clearable
@@ -565,6 +565,7 @@ export default {
         action: null,
         invCode: null,
         fromCorp: null,
+        fromCorpName: null,
         fromInvCode: null,
         remark: null,
         fromType: 2,
@@ -1446,6 +1447,7 @@ export default {
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
       this.actionEnable = true;
+      this.orderFormData.fromCorp=this.orderFormData.fromCorpName;
       if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
         this.checkPreInArray = this.orderFormData.split(",");
       }

src/views/inout/InvoiceRegistration.vue

@@ -798,41 +798,37 @@ export default {
     showImgViewer(row) {
       this.certFileUrl =
         this.BASE_URL +
-        "/udiwms/image/register/file/getImage?type=image2&name="+row.licenseUrl;
+        "/udiwms/image/register/file/getImage?type=image2&name=" + row.licenseUrl;
       this.imgList = [];
-      this.imgList.push(this.certFileUrl)
+      this.imgList.push(this.certFileUrl);
       let index = row.licenseUrl.lastIndexOf('.');
-      if(index===-1){
+      if (index === -1) {
-        this.$message.error("文件名异常!")
+        this.$message.error("文件名异常!");
-        return false
+        return false;
       }
-      if(row.licenseUrl.substr(index+1)==='pdf'){
+      if (row.licenseUrl.substr(index + 1) === 'pdf') {
-        let pdf = "application/pdf"
+        let pdf = "application/pdf";
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res=>{
+        previewFile(this.certFileUrl).then(res => {
           binaryData.push(res);
-          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }));
           window.open(URL);
-        })
+        });
-        // window.open(this.imgList[0])
+        return false;
-        return false
       }
       this.imgViewerVisible = true;
-      // previewImage({
-      //   imageUrl: this.inputQuery.licenseUrl,
-      //   certFileUrl: this.certFileUrl,
-      // }).then((response) => {
-      //   if (response.code === 20000) {
-      //   }
-      //   console.log(this.imgList);
-      // });
       const m = (e) => {
         e.preventDefault();
       };
       document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
-
     },
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      document.body.style.overflow = "auto"; // 恢复页面滑动
+      document.removeEventListener("touchmove", m, false); // 移除禁止页面滑动的事件
+    },
+
 
 
     invChange() {

src/views/inout/PanelCreateOrderBizDetail.vue

@@ -364,7 +364,7 @@ export default {
         return;
       }
 
-      if (this.$isBlank(this.idQuery.fromCorpName) && this.$isBlank(this.idQuery.fromInvCode)) {
+      if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
         this.$message.error("往来信息不能为空！");
         return;
       }