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

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

Browse Source
This commit is contained in:
zyx.net
2023-04-13 11:26:27 +08:00
parent 1b48353efa 002deaa026
commit 4c1a3dc66a
2 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+19 -6
View File
@@ -19,9 +19,10 @@
<sql id="BaseQuerySql">
<where>
<if test="params.querySource == '2'">
and project_name is not null
</if>
and temp.project_name is not null
<!--<if test="params.querySource == '2'">
and temp.project_name is not null
</if>-->
<if test="params.projectName != null and params.projectName !=''">
and (
temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
@@ -112,7 +113,10 @@
order by temp.create_time desc
</select>
<select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
select temp.* from (
select
temp.*,
(case temp.flow_type when '10' THEN '1' when '21' THEN '2' when '2' THEN '3' when '4' THEN '4' END) as "flowTypeShowOrderBy"
from (
SELECT
pi.id,
pi.project_library_id,
@@ -244,7 +248,15 @@
</foreach>
)temp
<include refid="BaseQuerySql"/>
order by temp.end_time ASC,temp.project_name ASC,standard_info ASC,temp.flow_type ASC
order by
temp.end_time IS NULL,
temp.end_time,
temp.project_name IS NULL,
temp.project_name,
standard_info IS NULL,
standard_info,
flowTypeShowOrderBy
ASC
</select>
<select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
select temp.* from (
@@ -267,7 +279,8 @@
pi.prc_name,
pi.create_by,
pi.acti_proc_inst_id,
pi.create_time
pi.create_time,
"project_name" as project_name
FROM
process_info pi
LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+35 -20
View File
@@ -11,9 +11,11 @@
style="height: 100%;overflow: auto;margin-bottom: 436px;">
<JLoading :loading="loading">{{textLoading}}</JLoading>
<!-- <a-button style="float: right" @click="referenceDeliverablesClick"-->
<!-- v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"-->
<!-- type="primary">{{$t('referenceDeliverables')}}</a-button>-->
<a-button style="float: right;z-index: -1" @click="referenceDeliverablesClick"
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
type="primary">{{$t('referenceDeliverables')}}
</a-button>
<a-icon class="questionClass" type="question-circle"/>
<projectInformation
v-if="isDisplay"
:title="$t('basicInformation')"
@@ -29,7 +31,7 @@
:url="url"
:standardContentQuery="queryProject"
/>
<!-- :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}"-->
<!-- :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}"-->
<div>
<circulationHistory
v-if="isDisplay"
@@ -38,8 +40,8 @@
/>
</div>
<!--:class="{'drawer-review':isDrawerClass,
'drawer-review-One':!isDrawerClass}"-->
<!--:class="{'drawer-review':isDrawerClass,
'drawer-review-One':!isDrawerClass}"-->
<div v-if="this.queryData.isDisplay" class="drawer-review">
<reviewedByThePersonInCharge
v-if="isDisplay"
@@ -48,15 +50,15 @@
:queryBy="queryBy"
:queryPersonInCharge="queryPersonInCharge"/>
</div>
<div class="drawer-bootom-button">
<footerProcess
v-if="isDisplay"
:is-cancel="isCancel"
:is-confirm="isConfirm"
@cancel="handleCancel"
@confirm="confirm"
/>
</div>
<div class="drawer-bootom-button">
<footerProcess
v-if="isDisplay"
:is-cancel="isCancel"
:is-confirm="isConfirm"
@cancel="handleCancel"
@confirm="confirm"
/>
</div>
</a-drawer>
<referenceDeliverablesList ref="referenceDeliverablesListRef"
@referenceDeliverablesListForm="referenceDeliverablesListForm"/>
@@ -102,7 +104,7 @@
{
title: this.$t('entryName'),
value: 'projectName',
projectVersion:'projectVersion',
projectVersion: 'projectVersion'
},
{
title: this.$t('regulationNo'),
@@ -160,10 +162,10 @@
handleCancel() {
this.visible = false
},
referenceDeliverablesClick(){
referenceDeliverablesClick() {
this.$refs.referenceDeliverablesListRef.transferModel()
},
referenceDeliverablesListForm(){
referenceDeliverablesListForm() {
},
confirm(operatorTime) {
@@ -281,7 +283,7 @@
getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
if (res.success) {
this.queryProject = res.result[0] || {}
if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr'){
if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') {
this.queryProject.endTime = this.queryData.endTime
}
this.loading = false
@@ -315,7 +317,8 @@
.drawer-review {
margin-bottom: 30px;
}
.drawer-review-One{
.drawer-review-One {
position: absolute;
bottom: 40px;
z-index: 1001;
@@ -326,6 +329,7 @@
background: #fff;
border-radius: 0 0 2px 2px;
}
.circulationHistory {
margin-bottom: 436px;
}
@@ -333,4 +337,15 @@
.circulationHistoryOne {
margin-bottom: 30px;
}
.questionClass {
position: absolute;
top: 20px;
right: 70px;
font-size: 16px;
}
::v-deep .ant-drawer-header {
top: 0;
position: sticky;
}
</style>