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

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
zyx.net
2022-09-07 11:57:13 +08:00
parent e618d2d359 da3cf9bba3
commit 77d6830e58
42 changed files with 670 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+2
View File
@@ -1283,4 +1283,6 @@ module.exports = {
rejectReason:'Reject Reason',
collectionLegislativeComments:'Collection of Legislative Comments',
regulatoryAndTechnicalAssessment:'Regulatory and technical assessment',
listConfirmationRejectionReason:'List confirmation rejection reason',
taskConfirmationRejectionReason:'Task confirmation rejection reason'
}
jero-web/src/common/lang/zh-cn.js
+3 -2
View File
@@ -834,7 +834,7 @@ module.exports = {
feedbackMessage: '反馈意见',
result: '结果',
opinion: '意见',
operationNode: '操作节点',
OperationNode: '操作节点',
selectInquiry: '选择询问人',
sendBack: '退回',
taskConfirmationProcess: '任务确认流程',
@@ -1385,5 +1385,6 @@ module.exports = {
rejectReason:'拒绝原因',
collectionLegislativeComments:'法规意见收集',
regulatoryAndTechnicalAssessment:'法规技术评估',
listConfirmationRejectionReason:'清单确认驳回原因',
taskConfirmationRejectionReason:'任务确认驳回原因'
}
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+68 -48
View File
@@ -12,43 +12,6 @@
<div style="padding-top: 68px;background: #fff">
<div class="detail-content" style="padding: 24px">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="8">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('displayPermission')">{{$t('displayPermission')}}</span>
</div>
<a-form-model-item class="itemModel" prop="showPermissions">
<a-select :placeholder="$t('PleaseSelect')+$t('displayPermission')"
@change="showPermissionsChange"
v-model="formInline.showPermissions">
<a-select-option v-for="(item, key) in projectNameList"
:key="key"
:value="item.value">
<span class="selectText" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
<a-col :span="8" v-if="isDisplay">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('authorizedUser')">{{$t('authorizedUser')}}</span>
</div>
<a-form-model-item class="itemModel" prop="studioEngineerName">
<PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('authorizedUser')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.studioEngineerName"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="8">
<div class="box-title-text">
@@ -106,25 +69,55 @@
<a-col :span="8">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('standardNo')">{{$t('standardNo')}}</span>
<span class="Required">*</span>
<span class="title-text-text" :title="$t('displayPermission')">{{$t('displayPermission')}}</span>
</div>
<a-form-model-item class="itemModel" prop="standNumber">
<a-input class="box-input"
:title="formInline.standNumber"
:disabled="true"
v-model="formInline.standNumber"
:placeholder="$t('PleaseEnter')+$t('standardNo')"/>
<a-form-model-item class="itemModel" prop="showPermissions">
<a-select :placeholder="$t('PleaseSelect')+$t('displayPermission')"
@change="showPermissionsChange"
v-model="formInline.showPermissions">
<a-select-option v-for="(item, key) in projectNameList"
:key="key"
:value="item.value">
<span class="selectText" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
<a-col :span="8" v-if="isDisplay">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('authorizedUser')">{{$t('authorizedUser')}}</span>
</div>
<a-form-model-item class="itemModel" prop="studioEngineerName">
<PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('authorizedUser')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.studioEngineerName"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="8">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"></span>
<span class="title-text-text" :title="$t('standardNo')">{{$t('standardNo')}}</span>
</div>
<a-button class="box-button" type="primary" @click="bringInDocumentInformationClick">
{{$t('bringInDocumentInformation')}}
</a-button>
<a-form-model-item class="itemModel" prop="standNumber">
<a-input class="box-input-index"
:title="formInline.standNumber"
:disabled="true"
v-model="formInline.standNumber"
:placeholder="$t('PleaseEnter')+$t('standardNo')"/>
<a-button class="box-button-index"
:title="$t('bringInDocumentInformation')"
type="primary" @click="bringInDocumentInformationClick">
{{$t('bringInDocumentInformation')}}
</a-button>
</a-form-model-item>
</div>
</a-col>
</a-row>
@@ -584,6 +577,26 @@
margin-top: 4px;
}
.box-button-index {
height: 38px;
margin-top: 2px;
width: 120px;
overflow: hidden;
padding: 0 0;
float: right;
text-align: center;
}
::v-deep .box-button-index span {
display: inline-block;
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-top: 4px;
text-align: center;
}
.submit-button {
width: 100%;
margin-top: 20px;
@@ -612,4 +625,11 @@
overflow: hidden;
word-break: break-word;
}
.box-input-index {
width: calc(100% - 130px);
display: inline-block;
height: 38px;
margin-right: 10px;
}
</style>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+28 -19
View File
@@ -18,6 +18,7 @@
<template v-for="tag in tagList">
<a-checkable-tag
:key="tag.id"
:title="tag.problemLabel"
:checked="selectedTags.indexOf(tag.id) > -1"
@change="checked => handleChange(tag.id, checked)"
>
@@ -45,7 +46,7 @@
<div style="margin-bottom: 10px;position: relative">
<!-- <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>-->
<div class="text-text-right"
:class="{ 'null-input':item.checked }">
:class="{ 'null-input':index % 2 == 0 ? true : false}">
<div class="text-header" @click="titleClick(item)">
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
<template slot="title">
@@ -306,7 +307,7 @@
}
.text-text-right {
padding: 19px 0;
padding: 19px 20px;
box-sizing: border-box;
/*margin-left: 38px;*/
}
@@ -352,8 +353,15 @@
font-weight: 400;
color: #040B29;
opacity: 0.7;
white-space: pre-wrap;
word-wrap: break-word;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all;
}
.page {
@@ -367,18 +375,9 @@
line-height: 10;
}
::v-deep .ant-tag {
padding: 2px 4px;
background: #9B9DA9;
color: #fff !important;
}
::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover {
color: #fff !important;
}
::v-deep .ant-tag-checkable-checked {
background: #21c9cc;
border: 1px #21c9cc solid;
color: #21c9cc;
}
::v-deep p {
@@ -394,11 +393,21 @@
}
.box-content-left .ant-tag-checkable {
padding: 3px 8px;
padding: 4px 10px;
display: inline-block;
box-sizing: border-box;
margin-bottom: 10px;
background: #fff;
border: 1px #d9d9d9 solid;
color: rgba(0, 0, 0, 0.65);
max-width: 150px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
.box-content-left .ant-tag-checkable-checked {
color: #fff;
.box-content-left .ant-tag-checkable-checked{
border: 1px #21c9cc solid;
color: #21c9cc;
}
</style>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+13 -4
View File
@@ -26,10 +26,10 @@
</div>
<div v-if="conList.length > 0" style="height: calc(100vh - 240px);overflow:auto;">
<div v-for="(item,index) in conList" :key="item.id">
<div style="margin-bottom: 10px;position: relative;overflow: hidden">
<div style="margin-bottom: 10px;position: relative;overflow: hidden"
:class="{ 'null-input':index % 2 == 0 ? true : false }">
<!-- <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>-->
<div class="text-text-right"
:class="{ 'null-input':item.checked }">
<div class="text-text-right">
<div class="text-header" @click="titleClick(item)">
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
<template slot="title">
@@ -270,7 +270,7 @@
}
.text-text-right {
padding: 19px 0;
padding: 19px 19px;
width: calc(100% - 180px);
box-sizing: border-box;
/*margin-left: 38px;*/
@@ -327,6 +327,15 @@
font-weight: 400;
color: #040B29;
opacity: 0.7;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all;
}
.page {
jero-web/src/views/documentManage/splitting/index.vue
+8 -2
View File
@@ -244,11 +244,17 @@
})
},
sVisible(val) {
sVisible(val,num) {
this.splitVisible = false
if (num == 1){
eventBUs.$emit('searchGetData')
}
},
iVisible(val) {
iVisible(val,num) {
this.importsVisible = val
if (num == 1){
eventBUs.$emit('searchGetData')
}
},
//查询
searchQuery() {
jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+3 -3
View File
@@ -43,6 +43,7 @@
@click="cancleImports">{{$t('cancel')}}
</a-button>
<a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit"
:loading="loading"
v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('submit')}}
</a-button>
</div>
@@ -57,7 +58,7 @@
<div class="err-value" v-html="errValue"></div>
<!-- <span class="err-value">{{errValue}}</span>-->
</a-modal>
<JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
<!-- <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>-->
<!-- <split-upload ref="uploadFile" :disabled="disabled" :title="upload1" :accept="accept" @uploadSuccess="uploadSuccess"></split-upload>-->
</a-drawer>
</div>
@@ -290,10 +291,9 @@
}).then(res => {
if (res.data.success) {
this.$message.success(this.$t('OperationSuccessful'))
eventBUs.$emit('searchGetData')
this.visible = false
this.loading = false
this.$emit('visible', false)
this.$emit('visible', false,1)
} else {
this.loading = false
// this.$message.warning(res.data.message)
jero-web/src/views/documentManage/splitting/modules/SplitText.vue
+5 -6
View File
@@ -68,12 +68,12 @@
<a-button class="split-btn" type="primary" @click="cancelSplit"
style='background-color: #f5222d;border: none;margin-right: 15px'>{{$t('cancel')}}
</a-button>
<a-button class="split-btn split-chai" type="primary" @click="submitSplit"
<a-button class="split-btn split-chai" type="primary" :loading="loading" @click="submitSplit"
v-has="'split:sarFileSplitInfo:add'">{{$t('submit')}}
</a-button>
</div>
</div>
<JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
<!-- <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>-->
</a-drawer>
</div>
</template>
@@ -244,10 +244,9 @@
postAction(`split/sarFileSplitInfo/add`, params).then(res => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
eventBUs.$emit('searchGetData')
this.visible = false
this.loading = false
this.$emit('visible', false)
this.$emit('visible', false,1)
} else {
this.loading = false
this.$message.warning(res.message)
@@ -281,10 +280,10 @@
postAction(`split/sarFileSplitInfo/add`, params).then(res => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
eventBUs.$emit('searchGetData')
// eventBUs.$emit('searchGetData')
this.visible = false
this.loading = false
this.$emit('visible', false)
this.$emit('visible', false,1)
} else {
this.loading = false
this.$message.warning(res.message)
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+54
View File
@@ -725,6 +725,29 @@
getAction(this.url.list, query).then((res) => {
if (res.success) {
this.dataSource = res.result || []
if (this.dataSource.length == 0) {
this.$nextTick(() => {
let anttablebody = document.getElementsByClassName('ant-table-body')
let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner')
let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner')
anttablebody[0].classList.add('ant-table-body-one')
antfixedLeft[0].classList.add('antfixedLeft')
antfixedRight[0].classList.add('antfixedRight')
})
} else {
let anttablebody = document.getElementsByClassName('ant-table-body-one')
let antfixedLeft = document.getElementsByClassName('antfixedLeft')
let antfixedRight = document.getElementsByClassName('antfixedRight')
if (anttablebody && anttablebody.length > 0) {
anttablebody[0].classList.remove('ant-table-body-one')
}
if (antfixedLeft && antfixedLeft.length > 0) {
antfixedLeft[0].classList.remove('antfixedLeft')
}
if (antfixedRight && antfixedRight.length > 0) {
antfixedRight[0].classList.remove('antfixedRight')
}
}
this.loading = false
} else {
this.loading = false
@@ -1030,6 +1053,37 @@
::v-deep .ant-table-body {
background: transparent!important;
}
::v-deep .ant-table-fixed-header .ant-table-body-inner {
overflow: visible;
}
::v-deep .ant-table-body {
padding-bottom: 7px;
}
::v-deep .ant-table-body-inner {
padding-bottom: 16px;
}
::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
/*height: 0;*/
width: 0;
}
::v-deep .ant-table-body-one {
padding-bottom: 0!important;
}
::v-deep .antfixedLeft {
padding-bottom: 0!important;
overflow: scroll!important;
}
::v-deep .antfixedRight {
padding-bottom: 0!important;
overflow: scroll!important;
}
</style>
<style>
.box-input .ant-select-selection {
jero-web/src/views/externalReports/index.vue
+9 -12
View File
@@ -291,10 +291,7 @@ export default {
userData: {},
wrapperCol: { span: 16 },
contentVisible: false, //条款内容弹框显示
queryParams: {
pageNo: 1,
pageSize: 10
},
queryParams: {},
pageSize: 10,
pageNo: 1,
disabled:false,
@@ -747,7 +744,7 @@ export default {
}
},
pageOnChange(page, pageSize) {
this.queryParams.pageNo = page
this.pageNo = page
this.loadData()
},
addModelList() {
@@ -761,6 +758,8 @@ export default {
//获取列表数据
loadData(item) {
this.queryParams.supFolder = this.menuId
this.queryParams.pageNo= this.pageNo
this.queryParams.pageSize= this.pageSize
let params = {
...this.queryParams,
...item,
@@ -785,10 +784,8 @@ export default {
},
//清空
searchReset() {
this.queryParams = {
pageNo: 1,
pageSize: 10
}
this.pageNo = 1
this.queryParams = {}
this.loadData()
},
//新增
@@ -942,13 +939,13 @@ export default {
},
//点击页数
onChangePage(page, pageSize) {
this.queryParams.pageNo = page
this.pageNo = page
this.loadData()
},
//一页显示条数
SizeChange(page, pageSize) {
this.queryParams.pageSize = pageSize
this.queryParams.pageNo = 1
this.pageSize = pageSize
this.pageNo = 1
this.loadData()
},
// 上传文件
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+21 -6
View File
@@ -183,19 +183,34 @@
}
})
},
rejectCauseAdd(rejectCause,ids) {
let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
let query = {
rejectUserId:this.userInfo().id,
rejectTime:rejectTime,
rejectCause:rejectCause,
projectLawsInventoryId:ids,
rejectType:'1',
}
postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
})
},
completeTask(value, handlingTime) {
let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
let data = JSON.stringify(json).replace(/\"/g, '\'')
Object.keys(data).forEach(res => {
if (data[res] && typeof data[res] == 'string') {
data[res] = data[res].replace(/\"/g, '“')
data[res] = data[res].replace(/\'/g, '‘')
if (json.flag == '1'){
this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id)
}
Object.keys(json).forEach(res => {
if (json[res] && typeof json[res] == 'string') {
json[res] = json[res].replace(/\"/g, '“')
json[res] = json[res].replace(/\'/g, '‘')
}
})
let query = {
userid: this.userInfo().id,
taskId: this.$route.query.taskId || this.$route.query.taskIds,
json: data
json: JSON.stringify(json).replace(/\"/g, '\'')
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
jero-web/src/views/processCenter/processForm/processDetails/index.vue
+1 -1
View File
@@ -7,7 +7,7 @@
</div>
<!-- <span class="flow-chart-title">{{ $route.params.processNumber }} {{ $route.params.processTypeName }} 流程图</span>-->
</div>
<div class="flow-group" style="margin-top: 30px;overflow: auto;">
<div class="flow-group" style="margin-top: 30px;overflow: auto;text-align: center">
<img :src="processStep" class="process-img">
</div>
</div>
jero-web/src/views/projectManagement/components/listEditModel.vue
+60 -2
View File
@@ -805,8 +805,9 @@
</a-col>
</a-row>
<div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
{{$t('reasonsForRejection')}}
{{$t('listConfirmationRejectionReason')}}
</div>
<div v-if="rejectCauseList && rejectCauseList.length > 0"
v-for="(item,index) in rejectCauseList">
<a-row :gutter="24">
@@ -847,6 +848,51 @@
</a-col>
</a-row>
</div>
<div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0">
{{$t('taskConfirmationRejectionReason')}}
</div>
<div v-if="rejectCauseListOne && rejectCauseListOne.length > 0"
v-for="(item,index) in rejectCauseListOne">
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
</div>
<div class="itemModel-reject">
{{item.createBy ? item.createBy : '--'}}
</div>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
</div>
<div class="itemModel-reject">
{{item.rejectTime ? item.rejectTime : '--'}}
</div>
</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('rejectReason')">{{$t('rejectReason')}}</span>
</div>
<div class="itemModel-reject">
{{item.rejectCause ? item.rejectCause : '--'}}
</div>
</div>
</a-col>
</a-row>
</div>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
@@ -881,6 +927,7 @@
visible: false,
confirmLoading: false,
rules: {},
rejectCauseListOne: [],
rulesData: {
subtitle: [
{
@@ -966,9 +1013,20 @@
}
getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
if (res.success) {
this.rejectCauseList = res.result
this.rejectCauseList = []
this.rejectCauseListOne = []
if (res.result && res.result.length > 0) {
res.result.forEach(val => {
if (val.rejectType == '0') {
this.rejectCauseList.push(val)
} else if (val.rejectType == '1') {
this.rejectCauseListOne.push(val)
}
})
}
} else {
this.rejectCauseList = []
this.rejectCauseListOne = []
}
})
},
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+83 -8
View File
@@ -1507,9 +1507,32 @@
getAction(this.url.list, query).then((res) => {
this.getRoleByUserId()
if (res.success) {
this.dataSource = res.result
this.dataSource = res.result || []
this.loading = false
this.JLoading = false
if (this.dataSource.length == 0) {
this.$nextTick(() => {
let anttablebody = document.getElementsByClassName('ant-table-body')
let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner')
let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner')
anttablebody[0].classList.add('ant-table-body-one')
antfixedLeft[0].classList.add('antfixedLeft')
antfixedRight[0].classList.add('antfixedRight')
})
} else {
let anttablebody = document.getElementsByClassName('ant-table-body-one')
let antfixedLeft = document.getElementsByClassName('antfixedLeft')
let antfixedRight = document.getElementsByClassName('antfixedRight')
if (anttablebody && anttablebody.length > 0) {
anttablebody[0].classList.remove('ant-table-body-one')
}
if (antfixedLeft && antfixedLeft.length > 0) {
antfixedLeft[0].classList.remove('antfixedLeft')
}
if (antfixedRight && antfixedRight.length > 0) {
antfixedRight[0].classList.remove('antfixedRight')
}
}
} else {
this.JLoading = false
this.loading = false
@@ -2052,7 +2075,7 @@
commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent,
projectLibraryId: this.$route.query.id
}
this.rejectCauseAdd(this.formInlineComment.commentContent,ids)
this.rejectCauseAdd(this.formInlineComment.commentContent, ids)
this.confirmLoadingComment = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
this.updateStatusBatch(1, selectedRowKeys)
@@ -2067,14 +2090,14 @@
}
})
},
rejectCauseAdd(rejectCause,ids) {
rejectCauseAdd(rejectCause, ids) {
let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
let query = {
rejectUserId:this.userInfo().id,
rejectTime:rejectTime,
rejectCause:rejectCause,
projectLawsInventoryId:ids.join(','),
rejectType:'0',
rejectUserId: this.userInfo().id,
rejectTime: rejectTime,
rejectCause: rejectCause,
projectLawsInventoryId: ids.join(','),
rejectType: '0'
}
postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
@@ -2413,6 +2436,58 @@
::v-deep .ant-table-body {
background: transparent !important;
}
::v-deep .ant-table-body::-webkit-scrollbar {
z-index: 10000000;
}
/*::v-deep .ant-table .ant-table-fixed-left {*/
/* height: auto !important;*/
/* bottom: 8px !important;*/
/*}*/
/*::v-deep .ant-table .ant-table-fixed-right {*/
/* height: auto !important;*/
/* bottom: 8px !important;*/
/*}*/
::v-deep .ant-table-fixed-header .ant-table-body-inner {
overflow: visible;
}
/*::v-deep .ant-table-fixed-left .ant-table-body-inner {*/
/* overflow-y: scroll;*/
/*}*/
/*::v-deep .ant-table-fixed-right .ant-table-body-inner {*/
/* overflow-y: scroll;*/
/*}*/
::v-deep .ant-table-body {
padding-bottom: 7px;
}
::v-deep .ant-table-body-inner {
padding-bottom: 16px;
}
::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar {
/*height: 0;*/
width: 0;
}
::v-deep .ant-table-body-one {
padding-bottom: 0!important;
}
::v-deep .antfixedLeft {
padding-bottom: 0!important;
overflow: scroll!important;
}
::v-deep .antfixedRight {
padding-bottom: 0!important;
overflow: scroll!important;
}
</style>
<style>
.box-input .ant-select-selection {
jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
+58 -3
View File
@@ -434,7 +434,7 @@
</a-col>
</a-row>
<div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
{{$t('reasonsForRejection')}}
{{$t('listConfirmationRejectionReason')}}
</div>
<div v-if="rejectCauseList && rejectCauseList.length > 0"
v-for="(item,index) in rejectCauseList">
@@ -476,6 +476,49 @@
</a-col>
</a-row>
</div>
<div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0">
{{$t('taskConfirmationRejectionReason')}}
</div>
<div v-if="rejectCauseListOne && rejectCauseListOne.length > 0"
v-for="(item,index) in rejectCauseListOne">
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
</div>
<div class="itemModel">
{{item.createBy ? item.createBy : '--'}}
</div>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
</div>
<div class="itemModel">
{{item.rejectTime ? item.rejectTime : '--'}}
</div>
</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('rejectReason')">{{$t('rejectReason')}}</span>
</div>
<div class="itemModel">
{{item.rejectCause ? item.rejectCause : '--'}}
</div>
</div>
</a-col>
</a-row>
</div>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
@@ -507,7 +550,8 @@
formInline: {},
disabled: false,
userInfoQuery: {},
rejectCauseList:[]
rejectCauseList:[],
rejectCauseListOne:[]
}
},
mounted() {
@@ -527,9 +571,20 @@
}
getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
if (res.success) {
this.rejectCauseList = res.result
this.rejectCauseList = []
this.rejectCauseListOne = []
if (res.result && res.result.length > 0) {
res.result.forEach(val => {
if (val.rejectType == '0') {
this.rejectCauseList.push(val)
} else if (val.rejectType == '1') {
this.rejectCauseListOne.push(val)
}
})
}
} else {
this.rejectCauseList = []
this.rejectCauseListOne = []
}
})
},