diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue index b47e38a8d..09fc9060d 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue @@ -196,28 +196,28 @@ :prop="'dataList.'+index+'.dutyTerritory'" :rules="[{ required: true, message: $t('areaOfResponsibility') + $t('cannotEmpty'), trigger: 'change'},]" > - - - - {{ val.itemText }} - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -460,28 +460,28 @@ - - - - {{ item.itemText }} - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue index 496f75338..7378538fb 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue @@ -110,7 +110,7 @@ -
{{ $t('preservation') }} @@ -123,7 +123,7 @@
-
{{ $t('BatchSetting') }} @@ -136,13 +136,6 @@ {{ $t('CertificationDirectory') }}
- -
- - {{ $t('bringInRelevantPersonnel') }} -
@@ -168,21 +161,21 @@
{{ $t('add') }}
{{ $t('addConfiguration') }}
{{ $t('templateDownload') }} @@ -190,21 +183,21 @@
{{ $t('export') }}
-
+
{{ $t('BatchDelete') }} @@ -212,7 +205,7 @@
{{ $t('processReset') }} @@ -220,21 +213,15 @@
+ v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"> ...{{ $t('more') }}
- -
- - {{ $t('release') }} -
- -
+
{{ $t('withdraw') }}
@@ -305,7 +292,7 @@
-
{{ $t('question') }} @@ -334,7 +321,7 @@ {{ $t('edit') }} @@ -343,7 +330,7 @@ {{ $t('history') }} {{ $t('deleteLib') }} @@ -400,7 +387,7 @@ {{text}} -
- - {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}} - -
item.id) + // console.log(this.selectedRowKeys) this.dataSource.forEach(value => { if (value.flowStatusName == '清单待校核') { value.flowStatusName = '任务待发起' @@ -1263,52 +1234,6 @@ dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' }, - releaseClick() { - // this.listTitle = this.$t('Deadline') - // if (this.selectedRowKeysList.length < 1) { - // this.$message.warning(this.$t('selectLeastOne')) - // } else { - // this.visible = true - // } - if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - let ids = [] - let notConditions = [] - for (let i = 0; i < this.selectedRowKeysList.length; i++) { - if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' && - this.selectedRowKeysList[i].deliverableType == '1635545748968783874') || - (this.selectedRowKeysList[i].flowStatus == 'Certification returned' && - this.selectedRowKeysList[i].deliverableType == '1635545748968783874')) { - ids.push(this.selectedRowKeysList[i].id) - } else if ((this.selectedRowKeysList[i].flowStatus == 'List to be released' && - this.selectedRowKeysList[i].endTime) || - (this.selectedRowKeysList[i].flowStatus == 'Certification returned' && - this.selectedRowKeysList[i].endTime)) { - ids.push(this.selectedRowKeysList[i].id) - } else { - notConditions.push(this.selectedRowKeysList[i].inspectionItem) - } - } - let data = '' - if (notConditions && notConditions.length > 0) { - data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataListReleasedAndCertificationReturnCanSelected') - } - if (ids && ids.length > 0) { - // this.releaseData(ids, notConditions, data) - let query = { - ids: ids, - notConditions: notConditions, - data: data, - dutyDueDate: 'inventoryVerifyEndTime', - title: this.$t('release') - } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query))) - } else { - this.failedMessage(data) - } - } else { - this.$message.warning(this.$t('selectLeastOne')) - } - }, deadlineDataForm(val, formInline) { if (val.title == this.$t('release')) { this.releaseData(val.ids, val.notConditions, val.data, formInline) @@ -1466,7 +1391,7 @@ let ids = [] let notConditions = [] let data = '' - if (this.roleSwitchingCode == 0) { + if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 2) { for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' || this.selectedRowKeysList[i].flowStatus == 'Certification returned' || @@ -1856,11 +1781,6 @@ deliveryChange() { this.preservationClick() }, - CertificationProgressClick(val) { - let item = JSON.parse(JSON.stringify(val)) - item.roleCode = this.roleSwitchingCode - this.$refs.TaskListModelRef.getData(item, this.$t('CertificationProgress')) - }, //发起流程 initiatingProcessClick(value, prompt) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { @@ -2283,31 +2203,6 @@ this.$message.warning(this.$t('selectLeastOne')) } }, - bringInRelevantPersonnelClick(){ - let _this = this - // if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$confirm({ - content: _this.$t('confirmBringInRelevantPersonnel'), - onOk() { - // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', { - // ids: selectedRowKeys.join(','), - projectLibraryId: _this.$route.query.id - }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) - // } else { - // this.$message.warning(this.$t('selectLeastOne')) - // } - }, } } diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue index 8ad6ad738..0ea88a2d0 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue @@ -1,3 +1,4 @@ +