Merge branch 'secondStage' into thirdStage

src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue

@@ -169,7 +169,7 @@ export default {
       this.form.setFieldsValue({ title: name })
     },
     // 下载导入模板
-    downTemplate (fileName, fileSuffix = '.xlsx') {
+    downTemplate (fileName, fileSuffix = '.xls') {
       if (!fileName || typeof fileName !== 'string') {
         fileName = '模板文件'
       }

src/views/enterpriseStandardLibrary/check/CheckList.vue

@@ -111,13 +111,13 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        operSpecialJudgeField="delayFlag"
-        :operSpecialJudgeValue="false"
-        :operSpecialJudgeDelBtn="$t('enterpriseStandardLibrary.check.deferredCheck')"
         :operationList="operationList"
         :operateMaxNum="operateMaxNum"
         @operationClick="operationClick"
         @change="handleTableChange">
+        <!--operSpecialJudgeField="delayFlag"-->
+        <!--:operSpecialJudgeValue="false"-->
+        <!--:operSpecialJudgeDelBtn="$t('enterpriseStandardLibrary.check.deferredCheck')"-->
 
         <!--   企标编号/企标名称  -->
         <template v-slot:toDetail="{text, record}">

src/views/standardRegulationLibrary/profileCenter/ProfileCenterList.vue

@@ -22,7 +22,9 @@
                   </template>
                   <span class="tree-node-custom-title">{{ record.folderName }}</span>
                 </a-tooltip>
-                <div class="tree-operate-node-btn-box" :class="{'tree-operate-node-btn-box-hide': record.id !== mouseInNodeKey}">
+                <div class="tree-operate-node-btn-box"
+                     :class="{'tree-operate-node-btn-box-hide': record.id !== mouseInNodeKey}"
+                     v-if="hasManagePermission(record)">
                   <!--新增同级-->
                   <a-button icon="plus"
                             class="tree-operate-node-btn"
@@ -142,6 +144,7 @@ import ProfileCenterModal from './modules/ProfileCenterModal.vue'
 import ProfileCenterTreeModal from './modules/ProfileCenterTreeModal.vue'
 import { filterObj } from '../../../utils/util'
 import { downloadFile } from '../../../api/manage'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'ProfileCenterList',
@@ -214,6 +217,9 @@ export default {
       treeLoading: false
     }
   },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
   created () {
     this.initTreeData()
   },
@@ -358,6 +364,22 @@ export default {
     },
     handleDownload ({ id, fileName }) {
       downloadFile(`/laws/dataCenter/lawsDataCenterFile/download?id=${id}`, fileName)
+    },
+    hasManagePermission ({ authManageIds }) {
+      if (!authManageIds) {
+        return true
+      }
+      const adminRoleList = window._CONFIG.adminRoleCode.split(',')
+      const userRoleList = this.userInfo.roleCode.split(',')
+      const isAdmin = userRoleList.some(tt => adminRoleList.includes(tt))
+      if (isAdmin) {
+        return true
+      }
+      const authManageArr = authManageIds.split(',')
+      if (authManageArr.includes(this.userInfo.id)) {
+        return true
+      }
+      return false
     }
   }
 }

src/views/user/Login.vue

@@ -37,7 +37,7 @@
           </a-col>
           <a-col :span="3"></a-col>
         </a-row>
-        <a-row style="margin-bottom: 0;">
+        <a-row style="margin-bottom: 2%;">
           <a-col :span="3"></a-col>
           <a-col :span="12">
             <a-form-item>
@@ -58,22 +58,22 @@
           </a-col>
           <a-col :span="3"></a-col>
         </a-row>
-        <a-row style="margin-bottom: 2%;">
-          <a-col :span="3"></a-col>
-          <a-col :span="7">
-            <a-form-item>
-              <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6"></a-col>
-          <a-col :span="5" style="text-align: right;color: #1891FF;">
-            <a-form-item>
-              <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
-                忘记密码
-              </router-link>
-            </a-form-item>
-          </a-col>
-        </a-row>
+        <!--<a-row style="margin-bottom: 2%;">-->
+        <!--  <a-col :span="3"></a-col>-->
+        <!--  <a-col :span="7">-->
+        <!--    <a-form-item>-->
+        <!--      <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>-->
+        <!--    </a-form-item>-->
+        <!--  </a-col>-->
+        <!--  <a-col :span="6"></a-col>-->
+        <!--  <a-col :span="5" style="text-align: right;color: #1891FF;">-->
+        <!--    <a-form-item>-->
+        <!--      <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
+        <!--        忘记密码-->
+        <!--      </router-link>-->
+        <!--    </a-form-item>-->
+        <!--  </a-col>-->
+        <!--</a-row>-->
         <a-row class="login-btn">
           <a-col :span="3"></a-col>
           <a-col :span="18">
@@ -430,7 +430,7 @@ function isMobile () {
     .user-layout-login{
       z-index: 99;
       width: 24%;
-      height: 59%;
+      height: 50%;
       padding: 3% 0 3% 0;
       min-width: 332px;
       min-height: 460px;