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

修改禅道已知问题

Browse Source
This commit is contained in:
范强强
2022-09-01 16:56:41 +08:00
parent 18349801e5
commit 57cccbad21
3 changed files with 170 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/listEditModel.vue
+67 -1
View File
@@ -804,6 +804,49 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
{{$t('reasonsForRejection')}}
</div>
<div v-if="rejectCauseList && rejectCauseList.length > 0"
v-for="(item,index) in rejectCauseList">
<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-form-model>
</a-spin> </a-spin>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">
@@ -907,7 +950,8 @@
verifyDutyIdDisabled: false, verifyDutyIdDisabled: false,
verifyInitiatorIdDisabled: false, verifyInitiatorIdDisabled: false,
DeliverableTreeList: [], DeliverableTreeList: [],
userInfoQuery: {} userInfoQuery: {},
rejectCauseList: []
} }
}, },
mounted() { mounted() {
@@ -916,6 +960,18 @@
}, },
methods: { methods: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
getRejectCause(id) {
let query = {
projectLawsInventoryId: id
}
getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
if (res.success) {
this.rejectCauseList = res.result
} else {
this.rejectCauseList = []
}
})
},
getDeliverableTree() { getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => { getAction('/sys/category/getDeliverableTree', {}).then((res) => {
if (res.success) { if (res.success) {
@@ -1110,6 +1166,7 @@
item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : [] item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : [] item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : [] item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
this.getRejectCause(item.id)
if (item.dutyTerritory) { if (item.dutyTerritory) {
this.queryPersonByProject(item) this.queryPersonByProject(item)
} else { } else {
@@ -1400,6 +1457,15 @@
margin-top: 2px; margin-top: 2px;
} }
.itemModel-reject {
width: calc(100% - 130px);
display: inline-block;
font-size: 16px;
word-break: break-all;
color: #040B29;
padding-top: 11px;
}
.Required { .Required {
color: red; color: red;
margin-right: 4px; margin-right: 4px;
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+43 -5
View File
@@ -220,6 +220,11 @@
@click="edit(record)"> @click="edit(record)">
{{ $t('edit') }} {{ $t('edit') }}
</a> </a>
<a class="text-operation"
v-else
@click="viewClick(record)">
{{$t('view')}}
</a>
<a class="text-operation" <a class="text-operation"
v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'Rejected') && record.roleCode == 0" v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'Rejected') && record.roleCode == 0"
@click="deleteLib(record)"> @click="deleteLib(record)">
@@ -229,10 +234,13 @@
@click="resultReportedClick(record)"> @click="resultReportedClick(record)">
{{$t('resultReported')}} {{$t('resultReported')}}
</a> </a>
<a class="text-operation"
@click="viewClick(record)"> </span>
<span slot="operationOne" slot-scope="text,record">
<a class="text-operation"
@click="viewClick(record)">
{{$t('view')}} {{$t('view')}}
</a> </a>
</span> </span>
<span slot="titleName" slot-scope="text,record" :title="text"> <span slot="titleName" slot-scope="text,record" :title="text">
<span class="textName"> <span class="textName">
@@ -745,6 +753,13 @@
fixed: 'right', fixed: 'right',
width: 240, width: 240,
scopedSlots: { customRender: 'operation' } scopedSlots: { customRender: 'operation' }
},
{
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: 140,
scopedSlots: { customRender: 'operationOne' }
} }
], ],
columnsFileAll: [ columnsFileAll: [
@@ -1014,7 +1029,14 @@
let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
if (!this.isRoleSwitching) { if (!this.isRoleSwitching) {
for (var i = 0; i < columnResult.length; i++) { for (var i = 0; i < columnResult.length; i++) {
if (columnResult[i].title === this.$t('operation')) { if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 240) {
columnResult.splice(i, 1)
i--
}
}
} else if (this.isRoleSwitching) {
for (var i = 0; i < columnResult.length; i++) {
if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) {
columnResult.splice(i, 1) columnResult.splice(i, 1)
i-- i--
} }
@@ -2019,15 +2041,18 @@
if (valid) { if (valid) {
let url = '/project/projectCommentEO/add' let url = '/project/projectCommentEO/add'
let content = [] let content = []
let ids = []
if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) { if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
this.rowKeysSuccessList.forEach(res => { this.rowKeysSuccessList.forEach(res => {
content.push(res.serialNumber) content.push(res.serialNumber)
ids.push(res.id)
}) })
} }
let query = { let query = {
commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent, commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent,
projectLibraryId: this.$route.query.id projectLibraryId: this.$route.query.id
} }
this.rejectCauseAdd(this.formInlineComment.commentContent,ids)
this.confirmLoadingComment = true this.confirmLoadingComment = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
this.updateStatusBatch(1, selectedRowKeys) this.updateStatusBatch(1, selectedRowKeys)
@@ -2042,6 +2067,19 @@
} }
}) })
}, },
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',
}
postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
})
},
handleCancelComment() { handleCancelComment() {
this.visibleComment = false this.visibleComment = false
}, },
@@ -2368,7 +2406,7 @@
} }
::v-deep .ant-table-row:first-child { ::v-deep .ant-table-row:first-child {
background: #fff!important; background: #fff !important;
opacity: 0.9; opacity: 0.9;
} }
jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
+60 -43
View File
@@ -433,46 +433,49 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
<!-- <div class="header-text">--> <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
<!-- {{$t('reasonsForRejection')}}--> {{$t('reasonsForRejection')}}
<!-- </div>--> </div>
<!-- <a-row :gutter="24">--> <div v-if="rejectCauseList && rejectCauseList.length > 0"
<!-- <a-col :span="12">--> v-for="(item,index) in rejectCauseList">
<!-- <div class="box-title-text">--> <a-row :gutter="24">
<!-- <div class="title-text">--> <a-col :span="12">
<!-- <span class="title-text-text"--> <div class="box-title-text">
<!-- :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>--> <div class="title-text">
<!-- </div>--> <span class="title-text-text"
<!-- <div class="itemModel">--> :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
<!-- {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}--> </div>
<!-- </div>--> <div class="itemModel">
<!-- </div>--> {{item.createBy ? item.createBy : '--'}}
<!-- </a-col>--> </div>
<!-- <a-col :span="12">--> </div>
<!-- <div class="box-title-text">--> </a-col>
<!-- <div class="title-text">--> <a-col :span="12">
<!-- <span class="title-text-text"--> <div class="box-title-text">
<!-- :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>--> <div class="title-text">
<!-- </div>--> <span class="title-text-text"
<!-- <div class="itemModel">--> :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
<!-- {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}--> </div>
<!-- </div>--> <div class="itemModel">
<!-- </div>--> {{item.rejectTime ? item.rejectTime : '--'}}
<!-- </a-col>--> </div>
<!-- </a-row>--> </div>
<!-- <a-row :gutter="24">--> </a-col>
<!-- <a-col :span="12">--> </a-row>
<!-- <div class="box-title-text">--> <a-row :gutter="24">
<!-- <div class="title-text">--> <a-col :span="24">
<!-- <span class="title-text-text"--> <div class="box-title-text">
<!-- :title="$t('rejectReason')">{{$t('rejectReason')}}</span>--> <div class="title-text">
<!-- </div>--> <span class="title-text-text"
<!-- <div class="itemModel">--> :title="$t('rejectReason')">{{$t('rejectReason')}}</span>
<!-- {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}--> </div>
<!-- </div>--> <div class="itemModel">
<!-- </div>--> {{item.rejectCause ? item.rejectCause : '--'}}
<!-- </a-col>--> </div>
<!-- </a-row>--> </div>
</a-col>
</a-row>
</div>
</a-form-model> </a-form-model>
</a-spin> </a-spin>
<div class="drawer-bootom-button"> <div class="drawer-bootom-button">
@@ -486,7 +489,7 @@
<script> <script>
import viewFileModel from '@/components/viewFileModel/index' import viewFileModel from '@/components/viewFileModel/index'
import { getAction, postAction, putAction } from '@/api/manage'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
@@ -503,7 +506,8 @@
rulesData: {}, rulesData: {},
formInline: {}, formInline: {},
disabled: false, disabled: false,
userInfoQuery: {} userInfoQuery: {},
rejectCauseList:[]
} }
}, },
mounted() { mounted() {
@@ -514,8 +518,21 @@
editModel(item) { editModel(item) {
this.visible = true this.visible = true
this.formInline = item this.formInline = item
this.getRejectCause(item.id)
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
}, },
getRejectCause(id) {
let query = {
projectLawsInventoryId: id
}
getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
if (res.success) {
this.rejectCauseList = res.result
} else {
this.rejectCauseList = []
}
})
},
handleCancel() { handleCancel() {
this.visible = false this.visible = false
}, },
@@ -550,7 +567,7 @@
width: calc(100% - 130px); width: calc(100% - 130px);
display: inline-block; display: inline-block;
font-size: 16px; font-size: 16px;
word-break: break-word; word-break: break-all;
color: #040B29; color: #040B29;
} }