diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 6f2346510..19a9b68d6 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -351,7 +351,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '复审'){ + }else if (row.taskInfo === '标准化复审'){ this.$router.push({ name: 'bussLibraryProduct7', query: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 4a4626f34..96909918f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -891,49 +891,63 @@ this.modelOptions = res.data }) }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + console.log(res) + if(res && res.data){ + this.countryOptions = res.data.COUNTRY + this.applyCountryOptions = res.data.COUNTRY + this.regionOptions = res.data.REGION // 区域 + this.standStateOptions = res.data.BUSSSTATE + this.energyKindOptions = res.data.ENERGYTYPES + this.standGeneraOptions = res.data.BUSSBIGCLASS + this.standSubclassOptions = res.data.BUSSFINECLASS + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.nylxOptions = res.data.NYLXCLASS // 能源类型 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 + + this.$emit('emitDataLoading',false) + } + }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { - this.form = this.formSub, - this.FBGBUSSFileList= this.FBGBUSSFileListSub, - this.XGDFileList= this.XGDFileListSub, - this.LSBBBUSSFileList= this.LSBBBUSSFileListSub, - this.QTWJBUSSFileList= this.QTWJBUSSFileListSub, - this.GLWJBUSSFileList= this.GLWJBUSSFileListSub, - this.summaryFileList= this.summaryFileListSub, - this.madelSubList= this.madelSubListSub, - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() + if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){ + this.getDataAsync() + this.form = this.formSub, + this.FBGBUSSFileList= this.FBGBUSSFileListSub, + this.XGDFileList= this.XGDFileListSub, + this.LSBBBUSSFileList= this.LSBBBUSSFileListSub, + this.QTWJBUSSFileList= this.QTWJBUSSFileListSub, + this.GLWJBUSSFileList= this.GLWJBUSSFileListSub, + this.summaryFileList= this.summaryFileListSub, + this.madelSubList= this.madelSubListSub + } }, watch: { form: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue index 99cf86ee4..d98190ffd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -629,43 +629,53 @@ this.modelOptions = res.data }) }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + console.log(res) + if(res && res.data){ + this.countryOptions = res.data.COUNTRY + this.applyCountryOptions = res.data.COUNTRY + this.regionOptions = res.data.REGION // 区域 + this.standStateOptions = res.data.BUSSSTATE + this.energyKindOptions = res.data.ENERGYTYPES + this.standGeneraOptions = res.data.BUSSBIGCLASS + this.standSubclassOptions = res.data.BUSSFINECLASS + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.nylxOptions = res.data.NYLXCLASS // 能源类型 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 + + this.$emit('emitDataLoading',false) + } + }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { - console.log(this.form.infoList) - console.log(this.form) - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() + this.getDataAsync() } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue index 605dbfc02..635047f5a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue @@ -633,43 +633,53 @@ this.modelOptions = res.data }) }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + console.log(res) + if(res && res.data){ + this.countryOptions = res.data.COUNTRY + this.applyCountryOptions = res.data.COUNTRY + this.regionOptions = res.data.REGION // 区域 + this.standStateOptions = res.data.BUSSSTATE + this.energyKindOptions = res.data.ENERGYTYPES + this.standGeneraOptions = res.data.BUSSBIGCLASS + this.standSubclassOptions = res.data.BUSSFINECLASS + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.nylxOptions = res.data.NYLXCLASS // 能源类型 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 + + this.$emit('emitDataLoading',false) + } + }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { - console.log(this.form.infoList) - console.log(this.form) - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() + this.getDataAsync() } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index 8d1da5cdd..b357f6286 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -28,6 +28,7 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" + @emitDataLoading="emitDataLoading" >
@@ -562,6 +563,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -647,6 +649,7 @@ loading: false, drawerModal: false, assigneeNewLoading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -934,7 +937,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1047,6 +1049,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2293,12 +2298,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i
@@ -563,6 +564,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -648,6 +650,7 @@ loading: false, drawerModal: false, assigneeNewLoading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -935,7 +938,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1048,6 +1050,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2294,12 +2299,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i
@@ -562,6 +563,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -647,6 +649,7 @@ loading: false, drawerModal: false, assigneeNewLoading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -934,7 +937,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1047,6 +1049,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2293,12 +2298,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + 正在加载数据 @@ -662,6 +664,7 @@ }, taskInfo:'发布', loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -975,7 +978,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1156,6 +1158,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue index 943a4594b..1e75b77c8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -29,6 +29,7 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" + @emitDataLoading="emitDataLoading" >
@@ -549,6 +550,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -647,8 +649,9 @@ }] }, loading: false, + dataLoading: true, disabledState: true, - taskInfo:'标准法规工程师复审', + taskInfo:'抄送', userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -996,7 +999,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1109,6 +1111,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, filterData2(){ let spanOneArr = [] let concatOne = 0 @@ -2396,12 +2401,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + :verifySarStandard = "verifySarStandard" + @emitDataLoading="emitDataLoading">
@@ -560,6 +561,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -646,6 +648,7 @@ taskInfo:'', loading: false, disabledState: true, + dataLoading: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -1050,6 +1053,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2351,12 +2357,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + 正在加载数据 @@ -706,6 +708,7 @@ }, taskInfo:'企标编写汇总', loading: false, + dataLoading: true, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1001,7 +1004,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1202,6 +1204,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index 6519cf072..a59798972 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -27,7 +27,8 @@ :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" - :verifySarStandard = "verifySarStandard"> + :verifySarStandard = "verifySarStandard" + @emitDataLoading="emitDataLoading">
@@ -561,6 +562,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -646,6 +648,7 @@ loading: false, drawerModal: false, assigneeNewLoading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -934,7 +937,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1047,6 +1049,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2293,12 +2298,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + :verifySarStandard = "verifySarStandard" + @emitDataLoading="emitDataLoading">
@@ -706,6 +707,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -828,6 +830,7 @@ showDrawer:false, taskInfo: '征求意见', loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, userName:this.$store.getters.userInfo.userName, @@ -1155,7 +1158,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1271,6 +1273,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, previewShow(attId) { this.iframeLoading = true return new Promise((resolve, reject) => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 87870c844..1bc1ffe3c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -32,6 +32,7 @@ :fileMadelSub = "fileMadel" :fbgDown = "true" @formCancel="formCancel" + @emitDataLoading="emitDataLoading" @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" @@ -691,6 +692,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> + 正在加载数据 @@ -776,6 +778,7 @@ }, taskInfo:'意见汇总修订', loading: false, + dataLoading: true, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1075,7 +1078,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1294,6 +1296,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 6b3216c5e..f72c600cb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -30,6 +30,7 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" + @emitDataLoading="emitDataLoading" >
@@ -563,6 +564,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -666,6 +668,7 @@ }] }, loading: false, + dataLoading: true, disabledState: true, taskInfo:'标准化复审', userId:this.$store.getters.userInfo.userId, @@ -964,7 +967,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1077,6 +1079,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, filterData2(){ let spanOneArr = [] let concatOne = 0 @@ -2396,12 +2401,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i
@@ -563,6 +564,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -648,6 +650,7 @@ loading: false, drawerModal: false, assigneeNewLoading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -935,7 +938,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1048,6 +1050,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2294,12 +2299,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i
@@ -563,6 +564,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -648,6 +650,7 @@ loading: false, drawerModal: false, assigneeNewLoading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -935,7 +938,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1048,6 +1050,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2294,12 +2299,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + 正在加载数据 @@ -706,6 +708,7 @@ }, taskInfo:'重新企标编写汇总', loading: false, + dataLoading: true, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1001,7 +1004,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1203,6 +1205,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index f953e1939..eab0cd50b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -32,6 +32,7 @@ :fileMadelSub = "fileMadel" :fbgDown = "true" @formCancel="formCancel" + @emitDataLoading="emitDataLoading" @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" @@ -691,6 +692,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> + 正在加载数据 @@ -776,6 +778,7 @@ }, taskInfo:'重新意见汇总修订', loading: false, + dataLoading: true, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1075,7 +1078,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1294,6 +1296,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue index d0db542be..8cd8bcd82 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -28,6 +28,7 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" + @emitDataLoading="emitDataLoading" > @@ -558,6 +559,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -636,6 +638,7 @@ }] }, loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -912,7 +915,6 @@ ], standYear: [ { required: true, message: '请输入标准年份'}, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, @@ -1025,6 +1027,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2226,12 +2231,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i @@ -916,50 +916,64 @@ export default { this.modelOptions = res.data }) }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + console.log(res) + if(res && res.data){ + this.countryOptions = res.data.COUNTRY + this.applyCountryOptions = res.data.COUNTRY + this.regionOptions = res.data.REGION // 区域 + this.standStateOptions = res.data.BUSSSTATE + this.energyKindOptions = res.data.ENERGYTYPES + this.standGeneraOptions = res.data.BUSSBIGCLASS + this.standSubclassOptions = res.data.BUSSFINECLASS + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.nylxOptions = res.data.NYLXCLASS // 能源类型 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 + + this.$emit('emitDataLoading',false) + } + }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { - this.form = this.formSub, - console.log(this.form) - this.FBGBUSSFileList= this.FBGBUSSFileListSub, - this.BZSMBUSSFileList= this.BZSMBUSSFileListSub, - this.LSBBBUSSFileList= this.LSBBBUSSFileListSub, - this.QTWJBUSSFileList= this.QTWJBUSSFileListSub, - this.GLWJBUSSFileList= this.GLWJBUSSFileListSub, - this.summaryFileList= this.summaryFileListSub, - this.madelSubList= this.madelSubListSub, - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() + if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){ + this.getDataAsync() + this.form = this.formSub + console.log(this.form) + this.FBGBUSSFileList= this.FBGBUSSFileListSub + this.BZSMBUSSFileList= this.BZSMBUSSFileListSub + this.LSBBBUSSFileList= this.LSBBBUSSFileListSub + this.QTWJBUSSFileList= this.QTWJBUSSFileListSub + this.GLWJBUSSFileList= this.GLWJBUSSFileListSub + this.summaryFileList= this.summaryFileListSub + this.madelSubList= this.madelSubListSub + } }, watch: { form: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 773c033aa..1d81ef1d3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -606,43 +606,53 @@ export default { this.modelOptions = res.data }) }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + console.log(res) + if(res && res.data){ + this.countryOptions = res.data.COUNTRY + this.applyCountryOptions = res.data.COUNTRY + this.regionOptions = res.data.REGION // 区域 + this.standStateOptions = res.data.BUSSSTATE + this.energyKindOptions = res.data.ENERGYTYPES + this.standGeneraOptions = res.data.BUSSBIGCLASS + this.standSubclassOptions = res.data.BUSSFINECLASS + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.nylxOptions = res.data.NYLXCLASS // 能源类型 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 + + this.$emit('emitDataLoading',false) + } + }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { - console.log(this.form.infoList) - console.log(this.form) - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() + this.getDataAsync() } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue index c15b6b780..5da7364f7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue @@ -616,43 +616,53 @@ this.modelOptions = res.data }) }, + async getDataAsync(){ + let res = await this.getDicTypeListCode() + console.log(res) + if(res && res.data){ + this.countryOptions = res.data.COUNTRY + this.applyCountryOptions = res.data.COUNTRY + this.regionOptions = res.data.REGION // 区域 + this.standStateOptions = res.data.BUSSSTATE + this.energyKindOptions = res.data.ENERGYTYPES + this.standGeneraOptions = res.data.BUSSBIGCLASS + this.standSubclassOptions = res.data.BUSSFINECLASS + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.nylxOptions = res.data.NYLXCLASS // 能源类型 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 + + this.$emit('emitDataLoading',false) + } + }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { - console.log(this.form.infoList) - console.log(this.form) - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() + this.getDataAsync() } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 02e6e0f97..32eeba398 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -29,6 +29,7 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" + @emitDataLoading="emitDataLoading" >
@@ -571,6 +572,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -649,6 +651,7 @@ }] }, loading: false, + dataLoading: true, drawerModal: false, assigneeNewLoading: false, disabledState: true, @@ -1061,6 +1064,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2291,12 +2297,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i
@@ -571,6 +572,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -649,6 +651,7 @@ }] }, loading: false, + dataLoading: true, drawerModal: false, assigneeNewLoading: false, disabledState: true, @@ -1060,6 +1063,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2290,12 +2296,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + 正在加载数据 @@ -656,6 +658,7 @@ }] }, loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1133,6 +1136,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) { this.form = form this.FBGBUSSFileList = list1 @@ -2457,12 +2463,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + 正在加载数据 @@ -657,6 +659,7 @@ }] }, loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1137,6 +1140,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) { this.form = form this.FBGBUSSFileList = list1 @@ -2474,12 +2480,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + :verifySarStandard = "verifySarStandard" + @emitDataLoading="emitDataLoading">
@@ -685,6 +686,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -765,6 +767,7 @@ }, taskInfo:'', loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1177,6 +1180,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, ccc(row){ this.form.evaluationData = [] this.form.evaluationData = JSON.parse(row.mesg) @@ -2598,12 +2604,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index c347d43fd..65de23ecb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -31,6 +31,7 @@ :fileMadelSub = "fileMadel" :fbgDown = "false" @formCancel="formCancel" + @emitDataLoading="emitDataLoading" @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" @@ -623,6 +624,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -702,6 +704,7 @@ }] }, taskInfo:'企标编写汇总', + dataLoading: true, loading: false, disabledState: false, userId:this.$store.getters.userInfo.userId, @@ -1175,6 +1178,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { this.form = form this.FBGBUSSFileList = list1 @@ -2510,7 +2516,6 @@ this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id - this.formKey++ }) }, assemble(ids,names){ @@ -2584,43 +2589,21 @@ }) }) }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { this.getTaskId() this.getData() this.processTable() - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 65ad1999a..4447e1332 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -26,7 +26,8 @@ :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" - :verifySarStandard = "verifySarStandard"> + :verifySarStandard = "verifySarStandard" + @emitDataLoading="emitDataLoading">
@@ -569,6 +570,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -647,6 +649,7 @@ }] }, loading: false, + dataLoading: true, drawerModal: false, assigneeNewLoading: false, disabledState: true, @@ -1056,6 +1059,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2302,12 +2308,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + :verifySarStandard = "verifySarStandard" + @emitDataLoading="emitDataLoading">
@@ -880,6 +881,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -997,6 +999,7 @@ showDrawer:false, taskInfo: '征求意见', loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, userName:this.$store.getters.userInfo.userName, @@ -1432,6 +1435,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, previewShow(attId) { this.iframeLoading = true return new Promise((resolve, reject) => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 1a5eb05ce..1838ff59b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -160,6 +160,7 @@ :fileMadelSub = "fileMadel" :fbgDown = "true" @formCancel="formCancel" + @emitDataLoading="emitDataLoading" @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" @@ -826,6 +827,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -935,6 +937,7 @@ }, taskInfo:'技术委员会评审、评审意见修改', loading: false, + dataLoading: true, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1521,6 +1524,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index fe18e335f..e659ca0d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -158,6 +158,7 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" + @emitDataLoading="emitDataLoading" > @@ -669,6 +670,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -767,6 +769,7 @@ }] }, loading: false, + dataLoading: true, disabledState: true, taskInfo:'标准化复审', userId:this.$store.getters.userInfo.userId, @@ -1187,6 +1190,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, filterData2(){ let spanOneArr = [] let concatOne = 0 @@ -2518,12 +2524,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i
@@ -490,6 +491,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据
@@ -588,6 +590,7 @@ }] }, loading: false, + dataLoading: true, drawerModal: false, taskInfo:'起草单位高级经理审核', assigneeNewLoading: false, @@ -1011,6 +1014,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, filterData2(){ let spanOneArr = [] let concatOne = 0 @@ -2328,12 +2334,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i @@ -680,6 +681,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -778,6 +780,7 @@ }] }, loading: false, + dataLoading: true, drawerModal: false, taskInfo:'标准法规部高级经理审核', assigneeNewLoading: false, @@ -1202,6 +1205,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, filterTwoTitle(row){ if(row.twoIndexTitle && row.twoIndexTitle.indexOf("%") === -1 && row.twoIndexTitle !== "创新性" && row.twoIndexTitle !== "经济效益" && row.twoIndexTitle !== "社会效益" ){ return row.twoIndexTitle + '%' @@ -2570,12 +2576,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i + 正在加载数据 @@ -778,6 +780,7 @@ }] }, loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1389,6 +1392,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 0df49118a..8b05dea70 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -31,6 +31,7 @@ :fileMadelSub = "fileMadel" :fbgDown = "false" @formCancel="formCancel" + @emitDataLoading="emitDataLoading" @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" @@ -623,6 +624,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -703,6 +705,7 @@ }, taskInfo:'重新企标编写汇总', loading: false, + dataLoading: true, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1178,6 +1181,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 122c6e717..d0a3799bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -160,6 +160,7 @@ :fileMadelSub = "fileMadel" :fbgDown = "true" @formCancel="formCancel" + @emitDataLoading="emitDataLoading" @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" @@ -826,6 +827,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -935,6 +937,7 @@ }, taskInfo:'重新技术委员会评审、评审意见修改', loading: false, + dataLoading: true, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1521,6 +1524,9 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, + emitDataLoading(boo){ + this.dataLoading = boo + }, formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { this.form = form this.FBGBUSSFileList = list1 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index 151634715..0ae80edc5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -28,6 +28,7 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" + @emitDataLoading="emitDataLoading" > @@ -558,6 +559,7 @@ :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + 正在加载数据 @@ -636,6 +638,7 @@ }] }, loading: false, + dataLoading: true, disabledState: true, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -1037,6 +1040,9 @@ }, }, methods: { + emitDataLoading(boo){ + this.dataLoading = boo + }, modelProp(row,index){ console.log(row) console.log(index) @@ -2238,12 +2244,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i