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

修改UAT提出的问题

Browse Source
This commit is contained in:
范强强
2023-05-09 11:31:50 +08:00
parent e972566364
commit 9d32a3c6f2
1 changed files with 121 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+121 -102
View File
@@ -6,6 +6,27 @@
{{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}} {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}}) — {{$t(this.$route.query.title)}}
</span> </span>
</div> </div>
<div class="Virtual-detail-title-right">
<a-popconfirm overlayClassName="popconfirmDetailsText"
:visible="visible"
@visibleChange="handleVisibleChange"
placement="bottomRight">
<template slot="title" id="popconfirmDetails">
<div @click="roleSwitchingClick(item.value)"
v-for="(item,index) in RoleType"
class="operator-text-title"
:class="{'operator-text-title-color':item.label == rolename ? true : false}"
:title="item.label">
{{ item.label }}
</div>
<JLoading :loading="JTextLoading"></JLoading>
</template>
<div class="operator-text" style="position: relative;margin-right: 0">
<a-icon type="select"/>
{{rolename}}
</div>
</a-popconfirm>
</div>
</div> </div>
<div style="padding-top: 54px;background: #fff;height: 100%"> <div style="padding-top: 54px;background: #fff;height: 100%">
<div class="detail-content" style="height: 100%"> <div class="detail-content" style="height: 100%">
@@ -33,28 +54,28 @@
v-model="formInline.paramsName"></a-input> v-model="formInline.paramsName"></a-input>
</div> </div>
</a-col> </a-col>
<!-- <a-col :md="6" :sm="8">--> <!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('NareaOfResponsibility')">--> <!-- <div class="title-text" :title="$t('NareaOfResponsibility')">-->
<!-- <span>{{$t('NareaOfResponsibility')}}</span>--> <!-- <span>{{$t('NareaOfResponsibility')}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"--> <!-- <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
<!-- :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"--> <!-- :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"-->
<!-- :type="'select'"--> <!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'duty_territory'"/>--> <!-- :triggerChange="false" :dictCode="'duty_territory'"/>-->
<!-- </div>--> <!-- </div>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<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>{{$t('certificationCategory')}}</span> <span>{{$t('certificationCategory')}}</span>
</div> </div>
<j-dict-select-tag class="box-input" v-model="formInline.certCategory" <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
:placeholder="$t('PleaseSelect')+$t('certificationCategory')" :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'cert_category'"/> :triggerChange="false" :dictCode="'cert_category'"/>
</div> </div>
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
@@ -269,9 +290,9 @@
{{$t('CompulsoryWithdrawal')}} {{$t('CompulsoryWithdrawal')}}
</div> </div>
<!-- 列表设置--> <!-- 列表设置-->
<!-- v-if="!this.$route.query.it"--> <!-- v-if="!this.$route.query.it"-->
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex" <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex"
placement="bottomRight" > placement="bottomRight">
<template slot="title" id="popconfirmmize"> <template slot="title" id="popconfirmmize">
<div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px"> <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
<a-checkbox <a-checkbox
@@ -283,13 +304,15 @@
>{{ $t('selectAll') }} >{{ $t('selectAll') }}
</a-checkbox> </a-checkbox>
<a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text"> <a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text">
<a-checkbox class="customize-text-title" :disabled="item.disabled" v-for="(item, key) in customizeList" <a-checkbox class="customize-text-title" :disabled="item.disabled"
v-for="(item, key) in customizeList"
:key="key" :value="item.field">{{ item.db_field_txt }} :key="key" :value="item.field">{{ item.db_field_txt }}
</a-checkbox> </a-checkbox>
</a-checkbox-group> </a-checkbox-group>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">
<a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button> <a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button>
<a-button @click="handleSubmitcustomize" type="primary" :loading="confirmLoading">{{ $t('determine') }} <a-button @click="handleSubmitcustomize" type="primary" :loading="confirmLoading">{{ $t('determine')
}}
</a-button> </a-button>
</div> </div>
</div> </div>
@@ -300,31 +323,13 @@
</div> </div>
</a-popconfirm> </a-popconfirm>
<!-- 角色切换 --> <!-- 角色切换 -->
<!-- <div class="operator-text"--> <!-- <div class="operator-text"-->
<!-- 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(this.rolename)}})--> <!-- {{ $t('roleSwitching') }} ({{ $t(this.rolename)}})-->
<!-- </div>--> <!-- </div>-->
<a-popconfirm overlayClassName="popconfirmDetails"
:visible="visible"
@visibleChange="handleVisibleChange"
placement="bottomRight">
<template slot="title" id="popconfirmDetails">
<div @click="roleSwitchingClick(item.value)"
v-for="(item,index) in RoleType"
class="operator-text-title"
:class="{'operator-text-title-color':item.label == rolename ? true : false}"
:title="item.label">
{{ item.label }}
</div>
<JLoading :loading="JTextLoading"></JLoading>
</template>
<div class="operator-text" style="position: relative">
<a-icon type="select"/>
{{rolename}}
</div>
</a-popconfirm>
</div> </div>
<div style="width: 100%"> <div style="width: 100%">
<!-- 表格-10控件--> <!-- 表格-10控件-->
@@ -868,7 +873,7 @@
// status: 2 // status: 2
// } // }
// ], // ],
customizeList:[], customizeList: [],
selectedRowKeys: [], selectedRowKeys: [],
textLoading: false, textLoading: false,
formInline: {}, formInline: {},
@@ -885,7 +890,7 @@
}, },
loading: false, loading: false,
dataSource: [], dataSource: [],
statuList:[], statuList: [],
areaVisible: false, // 弹框的控制 areaVisible: false, // 弹框的控制
configureareaVisible: false, // 配置的彈框 configureareaVisible: false, // 配置的彈框
pageNo: 1, pageNo: 1,
@@ -1118,7 +1123,7 @@
} }
}, },
roleSwitchingClick(roleCode) { roleSwitchingClick(roleCode) {
console.log(roleCode,1111) console.log(roleCode, 1111)
this.JTextLoading = true this.JTextLoading = true
// this.visibleRoleSwitching = true // this.visibleRoleSwitching = true
this.$nextTick(() => { this.$nextTick(() => {
@@ -1163,34 +1168,34 @@
} else { } else {
// this.$refs.ruleFormRoleSwitching.validate(valid => { // this.$refs.ruleFormRoleSwitching.validate(valid => {
// if (valid) { // if (valid) {
let query = { let query = {
userType: roleCode, userType: roleCode,
paramsManifestId: this.$route.query.id, paramsManifestId: this.$route.query.id,
projectId: this.$route.query.projectId, projectId: this.$route.query.projectId,
userId: this.userInfo().id userId: this.userInfo().id
} }
this.confirmLoadingRoleSwitching = true this.confirmLoadingRoleSwitching = true
postAction('/params/userTypeLog/edit', query).then((res) => { postAction('/params/userTypeLog/edit', query).then((res) => {
if (res.success) { if (res.success) {
this.currentPersonRole = roleCode this.currentPersonRole = roleCode
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
this.visibleRoleSwitching = false this.visibleRoleSwitching = false
this.confirmLoadingRoleSwitching = false this.confirmLoadingRoleSwitching = false
this.JTextLoading = false this.JTextLoading = false
this.visible = false this.visible = false
localStorage.setItem('currentPersonRole', JSON.stringify(roleCode)) localStorage.setItem('currentPersonRole', JSON.stringify(roleCode))
this.RoleType.forEach((item, index) => { this.RoleType.forEach((item, index) => {
if (item.value == this.currentPersonRole) { if (item.value == this.currentPersonRole) {
this.rolename = item.label this.rolename = item.label
}
})
this.selectedRowKeysValue = []
} else {
this.confirmLoadingRoleSwitching = false
this.JTextLoading = false
this.$message.warning(this.$t('operationFailed'))
} }
}) })
this.selectedRowKeysValue = []
} else {
this.confirmLoadingRoleSwitching = false
this.JTextLoading = false
this.$message.warning(this.$t('operationFailed'))
}
})
// } // }
// }) // })
} }
@@ -1823,27 +1828,27 @@
this.selectedValue = this.checkedList this.selectedValue = this.checkedList
this.indeterminate = false this.indeterminate = false
}, },
getcustomizeList(item){ getcustomizeList(item) {
let params = { let params = {
paramsManifestId: this.$route.query.id, paramsManifestId: this.$route.query.id,
projectName:this.$route.query.projectName, projectName: this.$route.query.projectName,
flag: '7' flag: '7'
} }
getAction('params/collectManifest/getHeader', params).then((res) => { getAction('params/collectManifest/getHeader', params).then((res) => {
if (res.success) { if (res.success) {
let List = [] let List = []
let sList = [] let sList = []
res.result.forEach((item,index) => { res.result.forEach((item, index) => {
if(!item.isLock){ if (!item.isLock) {
if(item.headFieldCn == '操作'){ if (item.headFieldCn == '操作') {
item.field = 'operation' item.field = 'operation'
item.disabled = true item.disabled = true
}else if(item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称'){ } else if (item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称') {
item.disabled = true item.disabled = true
} }
List.push(item) List.push(item)
} }
if(item.isLock) { if (item.isLock) {
sList.push(item) sList.push(item)
} }
}) })
@@ -1851,7 +1856,7 @@
this.statuList = sList this.statuList = sList
} }
}) })
if(item){ if (item) {
console.log(item) console.log(item)
this.checkedList = item this.checkedList = item
} }
@@ -2222,7 +2227,7 @@
returnDataJurisdiction() { returnDataJurisdiction() {
// 退回的状态权限 // 退回的状态权限
let homoJurisdictionReturn = this.homoJurisdictionReturn() let homoJurisdictionReturn = this.homoJurisdictionReturn()
console.log(homoJurisdictionReturn,'homoJurisdictionReturn') console.log(homoJurisdictionReturn, 'homoJurisdictionReturn')
if (homoJurisdictionReturn == 1) { if (homoJurisdictionReturn == 1) {
this.returnData() this.returnData()
} else if (homoJurisdictionReturn == 0) { } else if (homoJurisdictionReturn == 0) {
@@ -2306,9 +2311,9 @@
}) })
let _this = this let _this = this
let param = { let param = {
ids: _array.join(',') , ids: _array.join(','),
paramsManifestId:this.$route.query.id, paramsManifestId: this.$route.query.id,
projectId:this.$route.query.projectId, projectId: this.$route.query.projectId
} }
let url = '' let url = ''
@@ -2512,9 +2517,11 @@
.popconfirmIndex .anticon-exclamation-circle { .popconfirmIndex .anticon-exclamation-circle {
display: none !important; display: none !important;
} }
::v-deep .ant-table-fixed-header .ant-table-body-inner { ::v-deep .ant-table-fixed-header .ant-table-body-inner {
overflow: visible; overflow: visible;
} }
popconfirmmize { popconfirmmize {
z-index: 999; z-index: 999;
} }
@@ -2530,6 +2537,7 @@
.popconfirmmize .ant-popover-message { .popconfirmmize .ant-popover-message {
padding: 4px 0 36px !important; padding: 4px 0 36px !important;
} }
::v-deep .ant-popover-buttons { ::v-deep .ant-popover-buttons {
display: none !important; display: none !important;
} }
@@ -2639,6 +2647,7 @@
.Required { .Required {
color: red; color: red;
} }
.customize-text { .customize-text {
/*height: 1533px;*/ /*height: 1533px;*/
display: flex; display: flex;
@@ -2653,6 +2662,7 @@
color: #040B29; color: #040B29;
margin-bottom: 22px; margin-bottom: 22px;
} }
.drawer-bootom-button { .drawer-bootom-button {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@@ -2665,6 +2675,7 @@
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
.ant-table-placeholder { .ant-table-placeholder {
padding: 0; padding: 0;
border-top: none; border-top: none;
@@ -2673,9 +2684,11 @@
.itemModelComment .ant-form-item-control-wrapper { .itemModelComment .ant-form-item-control-wrapper {
width: 100% !important; width: 100% !important;
} }
.second { .second {
padding: 0 !important; padding: 0 !important;
} }
.doc-detail { .doc-detail {
background: #fff; background: #fff;
height: 100%; height: 100%;
@@ -2751,6 +2764,10 @@
line-height: 68px; line-height: 68px;
} }
.Virtual-detail-title-right {
float: right;
}
.doc-detail-right { .doc-detail-right {
width: 800px; width: 800px;
line-height: 68px; line-height: 68px;
@@ -2782,9 +2799,11 @@
.text-wraning { .text-wraning {
word-break: break-word; word-break: break-word;
} }
.operator-text-title-color { .operator-text-title-color {
color: #00B3BE; color: #00B3BE;
} }
</style> </style>
<style lang='less'> <style lang='less'>
.popconfirmIndex .ant-popover-message-title { .popconfirmIndex .ant-popover-message-title {
@@ -2792,16 +2811,16 @@
} }
</style> </style>
<style> <style>
.popconfirmDetails { .popconfirmDetailsText {
z-index: 999; z-index: 1000;
/*top: 42px !important;*/ top: 42px !important;
} }
.popconfirmDetails .ant-popover-buttons { .popconfirmDetailsText .ant-popover-buttons {
display: none !important; display: none !important;
} }
.popconfirmDetails .anticon-exclamation-circle { .popconfirmDetailsText .anticon-exclamation-circle {
display: none !important; display: none !important;
} }
</style> </style>