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-07-05 10:47:00 +08:00
parent 05d9d66240
commit c4b250439b
4 changed files with 114 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1072,4 +1072,5 @@ module.exports = {
theProjectContactEmpty:'The project contact person of cannot be empty',
pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank',
}
jero-web/src/common/lang/zh-cn.js
+2 -1
View File
@@ -693,7 +693,7 @@ module.exports = {
confirmOverrule: '确认驳回？',
The: '第',
submitted: '条数据已提交不能重复提交',
incorrectsubmitted: '条数据状态有误；只能提交状态为待确认的数据',
incorrectsubmitted: '状态有误；只能提交状态为待确认的数据',
basicInformationOfParameters: '项目基本信息',
regulatoryCertificationTaskPlan: '法规/认证任务计划',
bringInRelevantPersonnel: '带入相关人员',
@@ -1076,4 +1076,5 @@ module.exports = {
newNiONumber: 'NIO编号',
English:'英文',
requiredParametersEmpty:'必填参数不能为空',
theResponsiblePersonAndDeadlineClank:'的责任人、截止时间不能为空',
}
jero-web/src/views/projectManagement/components/TaskList.vue
+25 -4
View File
@@ -55,8 +55,8 @@
>
<div slot="standardInformation" slot-scope="text,result" class="box-left">
<div class="content">
<a class="box-content-a">{{result.serialNumber}}</a><br/>
<a>{{result.title}}</a>
<a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}</a>
<a class="box-content-buttom" :title="result.title">{{result.title}}</a>
</div>
</div>
<div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
@@ -512,10 +512,20 @@
}
.box-content-a {
margin-bottom: 8px;
display: inline-block;
text-align: left;
margin-bottom: 8px;
font-weight: 400;
display: -webkit-box;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
.box-content-index {
@@ -597,7 +607,18 @@
.box-content-cou {
cursor: pointer;
}
.box-content-buttom{
width: 100%;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
}
</style>
<style>
.box-input .ant-select-selection {
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+86 -25
View File
@@ -901,7 +901,9 @@
]
},
detailedSuccessList: [],
detailedWarningList: []
detailedWarningList: [],
rowKeysSuccessList:[],
rowKeysWarningList:[],
}
},
@@ -1623,53 +1625,100 @@
}
}
}
this.rowKeysSuccessList = []
this.rowKeysWarningList = []
for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].inventoryAffirmStatus == 'List to confirm') {
if (dataSource[i].roleCode == 1 && dataSource[i].regulationOwnerSubmitStatus) {
isTrue = false
this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
return
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
continue
// isTrue = false
// this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
// return
} else if (dataSource[i].roleCode == 2 && dataSource[i].homologationEngineerSubmitStatus) {
isTrue = false
this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
return
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
continue
// isTrue = false
// this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
// return
} else if (dataSource[i].roleCode == 4 && (dataSource[i].homologationEngineerSubmitStatus && dataSource[i].regulationOwnerSubmitStatus)) {
isTrue = false
this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted'))
return
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('submitted') } < /div>)
continue
// isTrue = false
// this.$message.warning(dataSource[i].serialNumber + this.$t('submitted'))
// return
}
if((dataSource[i].designInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].designInitiatorId == this.userInfo().id) ||
(dataSource[i].designInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].designInitiatorId == this.userInfo().id)){
if(!dataSource[i].designDutyId || !dataSource[i].designDueDate){
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue
}
}
if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].prehomoInitiatorId == this.userInfo().id) ||
(dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].prehomoInitiatorId == this.userInfo().id)){
if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue
}
}
if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId
&& dataSource[i].verifyInitiatorId == this.userInfo().id) ||
(dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId
&& dataSource[i].verifyInitiatorId == this.userInfo().id)){
if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>)
continue
}
}
this.rowKeysSuccessList.push(dataSource[i])
} else {
isTrue = false
this.$message.warning(this.$t('The') + (i + 1) + this.$t('incorrectsubmitted'))
return
this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('incorrectsubmitted') } < /div>)
// isTrue = false
// this.$message.warning(dataSource[i].serialNumber+ this.$t('incorrectsubmitted'))
// return
}
}
if (isTrue) {
callBack()
if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
callBack && callBack()
}else{
let that = this
this.$warning({
content: (
< div >
{ that.rowKeysWarningList }
< /div>
)
})
}
},
updateStatusBatch(num, selectedRowKeys) {
let _this = this
let lawsInventoryList = []
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
for (let i = 0; i < this.rowKeysSuccessList.length; i++) {
let roleCode
if (this.dataSource[i].regulationOwnerId == this.userInfo().id &&
this.dataSource[i].homologationEngineerId == this.userInfo().id) {
if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id &&
this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
roleCode = 4
} else if (this.dataSource[i].regulationOwnerId == this.userInfo().id) {
} else if (this.rowKeysSuccessList[i].regulationOwnerId == this.userInfo().id) {
roleCode = 1
} else if (this.dataSource[i].homologationEngineerId == this.userInfo().id) {
} else if (this.rowKeysSuccessList[i].homologationEngineerId == this.userInfo().id) {
roleCode = 2
}
lawsInventoryList.push({
id: this.dataSource[i].id,
id: this.rowKeysSuccessList[i].id,
roleCode: roleCode
})
}
}
}
let query = {
operatorType: 1,
@@ -1688,6 +1737,18 @@
_this.$message.warning(_this.$t('operationFailed'))
_this.confirmLoading = false
}
if(this.rowKeysWarningList && this.rowKeysWarningList.length > 0){
let that = this
this.$warning({
content: (
< div >
{ that.rowKeysWarningList }
< /div>
)
})
}
this.rowKeysWarningList = []
this.rowKeysSuccessList = []
})
},