Merge remote-tracking branch 'origin/develop' into develop

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
             });
           });
         });

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -274,6 +274,7 @@
                 </el-form-item>
               </el-form>
             </div>
+            <div class="table-height">
               <el-table
                 :data="standardData"
                 v-loading="loading"
@@ -281,7 +282,7 @@
                 style="width: 100%"
                 border
                 ref="table"
-              class="table-height"
+                height="100%"
                 :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
                 @selection-change="selectThree"
@@ -344,6 +345,7 @@
                 </el-table-column>
               </el-table>
             </div>
+          </div>
           <pagination
             :page="pageNo"
             :pageSize="pageSizeNo"

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
             });
           });
         });

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>
+                      <el-input v-model="standForm.cycvppsbm" placeholder="请输入乘用车VPPS编码" clearable></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-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>
+                      <el-input v-model="standForm.kccvppsbm" placeholder="请输入卡车VPPS编码" clearable></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-form-item>
                   </el-col>
                 </el-row>