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

项目库 关联平台件失败提示语

Browse Source
This commit is contained in:
zyx.net
2023-09-25 11:07:02 +08:00
parent c7018f1975
commit 44147c1ca1
7 changed files with 130 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1977,4 +1977,5 @@ module.exports = {
unpublishedregulationsselected:'Only unpublished regulations can be selected', unpublishedregulationsselected:'Only unpublished regulations can be selected',
PlatformInformation:'Platform Information', PlatformInformation:'Platform Information',
Processdetails:'Process Details', Processdetails:'Process Details',
matchempty:'The match is empty'
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -3933,4 +3933,5 @@ module.exports = {
unpublishedregulationsselected:'仅能选择未发布的法规', unpublishedregulationsselected:'仅能选择未发布的法规',
PlatformInformation:'平台件信息', PlatformInformation:'平台件信息',
Processdetails:'流程详情', Processdetails:'流程详情',
matchempty:'匹配项为空'
} }
jero-web/src/views/projectManagement/components/associatedplat.vue
-21
View File
@@ -226,27 +226,6 @@
this.confirmLoading = false this.confirmLoading = false
this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type,this.ids) this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type,this.ids)
this.selectedRowKeys = [] this.selectedRowKeys = []
// postAction(this.url.addModel, {
// dummyInventoryBaseId: selectedRowKeys.join(','),
// projectLibraryId: this.$route.query.id,
// flag: flag
// }).then((res) => {
// if (res.success) {
// this.confirmLoading = false
// this.$message.success(this.$t('OperationSuccessful'))
// this.visible = false
// this.selectedRowKeys = []
// this.$emit('transferListForm')
// } else {
// if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') {
// this.confirmLoading = false
// this.getAdd()
// return
// }
// this.$message.warning(this.$t('operationFailed'))
// this.confirmLoading = false
// }
// })
} else { } else {
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
} }
jero-web/src/views/projectManagement/components/associatedplatthree.vue
+20 -13
View File
@@ -97,6 +97,7 @@
width: 130 width: 130
}, },
], ],
msg:'',
data: [ data: [
// { // {
// id:'1', // id:'1',
@@ -191,20 +192,19 @@
this.loading = true this.loading = true
postAction(this.flag == '2' ? '/project/projectLibraryBase/listPlatformAll' : 'project/projectLibraryBase/listPlatform', this.flag == '2' ? val : query).then((res) => { postAction(this.flag == '2' ? '/project/projectLibraryBase/listPlatformAll' : 'project/projectLibraryBase/listPlatform', this.flag == '2' ? val : query).then((res) => {
if (res.success) { if (res.success) {
this.data = res.result || [] this.data = res.result.result || []
this.msg = res.result.msg || ''
this.data.forEach((item,index) => { this.data.forEach((item,index) => {
let name = 'selectedRowKeys'+index let name = 'selectedRowKeys'+index
this.selectQuery[name] = item.result.map(val => val.id) this.selectQuery[name] = item.result.map(val => val.id)
// for(var i in item.result.map(val => val.id)){
// this.selectedRowKeys.push(item.result.map(val => val.id)[i])
// }
// this.selectedRow.push(item.result)
}) })
console.log(this.selectQuery) console.log(this.selectQuery)
// console.log(this.selectedRow) // console.log(this.selectedRow)
this.loading = false this.loading = false
if(this.data.length >= 1){ if(this.data.length >= 1){
this.visible = true this.visible = true
}else {
this.$emit('associatedplatthreeFormHomo',this.msg)
} }
} else { } else {
this.loading = false this.loading = false
@@ -234,18 +234,25 @@
}) })
}) })
arr = arr arr = arr
console.log(arr)
let query = { let query = {
list : JSON.parse(JSON.stringify(arr)) list : JSON.parse(JSON.stringify(arr)),
msg:this.msg
} }
console.log(query) console.log(query)
postAction('project/lawsInventoryPlatformEO/addBatch', query).then((res) => { postAction('project/lawsInventoryPlatformEO/addBatch', query).then((res) => {
if (res.success) { if (res.success) {
this.confirmLoading = false if(res.result == ''){
this.$message.success(this.$t('OperationSuccessful')) this.confirmLoading = false
this.visible = false this.$message.success(this.$t('OperationSuccessful'))
this.selectQuery = {} this.visible = false
this.$emit('associatedplatthreeForm') this.selectQuery = {}
this.$emit('associatedplatthreeForm')
}else{
this.confirmLoading = false
this.visible = false
this.selectQuery = {}
this.$emit('associatedplatthreeFormHomo',res.result)
}
} else { } else {
this.$message.warning(this.$t('operationFailed')) this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false this.confirmLoading = false
@@ -253,7 +260,7 @@
}) })
} else { } else {
// this.$message.warning(this.$t('selectLeastOne')) // this.$message.warning(this.$t('selectLeastOne'))
this.visible = false this.$emit('associatedplatthreeForm')
} }
}, },
getAdd() { getAdd() {
jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+13 -2
View File
@@ -42,7 +42,7 @@
:placeholder="$t('PleaseSelect')+$t('regulationNo')" :placeholder="$t('PleaseSelect')+$t('regulationNo')"
v-model="formInline.serialNumber"></a-input> v-model="formInline.serialNumber"></a-input>
<a-input class="box-input" <a-input class="box-input"
:disabled="true" :disabled="flowdisabled"
v-else v-else
v-model.trim="formInline.serialNumber" v-model.trim="formInline.serialNumber"
:placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/> :placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>
@@ -504,6 +504,7 @@
optionFilterProp="label" optionFilterProp="label"
@change="handleInput('sdt',formInline.sdt)" @change="handleInput('sdt',formInline.sdt)"
showSearch showSearch
:disabled="flowdisabled"
v-model="formInline.sdt"> v-model="formInline.sdt">
<a-select-option v-for="(item, key) in engineeringInterfacePersonList" <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
:label="item.name" :label="item.name"
@@ -534,6 +535,7 @@
:maxTagCount="1" :maxTagCount="1"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input" class="box-input"
:disabled="flowdisabled"
style="width: 100%" style="width: 100%"
:tree-data="DeliverableTreeList" :tree-data="DeliverableTreeList"
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')" :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
@@ -552,6 +554,7 @@
:title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span> :title="$t('deliverableTemplate')">{{$t('deliverableTemplate')}}</span>
</div> </div>
<a-form-model-item class="itemModel" prop="deliverableTemplate"> <a-form-model-item class="itemModel" prop="deliverableTemplate">
<!-- this.$refs.uploadFile.disabled = isTrue-->
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
@click="clickButtonToUpload('deliverableTemplate')"> @click="clickButtonToUpload('deliverableTemplate')">
{{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === ''
@@ -577,9 +580,9 @@
:query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}" :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
:personneQuery="formInline" :personneQuery="formInline"
:isSingleChoice="true" :isSingleChoice="true"
:disabled="flowdisabled"
v-if="personnelVisible" v-if="personnelVisible"
@change="PersonnelSelectionChange" @change="PersonnelSelectionChange"
:disabled="disabled"
v-model="formInline.dutyPersonName"/> v-model="formInline.dutyPersonName"/>
</a-form-model-item> </a-form-model-item>
</div> </div>
@@ -598,6 +601,7 @@
message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'}]" message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'}]"
> >
<a-date-picker class="box-input" <a-date-picker class="box-input"
:disabled="flowdisabled"
:placeholder="$t('PleaseSelect')+$t('closingDate')" :placeholder="$t('PleaseSelect')+$t('closingDate')"
@change="dateChange({db_field_name:'endTime'})" @change="dateChange({db_field_name:'endTime'})"
format="YYYY-MM-DD" format="YYYY-MM-DD"
@@ -693,6 +697,7 @@
formInline: {}, formInline: {},
confirmLoading: false, confirmLoading: false,
visible: false, visible: false,
disabledType:'',
personnelVisible: false, personnelVisible: false,
yearNameDataList: [], yearNameDataList: [],
firstLevelDutyTerritoryList: [], firstLevelDutyTerritoryList: [],
@@ -761,6 +766,7 @@
] ]
}, },
disabled: false, disabled: false,
flowdisabled: false,
projectNameList: [], projectNameList: [],
title: '', title: '',
DeliverableTreeList: [], DeliverableTreeList: [],
@@ -869,6 +875,11 @@
if (value.dutyTerritory && value.dutyTerritory.length > 0) { if (value.dutyTerritory && value.dutyTerritory.length > 0) {
this.queryPersonByProject(value.dutyTerritory.join(',')) this.queryPersonByProject(value.dutyTerritory.join(','))
} }
console.log(value)
if(value.projectCertificationInventoryEOS && value.projectCertificationInventoryEOS.length > 0){
this.flowdisabled = true
this.$refs.uploadFile.disabled = true
}
this.getRegulationNo() this.getRegulationNo()
this.title = this.$t('edit') this.title = this.$t('edit')
this.$nextTick(() => { this.$nextTick(() => {
jero-web/src/views/projectManagement/components/certificationList/index.vue
+47 -6
View File
@@ -464,6 +464,28 @@
/> />
</div> </div>
</div> </div>
<!-- 关联错误数据提示-->
<a-modal
:title="$t('operationFailed')"
:width="860"
v-model="visibleoperationFailed"
:maskClosable="false"
:footer="null"
>
<a-row :gutter="24">
<a-col :span="24">
<div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
class="box-title-text-index">
<span v-html="visibleoperation"></span>
</div>
</a-col>
</a-row>
<div class="imports-footer">
<div class="imports-footer-wrap" style='text-align: center;'>
<a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
</div>
</div>
</a-modal>
<transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/> <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
<certificationDirectory :isDisplayNum="isDisplayNum" :roleSwitchingCode="roleSwitchingCode" <certificationDirectory :isDisplayNum="isDisplayNum" :roleSwitchingCode="roleSwitchingCode"
:url="url" ref="certificationDirectoryRef"/> :url="url" ref="certificationDirectoryRef"/>
@@ -610,6 +632,8 @@
pageSize: 50, pageSize: 50,
total: 0, total: 0,
JTextLoading: false, JTextLoading: false,
visibleoperationFailed: false,
visibleoperation:'',
CertificationColor: { CertificationColor: {
'Test passed': 'accordColor', 'Test passed': 'accordColor',
'Test failed': 'nonConformityColor', 'Test failed': 'nonConformityColor',
@@ -1278,6 +1302,7 @@
if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
this.detailedWarningList = [] this.detailedWarningList = []
let dataSource = [] let dataSource = []
let status = ''
for (let i = 0; i < this.dataSource.length; i++) { for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < this.selectedRowKeys.length; j++) { for (let j = 0; j < this.selectedRowKeys.length; j++) {
if (this.dataSource[i].id == this.selectedRowKeys[j]) { if (this.dataSource[i].id == this.selectedRowKeys[j]) {
@@ -1288,12 +1313,16 @@
for (let i = 0; i < dataSource.length; i++) { for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].flowStatus == 'List to be released') { if (dataSource[i].flowStatus == 'List to be released') {
flag = '1' flag = '1'
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) status = '1'
} else { } else {
this.$message.warning(this.$t('unpublishedregulationsselected')) status = '2'
return
} }
} }
if(status == '1'){
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
}else{
this.$message.warning(this.$t('unpublishedregulationsselected'))
}
}else{ }else{
flag = '2' flag = '2'
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
@@ -1308,9 +1337,15 @@
if(type == '认证'){ if(type == '认证'){
postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => { postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => {
if (res.success) { if (res.success) {
this.$refs.associatedplatRef.visible = false if(res.result == ''){
this.$message.success(this.$t('OperationSuccessful')) this.$refs.associatedplatRef.visible = false
this.getList() this.$message.success(this.$t('OperationSuccessful'))
this.selectedRowKeys = []
this.getList()
}else{
this.visibleoperation = res.result
this.visibleoperationFailed = true
}
} }
}) })
} }
@@ -1320,6 +1355,12 @@
// this.$refs.associatedplattwoRef.transferModel(id,type,ids) // this.$refs.associatedplattwoRef.transferModel(id,type,ids)
// } // }
}, },
cancleoperationFailed(){
this.visibleoperationFailed = false
this.$refs.associatedplatRef.handleCancel()
this.selectedRowKeys = []
this.getList()
},
associatedplattwoForm(id,type,ids){ associatedplattwoForm(id,type,ids){
// this.$refs.associatedplatthreeRef.transferModel(id,type,ids) // this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
}, },
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+48 -5
View File
@@ -435,7 +435,7 @@
<transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/> <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
<associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/> <associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/>
<associatedplattwo :url="url" @associatedplattwoForm="associatedplattwoForm" ref="associatedplattwoRef"/> <associatedplattwo :url="url" @associatedplattwoForm="associatedplattwoForm" ref="associatedplattwoRef"/>
<associatedplatthree :url="url" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/> <associatedplatthree :url="url" @associatedplatthreeFormHomo="associatedplatthreeFormHomo" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
<customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/> <customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/>
<transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/> <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
<fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/> <fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
@@ -688,6 +688,28 @@
</span> </span>
</a-table> </a-table>
</a-modal> </a-modal>
<!-- 关联错误数据提示-->
<a-modal
:title="$t('operationFailed')"
:width="860"
v-model="visibleoperationFailed"
:maskClosable="false"
:footer="null"
>
<a-row :gutter="24">
<a-col :span="24">
<div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
class="box-title-text-index">
<span v-html="visibleoperation"></span>
</div>
</a-col>
</a-row>
<div class="imports-footer">
<div class="imports-footer-wrap" style='text-align: center;'>
<a-button class="imports-btn" type="primary" @click="cancleoperationFailed">{{$t('cancel')}}</a-button>
</div>
</div>
</a-modal>
<JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading> <JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading>
<JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading> <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
<resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/> <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
@@ -757,6 +779,7 @@
data() { data() {
return { return {
toggleSearchStatus: false, toggleSearchStatus: false,
visibleoperationFailed: false,
visibleQuestion: false, visibleQuestion: false,
visibleReset: false, visibleReset: false,
confirmLoadingReset: false, confirmLoadingReset: false,
@@ -768,6 +791,7 @@
pageSize: 50, pageSize: 50,
total: 0, total: 0,
long:'', long:'',
visibleoperation:'',
roleSwitchingList: [], roleSwitchingList: [],
formInlineQuestion: {}, formInlineQuestion: {},
formInlineReset: {}, formInlineReset: {},
@@ -1955,7 +1979,7 @@
transferClick() { transferClick() {
this.$refs.transferListRef.transferModel() this.$refs.transferListRef.transferModel()
}, },
// 关联平台件 // 关联平台件visibleoperation
associatedplatformClick(type){ associatedplatformClick(type){
let flag = '' let flag = ''
if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
@@ -1978,7 +2002,6 @@
status = '2' status = '2'
} }
} }
console.log(status)
if(status == '1'){ if(status == '1'){
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
}else{ }else{
@@ -1986,8 +2009,6 @@
} }
}else{ }else{
flag = '2' flag = '2'
this.selectedRowKeys = this.dataSource.map(val => val.id)
console.log(this.selectedRowKeys)
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
} }
}, },
@@ -2002,6 +2023,28 @@
this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids) this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
}, },
associatedplatthreeForm(id){ associatedplatthreeForm(id){
this.$refs.associatedplatRef.handleCancel()
this.$refs.associatedplattwoRef.handleCancel()
this.selectedRowKeys = []
this.getList()
},
associatedplatthreeFormHomo(msg){
if(msg){
this.visibleoperation = msg
this.visibleoperationFailed = true
}else{
this.$message.warning(this.$t('matchempty'))
this.$refs.associatedplatRef.handleCancel()
this.$refs.associatedplattwoRef.handleCancel()
this.selectedRowKeys = []
this.getList()
}
},
cancleoperationFailed(){
this.visibleoperationFailed = false
this.$refs.associatedplatRef.handleCancel()
this.$refs.associatedplattwoRef.handleCancel()
this.selectedRowKeys = []
this.getList() this.getList()
}, },
//批量设置 //批量设置