diff --git a/src/assets/image/analysisLogo.png b/src/assets/image/analysisLogo.png index 94d455e2..af871506 100644 Binary files a/src/assets/image/analysisLogo.png and b/src/assets/image/analysisLogo.png differ diff --git a/src/assets/image/logoExpand.png b/src/assets/image/logoExpand.png new file mode 100644 index 00000000..1761c8b9 Binary files /dev/null and b/src/assets/image/logoExpand.png differ diff --git a/src/assets/image/logoFold.png b/src/assets/image/logoFold.png new file mode 100644 index 00000000..3a4e53a6 Binary files /dev/null and b/src/assets/image/logoFold.png differ diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 0700e61b..9ef90ed6 100644 --- a/src/components/customField/AddForm.vue +++ b/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) { diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue index 1d8088f0..7c5a7f29 100644 --- a/src/components/tools/Logo.vue +++ b/src/components/tools/Logo.vue @@ -7,9 +7,9 @@ - logo + logo -

{{ title }}

+ @@ -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); } diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index 78a43164..8a97e5fd 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/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 = '模板文件' } diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 677f6637..c0e9fda1 100644 --- a/src/mixins/JeroListMixin.js +++ b/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 = '模板文件' } diff --git a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue index e76d07ed..84f2e029 100644 --- a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue +++ b/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 = '模板文件' } diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue index 0b086090..c1c177c0 100644 --- a/src/views/enterpriseStandardLibrary/check/CheckList.vue +++ b/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"> + + + {{ record.folderName }} -
+
adminRoleList.includes(tt)) + if (isAdmin) { + return true + } + const authManageArr = authManageIds.split(',') + if (authManageArr.includes(this.userInfo.id)) { + return true + } + return false } } } diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 290164f2..5c7a8522 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -37,7 +37,7 @@ - + @@ -58,22 +58,22 @@ - - - - - 自动登录 - - - - - - - 忘记密码 - - - - + + + + + + + + + + + + + + + +