From 565c28f7e705ce31efba917706b4726ce2bb3a3d Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:06:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/preview/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/common/preview/index.js b/src/common/preview/index.js
index 90c5be3f9..e76d60d27 100644
--- a/src/common/preview/index.js
+++ b/src/common/preview/index.js
@@ -54,7 +54,12 @@ async function preview (attId, type) {
           this.$message.error('文档未转换成功或本地读取不到该文档')
           return
         }
-      } else {
+      } else if (file.previewAttId) {
+        url = viewer + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.previewAttId)
+      } else if (!file.previewAttId) {
+        this.$message.error('文档未转换成功或本地读取不到该文档')
+        return
+      }else {
         url = kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(file.downLoadUrl)) + '&watermarkTxt=' + encodeURIComponent(store.getters.userInfo.userName)
       }
     }

From f2fd24dde29677e0cd5a5e8beb114b0042afbf88 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:10:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/preview/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/common/preview/index.js b/src/common/preview/index.js
index e76d60d27..299f6aca7 100644
--- a/src/common/preview/index.js
+++ b/src/common/preview/index.js
@@ -56,9 +56,6 @@ async function preview (attId, type) {
         }
       } else if (file.previewAttId) {
         url = viewer + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.previewAttId)
-      } else if (!file.previewAttId) {
-        this.$message.error('文档未转换成功或本地读取不到该文档')
-        return
       }else {
         url = kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(file.downLoadUrl)) + '&watermarkTxt=' + encodeURIComponent(store.getters.userInfo.userName)
       }

From ead31acea41763e77211630f41cdcc22020afe97 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:29:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E4=BA=A7=E5=93=81=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BA=E4=BF=AE=E8=AE=A2=E6=97=B6=E4=B8=8D=E5=B8=A6=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk-product/bussLibraryProduct.vue      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue
index 7baa03b50..a7ccc96f0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/bussLibraryProduct.vue
@@ -568,6 +568,8 @@ export default {
       if (this.form.standStatus === '2') {
         form.putTime = undefined
         form.issueTime = undefined
+        form.XGD = undefined
+        form.XGDName = undefined
       }
       this.form = Object.assign(initForm, pick(form, keys), { standStatus: this.form.standStatus })
       // 对象空值转为空字符串