diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index dbccc4ddc..19f020dad 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1977,4 +1977,5 @@ module.exports = { unpublishedregulationsselected:'Only unpublished regulations can be selected', PlatformInformation:'Platform Information', Processdetails:'Process Details', + matchempty:'The match is empty' } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 888611cac..f3cb814c8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3933,4 +3933,5 @@ module.exports = { unpublishedregulationsselected:'仅能选择未发布的法规', PlatformInformation:'平台件信息', Processdetails:'流程详情', + matchempty:'匹配项为空' } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue index e6c0466d5..a9ab5ff37 100644 --- a/jero-web/src/views/projectManagement/components/associatedplat.vue +++ b/jero-web/src/views/projectManagement/components/associatedplat.vue @@ -226,27 +226,6 @@ this.confirmLoading = false this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type,this.ids) 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 { this.$message.warning(this.$t('selectLeastOne')) } diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue index 96a610c85..f2e7dbe94 100644 --- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue +++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue @@ -97,6 +97,7 @@ width: 130 }, ], + msg:'', data: [ // { // id:'1', @@ -191,20 +192,19 @@ this.loading = true postAction(this.flag == '2' ? '/project/projectLibraryBase/listPlatformAll' : 'project/projectLibraryBase/listPlatform', this.flag == '2' ? val : query).then((res) => { if (res.success) { - this.data = res.result || [] + this.data = res.result.result || [] + this.msg = res.result.msg || '' this.data.forEach((item,index) => { let name = 'selectedRowKeys'+index 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.selectedRow) this.loading = false if(this.data.length >= 1){ this.visible = true + }else { + this.$emit('associatedplatthreeFormHomo',this.msg) } } else { this.loading = false @@ -234,18 +234,25 @@ }) }) arr = arr - console.log(arr) let query = { - list : JSON.parse(JSON.stringify(arr)) + list : JSON.parse(JSON.stringify(arr)), + msg:this.msg } console.log(query) postAction('project/lawsInventoryPlatformEO/addBatch', query).then((res) => { if (res.success) { - this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.selectQuery = {} - this.$emit('associatedplatthreeForm') + if(res.result == ''){ + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.selectQuery = {} + this.$emit('associatedplatthreeForm') + }else{ + this.confirmLoading = false + this.visible = false + this.selectQuery = {} + this.$emit('associatedplatthreeFormHomo',res.result) + } } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false @@ -253,7 +260,7 @@ }) } else { // this.$message.warning(this.$t('selectLeastOne')) - this.visible = false + this.$emit('associatedplatthreeForm') } }, getAdd() { diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index b47e38a8d..12c7ddba4 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -42,7 +42,7 @@ :placeholder="$t('PleaseSelect')+$t('regulationNo')" v-model="formInline.serialNumber"> @@ -504,6 +504,7 @@ optionFilterProp="label" @change="handleInput('sdt',formInline.sdt)" showSearch + :disabled="flowdisabled" v-model="formInline.sdt"> {{$t('deliverableTemplate')}} + {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' @@ -577,9 +580,9 @@ :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}" :personneQuery="formInline" :isSingleChoice="true" + :disabled="flowdisabled" v-if="personnelVisible" @change="PersonnelSelectionChange" - :disabled="disabled" v-model="formInline.dutyPersonName"/> @@ -598,6 +601,7 @@ message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'}]" > 0) { 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.title = this.$t('edit') this.$nextTick(() => { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 645dbe1ea..f9b9692ff 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -464,6 +464,28 @@ /> + + + + +
+ +
+ + +
+
+ {{$t('cancel')}} +
+
+ @@ -610,6 +632,8 @@ pageSize: 50, total: 0, JTextLoading: false, + visibleoperationFailed: false, + visibleoperation:'', CertificationColor: { 'Test passed': 'accordColor', 'Test failed': 'nonConformityColor', @@ -1278,6 +1302,7 @@ if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ this.detailedWarningList = [] let dataSource = [] + let status = '' for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < this.selectedRowKeys.length; j++) { if (this.dataSource[i].id == this.selectedRowKeys[j]) { @@ -1288,12 +1313,16 @@ for (let i = 0; i < dataSource.length; i++) { if (dataSource[i].flowStatus == 'List to be released') { flag = '1' - this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) + status = '1' } else { - this.$message.warning(this.$t('unpublishedregulationsselected')) - return + status = '2' } } + if(status == '1'){ + this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) + }else{ + this.$message.warning(this.$t('unpublishedregulationsselected')) + } }else{ flag = '2' this.$message.warning(this.$t('selectLeastOne')) @@ -1308,9 +1337,15 @@ if(type == '认证'){ postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => { if (res.success) { - this.$refs.associatedplatRef.visible = false - this.$message.success(this.$t('OperationSuccessful')) - this.getList() + if(res.result == ''){ + this.$refs.associatedplatRef.visible = false + 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) // } }, + cancleoperationFailed(){ + this.visibleoperationFailed = false + this.$refs.associatedplatRef.handleCancel() + this.selectedRowKeys = [] + this.getList() + }, associatedplattwoForm(id,type,ids){ // this.$refs.associatedplatthreeRef.transferModel(id,type,ids) }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 7c837d07c..f2290d886 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -435,7 +435,7 @@ - + @@ -688,6 +688,28 @@ + + + + +
+ +
+ + +
+
+ {{$t('cancel')}} +
+
+ {{ $t('dataLoading') }} {{ $t('Submitting') }} @@ -757,6 +779,7 @@ data() { return { toggleSearchStatus: false, + visibleoperationFailed: false, visibleQuestion: false, visibleReset: false, confirmLoadingReset: false, @@ -768,6 +791,7 @@ pageSize: 50, total: 0, long:'', + visibleoperation:'', roleSwitchingList: [], formInlineQuestion: {}, formInlineReset: {}, @@ -1955,7 +1979,7 @@ transferClick() { this.$refs.transferListRef.transferModel() }, - // 关联平台件 + // 关联平台件visibleoperation associatedplatformClick(type){ let flag = '' if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ @@ -1978,7 +2002,6 @@ status = '2' } } - console.log(status) if(status == '1'){ this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) }else{ @@ -1986,8 +2009,6 @@ } }else{ flag = '2' - this.selectedRowKeys = this.dataSource.map(val => val.id) - console.log(this.selectedRowKeys) this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) } }, @@ -2002,6 +2023,28 @@ this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids) }, 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() }, //批量设置