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

对接认证清单角色切换

Browse Source
This commit is contained in:
范强强
2023-03-07 11:56:08 +08:00
parent 90f7cdc2cb
commit 0e44bb7b41
6 changed files with 530 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+8
View File
@@ -1395,4 +1395,12 @@ module.exports = {
regulationNo:'Regulation No',
itemInformation:'Item Information',
modifyHistory:'Modify History',
returnToStudio:'Return to Studio',
Approved:'Approved',
returnedForApproval:'Returned For Approval',
changeSetting:'Change Setting',
referenceDeliverables:'Reference Deliverables',
missionAccepted:'Mission Accepted',
missionRejection:'Mission Rejection',
turnToDo:'Turn To Do',
}
jero-web/src/common/lang/zh-cn.js
+8
View File
@@ -1496,4 +1496,12 @@ module.exports = {
regulationNo:'法规编号',
itemInformation:'条目信息',
modifyHistory:'修改历史',
returnToStudio:'退回至Studio',
Approved:'审批通过',
returnedForApproval:'审批退回',
changeSetting:'修改配置',
referenceDeliverables:'引用交付物',
missionAccepted:'任务接受',
missionRejection:'任务拒绝',
turnToDo:'转办',
}
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+48 -27
View File
@@ -10,19 +10,32 @@
{{this.title}}
</span>
</div>
<div class="Virtual-detail-text-right" v-if="textTitle === $t('listOfRegulations')">
<div class="operator-text" v-has="'projectComment:list'" @click="commentClick">
<div class="Virtual-detail-text-right">
<div class="operator-text"
v-if="textTitle === $t('listOfRegulations')"
v-has="'projectComment:list'"
@click="commentClick">
<a-icon type="message"/>
{{$t('comment')}}
</div>
<div class="operator-text" v-has="'projectHistoryVersions:list'" @click="historicalVersionClick">
<div class="operator-text" v-has="'projectHistoryVersions:list'"
v-if="textTitle === $t('listOfRegulations')"
@click="historicalVersionClick">
<a-icon type="clock-circle"/>
{{$t('historicalVersion')}}
</div>
<div class="operator-text" v-has="'projectLawsInventoryLog:page'" @click="UpdateLogClick">
<div class="operator-text" v-has="'projectLawsInventoryLog:page'"
v-if="textTitle === $t('listOfRegulations')"
@click="UpdateLogClick">
<a-icon type="reload"/>
{{$t('UpdateLog')}}
</div>
<div class="operator-text" v-has="'projectLawsInventoryLog:page'"
v-if="textTitle === $t('certificationList') || textTitle === $t('listOfRegulations')"
@click="roleSwitchingClick">
<a-icon type="select"/>
{{$t('roleSwitching')}}
</div>
</div>
</div>
<div style="padding: 52px 0 0 0;background: #ffffff;height:100%">
@@ -46,17 +59,17 @@
<a-icon type="safety"/>
{{$t('certificationList')}}
</div>
<!-- <div class="Virtual-detail-left-text" :title="$t('taskList')"-->
<!-- v-has="'projectLawsInventory:taskList'"-->
<!-- @click="textClick(2,$t('taskList'))">-->
<!-- <a-icon type="safety"/>-->
<!-- {{$t('taskList')}}-->
<!-- </div>-->
<!-- <div class="Virtual-detail-left-text" v-has="'ncrTrack:queryPageInfo'" :title="$t('nonConformance')"-->
<!-- @click="textClick(3,$t('nonConformance'))">-->
<!-- <a-icon type="safety-certificate"/>-->
<!-- {{$t('nonConformance')}}-->
<!-- </div>-->
<!-- <div class="Virtual-detail-left-text" :title="$t('taskList')"-->
<!-- v-has="'projectLawsInventory:taskList'"-->
<!-- @click="textClick(2,$t('taskList'))">-->
<!-- <a-icon type="safety"/>-->
<!-- {{$t('taskList')}}-->
<!-- </div>-->
<!-- <div class="Virtual-detail-left-text" v-has="'ncrTrack:queryPageInfo'" :title="$t('nonConformance')"-->
<!-- @click="textClick(3,$t('nonConformance'))">-->
<!-- <a-icon type="safety-certificate"/>-->
<!-- {{$t('nonConformance')}}-->
<!-- </div>-->
<div class="Virtual-detail-left-text" v-has="'params:manifest:page'"
:title="$t('TaskParameterCollection')"
@click="textClick(4,$t('TaskParameterCollection'))">
@@ -66,7 +79,7 @@
<div class="Virtual-detail-left-text"
:title="$t('projectStatus')"
@click="textClick(5,$t('projectStatus'))">
<a-icon type="cluster" />
<a-icon type="cluster"/>
{{$t('projectStatus')}}
</div>
<a-icon @click="textIconClick" type="menu-fold" class="text-icon"/>
@@ -88,15 +101,15 @@
@click="textClick(6,$t('certificationList'))">
<a-icon type="safety"/>
</div>
<!-- <div class="Virtual-detail-left-text" :title="$t('taskList')"-->
<!-- v-has="'projectLawsInventory:taskList'"-->
<!-- @click="textClick(2,$t('taskList'))">-->
<!-- <a-icon type="safety"/>-->
<!-- </div>-->
<!-- <div class="Virtual-detail-left-text" v-has="'ncrTrack:queryPageInfo'" :title="$t('nonConformance')"-->
<!-- @click="textClick(3,$t('nonConformance'))">-->
<!-- <a-icon type="safety-certificate"/>-->
<!-- </div>-->
<!-- <div class="Virtual-detail-left-text" :title="$t('taskList')"-->
<!-- v-has="'projectLawsInventory:taskList'"-->
<!-- @click="textClick(2,$t('taskList'))">-->
<!-- <a-icon type="safety"/>-->
<!-- </div>-->
<!-- <div class="Virtual-detail-left-text" v-has="'ncrTrack:queryPageInfo'" :title="$t('nonConformance')"-->
<!-- @click="textClick(3,$t('nonConformance'))">-->
<!-- <a-icon type="safety-certificate"/>-->
<!-- </div>-->
<div class="Virtual-detail-left-text" v-has="'params:manifest:page'"
:title="$t('TaskParameterCollection')"
@click="textClick(4,$t('TaskParameterCollection'))">
@@ -105,7 +118,7 @@
<div class="Virtual-detail-left-text"
:title="$t('projectStatus')"
@click="textClick(5,$t('projectStatus'))">
<a-icon type="cluster" />
<a-icon type="cluster"/>
</div>
<a-icon @click="textIconClick" type="menu-unfold" class="text-icon-one"/>
</div>
@@ -113,6 +126,7 @@
:style="{'width':isDisplay?'calc(100% - 240px)':'calc(100% - 66px)'}">
<ProjectDetailsName v-if="textTitle === $t('projectDetails')"/>
<listOfRegulations v-else-if="textTitle === $t('listOfRegulations')"
ref="listOfRegulationsRef"
:areaOfResponsibilityList="areaOfResponsibilityList"/>
<TaskList :isDisplayNum="isDisplayNum" :areaOfResponsibility="areaOfResponsibility"
v-else-if="textTitle === $t('taskList')"/>
@@ -120,7 +134,7 @@
<nonConformance v-else-if="textTitle === $t('nonConformance')"/>
<projectStatus @TaskListChange="TaskListChange"
v-else-if="textTitle === $t('projectStatus')"/>
<certificationList v-else-if="textTitle === $t('certificationList')"/>
<certificationList ref="certificationListRef" v-else-if="textTitle === $t('certificationList')"/>
</div>
</div>
</div>
@@ -339,6 +353,13 @@
this.$router.push({
path: '/projectLibrary'
})
},
roleSwitchingClick() {
if (this.textTitle === this.$t('listOfRegulations')) {
this.$refs.listOfRegulationsRef.roleSwitchingClick()
} else {
this.$refs.certificationListRef.roleSwitchingClick()
}
}
}
}
jero-web/src/views/projectManagement/components/certificationList/components/modifyHistoryList.vue
+175
View File
@@ -0,0 +1,175 @@
<template>
<a-drawer
:title="$t('modifyHistory')"
:maskClosable="false"
:width="1000"
placement="right"
:closable="true"
@close="handleCancel"
:visible="visible"
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div style="margin-bottom: 60px">
<a-table
:columns="columns"
rowKey="id"
:scroll="{x: '100%'}"
:data-source="dataList"
:pagination="false"
:loading="loading">
</a-table>
<div class="page" v-if="dataList.length > 0">
<a-pagination
:show-total="total => $t('total')+` ${total} `+$t('strip')"
show-quick-jumper
show-size-changer
:page-size.sync="pageSize"
:total="total"
:current="pageNo"
@change="onChange"
@showSizeChange="SizeChange"
/>
</div>
</div>
<div class="drawer-bootom-button">
<a-button @click="handleCancel" type="primary">{{$t('determine')}}</a-button>
</div>
</a-drawer>
</template>
<script>
import { getAction, postAction } from '@/api/manage'
export default {
name: 'modifyHistoryList',
data() {
return {
visible:false,
dataList:[],
confirmLoading:false,
loading:false,
pageNo: 1,
pageSize: 10,
total: 0,
url:{
list:'',
},
columns:[
{
title: this.$t('Operator'),
dataIndex: 'Operator',
align: 'left',
ellipsis: true,
width: 228
},
{
title: this.$t('operationTime'),
dataIndex: 'operationTime',
align: 'left',
ellipsis: true,
width: 228
},
{
title: this.$t('OperationContent'),
dataIndex: 'OperationContent',
align: 'left',
ellipsis: true,
width: 228
},
],
}
},
mounted() {
},
methods:{
handleCancel(){
this.visible = false
},
getList() {
this.pageNo = 1
this.visible = true
this.replacePage()
},
onChange(page, pageSize) {
this.pageNo = page
this.replacePage()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.replacePage()
},
replacePage(){
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
}
this.loading = true
postAction(this.url.list, query).then((res) => {
if (res.success) {
this.dataList = res.result.records || []
this.total = res.result.total
this.loading = false
} else {
this.dataList = []
this.total = 0
this.loading = false
}
})
},
}
}
</script>
<style scoped>
.page {
text-align: right;
margin-top: 20px;
}
.drawer-bootom-button {
position: absolute;
bottom: 0;
width: 100%;
z-index: 100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
.box-title-text {
line-height: 1.4;
display: flex;
align-items: center;
margin-bottom: 10px;
}
.title-text {
width: 110px;
min-width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.box-input {
display: inline-block;
width: 70%;
height: 38px;
margin-top: 2px;
}
.box-button {
height: 38px;
}
</style>
jero-web/src/views/projectManagement/components/certificationList/index.vue
+275 -58
View File
@@ -9,7 +9,7 @@
<span>{{ $t('inspectionItems') }}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('inspectionItems')"
v-model="queryParam.inspectionItems"></j-input>
v-model="queryParam.inspectionItem"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
@@ -17,10 +17,10 @@
<div class="title-text" :title="$t('areaOfResponsibility')">
<span>{{ $t('areaOfResponsibility') }}</span>
</div>
<j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
@@ -32,7 +32,7 @@
class="box-input"
allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.processStatus">
v-model="queryParam.flowStatus">
<a-select-option v-for="(item, key) in processStatusList"
:key="item.key"
:value="item.value">
@@ -67,18 +67,36 @@
<div class="table-operator"
style="overflow:hidden;margin-bottom: 20px;text-align: left">
<div style="margin-top: 1px;float:left;">
<div @click="transferClick" class="operator-text">
<div @click="handleExport" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 11 ||
roleSwitchingCode == 12 || roleSwitchingCode == 13 || roleSwitchingCode == 14"
class="operator-text">
<a-icon type="export" :rotate="-90"/>
{{ $t('export') }}
</div>
<div @click="transferClick" v-if="roleSwitchingCode == 2" class="operator-text">
<a-icon type="profile"/>
{{ $t('preservation') }}
</div>
<div @click="transferClick" v-if="roleSwitchingCode == 0" class="operator-text">
<a-icon type="profile"/>
{{ $t('Transfer') }}
</div>
<div @click="BatchSettingClick" class="operator-text">
<div @click="BatchSettingClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2" class="operator-text">
<a-icon type="setting"/>
{{ $t('BatchSetting') }}
</div>
<div @click="certificationClick" class="operator-text">
<div @click="certificationClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2" class="operator-text">
<a-icon type="profile"/>
{{ $t('CertificationDirectory') }}
</div>
<div @click="transferClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
<a-icon type="profile"/>
{{ $t('changeSetting') }}
</div>
<div @click="transferClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
<a-icon type="profile"/>
{{ $t('referenceDeliverables') }}
</div>
<a-popconfirm overlayClassName="popconfirm" placement="bottomRight">
<template slot="title" id="popconfirm">
<div style="height:320px;overflow:scroll;overflow-x: auto;">
@@ -86,43 +104,87 @@
<!-- <ImportFile :url="url" :projectLibraryId=$route.query.id :isTrue="true" :accept="'.zip'"-->
<!-- @getList="getPersonnelList" />-->
<!-- </div>-->
<div @click="handleAdd" class="operator-text-title">
<div @click="handleAdd"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
class="operator-text-title">
<a-icon type="plus"/>
{{ $t('add') }}
</div>
<div @click="handleModule" class="operator-text-title">
<div @click="handleModule"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
class="operator-text-title">
<a-icon type="download"/>
{{ $t('templateDownload') }}
</div>
<div @click="handleExport" class="operator-text-title">
<div @click="handleExport"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"
class="operator-text-title">
<a-icon type="export" :rotate="-90"/>
{{ $t('export') }}
</div>
<div @click="handleDel" class="operator-text-title">
<div @click="handleDel"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
class="operator-text-title">
<a-icon type="delete"/>
{{ $t('BatchDelete') }}
</div>
<div @click="processResetClick" class="operator-text-title">
<div @click="processResetClick"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2"
class="operator-text-title">
<a-icon type="stop"/>
{{ $t('processReset') }}
</div>
</div>
</template>
<div class="operator-text" style="position: relative">
<div class="operator-text" style="position: relative"
v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21">
<span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
</div>
</a-popconfirm>
</div>
<div style="margin-top: 1px;float:right;">
<div @click="releaseClick" class="operator-text">
<div @click="releaseClick" v-if="roleSwitchingCode == 0" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('release') }}
</div>
<div @click="withdrawClick" class="operator-text">
<div @click="withdrawClick" v-if="roleSwitchingCode == 0" class="operator-text">
<a-icon type="rollback"/>
{{ $t('withdraw') }}
</div>
<div @click="questionClick" class="operator-text">
<div @click="releaseClick" v-if="roleSwitchingCode == 2" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('initiatingProcess') }}
</div>
<div @click="releaseClick" v-if="roleSwitchingCode == 2" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('returnToStudio') }}
</div>
<div @click="releaseClick" v-if="roleSwitchingCode == 2" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('Approved') }}
</div>
<div @click="releaseClick" v-if="roleSwitchingCode == 2" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('returnedForApproval') }}
</div>
<div @click="releaseClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('missionAccepted') }}
</div>
<div @click="releaseClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('missionRejection') }}
</div>
<div @click="releaseClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('submit') }}
</div>
<div @click="releaseClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21" class="operator-text">
<a-icon type="check-circle"/>
{{ $t('turnToDo') }}
</div>
<div @click="questionClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2 || roleSwitchingCode == 20"
class="operator-text">
<a-icon type="sound"/>
{{ $t('question') }}
</div>
@@ -160,6 +222,7 @@
<certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
<batSetting :url="url" ref="batSettingRef" @batSettingForm="batSettingForm"/>
<addModel ref="addModelRef" @addModelForm="addModelForm"/>
<modifyHistory ref="modifyHistoryRef"/>
<a-modal
:title="listTitle"
:width="500"
@@ -187,7 +250,7 @@
:disabledDate="disabledDate"
:getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.endTime"
style="width: 100%" />
style="width: 100%"/>
</a-form-model-item>
</div>
</a-col>
@@ -195,6 +258,40 @@
</a-form-model>
</a-spin>
</a-modal>
<a-modal
:title="$t('roleSwitching')"
:width="500"
:visible="visibleRoleSwitching"
:confirm-loading="confirmLoadingRoleSwitching"
:maskClosable="false"
@ok="handleOkRoleSwitching"
@cancel="handleCancelRoleSwitching"
>
<a-form-model :model="formInlineRoleSwitching" class="formAdd" :rules="rulesRoleSwitching"
ref="ruleFormRoleSwitching">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text-index">
<div class="title-text-Comment">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('roleSwitching')">{{ $t('roleSwitching') }}</span>
</div>
<a-form-model-item class="itemModelComment" :prop="'roleSwitchingCode'">
<a-select allowClear :placeholder="$t('pleaseSelect')+$t('roleSwitching')"
v-model="formInlineRoleSwitching.roleSwitchingCode">
<!-- <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
<a-select-option :value="item.roleCode" v-for="item in roleSwitchingList">
<span class="itemOption-index" :title="item.roleName">
{{ item.roleName }}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-modal>
</a-card>
</template>
@@ -205,8 +302,10 @@
import transferList from './components/transferList'
import addModel from './components/addModel'
import batSetting from './components/batSetting'
import modifyHistory from './components/modifyHistoryList'
import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
import moment from "moment";
import moment from 'moment'
import { mapGetters } from 'vuex'
export default {
name: 'index',
@@ -216,18 +315,19 @@
transferList,
certificationDirectory,
batSetting,
addModel
addModel,
modifyHistory
},
data() {
return {
queryParam: {},
fieldList: [],
queryParamQuery: {},
formInline:{},
formInline: {},
toggleSearchStatus: false,
confirmLoading:false,
listTitle:'',
visible:false,
confirmLoading: false,
listTitle: '',
visible: false,
rules: {
endTime: [
{
@@ -235,7 +335,7 @@
message: this.$t('TaskCutOffTime') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
]
},
url: {
list: '/project/projectCertificationInventoryEO/page',
@@ -243,12 +343,28 @@
exportData: '',
deleteBatch: '/project/projectCertificationInventoryEO/deleteBatch',
setBatch: '/project/projectCertificationInventoryEO/setBatch',
deleteOne: '/project/projectCertificationInventoryEO/delete'
deleteOne: '/project/projectCertificationInventoryEO/delete',
AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId',
AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit'
},
processStatusList: [],
dataSource: [],
roleSwitchingCode:'',
loading: false,
columns: [
roleSwitchingList: [],
visibleRoleSwitching: false,
confirmLoadingRoleSwitching: false,
formInlineRoleSwitching: {},
AndUserId: '',
rulesRoleSwitching: {
roleSwitchingCode: [
{
required: true,
message: this.$t('roleSwitching') + this.$t('cannotEmpty'),
trigger: 'change'
}
]
},
columnsAll: [
{
title: this.$t('category'),
align: 'left',
@@ -375,9 +491,31 @@
}
},
mounted() {
this.getList()
// this.getList()
this.getRoleByUserId(() => {
this.getAndUserId()
})
},
computed: {
columns: function() {
let columns = JSON.parse(JSON.stringify(this.columnsAll))
if (this.roleSwitchingCode == 11 ||
this.roleSwitchingCode == 12 || this.roleSwitchingCode == 13 || this.roleSwitchingCode == 14) {
for (let i = 0; i < columns.length; i++) {
if (columns[i].title == this.$t('operation')) {
columns.splice(i, 1)
i--
}
}
}
return columns
}
},
methods: {
...mapGetters(['userInfo']),
disabledDate(current) {
return current && current < moment().subtract(1, 'day')
},
searchQuery() {
this.selectedRowKeys = []
this.getList()
@@ -417,7 +555,8 @@
let query = {
...this.queryParamQuery,
...queryParam,
projectLibraryId: this.$route.query.id
projectLibraryId: this.$route.query.id,
roleCode: this.formInlineRoleSwitching.roleSwitchingCode
}
this.loading = true
getAction(this.url.list, query).then((res) => {
@@ -435,9 +574,9 @@
this.$refs.transferListRef.transferModel()
},
BatchSettingClick() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0){
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
}else{
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
@@ -515,38 +654,38 @@
},
releaseClick() {
this.listTitle = this.$t('Deadline')
if(this.selectedRowKeysList.length < 1){
if (this.selectedRowKeysList.length < 1) {
this.$message.warning(this.$t('selectLeastOne'))
}else{
} else {
this.visible = true
}
},
handleOk() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
let selectedRowKeys = []
this.selectedRowKeysList.forEach(res => {
selectedRowKeys.push(res.id)
})
let query = {
ids: selectedRowKeys.join(','),
projectLibraryId: this.$route.query.id,
...this.formInline
let selectedRowKeys = []
this.selectedRowKeysList.forEach(res => {
selectedRowKeys.push(res.id)
})
let query = {
ids: selectedRowKeys.join(','),
projectLibraryId: this.$route.query.id,
...this.formInline
}
this.confirmLoading = true
postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.selectedRowKeys = []
this.confirmLoading = false
this.getList()
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
}
this.confirmLoading = true
postAction('/project/projectCertificationInventoryEO/issue', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.selectedRowKeys = []
this.confirmLoading = false
this.getList()
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
}
this.detailedSuccessList = []
})
this.detailedSuccessList = []
})
}
})
},
@@ -590,7 +729,85 @@
})
},
modifyHistoryClick() {
this.$refs.modifyHistoryRef.getList()
},
getRoleByUserId(callback) {
getAction('/project/projectCertificationInventoryEO/getRoleByUserId', { projectLibraryId: this.$route.query.id }).then((res) => {
if (res.success) {
this.roleSwitchingList = res.result || []
} else {
this.roleSwitchingList = []
}
callback && callback()
})
},
getAndUserId() {
let query = {
projectLibraryId: this.$route.query.id,
userId: this.userInfo().id,
modelType: 'Certification inventory'
}
getAction(this.url.AndUserId, query).then((res) => {
if (res.success) {
this.isDisplay = true
this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
this.AndUserId = res.result.id
if (this.formInlineRoleSwitching.roleSwitchingCode) {
if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
}
} else {
this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
}
this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
this.getList()
} else {
this.JLoading = false
}
})
},
roleSwitchingClick() {
this.visibleRoleSwitching = true
this.$nextTick(() => {
this.$refs.ruleFormRoleSwitching.clearValidate()
if (!this.formInlineRoleSwitching.roleSwitchingCode) {
this.formInlineRoleSwitching.roleSwitchingCode = '0'
}
if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
}
this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
})
},
handleOkRoleSwitching() {
this.$refs.ruleFormRoleSwitching.validate(valid => {
if (valid) {
let query = {
roleCode: this.formInlineRoleSwitching.roleSwitchingCode,
id: this.AndUserId,
projectLibraryId: this.$route.query.id,
modelType: 'Certification inventory'
}
this.confirmLoadingRoleSwitching = true
postAction(this.url.AndUserIdEdit, query).then((res) => {
if (res.success) {
this.isRoleSwitching = true
this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
this.$message.success(this.$t('OperationSuccessful'))
this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false
this.getList()
} else {
this.confirmLoadingRoleSwitching = false
this.$message.warning(this.$t('operationFailed'))
}
})
}
})
},
handleCancelRoleSwitching() {
this.visibleRoleSwitching = false
}
}
}
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+16 -17
View File
@@ -207,12 +207,12 @@
<a-icon type="plus" />
{{ $t('add') }}
</div>
<div class="operator-text"
v-if="roleSwitchingList.length > 1"
@click="roleSwitchingClick">
<a-icon type="select" />
{{ $t('roleSwitching') }}
</div>
<!-- <div class="operator-text"-->
<!-- v-if="roleSwitchingList.length > 1"-->
<!-- @click="roleSwitchingClick">-->
<!-- <a-icon type="select" />-->
<!-- {{ $t('roleSwitching') }}-->
<!-- </div>-->
</div>
<div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px;margin-right: 20px">
<div @click="handleExport" v-has="'projectLawsInventory:exportData'"
@@ -233,12 +233,12 @@
<a-icon type="setting" />
{{ $t('batchSettingInformation') }}
</div>
<div class="operator-text"
v-if="roleSwitchingList.length > 1"
@click="roleSwitchingClick">
<a-icon type="select" />
{{ $t('roleSwitching') }}
</div>
<!-- <div class="operator-text"-->
<!-- v-if="roleSwitchingList.length > 1"-->
<!-- @click="roleSwitchingClick">-->
<!-- <a-icon type="select" />-->
<!-- {{ $t('roleSwitching') }}-->
<!-- </div>-->
</div>
</div>
<div style="width: 100%">
@@ -1504,7 +1504,8 @@ export default {
getAndUserId() {
let query = {
projectLibraryId: this.$route.query.id,
userId: this.userInfo().id
userId: this.userInfo().id,
modelType:"Laws inventory"
}
getAction(this.url.AndUserId, query).then((res) => {
if (res.success) {
@@ -1528,9 +1529,6 @@ export default {
this.isRoleSwitching = false
}
}
console.log(this.formInlineRoleSwitching.roleSwitchingCode)
console.log(this.isRoleSwitching)
console.log(this.isDisplay)
this.getList()
// this.JLoading = false
} else {
@@ -1769,7 +1767,8 @@ export default {
let query = {
roleCode: this.formInlineRoleSwitching.roleSwitchingCode,
id: this.AndUserId,
projectLibraryId: this.$route.query.id
projectLibraryId: this.$route.query.id,
modelType:"Laws inventory",
}
this.confirmLoadingRoleSwitching = true
postAction(this.url.AndUserIdEdit, query).then((res) => {