From 6f6c28151eaa10cfbd19281c6d586d29be3671f1 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 28 Dec 2021 17:50:12 +0800
Subject: [PATCH 1/2] feat: There is no way the,vpps car and bus

---
 .../searchCenter/pages/advancedSearch.vue     | 32 ++-----------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index b84453434..0fcf27ebd 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -305,21 +305,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                      <el-input v-model="standForm.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', standForm.cycvppsbm)"></el-input>
-                      <tree-select-new
-                              width = "800"
-                              :key="key1"
-                              :lazy=true
-                              :multiple=true
-                              :check-strictly= true
-                              :modalShowFlag="modalShowFlag2"
-                              :drawerTitle="drawerTitle"
-                              :show-checkBox="showCheckBox"
-                              :url="url"
-                              :urlChild="urlChild"
-                              @popoverHideCancel = "modalShowFlag2 = false"
-                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+                      <el-input v-model="standForm.cycvppsbm" placeholder="请输入乘用车VPPS编码" clearable></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -332,21 +318,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-                      <el-input v-model="standForm.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', standForm.kccvppsbm)"></el-input>
-                      <tree-select-new
-                              width = "800"
-                              :key="key2"
-                              :lazy=true
-                              :multiple=true
-                              :check-strictly= true
-                              :modalShowFlag="modalShowFlag3"
-                              :drawerTitle="drawerTitle"
-                              :show-checkBox="showCheckBox"
-                              :url="url"
-                              @popoverHideCancel = "modalShowFlag3 = false"
-                              :urlChild="urlChild"
-                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+                      <el-input v-model="standForm.kccvppsbm" placeholder="请输入卡车VPPS编码" clearable></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>

From f03807f9ab4ebca679b38cb251fdc5027abe8239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 28 Dec 2021 18:01:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step2.vue       |   5 +-
 .../pages/creatProcess/bzqdfb/step3.vue       | 136 +++++++++---------
 .../pages/creatProcess/bzqdfb/step4.vue       |   5 +-
 3 files changed, 75 insertions(+), 71 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index a70f42992..19e5fbd11 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -49,7 +49,7 @@
                     />
                     <i
                       title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.name)"
+                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -360,7 +360,8 @@ export default {
               name: item.oldFileName,
               uid: item.uid,
               status: item.status,
-              id: item.id
+              id: item.id,
+              fileSuffix: item.fileSuffix
             });
           });
         });
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 7128517c9..a10230dd2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -274,75 +274,77 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
-              :data="standardData"
-              v-loading="loading"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              ref="table"
-              class="table-height"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+            <div class="table-height">
+              <el-table
+                :data="standardData"
+                v-loading="loading"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                ref="table"
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="code"
-                align="center"
-                label="标准号">
-                <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
-                      scope.row.standNumber
-                    }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                      scope.row.standSortShow }}
-                    {{ scope.row.standNumber }}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="standName"
-                align="center"
-                label="标准名称"
+                @selection-change="selectThree"
               >
-                <template slot-scope="scope">
-                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="issueTime"
-                align="center"
-                label="发布日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="XCXSSRQ"
-                align="center"
-                label="新车型实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="ZCCSSRQ"
-                align="center"
-                label="在产车实施日期">
-              </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="textStatus"
-                align="center"
-                label="文本状态">
-                <template slot-scope="scope">
-                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                </template>
-              </el-table-column>
-            </el-table>
+                <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+                </el-table-column>
+                <el-table-column
+                  prop="code"
+                  align="center"
+                  label="标准号">
+                  <template slot-scope="scope">
+                    <a v-if="scope.row.standYear" class="table-jump"
+                       @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                        scope.row.standNumber
+                      }}-{{ scope.row.standYear }}</a>
+                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                        scope.row.standSortShow }}
+                      {{ scope.row.standNumber }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standName"
+                  align="center"
+                  label="标准名称"
+                >
+                  <template slot-scope="scope">
+                    <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  align="center"
+                  label="发布日期">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="XCXSSRQ"
+                  align="center"
+                  label="新车型实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="ZCCSSRQ"
+                  align="center"
+                  label="在产车实施日期">
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="textStatus"
+                  align="center"
+                  label="文本状态">
+                  <template slot-scope="scope">
+                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index fe89b2cc7..a03c6e1a1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -49,7 +49,7 @@
                     />
                     <i
                       title="下载带水印"
-                      @click.stop="downloadFileByWater(item.id, item.name)"
+                      @click.stop="downloadFileByWater(item.id, item.fileSuffix)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -429,7 +429,8 @@ export default {
               name: item.oldFileName,
               uid: item.uid,
               status: item.status,
-              id: item.id
+              id: item.id,
+              fileSuffix: item.fileSuffix
             });
           });
         });