From de300ea504d5da641278b0072dcee2542d5c0280 Mon Sep 17 00:00:00 2001
From: zhuangxinwei <1152856986@qq.com>
Date: Sat, 8 Oct 2022 12:09:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index e76ece474..5afcf5de7 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -848,12 +848,15 @@
 <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
 <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
 <!--              </div>-->
-              <el-tooltip placement="top">
-                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>
                 <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
                   {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
                 </div>
-              </el-tooltip>
+<!--              <el-tooltip placement="top">-->
+<!--                <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>-->
+<!--                <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+<!--                  {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+<!--                </div>-->
+<!--              </el-tooltip>-->
             </template>
           </el-table-column>
           <el-table-column

From 4ae82a122bc2a98a4409c5e586c7eb93d95bdb2e Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Sat, 8 Oct 2022 13:54:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=E4=B8=AD=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E4=B8=8D=E6=94=AF=E6=8C=81=E8=A7=A3?=
 =?UTF-8?q?=E5=AF=86=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index 679ec4c32..85a5fe84c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -561,7 +561,7 @@ export default {
         _formData.append('standNumSplit', files.standNumSplit)
         _formData.append('standNameSplit', files.standNameSplit)
         _formData.append('fileType', files.fileType)
-        _formData.append('file', file.raw)
+        _formData.append('importFileId', files.attId)
         this.$http.postData('importWkExcel/importData', _formData,{
           _this: this
         }, res => {