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

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-06-23 16:55:41 +08:00
parent 5a891e63b6
commit 759cb52e57
13 changed files with 105 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -939,5 +939,6 @@ module.exports = {
question: 'Question', question: 'Question',
ConfirmQuestion: 'Confirm Question', ConfirmQuestion: 'Confirm Question',
disableInput: 'Disable input', disableInput: 'Disable input',
taskConfirmationDeadline:'Task Confirmation Deadline',
OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out'
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -945,4 +945,5 @@ module.exports = {
ConfirmQuestion: '确认催办？', ConfirmQuestion: '确认催办？',
OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办',
disableInput:'禁止输入', disableInput:'禁止输入',
taskConfirmationDeadline:'任务确认截止时间',
} }
jero-web/src/views/documentManage/subscribtion/index.vue
+32 -30
View File
@@ -5,44 +5,46 @@
<div class="subscribtion-search-header"> <div class="subscribtion-search-header">
<!-- <search :url="url" :flag="'1'"></search>--> <!-- <search :url="url" :flag="'1'"></search>-->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-row :gutter="24"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-col :md="6" :sm="8"> <a-row :gutter="24">
<div class="box-title-text"> <a-col :md="6" :sm="8">
<div class="title-text" :title="$t('standard')"> <div class="box-title-text">
<span>{{$t('standard')}}</span> <div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParams.serialNumber"></a-input>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')" </a-col>
v-model="queryParams.serialNumber"></a-input> <a-col :md="6" :sm="8">
</div> <div class="box-title-text">
</a-col> <div class="title-text" :title="$t('title')">
<a-col :md="6" :sm="8"> <span>{{$t('title')}}</span>
<div class="box-title-text"> </div>
<div class="title-text" :title="$t('title')"> <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
<span>{{$t('title')}}</span> v-model="queryParams.title"></a-input>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')" </a-col>
v-model="queryParams.title"></a-input> <a-col :md="6" :sm="8">
</div> <div class="box-title-text">
</a-col> <div class="title-text" :title="$t('status')">
<a-col :md="6" :sm="8"> <span>{{$t('status')}}</span>
<div class="box-title-text"> </div>
<div class="title-text" :title="$t('status')"> <j-dict-select-tag class="box-input" v-model="queryParams.state"
<span>{{$t('status')}}</span> :placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div> </div>
<j-dict-select-tag class="box-input" v-model="queryParams.state" </a-col>
:placeholder="$t('PleaseSelect')+$t('status')" <span style="float: right;overflow: hidden;margin-right: 11px"
:type="'select'" class="table-page-search-submitButtons">
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px"
class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
</a-form>
</div> </div>
</div> </div>
</div> </div>
jero-web/src/views/documentManage/tags/dialog/DicList.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="dic-list"> <div class="dic-list">
<div class="dic-list-content"> <div class="dic-list-content">
<div class="dic-list-header"> <div class="dic-list-header">
<a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form :model="queryParams" :label-col="labelCol" @keyup.enter.native="search" :wrapper-col="wrapperCol">
<a-form-item :label="$t('name')+':'"> <a-form-item :label="$t('name')+':'">
<a-input v-if="dictVal=='tree'" v-model="queryParams.name" :placeholder="$t('enterName')"/> <a-input v-if="dictVal=='tree'" v-model="queryParams.name" :placeholder="$t('enterName')"/>
<j-input v-if="dictVal=='list'" v-model="queryParams.itemText" :placeholder="$t('enterName')"/> <j-input v-if="dictVal=='list'" v-model="queryParams.itemText" :placeholder="$t('enterName')"/>
jero-web/src/views/documentTools/virtualList/components/batSetting.vue
+18 -10
View File
@@ -31,11 +31,15 @@
<span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span> <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<j-dict-select-tag class="box-input" v-model="formInline.attestationType" <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
@input="handleInput('attestationType')" :placeholder="$t('PleaseSelect')+$t('certificationType')"
:placeholder="$t('PleaseSelect')+$t('certificationType')" :type="'select'"
:type="'select'" :triggerChange="false" :dictCode="'attestation_type'"/>
:triggerChange="false" dictCode="attestation_type"/> <!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
<!-- @input="handleInput('attestationType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" dictCode="attestation_type"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -47,11 +51,15 @@
<span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span> <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<j-dict-select-tag class="box-input" v-model="formInline.attestationRank" <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
@input="handleInput('attestationRank')" :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')" :type="'select'"
:type="'select'" :triggerChange="false" :dictCode="'attestation_rank'"/>
:triggerChange="false" dictCode="attestation_rank"/> <!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
<!-- @input="handleInput('attestationRank')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" dictCode="attestation_rank"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+6 -8
View File
@@ -195,7 +195,7 @@
<span class="title-text-text" <span class="title-text-text"
:title="$t('certificationType')">{{$t('certificationType')}}</span> :title="$t('certificationType')">{{$t('certificationType')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="certificationType"> <a-form-model-item class="itemModel-multi" prop="certificationType">
<j-multi-select-tag class="box-input" v-model="formInline.attestationType" <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
:placeholder="$t('PleaseSelect')+$t('certificationType')" :placeholder="$t('PleaseSelect')+$t('certificationType')"
:type="'select'" :type="'select'"
@@ -212,13 +212,11 @@
<span class="title-text-text" <span class="title-text-text"
:title="$t('certificationLevel')">{{$t('certificationLevel')}}</span> :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="attestationRank"> <a-form-model-item class="itemModel-multi" prop="attestationRank">
<j-dict-select-tag class="box-input" v-model="formInline.attestationRank" <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
:disabled="disabled" :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
@input="handleInput('attestationRank')" :type="'select'"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')" :triggerChange="false" :dictCode="'attestation_rank'"/>
:type="'select'"
:triggerChange="false" :dictCode="'attestation_rank'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+3 -2
View File
@@ -139,11 +139,12 @@
<a-col :span="24" v-if="title == $t('addFeedback') || title == $t('edit')"> <a-col :span="24" v-if="title == $t('addFeedback') || title == $t('edit')">
<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">*</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>
<a-form-model-item class="itemModel" prop="fileId"> <!-- prop="fileId"-->
<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')">
{{ (formInline.fileId === 'null' || formInline.fileId === '' || {{ (formInline.fileId === 'null' || formInline.fileId === '' ||
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+7
View File
@@ -44,6 +44,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="$route.query.isDisplay">*</span>
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span> <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="approvalOpinion"> <a-form-model-item class="itemModel" prop="approvalOpinion">
@@ -148,6 +149,7 @@
<a-col :span="24"> <a-col :span="24">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="$route.query.isDisplay">*</span>
<span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span> <span class="title-text-text" :title="$t('feedbackMessage')">{{$t('feedbackMessage')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="approvalOpinion"> <a-form-model-item class="itemModel" prop="approvalOpinion">
@@ -197,6 +199,11 @@
} }
], ],
approvalOpinion: [ approvalOpinion: [
{
required: true,
message: this.$t('feedbackMessage') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{ {
max: 300, max: 300,
message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'), message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
jero-web/src/views/projectManagement/components/TaskList.vue
+2 -2
View File
@@ -197,7 +197,7 @@
scopedSlots: { customRender: 'CertificationProgress' } scopedSlots: { customRender: 'CertificationProgress' }
}, },
{ {
title: this.$t('CurrentProjectStatusEvaluation'), title: this.$t('CurrentStatus'),
align: 'center', align: 'center',
width: 150, width: 150,
dataIndex: 'CurrentProjectStatusEvaluation', dataIndex: 'CurrentProjectStatusEvaluation',
@@ -406,7 +406,7 @@
}, },
CurrentProjectClick(val) { CurrentProjectClick(val) {
let item = JSON.parse(JSON.stringify(val)) let item = JSON.parse(JSON.stringify(val))
this.$refs.TaskListModelRef.getData(item, this.$t('CurrentProjectStatusEvaluation')) this.$refs.TaskListModelRef.getData(item, this.$t('CurrentStatus'))
}, },
TaskListModelList() { TaskListModelList() {
this.getList() this.getList()
jero-web/src/views/projectManagement/components/TaskListModel.vue
+5 -5
View File
@@ -10,7 +10,7 @@
> >
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm"> <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24"> <a-row :gutter="24">
<div class="headerText" v-if="title == $t('CurrentProjectStatusEvaluation')"> <div class="headerText" v-if="title == $t('CurrentStatus')">
{{this.$t('redSchedule')}}<br/> {{this.$t('redSchedule')}}<br/>
{{this.$t('yellowSchedule')}}<br/> {{this.$t('yellowSchedule')}}<br/>
{{this.$t('greenRequirements')}}<br/> {{this.$t('greenRequirements')}}<br/>
@@ -47,7 +47,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'"> <a-col :span="24" v-if="title == $t('CurrentStatus') && this.formInline.roleCode != '0'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="title-text-text"
@@ -84,7 +84,7 @@
</div> </div>
</a-col> </a-col>
<a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation') && this.formInline.roleCode != '0'"> <a-col :span="24" v-if="title == $t('CurrentStatus') && this.formInline.roleCode != '0'">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="title-text-text" <span class="title-text-text"
@@ -99,7 +99,7 @@
</div> </div>
</a-col> </a-col>
<div v-for="item in studioList" <div v-for="item in studioList"
v-if="title == $t('CurrentProjectStatusEvaluation') && formInline.roleCode == '0'"> v-if="title == $t('CurrentStatus') && formInline.roleCode == '0'">
<div class="headerText" <div class="headerText"
v-if="item.roleCode == 1" v-if="item.roleCode == 1"
style="margin-top: 10px"> style="margin-top: 10px">
@@ -196,7 +196,7 @@
getData(val, title) { getData(val, title) {
this.visible = true this.visible = true
this.title = title this.title = title
if (title == this.$t('CurrentProjectStatusEvaluation')) { if (title == this.$t('CurrentStatus')) {
val.remark = val.projectStatusAssessRemark || '' val.remark = val.projectStatusAssessRemark || ''
val.conditionAssessment = val.projectStatusAssess || '' val.conditionAssessment = val.projectStatusAssess || ''
if (val.roleCode == '2' || val.roleCode == '4' || val.roleCode == '1') { if (val.roleCode == '2' || val.roleCode == '4' || val.roleCode == '1') {
jero-web/src/views/projectManagement/components/batSetting.vue
+18 -10
View File
@@ -31,11 +31,15 @@
<span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span> <span class="title-text-text" :title="$t('certificationType')">{{$t('certificationType')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<j-dict-select-tag class="box-input" v-model="formInline.attestationType" <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
@input="handleInput('attestationType')" :placeholder="$t('PleaseSelect')+$t('certificationType')"
:placeholder="$t('PleaseSelect')+$t('certificationType')" :type="'select'"
:type="'select'" :triggerChange="false" :dictCode="'attestation_type'"/>
:triggerChange="false" dictCode="attestation_type"/> <!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
<!-- @input="handleInput('attestationType')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" dictCode="attestation_type"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
@@ -61,11 +65,15 @@
<span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span> <span class="title-text-text" :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div> </div>
<a-form-model-item class="itemModel"> <a-form-model-item class="itemModel">
<j-dict-select-tag class="box-input" v-model="formInline.attestationRank" <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
@input="handleInput('attestationRank')" :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')" :type="'select'"
:type="'select'" :triggerChange="false" :dictCode="'attestation_rank'"/>
:triggerChange="false" dictCode="attestation_rank"/> <!-- <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
<!-- @input="handleInput('attestationRank')"-->
<!-- :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" dictCode="attestation_rank"/>-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
jero-web/src/views/projectManagement/components/listEditModel.vue
+7 -8
View File
@@ -142,7 +142,7 @@
<span class="title-text-text" <span class="title-text-text"
:title="$t('certificationType')">{{$t('certificationType')}}</span> :title="$t('certificationType')">{{$t('certificationType')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="attestationType"> <a-form-model-item class="itemModel-multi" prop="attestationType">
<j-multi-select-tag class="box-input" v-model="formInline.attestationType" <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
:disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true" :disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true"
:placeholder="$t('PleaseSelect')+$t('certificationType')" :placeholder="$t('PleaseSelect')+$t('certificationType')"
@@ -158,13 +158,12 @@
<span class="title-text-text" <span class="title-text-text"
:title="$t('certificationLevel')">{{$t('certificationLevel')}}</span> :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="attestationRank"> <a-form-model-item class="itemModel-multi" prop="attestationRank">
<j-dict-select-tag class="box-input" v-model="formInline.attestationRank" <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
:disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true" :disabled="formInline.roleCode == 0 || formInline.roleCode == 2 ? false : true"
@input="handleInput('attestationRank')" :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
:placeholder="$t('PleaseSelect')+$t('certificationLevel')" :type="'select'"
:type="'select'" :triggerChange="false" :dictCode="'attestation_rank'"/>
:triggerChange="false" :dictCode="'attestation_rank'"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+4 -1
View File
@@ -220,7 +220,7 @@
<transferList :url="url" @transferListForm="addModelList" ref="transferListRef"/> <transferList :url="url" @transferListForm="addModelList" ref="transferListRef"/>
<fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/> <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
<a-modal <a-modal
:title="$t('ListConfirmationDeadline')" :title="listTitle"
:width="500" :width="500"
:visible="visible" :visible="visible"
:confirm-loading="confirmLoading" :confirm-loading="confirmLoading"
@@ -391,6 +391,7 @@
data() { data() {
return { return {
roleSwitchingList: [], roleSwitchingList: [],
listTitle: '',
columnsAll: [ columnsAll: [
{ {
title: this.$t('standard'), title: this.$t('standard'),
@@ -1269,6 +1270,7 @@
this.getList() this.getList()
}, },
initiateListConfirmationcClick(name) { initiateListConfirmationcClick(name) {
this.listTitle = this.$t('ListConfirmationDeadline')
this.timeName = name this.timeName = name
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -1298,6 +1300,7 @@
initiateTaskConfirmationClick(name) { initiateTaskConfirmationClick(name) {
this.timeName = name this.timeName = name
this.listTitle = this.$t('taskConfirmationDeadline')
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let isTrue = true let isTrue = true