页面UI

src/pages/config/pages/postManage/index.vue

@@ -244,7 +244,8 @@
                 this.submitLoading = true
                 this.$http.postData('sarPosition/position/role', {
                     positionId: this.selectList[0].id,
-                    roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys())
+                    roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys()),
+                    operator: this.$store.getters.userInfo.account,
                 }, {}, res=> {
                     if (res.ok) {
                         this.$message.success('配置成功')

src/pages/personal/pages/my-collection/components/CollectionLaws.vue

@@ -15,7 +15,7 @@
             <el-form-item class="search-item btn-box">
               <el-button
                 :loading="searching"
-                v-btn-permission="'1044adc0569438df582585db349f2cde'"
+                v-btn-permission="'6b287f97264d39c234a6abd45ba1e508'"
                 type="primary"
                 class="common-button-primary"
                 @click="selectLawsBtn">
@@ -23,7 +23,7 @@
               </el-button>
               <el-button
                 class="common-button-default"
-                v-btn-permission="'3b4223ab22aa24b8332c3d27f1e7fe32'"
+                v-btn-permission="'4c0d359d32e9639ba16eefd649496259'"
                 @click="resetSelect">清空</el-button>
 <!--              <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>-->
             </el-form-item>

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -18,14 +18,14 @@
                 type="primary"
                 class="common-button-primary"
                 size="mini"
-                v-btn-permission="'a0926c279e15ef0a3a2bc782f93d15fa'"
+                v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
                 @click="selectStandardBtn">
                 查询
               </el-button>
               <el-button
                 class="common-button-default"
                 size="mini"
-                v-btn-permission="'63d0dbbae0bee0f0888295d6cc6ef9c3'"
+                v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"
                 @click="resetSelect">清空</el-button>
 <!--              <el-button-->
 <!--                      class="common-button-default"-->
@@ -63,7 +63,7 @@
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" v-btn-permission="'fc2b045e1fe8a5e14feab48d3138df53'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+                <el-button size="mini" v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>

src/pages/personal/pages/my-collection/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="my-collection v-class">
     <panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header>
-    <panel-content class="panel-content-box">
+    <transition enter-active-class="" leave-active-class="">
       <components :is="active"></components>
-    </panel-content>
+    </transition>
   </div>
 </template>
 
@@ -17,10 +17,15 @@ export default {
   data () {
     return {
       active: 'CollectionStandard',
-      tabsList: [
+    }
+  },
+  computed: {
+    tabsList() {
+      const list = [
         {
           title: '已收藏的标准法规',
-          name: 'CollectionStandard'
+          name: 'CollectionStandard',
+          permission:'f3686f4736acca57b1c0a97a990f96fc'
         },
         // {
         //   title: '已收藏的动态&资料 ',
@@ -28,18 +33,30 @@ export default {
         // },
         {
           title: '已收藏的政策',
-          name: 'CollectionLaws'
+          name: 'CollectionLaws',
+          permission:'200212748ffc5fd3d93179789446535a'
         },
         // {
         //   title: '已收藏的标准拆分',
         //   name: 'CollectionBreak'
         // }
       ]
+
+      return list.filter(item => {
+        if (item.permission) {
+          return this.$hasPermission(item.permission)
+        } else {
+          return false
+        }
+      })
     }
   },
   methods: {
-    showComponent (name) {
+    showComponent(name) {
-      this.active = name
+      if (this.active !== name) {
+        this.active = name
+        const location = this.$router.replace({ query: { tabsName: name } })
+      }
     }
     // getCookie (name) {
     //   // 获取指定名称的cookie值

src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"
@@ -82,12 +82,12 @@
                     style="display: none;"
                     clearable
                   ></el-input>
-                  <el-button type="primary" @click="choiceZRR">选择责任人</el-button>
+                  <el-button type="primary" @click="choiceZRR" style="padding-left: 10px">选择责任人</el-button>
                   <div @click="choiceZRR">
                     <div v-if="form.responUserListName" style="color: #666;">
                       {{ form.responUserListName }}
                     </div>
-                    <div v-else style="color: #ccc;">
+                    <div v-else style="color: #ccc;padding-left: 10px;" >
                       请选择责任人
                     </div>
                   </div>

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

@@ -62,7 +62,7 @@
                                 </el-form-item>
                                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                                             <span @click="fileLook(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"

src/pages/processCenter/pages/creatProcess/qbfz/step4.vue

@@ -543,7 +543,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

src/pages/processCenter/pages/creatProcess/qbfz/step5.vue

@@ -570,7 +570,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

src/pages/processCenter/pages/creatProcess/qbfz/step6.vue

@@ -570,7 +570,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

src/pages/processCenter/pages/processList/index.vue

@@ -65,7 +65,7 @@ export default {
         if (item.permission) {
           return this.$hasPermission(item.permission)
         } else {
-          return true
+          return false
         }
       })
     }

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

@@ -114,6 +114,7 @@
                 label="章节名称">
         </el-table-column>
         <el-table-column
+                prop="content"
                 align="center"
                 label="修改意见内容(包括理由或依据)"
         >