From fc6e17a699b462aaf9252e6bc2c8b0cca0a1b263 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 6 Jul 2023 15:43:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97=E5=88=B0=E5=BE=85=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E4=BC=9A=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue         | 6 ++++--
 src/views/inout/PanelCreateOrderBizDetail.vue | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 1df9bf72..74a50762 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -119,7 +119,7 @@
         <el-row>
           <el-col :span="11">
             <el-form-item
-              prop="fromCorp"
+              prop="fromName"
               label="往来信息:"
               v-if="
                 curAction.corpType === 0 ||
@@ -128,7 +128,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromCorpName"
+                v-model="orderFormData.fromName"
                 filterable
                 remote
                 clearable
@@ -565,6 +565,8 @@ export default {
         action: null,
         invCode: null,
         fromCorp: null,
+        fromCorpName: null,
+        fromName: null,
         fromInvCode: null,
         remark: null,
         fromType: 2,
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 972b3dd3..a0616924 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/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;
       }

From ca7d0b41b2882a14bae17c8bdc683956e6bba80b Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 6 Jul 2023 16:44:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 74a50762..3dbb2bb9 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -119,7 +119,7 @@
         <el-row>
           <el-col :span="11">
             <el-form-item
-              prop="fromName"
+              prop="fromCorp"
               label="往来信息:"
               v-if="
                 curAction.corpType === 0 ||
@@ -128,7 +128,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromName"
+                v-model="orderFormData.fromCorp"
                 filterable
                 remote
                 clearable
@@ -566,7 +566,6 @@ export default {
         invCode: null,
         fromCorp: null,
         fromCorpName: null,
-        fromName: null,
         fromInvCode: null,
         remark: null,
         fromType: 2,
@@ -1448,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(",");
       }

From 0474f4323bfe19530462d6038633ff6c21eb4cc8 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 6 Jul 2023 17:01:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=97=A0=E6=B3=95=E6=89=8B=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceRegistration.vue | 38 +++++++++++--------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index d7066054..6dfd59ba 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/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){
-        this.$message.error("文件名异常!")
-        return false
+      if (index === -1) {
+        this.$message.error("文件名异常!");
+        return false;
       }
-      if(row.licenseUrl.substr(index+1)==='pdf'){
-        let pdf = "application/pdf"
+      if (row.licenseUrl.substr(index + 1) === '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() {