WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

布局对外报告管理

Browse Source 
参数项清单-添加角色显示
This commit is contained in:
zyx.net
2022-07-25 11:33:09 +08:00
parent 676c77469b
commit aabbb7b5ce
6 changed files with 150 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+9
View File
@@ -1173,4 +1173,13 @@ module.exports = {
convertFailed:'Convert Failed', convertFailed:'Convert Failed',
standardData:'Standard Data', standardData:'Standard Data',
Theorganization:'The Organization', Theorganization:'The Organization',
Addingfolder:'Adding a folder',
Addingsubfolders:'Adding Subfolders',
Editfolder:'Edit Folder',
Deletefolders:'Delete Folders',
Foldername:'Folder Name',
Folderpermissions:'Folder Permissions',
Folderorder:'Folder Order',
Downloadprivileges:'Download Privileges',
Openpersonnel:'Open Personnel'
} }
jero-web/src/common/lang/zh-cn.js
+9
View File
@@ -1177,4 +1177,13 @@ module.exports = {
convertFailed:'转换失败', convertFailed:'转换失败',
standardData:'标准数据', standardData:'标准数据',
Theorganization:'组织机构', Theorganization:'组织机构',
Addingfolder:'新增文件夹',
Addingsubfolders:'新增子文件夹',
Editfolder:'编辑文件夹',
Deletefolders:'删除文件夹',
Foldername:'文件夹名称',
Folderpermissions:'文件夹权限',
Folderorder:'文件夹顺序',
Downloadprivileges:'下载权限',
Openpersonnel:'开放人员'
} }
jero-web/src/views/externalReports/components/addModel.vue
+71 -20
View File
@@ -1,4 +1,5 @@
<template> <template>
<div>
<a-modal <a-modal
:title="title" :title="title"
:maskClosable="false" :maskClosable="false"
@@ -12,33 +13,37 @@
<a-form> <a-form>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm"> <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span> :title="$t('fileName')">{{$t('fileName')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="paramsTemplateName"> <a-form-model-item class="itemModel" prop="paramsTemplateName">
<a-input class="box-input" <a-button type="primary" class="button-text"
:disabled="disabled" @click="clickButtonToUpload('accessory_id')">
v-model.trim="formInline.paramsTemplateName" {{ (formInline.fileName === 'null' || formInline.fileName === '' ||
:placeholder="$t('PleaseEnter')+$t('parameterTemplate')"/> formInline.fileName == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
</a-button>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12"> </a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="Required">*</span>
<span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span> <span class="title-text-text" :title="$t('fileDeclaration')">{{$t('fileDeclaration')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="region"> <a-form-model-item class="itemModel" prop="region">
<j-dict-select-tag class="box-input" v-model="formInline.region" <a-input class="box-input add-input"
:disabled="disabled" type="textarea"
:placeholder="$t('PleaseSelect')+$t('zoneOfApplication')" :disabled="disabled"
:type="'select'" :placeholder="$t('PleaseEnter')+$t('fileDeclaration')"
:triggerChange="false" :dictCode="'region'"/> v-model="formInline.description"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -48,14 +53,31 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="title-text-text"
:title="$t('contentDescription')">{{$t('contentDescription')}}</span> :title="$t('Openpersonnel')">{{$t('Openpersonnel')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="description"> <a-form-model-item class="itemModel" prop="description">
<a-input class="box-input add-input" <PersonnelSelection
type="textarea" :query="{db_field_name:'Openpersonnel',db_field_txt:$t('Openpersonnel')}"
:disabled="disabled" :personneQuery="formInline"
v-model="formInline.description" @change="PersonnelSelectionChange"
:placeholder="$t('PleaseEnter')+$t('contentDescription')"/> v-model="formInline.Openpersonnel"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('Downloadprivileges')">{{$t('Downloadprivileges')}}</span>
</div>
<a-form-model-item class="itemModel" prop="description">
<PersonnelSelection
:query="{db_field_name:'Downloadprivileges',db_field_txt:$t('Downloadprivileges')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.lawEngineerName"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -68,16 +90,21 @@
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button> <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
</div> </div>
</a-modal> </a-modal>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
</div>
</template> </template>
<script> <script>
import PersonnelSelection from '@/components/PersonnelSelection/index' import PersonnelSelection from '@/components/PersonnelSelection/index'
import { getAction, postAction, downloadFile, putAction } from '@/api/manage' import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
import uploadFile from '@/components/uploadFile/file'
export default { export default {
name: 'addModel', name: 'addModel',
components: { components: {
PersonnelSelection PersonnelSelection,
uploadFile
}, },
props: ['url'], props: ['url'],
data() { data() {
@@ -186,6 +213,30 @@ export default {
projectNameChange(value){ projectNameChange(value){
console.log(value) console.log(value)
}, },
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
})
}
/** 赋值给当前对应的表单文件 */
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = item
getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
} }
} }
</script> </script>
jero-web/src/views/externalReports/index.vue
+31 -14
View File
@@ -44,17 +44,18 @@
<template #overlay> <template #overlay>
<a-menu <a-menu
@click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)"> @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
<a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('newNode')}} <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">{{$t('Addingfolder')}}
</a-menu-item>
<a-menu-item key="4" @click="orgAdds" v-if="deleteNode"
v-has="'split:sarFileSplitMenu:delete'">{{$t('Addingsubfolders')}}
</a-menu-item> </a-menu-item>
<a-menu-item key="2" @click="orgEdit" v-has="'split:sarFileSplitMenu:update'"> <a-menu-item key="2" @click="orgEdit" v-has="'split:sarFileSplitMenu:update'">
{{$t('modifyNode')}} {{$t('Editfolder')}}
</a-menu-item> </a-menu-item>
<a-menu-item key="3" @click="orgDelete" <a-menu-item key="3" @click="orgDelete"
v-has="'split:sarFileSplitMenu:delete'">{{$t('deleteNode')}} v-has="'split:sarFileSplitMenu:delete'">{{$t('Deletefolders')}}
</a-menu-item>
<a-menu-item key="4" @click="orgDelete" v-if="deleteNode"
v-has="'split:sarFileSplitMenu:delete'">{{$t('add')}}
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</template> </template>
</a-dropdown> </a-dropdown>
@@ -184,15 +185,19 @@
:label-col="labelCol" :label-col="labelCol"
:wrapper-col="wrapperCol" :wrapper-col="wrapperCol"
> >
<a-form-model-item :label="$t('clauseNo')" prop="name"> <a-form-model-item :label="$t('Foldername')" prop="name">
<a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('clauseNo')"/> <a-input v-model="form.name" :placeholder="$t('PleaseEnter')+$t('Foldername')"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :label="$t('clauseName')" prop="itemName"> <a-form-model-item :label="$t('Folderpermissions')" prop="itemName">
<a-input v-model="form.itemName" :placeholder="$t('PleaseEnter')+$t('clauseName')"/> <PersonnelSelection
:personneQuery="form"
:query="{db_field_name:'Folderpermissions',db_field_txt:$t('Folderpermissions')}"
@change="PersonnelSelectionChange"
v-model="form.folderpermissions"/>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :label="$t('serialNumber')" prop="displaySeq"> <a-form-model-item :label="$t('Folderorder')" prop="displaySeq">
<a-input-number v-model="form.displaySeq" :min="1" :max="99999" <a-input-number v-model="form.displaySeq" :min="1" :max="99999"
:placeholder="$t('PleaseEnter')+$t('serialNumber')" :formatter="limitNumber" :placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
:parser="limitNumber" style="width: 100%"/> :parser="limitNumber" style="width: 100%"/>
<!-- <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />--> <!-- <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->
</a-form-model-item> </a-form-model-item>
@@ -220,13 +225,14 @@ import Vue from 'vue'
import moment from 'moment' import moment from 'moment'
import eventBUs from '@/common/event' import eventBUs from '@/common/event'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import PersonnelSelection from '@/components/PersonnelSelection/index'
export default { export default {
name: 'SplitDetail', name: 'SplitDetail',
components: { components: {
addModel, addModel,
handleModel, handleModel,
// exportTree, PersonnelSelection,
globalAdvancedQuery globalAdvancedQuery
// ImportFile // ImportFile
}, },
@@ -242,6 +248,7 @@ export default {
}, },
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
disabled:false,
total: 0, total: 0,
tableData: [], tableData: [],
selectedRowKeys: [], selectedRowKeys: [],
@@ -393,6 +400,10 @@ export default {
this.contentVisible = true this.contentVisible = true
this.contentValue = val this.contentValue = val
}, },
PersonnelSelectionChange(value, id) {
this.form[value] = id
this.form = { ...this.form }
},
//关闭条款内容弹框 //关闭条款内容弹框
handleCancel() { handleCancel() {
this.contentVisible = false this.contentVisible = false
@@ -549,12 +560,18 @@ export default {
}, },
//树形新增 //树形新增
orgAdd() { orgAdd() {
this.menuTitle = this.$t('add') this.menuTitle = this.$t('Addingfolder')
this.isEdit = false this.isEdit = false
this.form = {} this.form = {}
this.menuRightVisible = true this.menuRightVisible = true
}, },
orgAdds(){
this.menuTitle = this.$t('Addingsubfolders')
this.isEdit = false
this.form = {}
this.menuRightVisible = true
},
//树形修改 //树形修改
orgEdit() { orgEdit() {
this.menuTitle = this.$t('edit') this.menuTitle = this.$t('edit')
jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+3
View File
@@ -17,6 +17,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('certificationCategory')"> <div class="title-text" :title="$t('certificationCategory')">
<span class="Required">*</span>
<span>{{$t('certificationCategory')}}</span> <span>{{$t('certificationCategory')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="certCategory"> <a-form-model-item class="itemModel" prop="certCategory">
@@ -35,6 +36,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('configure')"> <div class="title-text" :title="$t('configure')">
<span class="Required">*</span>
<span>{{$t('configure')}}</span> <span>{{$t('configure')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="configIds"> <a-form-model-item class="itemModel" prop="configIds">
@@ -59,6 +61,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}</span> :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}</span>
</div> </div>
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+27 -8
View File
@@ -108,7 +108,7 @@
<!-- // R&H Manager manager--> <!-- // R&H Manager manager-->
<!-- // 系统管理员 admin--> <!-- // 系统管理员 admin-->
<!-- // 游客 guest--> <!-- // 游客 guest-->
<a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'> <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo"'>
<template slot="title" id="popconfirm"> <template slot="title" id="popconfirm">
<!-- 添加--> <!-- 添加-->
<div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'> <div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -121,10 +121,9 @@
<!-- {{$t('distributionAndCollection')}}--> <!-- {{$t('distributionAndCollection')}}-->
<!-- </div>--> <!-- </div>-->
<!-- 导出--> <!-- 导出-->
<div @click="handleExport" class="operator-text-title" <div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
<a-icon type="export"/> <a-icon type="export"/>
{{$t('export')}} {{$t('dataExport')}}
</div> </div>
<!-- 一键下发收集 --> <!-- 一键下发收集 -->
<div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'> <div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'>
@@ -171,6 +170,11 @@
<a-icon type="copy"/> <a-icon type="copy"/>
{{$t('Assignedby')}} {{$t('Assignedby')}}
</div> </div>
<!-- 导出-->
<div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt"'>
<a-icon type="export"/>
{{$t('dataExport')}}
</div>
<!-- 引用参数--> <!-- 引用参数-->
<div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" '> <div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" '>
<a-icon type="plus"/> <a-icon type="plus"/>
@@ -204,7 +208,7 @@
v-if="!this.$route.query.it" v-if="!this.$route.query.it"
@click="roleSwitchingClick"> @click="roleSwitchingClick">
<a-icon type="select"/> <a-icon type="select"/>
{{ $t('roleSwitching') }} {{ $t('roleSwitching') }} ({{ $t(this.rolename)}})
</div> </div>
</div> </div>
<div style="width: 100%"> <div style="width: 100%">
@@ -584,6 +588,7 @@
configureareaVisible: false, // 配置的彈框 configureareaVisible: false, // 配置的彈框
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
rolename:'',
total: 0, total: 0,
selectedRowKeysArray: '', selectedRowKeysArray: '',
templatetitle: '', templatetitle: '',
@@ -643,7 +648,7 @@
mounted() { mounted() {
this.GetgetLoginUserType() this.GetgetLoginUserType()
console.log(this.currentPersonRole) console.log(this.currentPersonRole)
// this.LoginUserType() this.LoginUserType()
setTimeout(() => { setTimeout(() => {
if (this.currentPersonRole == 'dre') { if (this.currentPersonRole == 'dre') {
this.handlePreservation() this.handlePreservation()
@@ -690,6 +695,11 @@
this.visibleRoleSwitching = false this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false this.confirmLoadingRoleSwitching = false
localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode)) localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
this.RoleType.forEach((item,index) => {
if(item.value == this.currentPersonRole){
this.rolename = item.label
}
})
this.selectedRowKeysValue = [] this.selectedRowKeysValue = []
} else { } else {
this.confirmLoadingRoleSwitching = false this.confirmLoadingRoleSwitching = false
@@ -1026,6 +1036,11 @@
} }
this.RoleType = val this.RoleType = val
this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value this.formInlineRoleSwitching.roleSwitchingCode = currentPersonRole || userType || val[0].value
val.forEach((item,index) => {
if(item.value == this.currentPersonRole){
this.rolename = item.label
}
})
this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
}, },
// 表格所选中得行内容 // 表格所选中得行内容
@@ -1103,7 +1118,7 @@
}, },
getFreeze(callback) { getFreeze(callback) {
let _this = this let _this = this
let param = { paramsManifestId: this.paramsManifest.id, configFlag: 1 } let param = { paramsManifestId: this.$route.query.id, configFlag: 1 }
axios({ axios({
url: '/jero-boot/params/collectManifest/getConfigLableList', url: '/jero-boot/params/collectManifest/getConfigLableList',
method: 'post', method: 'post',
@@ -1659,7 +1674,6 @@
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
} }
.operator-text-title { .operator-text-title {
cursor: pointer; cursor: pointer;
margin-right: 22px; margin-right: 22px;
@@ -1808,4 +1822,9 @@
.text-wraning{ .text-wraning{
word-break: break-word; word-break: break-word;
} }
</style>
<style lang='less'>
.ant-popover-message-title{
margin-bottom: -30px;
}
</style> </style>