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

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

Browse Source
This commit is contained in:
wangzhijiang
2022-10-21 15:55:59 +08:00
parent 1a9051981b 32b203efc7
commit e368f51f3e
9 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/processCenter/components/feedbackInformation.vue
+4 -3
View File
@@ -23,7 +23,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span> <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
</div> </div>
<a-form-model-item class="itemModel" <a-form-model-item class="itemModel"
@@ -58,7 +58,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" <span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span> :title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div> </div>
@@ -75,7 +75,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required">*</span> <span class="Required" v-if="!disabled">*</span>
<span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span> <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
</div> </div>
<a-form-model-item class="itemModel" <a-form-model-item class="itemModel"
@@ -109,6 +109,7 @@
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
</div> </div>
</a-form-model> </a-form-model>
</div> </div>
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+16 -3
View File
@@ -72,7 +72,7 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'"> <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
<a-col :span="12"> <a-col :span="12" v-if="$route.query.isDisplay">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text-fq"> <div class="title-text-fq">
<span class="Required" v-if="$route.query.isDisplay">*</span> <span class="Required" v-if="$route.query.isDisplay">*</span>
@@ -88,16 +88,29 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-else>
<div class="box-title-text">
<div class="title-text-fq">
<span class="title-text-text"
:title="$t('feedbackFromTheEngineer')">{{$t('feedbackFromTheEngineer')}}</span>
</div>
<a-form-model-item class="itemModel">
<span class="text-header">
{{formInline.engineerFeedbackContent}}
</span>
</a-form-model-item>
</div>
</a-col>
</a-row> </a-row>
<a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'"> <a-row :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text-fq"> <div class="title-text-fq">
<!-- <span class="Required" v-if="this.$route.query.isDisplay">*</span>--> <!-- <span class="Required" v-if="this.$route.query.isDisplay">*</span>-->
<span class="title-text-text" <span class="title-text-text"
:title="$t('Deliverables')">{{$t('Deliverables')}}</span> :title="$t('Deliverables')">{{$t('Deliverables')}}</span>
</div> </div>
<!-- :prop="!this.$route.query.isDisplay?'':'fileId'"--> <!-- :prop="!this.$route.query.isDisplay?'':'fileId'"-->
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
@click="clickButtonToUpload('fileId')"> @click="clickButtonToUpload('fileId')">
jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+1 -1
View File
@@ -80,7 +80,7 @@
methods: { methods: {
getList() { getList() {
let query = { let query = {
actiProcInstId: this.$route.query.actiProcInstId actiProcInstId: this.$route.query.actiProcInstId || this.$route.query.prcId
} }
this.loading = true this.loading = true
getAction('/wkflow/processHistoryEO/list', query).then((res) => { getAction('/wkflow/processHistoryEO/list', query).then((res) => {
jero-web/src/views/processCenter/processForm/processDetails/index.vue
+4 -1
View File
@@ -15,6 +15,7 @@
</div> </div>
<regulatoryCirculationHistory :isTrue="isTrue" <regulatoryCirculationHistory :isTrue="isTrue"
v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/> v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
<taskCirculationHistory v-else-if="$route.query.prcType == '2' || $route.query.prcType == '3' || $route.query.prcType == '4'"/>
<circulationHistory v-else/> <circulationHistory v-else/>
</div> </div>
</template> </template>
@@ -22,6 +23,7 @@
<script> <script>
import circulationHistory from '../../components/circulationHistory' import circulationHistory from '../../components/circulationHistory'
import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory' import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
import taskCirculationHistory from '../../components/taskCirculationHistory'
import axios from 'axios' import axios from 'axios'
import Vue from 'vue' import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types' import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -30,7 +32,8 @@
name: 'processDetails', name: 'processDetails',
components: { components: {
circulationHistory, circulationHistory,
regulatoryCirculationHistory regulatoryCirculationHistory,
taskCirculationHistory
}, },
data() { data() {
return { return {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+11 -8
View File
@@ -21,7 +21,10 @@
<a @click="RelatedItemsClick(record)" :title="text">{{text}}</a> <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
</span> </span>
<span slot="standardInformation" slot-scope="text,record"> <span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" :title="text">{{text}}</a> <a @click="standardInformationClick(record)" v-if="text" :title="text">
{{text}}
</a>
<span v-else>--</span>
</span> </span>
</a-table> </a-table>
<div class="page" v-if="dataSource && dataSource.length > 0"> <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -86,13 +89,13 @@
ellipsis: true, ellipsis: true,
width: 170 width: 170
}, },
// { {
// title: this.$t('TaskCutOffTime'), title: this.$t('TaskCutOffTime'),
// align: 'center', align: 'center',
// dataIndex: 'endTime', dataIndex: 'endTime',
// ellipsis: true, ellipsis: true,
// width: 170 width: 170
// }, },
{ {
title: this.$t('taskStatus'), title: this.$t('taskStatus'),
align: 'center', align: 'center',
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+4 -1
View File
@@ -19,7 +19,10 @@
<a @click="RelatedItemsClick(record)" :title="text">{{text}}</a> <a @click="RelatedItemsClick(record)" :title="text">{{text}}</a>
</span> </span>
<span slot="standardInformation" slot-scope="text,record"> <span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" :title="text">{{text}}</a> <a @click="standardInformationClick(record)" v-if="text" :title="text">
{{text}}
</a>
<span v-else>--</span>
</span> </span>
</a-table> </a-table>
<div class="page" v-if="dataSource && dataSource.length > 0"> <div class="page" v-if="dataSource && dataSource.length > 0">
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+14 -9
View File
@@ -18,10 +18,15 @@
@click="viewClick(record)">{{$t('view')}}</a> @click="viewClick(record)">{{$t('view')}}</a>
</span> </span>
<span slot="RelatedItems" slot-scope="text,record"> <span slot="RelatedItems" slot-scope="text,record">
<a @click="RelatedItemsClick(record)" :title="text">{{text}}</a> <a @click="RelatedItemsClick(record)" :title="text">
{{text}}
</a>
</span> </span>
<span slot="standardInformation" slot-scope="text,record"> <span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" :title="text">{{text}}</a> <a @click="standardInformationClick(record)" v-if="text" :title="text">
{{text}}
</a>
<span v-else>--</span>
</span> </span>
</a-table> </a-table>
<div class="page" v-if="dataSource && dataSource.length > 0"> <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -90,13 +95,13 @@
ellipsis: true, ellipsis: true,
width: 170 width: 170
}, },
// { {
// title: this.$t('TaskCutOffTime'), title: this.$t('TaskCutOffTime'),
// align: 'center', align: 'center',
// dataIndex: 'endTime', dataIndex: 'endTime',
// ellipsis: true, ellipsis: true,
// width: 170 width: 170
// }, },
{ {
title: this.$t('taskStatus'), title: this.$t('taskStatus'),
align: 'center', align: 'center',
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+7 -7
View File
@@ -78,13 +78,13 @@
ellipsis: true, ellipsis: true,
width: 170 width: 170
}, },
// { {
// title: this.$t('TaskCutOffTime'), title: this.$t('TaskCutOffTime'),
// align: 'center', align: 'center',
// dataIndex: 'TaskCutOffTime', dataIndex: 'endTime',
// ellipsis: true, ellipsis: true,
// width: 170 width: 170
// }, },
{ {
title: this.$t('taskStatus'), title: this.$t('taskStatus'),
align: 'center', align: 'center',
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+7 -7
View File
@@ -75,13 +75,13 @@
ellipsis: true, ellipsis: true,
width: 170 width: 170
}, },
// { {
// title: this.$t('TaskCutOffTime'), title: this.$t('TaskCutOffTime'),
// align: 'center', align: 'center',
// dataIndex: 'TaskCutOffTime', dataIndex: 'endTime',
// ellipsis: true, ellipsis: true,
// width: 170 width: 170
// }, },
{ {
title: this.$t('taskStatus'), title: this.$t('taskStatus'),
align: 'center', align: 'center',