Merge branch 'secondStage' into thirdStage

src/components/customField/AddForm.vue

@@ -313,7 +313,8 @@ export default {
       standardGradeClassification: [], // 企标级别映射
       innerDisabledField: [], // 内部不可编辑字段
       departSelectRange: [], // 选择部门的选择范围，传了就只能从这些里面选，不传就都能选
-      isEditSetData: false // 正在编辑回显数据
+      isEditSetData: false, // 正在编辑回显数据
+      oldMainDraftingUnit: '' // 上一次的主起草单位
     }
   },
   watch: {
@@ -332,8 +333,10 @@ export default {
           }
         } else if (val === StandardGradeClassify.ONE_LEVEL.value) {
           // 选的是1级
-          // 带出3级的部门：起草部门
-          this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // // 带出3级的部门：起草部门
+          // this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // 带出主起草单位
+          this.formInline.auth_dept = this.formInline.main_drafting_unit
           // 设置可选择项
           this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '1').deptIds.split(',')
           this.formInline = JSON.parse(JSON.stringify(this.formInline))
@@ -343,8 +346,10 @@ export default {
           }
         } else if (val === StandardGradeClassify.TWO_LEVEL.value) {
           // 选的是2级
-          // 带出3级的部门：起草部门
-          this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // // 带出3级的部门：起草部门
+          // this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // 带出主起草单位
+          this.formInline.auth_dept = this.formInline.main_drafting_unit
           // 设置可选择项
           this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '2').deptIds.split(',')
           this.formInline = JSON.parse(JSON.stringify(this.formInline))
@@ -353,8 +358,10 @@ export default {
             this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'auth_dept')
           }
         } else if (val === StandardGradeClassify.THREE_LEVEL.value) {
-          // 选的是3级，授权部门带出不可编辑
-          this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // // 选的是3级，授权部门带出不可编辑
+          // this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds
+          // 选的是3级，带出主起草单位
+          this.formInline.auth_dept = this.formInline.main_drafting_unit
           if (!this.innerDisabledField.includes('auth_dept')) {
             this.innerDisabledField.push('auth_dept')
           }
@@ -389,6 +396,23 @@ export default {
         }
       }
     },
+    // 主起草单位改变后，需要将选中的主起草单位增加到授权部门
+    'formInline.main_drafting_unit' (val) {
+      if (val) {
+        if (this.formInline.grade_classification === StandardGradeClassify.ONE_LEVEL.value ||
+          this.formInline.grade_classification === StandardGradeClassify.TWO_LEVEL.value) {
+          // 标准等级分类是1级或者2级需要，把主起草单位追加到授权部门
+          let authDeptArr = (this.formInline.auth_dept || '').split(',')
+          authDeptArr = authDeptArr.filter(item => item !== this.oldMainDraftingUnit)
+          authDeptArr.push(val)
+          this.formInline.auth_dept = authDeptArr.join(',')
+        } else if (this.formInline.grade_classification === StandardGradeClassify.THREE_LEVEL.value) {
+          // 标准等级分类是3级，把授权部门替换成主起草单位
+          this.formInline.auth_dept = val
+        }
+        this.oldMainDraftingUnit = val
+      }
+    },
     // 企标是否试行改变，标准状态需要跟着变,试行周期必填校验也跟着变
     'formInline.try_flag' (val) {
       if (val && this.flag === StandardSource.ENTERPRISE.value) {

src/components/tools/Logo.vue

@@ -7,9 +7,9 @@
       <!--      <img v-else src="~@/assets/logo.png" alt="logo">-->
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
 
-      <img v-if="showTitle" src='../../assets/image/analysisLogo.png' alt="logo"/>
+      <img v-if="showTitle" src='../../assets/image/logoExpand.png' alt="logo" />
       <!--<img src="~@/assets/image/analysisLogo.png" alt="logo">-->
-      <h1 v-else>{{ title }}</h1>
+      <img v-else src="../../assets/image/logoFold.png" />
     </router-link>
   </div>
 </template>
@@ -45,15 +45,18 @@ export default {
 
 .sider {
   box-shadow: none !important;
+
   .h1-logo {
-    padding-left: 10px;
+    padding: 0 12px !important;
   }
+
   .logo {
     height: @height !important;
     line-height: @height !important;
     box-shadow: 1px 0px 0 0 #e8e8e8 !important;
     transition: background 300ms;
     background-color: transparent !important;
+    padding: 0 24px 0 0;
 
     h1 {
       color: @primary-color !important;
@@ -61,8 +64,15 @@ export default {
     }
 
     a {
+      width: 100%;
+      display: inline-block;
       color: white;
 
+      img {
+        width: 100%;
+        height: auto;
+      }
+
       &:hover {
         color: rgba(255, 255, 255, 0.8);
       }

src/mixins/ConfigurableTableMixin.js

@@ -400,7 +400,7 @@ export const ConfigurableTableMixin = {
       })
     },
     // 下载导入模板
-    downTemplate (fileName, fileSuffix = '.xlsx') {
+    downTemplate (fileName, fileSuffix = '.xls') {
       if (!fileName || typeof fileName !== 'string') {
         fileName = '模板文件'
       }

src/mixins/JeroListMixin.js

@@ -300,7 +300,7 @@ export const JeroListMixin = {
       const paramsStr = encodeURI(JSON.stringify(this.getQueryParams()))
       window.location.href = `${window._CONFIG.domianURL}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`
     },
-    handleExportXls (fileName, fileSuffix = '.xlsx') {
+    handleExportXls (fileName, fileSuffix = '.xls') {
       if (!fileName || typeof fileName !== 'string') {
         fileName = '导出文件'
       }
@@ -486,7 +486,7 @@ export const JeroListMixin = {
       window.open(url)
     },
     // 下载导入模板
-    downTemplate (fileName, fileSuffix = '.xlsx') {
+    downTemplate (fileName, fileSuffix = '.xls') {
       if (!fileName || typeof fileName !== 'string') {
         fileName = '模板文件'
       }

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;