Merge branch 'develop' into FOTON

# Conflicts:
#	src/sysConfig/index.js

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -341,7 +341,7 @@
               </template>
             </el-table-column>
             <el-table-column fixed="right"
-                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
+                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
                              label="收藏" align="center" width="50px"
             >
               <template slot-scope="scope">
@@ -371,13 +371,11 @@
                   <div @click.stop style="display: inline-block">
                     <!--                                            <i class="iconfont">&#xe61e;</i>-->
                     <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-if="scope.row.collectBtn"
                                @click="handleCommand([scope.row, '收藏'])"
                     >
                     </el-button>
                     <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-else
                                @click="handleCommand([scope.row, '取消收藏'])"
                     >
@@ -3721,6 +3719,7 @@ export default {
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
+      sessionStorage.setItem('tableFlag', JSON.stringify(item))
       this.tableFlag = item
       item.page = 1
       this.getDomesticStandardTable(item)
@@ -4495,7 +4494,8 @@ export default {
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.getDomesticStandardTable(this.tableFlag)
+      let tabFlag  = JSON.parse(sessionStorage.getItem('tableFlag'))
+      this.getDomesticStandardTable(tabFlag)
       this.selectConfiguraStand()
       // 此处需要调用接口，修改个人配置
     },

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -355,6 +355,13 @@
             label="代替企标编号"
             min-width="300"
           >
+            <template slot-scope="scope">
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" >{{scope.row.dtqbbhbuss}}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" class="table-jump">{{scope.row.dtqbbhbuss}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" class="table-jump">{{
+                scope.row.dtqbbhbuss
+                }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="issueTime"
@@ -647,7 +654,7 @@
                         <el-input
                           v-model="sarBussionessStandEO.CYCVPPSBMBUSS"
                           placeholder="选择VPPS编码"
-                          @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
+                          @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.CYCVPPSBMBUSS,true)"></el-input>
                       </el-form-item>
                     </el-tooltip>
                   </template>
@@ -690,17 +697,38 @@
                       label-width="150px"
                       class="add-form-item"
                     >
-                      <template slot="label">模块结构单元变型号</template>
+                      <template slot="label">模块结构单元变型号(卡车)</template>
                       <el-input
-                        v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号"
-                        @click.native="choiceZRR4('dybxhbuss', '模块结构单元', sarBussionessStandEO.dybxh)">
+                        v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号(卡车)"
+                        @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', sarBussionessStandEO.dybxh)">
                       </el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DYMCBUSS'">
-                    <el-form-item label="模块结构单元名称" label-width="150px" prop="DYMCBUSS" class="add-form-item">
+                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMCBUSS" class="add-form-item">
                       <el-input
-                        v-model="sarBussionessStandEO.DYMCBUSS" disabled
+                              v-model="sarBussionessStandEO.DYMCBUSS" disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'CYCDYBXHBUSS'">
+                    <el-form-item
+                            prop="CYCDYBXHBUSS"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(乘用车)</template>
+                      <el-input
+                              v-model="sarBussionessStandEO.CYCDYBXHBUSS" placeholder="选择模块结构单元变型号(乘用车)"
+                              @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', sarBussionessStandEO.dybxh)">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'CYCDYMCBUSS'">
+                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="CYCDYMCBUSS" class="add-form-item">
+                      <el-input
+                        v-model="sarBussionessStandEO.CYCDYMCBUSS" disabled
                         clearable
                       ></el-input>
                     </el-form-item>
@@ -1055,7 +1083,7 @@
       </el-dialog>
     </div>
     <el-drawer
-      title="高级搜索"
+      title="高级检索"
       size="700px"
       :wrapperClosable="false"
       :visible.sync="isAdvancedSearch">
@@ -1583,6 +1611,19 @@
       :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
       :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
       @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
   </div>
 </template>
 
@@ -2240,6 +2281,7 @@ export default {
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      defaultCheckedKeys4: [],
       defaultCodeProps: {
         children: 'children',
         label: 'code'
@@ -2367,9 +2409,11 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false, // drawer开关
       type: '',
       url: '',
       urlChild: '',
+      modelType:'',
     }
   },
   methods: {
@@ -2588,15 +2632,13 @@ export default {
           if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
             this.sarBussionessSearch.CYCVPPSBMBUSS =  checkedData.map(item => item.code).join(",")
             this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-          } else {
             this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
             this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-          }
+            }
         } else {
           if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
             this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
             this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
-          } else {
             this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
             this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
           }
@@ -2638,6 +2680,22 @@ export default {
     popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarBussionessStandEO.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+          this.sarBussionessStandEO.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarBussionessStandEO.CYCDYBXHBUSS = checkedData.model
+          this.sarBussionessStandEO.CYCDYMCBUSS = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverCarHideModelCancel() {
+      this.modalShowFlag5 = false
+    },
     popoverHideCancel() {
       this.modalShowFlag1 = false
     },
@@ -2685,9 +2743,19 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
+      this.modelType = type
       this.url = "sarModelTree/list"
       this.urlChild = "sarModelTree/childByList"
     },
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+    },
     choiceZRR1(type, title, id) {
       this.drawerTitle1 = title
       this.modalShowFlag1 = true
@@ -3563,10 +3631,12 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.sarBussionessSearch.QCDW = data[0].institutionName
-      this.sarBussionessSearch.QCDWId = data[0].institutionId
-      this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId)
-      this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName)
+      if(data && data.length > 0){
+          this.sarBussionessSearch.QCDW = data[0].institutionName
+          this.sarBussionessSearch.QCDWId = data[0].institutionId
+          this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId)
+          this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName)
+      }
       if (this.drawerTitle === '查询起草人') {
         this.sarBussionessSearch['QCRBUSS'] = nameList
       }
@@ -4206,6 +4276,7 @@ export default {
       this.tableFlag = item
       // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
       this.getBussionStandTable(item, '', type)
+      this.isAdvancedSearch = false
     },
     // 清空搜索框
     clearAllSearch(flag) {
@@ -4378,6 +4449,7 @@ export default {
       }
       this.SarExportSearchEo = formData
       formData.isKU = '1'
+      this.isAdvancedSearch = false
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
@@ -4398,7 +4470,6 @@ export default {
         if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
         }
-        this.isAdvancedSearch = false
       }, e => {
       })
       // this.$refs.selection.selectAll(false)

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -333,7 +333,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="收藏" align="center" width="50">
+            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc')>0" label="收藏" align="center" width="50">
               <template slot-scope="scope">
 <!--                <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
 <!--                     @command="handleCommand"-->

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -89,8 +89,11 @@
       <el-table
               :data="standinfoList"
               height="100%"
+              tooltip-effect="dark"
+              header-cell-class-name="zTable_style"
               border
-              style="width: 100%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
               :default-sort = "{prop: 'partCode', order: 'ascending'}"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
@@ -608,6 +611,9 @@
   @import '~@/assets/styles/style';
 
   .consultationDetails {
+    /deep/.zTable_style {
+      border-bottom: 1px solid #d1d1d1;
+    }
     height: 100%;
     display: flex;
     flex-direction: column;