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 dev_2nd_period_test

Browse Source 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/store/modules/user.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
This commit is contained in:
高嵩
2022-10-27 09:49:39 +08:00
parent f9cc564ffc e61dadc20f
commit 3ba0ae2367
68 changed files with 7336 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/processCenter/ProcessMapping.vue
+1 -1
View File
@@ -16,7 +16,7 @@
data() {
return {
name: '',
actUrl: 'http://10.0.1.13:17210/bat-wkflow/modeler.html?modelId='//本地
actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地
// actUrl: 'http://10.255.35.25:8082/modeler.html?modelId=' //正式
// actUrl: 'http://10.255.128.148:8888/modeler.html?modelId=' //测试
}
jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+24 -3
View File
@@ -156,12 +156,13 @@
</a-col>
</a-row>
</div>
<div class="box-text" style="margin-top: 10px" v-if="disabled">
<div class="box-text" style="margin-top: 10px"
v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
<div class="header-text">
{{$t('sponsorReview')}}
</div>
</div>
<a-row :gutter="24" v-if="disabled">
<a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && !isTrue">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
@@ -175,6 +176,18 @@
</div>
</a-col>
</a-row>
<!-- <a-row :gutter="24" v-if="disabled && $route.query.taskDefinitionKey == 'fqrsc' && isTrue">-->
<!-- <a-col :span="24">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text">-->
<!-- <span class="title-text-text" :title="$t('reviewComments')">{{$t('reviewComments')}}</span>-->
<!-- </div>-->
<!-- <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="formInline.approvalOpinion">-->
<!-- {{formInline.approvalOpinion}}-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-col>-->
<!-- </a-row>-->
</a-form-model>
</div>
<uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -259,7 +272,8 @@
},
disabled: false,
uploadIndex: '',
dataList: []
dataList: [],
isTrue: false
}
},
mounted() {
@@ -283,8 +297,14 @@
})
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
this.disabled = false
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
} else {
this.disabled = true
if (this.$route.query.isDisabled) {
this.isTrue = JSON.parse(this.$route.query.isDisabled)
}
}
},
methods: {
@@ -443,4 +463,5 @@
white-space: normal;
word-break: break-all;
}
</style>
jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+92 -7
View File
@@ -74,7 +74,9 @@
<span v-else>--</span>
</span>
<span slot="Results" slot-scope="text,result">
{{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
<span v-if="text == 'Compliance'">{{$t('accord')}}</span>
<span v-else-if="text == 'Non-Compliance'">{{$t('nonConformity')}}</span>
<span v-else>--</span>
</span>
<span slot="sponsorFeedback" slot-scope="text,result">
<a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
@@ -282,6 +284,81 @@
ellipsis: true,
scopedSlots: { customRender: 'sponsorFeedback' }
}
],
columnsOne: [
{
title: this.$t('clauseNo'),
dataIndex: 'itemNum',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseName'),
dataIndex: 'itemName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('clauseContent'),
dataIndex: 'itemContent',
align: 'center',
width: 280,
scopedSlots: { customRender: 'clauseContent' }
},
{
title: this.$t('evaluationMethod'),
dataIndex: 'evaluationMethodsName',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('complianceResults'),
dataIndex: 'complianceResult',
align: 'center',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'Results' }
},
{
title: this.$t('nameTechnicalDocument'),
dataIndex: 'technicalFileName',
align: 'center',
width: 280,
ellipsis: true
},
{
title: this.$t('chapter'),
dataIndex: 'section',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('opinion'),
dataIndex: 'opinion',
align: 'center',
width: 180,
ellipsis: true
},
{
title: this.$t('enclosure'),
dataIndex: 'accessoryFile',
align: 'center',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'accessoryFile' }
},
{
title: this.$t('sponsorFeedback'),
dataIndex: 'sponsorFeedback',
align: 'center',
width: 180,
ellipsis: true,
scopedSlots: { customRender: 'sponsorFeedbackIndex' }
}
]
}
},
@@ -306,10 +383,18 @@
},
computed: {
columns() {
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
return this.columnsTwo
let disabled = false
if (this.$route.query.isDisabled) {
disabled = JSON.parse(this.$route.query.isDisabled)
}
if (disabled) {
return this.columnsOne
} else {
return this.columnsThree
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
return this.columnsTwo
} else {
return this.columnsThree
}
}
}
},
@@ -345,14 +430,14 @@
this.$message.warning(this.$t('PleaseCompleteList'))
return
}
Object.keys(this.dataSource[i]).forEach(res=>{
Object.keys(this.dataSource[i]).forEach(res => {
if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') {
this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
}
})
}
if (this.$route.query.taskDefinitionKey == 'pgrqr'){
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
for (let i = 0; i < this.dataSource.length; i++) {
this.dataSource[i].feedbackTime = feedbackTime
@@ -361,7 +446,7 @@
callBack && callBack(this.dataSource)
},
preservationData(callBack) {
if (this.$route.query.taskDefinitionKey == 'pgrqr'){
if (this.$route.query.taskDefinitionKey == 'pgrqr') {
let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
for (let i = 0; i < this.dataSource.length; i++) {
this.dataSource[i].feedbackTime = feedbackTime
jero-web/src/views/processCenter/components/feedbackInformation.vue
+14 -6
View File
@@ -12,18 +12,18 @@
{{$t('feedbackPoint')+(index+1)}}
<a-icon class="icon-size"
@click="addData"
v-if="(formInline.dataList.length-1) == index"
v-if="(formInline.dataList.length-1) == index && !disabled"
type="plus-circle"/>
<a-icon class="icon-size"
@click="deleteData"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index"
v-if="formInline.dataList.length > 1 && (formInline.dataList.length - 1) == index && !disabled"
type="minus-circle"/>
</div>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-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>
</div>
<a-form-model-item class="itemModel"
@@ -62,7 +62,7 @@
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text"
:title="$t('questionsSuggestions')">{{$t('questionsSuggestions')}}</span>
</div>
@@ -72,6 +72,7 @@
}]">
<a-textarea :placeholder="$t('PleaseEnter')+$t('questionsSuggestions')"
:disabled="disabled"
:title="item.issueOrSuggest"
v-model="item.issueOrSuggest" :rows="4"/>
</a-form-model-item>
</div>
@@ -79,7 +80,7 @@
<a-col :span="12">
<div class="box-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>
</div>
<a-form-model-item class="itemModel"
@@ -89,6 +90,7 @@
{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
}]">
<a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
:title="item.reason"
:disabled="disabled"
v-model="item.reason" :rows="4"/>
</a-form-model-item>
@@ -112,6 +114,7 @@
</div>
</a-col>
</a-row>
</div>
</a-form-model>
</div>
@@ -166,7 +169,9 @@
}
this.formInline = { ...this.formInline }
})
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
},
methods: {
clickButtonToUpload(item, index) {
@@ -301,4 +306,7 @@
margin-left: 8px;
cursor: pointer;
}
::v-deep .ant-input-disabled{
color: #000F16;
}
</style>
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+16 -3
View File
@@ -72,7 +72,7 @@
</a-col>
</a-row>
<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="title-text-fq">
<span class="Required" v-if="$route.query.isDisplay">*</span>
@@ -88,16 +88,29 @@
</a-form-model-item>
</div>
</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 :gutter="24" v-if="$route.query.TaskKey == 'dreDispose'">
<a-col :span="12">
<div class="box-title-text">
<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"
:title="$t('Deliverables')">{{$t('Deliverables')}}</span>
</div>
<!-- :prop="!this.$route.query.isDisplay?'':'fileId'"-->
<!-- :prop="!this.$route.query.isDisplay?'':'fileId'"-->
<a-form-model-item class="itemModel">
<a-button type="primary" class="button-text"
@click="clickButtonToUpload('fileId')">
jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+1 -1
View File
@@ -80,7 +80,7 @@
methods: {
getList() {
let query = {
actiProcInstId: this.$route.query.actiProcInstId
actiProcInstId: this.$route.query.actiProcInstId || this.$route.query.prcId
}
this.loading = true
getAction('/wkflow/processHistoryEO/list', query).then((res) => {
jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+5 -1
View File
@@ -26,7 +26,7 @@
:title="$t('evaluatorFeedback')"
/>
<footerProcess
v-if="isDisplay"
v-if="isDisplay && !disabled"
:isPreservation="isPreservation"
:isSubmit="true"
:isSendBack="isSendBack"
@@ -78,6 +78,7 @@
isPreservation: false,
isSendBack: false,
isTrue: false,
disabled:false,
standardContentList: [],
standardContent: [
{
@@ -155,6 +156,9 @@
this.isSendBack = true
}
this.queryTaskDetailByTask()
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
},
methods: {
...mapGetters(['userInfo']),
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+9 -4
View File
@@ -28,7 +28,7 @@
"/>
<examineInformation
:isFlag="isFlag"
v-if="isDisplay"
v-if="isDisplay && isTrue"
isApprovalOpinion
:title="titleName"
:isSendBack="isSendBackOne"
@@ -37,6 +37,7 @@
<!-- @terminationProcess="terminationProcess"-->
<footerProcess
is-submit
v-if="isTrue"
:isSendBack="isSendBack"
@submit="submit"
@sendBack="sendBack"
@@ -116,7 +117,8 @@
queryProject: {},
loading: false,
titleName: '',
textLoading: this.$t('dataLoading')
textLoading: this.$t('dataLoading'),
isTrue: false
}
},
created() {
@@ -130,6 +132,9 @@
} else {
this.titleName = this.$t('taskConfirmationResponsiblePerson')
}
if (this.$route.query.isTrue) {
this.isTrue = JSON.parse(this.$route.query.isTrue)
}
this.queryTaskDetailByTask(function() {
_this.queryProjectLawsInventoryInfo()
})
@@ -181,10 +186,10 @@
this.loading = true
getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
if (res instanceof String) {
this.queryBy = JSON.parse(res)
this.queryBy = JSON.parse(res) || {}
callback()
} else {
this.queryBy = res
this.queryBy = res || {}
callback()
}
})
jero-web/src/views/processCenter/processForm/processDetails/index.vue
+4 -1
View File
@@ -15,6 +15,7 @@
</div>
<regulatoryCirculationHistory :isTrue="isTrue"
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/>
</div>
</template>
@@ -22,6 +23,7 @@
<script>
import circulationHistory from '../../components/circulationHistory'
import regulatoryCirculationHistory from '../../components/regulatoryCirculationHistory'
import taskCirculationHistory from '../../components/taskCirculationHistory'
import axios from 'axios'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -30,7 +32,8 @@
name: 'processDetails',
components: {
circulationHistory,
regulatoryCirculationHistory
regulatoryCirculationHistory,
taskCirculationHistory
},
data() {
return {
jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+5 -1
View File
@@ -19,7 +19,7 @@
:title="$t('feedbackInformation')"
/>
<footerProcess
v-if="isDisplay"
v-if="isDisplay && !disabled"
isPreservation
:isSubmit="true"
@preservation="preservation"
@@ -61,6 +61,7 @@
},
loading: false,
isDisplay: true,
disabled: false,
feedbackDataList: [],
queryProject: {},
standardContentList: [
@@ -101,6 +102,9 @@
},
mounted() {
this.isDisplay = false
if (this.$route.query.isDisabled) {
this.disabled = JSON.parse(this.$route.query.isDisabled)
}
this.queryTaskDetailByTask(() => {
this.lawsOpinionAssessmentResult()
})
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+28 -17
View File
@@ -324,14 +324,19 @@
putAction(this.url.dreSubmit, query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
if (this.$route.query.router) {
this.$router.push({
path: '/projectRegulationTasks'
})
} else {
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
}
// setTimeout(() => {
// this.loading = false
// window.close()
@@ -375,13 +380,19 @@
if (res.success) {
setTimeout(() => {
this.loading = false
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
if (this.$route.query.router) {
this.$router.push({
path: '/projectRegulationTasks'
})
} else {
this.$router.push({
path: '/ProjectDetails',
query: {
type: '103',
...this.$route.query
}
})
}
}, 1000)
}
})
@@ -390,10 +401,10 @@
this.loading = true
getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => {
if (res instanceof String) {
this.queryBy = JSON.parse(res)
this.queryBy = JSON.parse(res) || {}
callback()
} else {
this.queryBy = res
this.queryBy = res || {}
callback()
}
})