diff --git a/jero-web/src/views/projectManagement/components/associatedplat.vue b/jero-web/src/views/projectManagement/components/associatedplat.vue
index a40587ed4..3f2bd496b 100644
--- a/jero-web/src/views/projectManagement/components/associatedplat.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplat.vue
@@ -72,7 +72,7 @@
:scroll="{x: 1000}"
:data-source="dataList"
:pagination="false"
- :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '法规'?' ':'' }"
+ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:flag !== '1'?' ':'' }"
:loading="loading">
@@ -164,15 +164,17 @@
pageSize: 10,
total: 0,
flag:'',
+ type:'',
}
},
mounted() {
},
methods: {
- transferModel(flag) {
+ transferModel(flag,type) {
this.visible = true
this.flag = flag
+ this.type = type
this.queryParam = {}
this.selectedRowKeys = []
this.replacePage()
@@ -214,7 +216,7 @@
},
onSelectChange(value) {
this.selectedRowKeys = value
- if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
+ if (this.selectedRowKeys.length > 1 && this.flag !== '1') {
this.selectedRowKeys.shift()
}
},
@@ -226,7 +228,7 @@
this.confirmLoading = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
this.confirmLoading = false
- this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag)
+ this.$emit('associatedplatForm',selectedRowKeys.join(','),this.flag,this.type)
this.selectedRowKeys = []
// postAction(this.url.addModel, {
// dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/associatedplatthree.vue b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
index 52c045f6b..5a7158360 100644
--- a/jero-web/src/views/projectManagement/components/associatedplatthree.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplatthree.vue
@@ -158,15 +158,19 @@
loading: false,
pageNo: 1,
pageSize: 10,
- total: 0
+ total: 0,
+ type:'',
+ id:'',
}
},
mounted() {
},
methods: {
- transferModel() {
+ transferModel(id,type) {
this.visible = true
+ this.id = id
+ this.type = type
this.queryParam = {}
this.selectedRowKeys = []
this.replacePage()
diff --git a/jero-web/src/views/projectManagement/components/associatedplattwo.vue b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
index 40af5e357..e5337f1bf 100644
--- a/jero-web/src/views/projectManagement/components/associatedplattwo.vue
+++ b/jero-web/src/views/projectManagement/components/associatedplattwo.vue
@@ -144,15 +144,17 @@ export default {
pageSize: 10,
total: 0,
flag:'',
+ type:'',
}
},
mounted() {
},
methods: {
- transferModel(flag) {
+ transferModel(flag,type) {
this.visible = true
this.flag = flag
+ this.type = type
this.queryParam = {}
this.selectedRowKeys = []
this.replacePage()
@@ -194,7 +196,7 @@ export default {
},
onSelectChange(value) {
this.selectedRowKeys = value
- // if (this.selectedRowKeys.length > 1 && this.flag !== '法规') {
+ // if (this.selectedRowKeys.length > 1 && this.flag !== '1') {
// this.selectedRowKeys.shift()
// }
},
@@ -206,7 +208,7 @@ export default {
this.confirmLoading = true
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
this.confirmLoading = false
- this.$emit('associatedplattwoForm',selectedRowKeys.join(','))
+ this.$emit('associatedplattwoForm',selectedRowKeys.join(','),this.type)
this.selectedRowKeys = []
// postAction(this.url.addModel, {
// dummyInventoryBaseId: selectedRowKeys.join(','),
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 496f75338..4f2dfcf86 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -217,6 +217,13 @@
{{ $t('processReset') }}
+
+
+
+ {{ $t('Associatedplatform') }}
+
+
+
+
{{ $t('Submitting') }}
@@ -551,6 +561,9 @@
import viewFileModel from '@/components/viewFileModel/index'
import ImportFile from '@/components/ImportFile/index'
import transferList from './components/transferList'
+ import associatedplat from '../associatedplat'
+ import associatedplattwo from '../associatedplattwo'
+ import associatedplatthree from '../associatedplatthree'
import uploadFile from '@/components/uploadFile/file'
import addModel from './components/addModel'
import batSetting from './components/batSetting'
@@ -580,6 +593,9 @@
modifyHistory,
uploadFile,
TaskListModel,
+ associatedplat,
+ associatedplattwo,
+ associatedplatthree,
referenceDeliverablesList,
SelectedBy,
viewFileModel,
@@ -1256,6 +1272,47 @@
this.$message.warning(this.$t('selectLeastOne'))
}
},
+ // 关联平台件
+ associatedplatformClick(type){
+ let flag = ''
+ if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
+ this.detailedWarningList = []
+ let dataSource = []
+ 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]) {
+ dataSource.push(this.dataSource[i])
+ }
+ }
+ }
+ for (let i = 0; i < dataSource.length; i++) {
+ if (dataSource[i].verifyFlowStatus == 'List to be released' &&
+ dataSource[i].designFlowStatus == 'List to be released') {
+ flag = '1'
+ this.$refs.associatedplatRef.transferModel(flag,type)
+ } else {
+ this.$message.warning(this.$t('unpublishedregulationsselected'))
+ return
+ }
+ }
+ }else{
+ flag = '2'
+ this.$refs.associatedplatRef.transferModel(flag,type)
+ }
+ },
+ associatedplatForm(id,flag,type){
+ if(flag == '1'){
+ this.$refs.associatedplatthreeRef.transferModel(id,type)
+ }else{
+ this.$refs.associatedplattwoRef.transferModel(id,type)
+ }
+ },
+ associatedplattwoForm(id,type){
+ this.$refs.associatedplatthreeRef.transferModel(id,type)
+ },
+ associatedplatthreeForm(id){
+ console.log(id)
+ },
//添加
handleAdd() {
this.$refs.addModelRef.addModel()
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index bfc34ed26..d39c57392 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -162,10 +162,10 @@
-
-
- {{ $t('Associatedplatform') }}
-
+
+
+
+
{{ $t('processReset') }}
+
+
+
+ {{ $t('Associatedplatform') }}
+
@@ -1937,14 +1944,45 @@
this.$refs.transferListRef.transferModel()
},
// 关联平台件
- associatedplatformClick(){
+ associatedplatformClick(type){
let flag = ''
if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
- flag = '法规'
+ this.detailedWarningList = []
+ let dataSource = []
+ 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]) {
+ dataSource.push(this.dataSource[i])
+ }
+ }
+ }
+ for (let i = 0; i < dataSource.length; i++) {
+ if (dataSource[i].verifyFlowStatus == 'List to be released' &&
+ dataSource[i].designFlowStatus == 'List to be released') {
+ flag = '1'
+ this.$refs.associatedplatRef.transferModel(flag,type)
+ } else {
+ this.$message.warning(this.$t('unpublishedregulationsselected'))
+ return
+ }
+ }
}else{
- flag = '清单'
+ flag = '2'
+ this.$refs.associatedplatRef.transferModel(flag,type)
}
- this.$refs.associatedplatRef.transferModel(flag)
+ },
+ associatedplatForm(id,flag,type){
+ if(flag == '1'){
+ this.$refs.associatedplatthreeRef.transferModel(id,type)
+ }else{
+ this.$refs.associatedplattwoRef.transferModel(id,type)
+ }
+ },
+ associatedplattwoForm(id,type){
+ this.$refs.associatedplatthreeRef.transferModel(id,type)
+ },
+ associatedplatthreeForm(id){
+ console.log(id)
},
//批量设置
batSettingClick() {
@@ -2552,20 +2590,6 @@
transferListForm(id) {
this.$refs.transferListvirtalRef.transferModel(id)
},
- associatedplatForm(id,flag){
- console.log(flag)
- if(flag == '法规'){
- this.$refs.associatedplatthreeRef.transferModel(id)
- }else{
- this.$refs.associatedplattwoRef.transferModel(id)
- }
- },
- associatedplattwoForm(id){
- this.$refs.associatedplatthreeRef.transferModel(id)
- },
- associatedplatthreeForm(id){
- console.log(id)
- },
transferListFormHomo() {
this.$refs.transferListRef.handleCancel()
this.pageNo = 1
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 dee8bbe07..aeb1aa03b 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
@@ -775,21 +775,9 @@
})
},
DutyDepartChangeOne(event) {
- this.formInline.dutyTerritory = []
+ // this.formInline.dutyTerritory = []
this.formInline = {...this.formInline}
- this.getDutyTerritoryOne(event.join(','))
- },
- getDutyTerritoryOne(row) {
- let query = {
- dutyDepart: row
- }
- getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
- if (res.success) {
- this.dutyTerritoryList = res.result || []
- } else {
- this.dutyTerritoryList = []
- }
- })
+ // this.getDutyTerritoryOne(event.join(','))
},
addModel() {
this.visible = true