diff --git a/public/static/onlyOffice/editor.html b/public/static/onlyOffice/editor.html index 4ff974662..b92157117 100644 --- a/public/static/onlyOffice/editor.html +++ b/public/static/onlyOffice/editor.html @@ -44,8 +44,8 @@ var fileSuffix = GetQueryValue('fileType') // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation var documentType = '' - var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT']; - var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX']; + var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT']; + var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX']; var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX']; arr_data_ppt.find(function(value) { @@ -110,7 +110,7 @@ "documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation "editorConfig": { // 此处配置回调地址 - "callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, + "callbackUrl": `https://srms.foton.com.cn/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, "mode":"edit", "lang":"zh-CN", // "customization": { diff --git a/public/static/onlyOffice/onlinePreview.html b/public/static/onlyOffice/onlinePreview.html index 013abf4a9..897dd02a4 100644 --- a/public/static/onlyOffice/onlinePreview.html +++ b/public/static/onlyOffice/onlinePreview.html @@ -41,8 +41,8 @@ var fileSuffix = GetQueryValue('fileType') // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation var documentType = '' - var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT']; - var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX']; + var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT']; + var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX']; var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX']; arr_data_ppt.find(function(value) { @@ -107,7 +107,7 @@ "documentType": documentType, "editorConfig": { // 此处配置回调地址 - "callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, + "callbackUrl": `https://srms.foton.com.cn/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`, "mode":"edit", "lang":"zh-CN", // "customization": { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 043a35eef..376fb2101 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -629,6 +629,23 @@ :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"> + + + + @@ -743,7 +760,7 @@ clearable > - + + + + + @@ -1477,6 +1508,7 @@ export default { key1: 2, key2: 3, key3: 4, + key4: 5, treeData: [], // 人员数据 modalShowFlag: false, // drawer开关 modalShowRoleFlag: false, // drawer开关 @@ -1484,6 +1516,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 modalShowRoleFlag5: false, modalShowTree: false, // 归档位置drawer开关 url: '', @@ -1571,7 +1604,8 @@ export default { cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 kccvppscn: '', // 关联模块--卡车vpps中文名称 - dybxh: '', // 模块结构单元变型号 + dybxh: '', // 模块结构单元变型号卡车 + dybxhcar: '', // 模块结构单元变型号乘用车 dymc: '', // 模块结构单元名称 // 关联信息 dtbjh: '', // 代替标准号 @@ -2280,25 +2314,27 @@ export default { }, {}, res => { if (res.ok) { this.treeListOptions = res.data - this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', { - standId: bringData.id, - }, {}, reson => { - if (reson.ok) { - let treeList = '' - let treeListId = '' - reson.data.forEach(item=>{ - this.treeCheckedKeys.push(item.menuId) - if (treeList.length > 0) { - treeList += ',' - treeListId += ',' - } - treeList += item.menuName - treeListId += item.menuId - }) - this.form.treeListName = treeList - this.form.treeListId = treeListId - } - }) + if(bringData.standNumber){ + this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', { + standId: bringData.id, + }, {}, reson => { + if (reson.ok) { + let treeList = '' + let treeListId = '' + reson.data.forEach(item=>{ + this.treeCheckedKeys.push(item.menuId) + if (treeList.length > 0) { + treeList += ',' + treeListId += ',' + } + treeList += item.menuName + treeListId += item.menuId + }) + this.form.treeListName = treeList + this.form.treeListId = treeListId + } + }) + } } }) }, @@ -2459,6 +2495,15 @@ export default { this.urlChild = "sarModelTree/childByList" this.key3++ }, + choiceZRR5(type, title, id) { + this.drawerTitle = title + this.modalShowFlag5 = true + this.url = '' + this.urlChild = '' + this.url = "sarModelTree/listByType" + this.urlChild = "sarModelTree/childByList" + this.key4++ + }, choiceTree(type, title, id) { this.drawerTitle = title @@ -2942,6 +2987,7 @@ export default { }, treeHideCancel() { + this.treeListOptions = [] this.modalShowTree = false }, popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { @@ -2989,9 +3035,24 @@ export default { } }, + popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.dybxhcar = checkedData.map(item => item.model).join(",") + this.form.dymccar = checkedData.map(item => item.name).join(",") + } else { + this.form.dybxhcar = checkedData.model + this.form.dymccar = checkedData.name + } + this.modalShowFlag5 = false + } + }, popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverHideModelCancel2() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 001546aa4..c9dc34bae 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -407,9 +407,12 @@ - + + + + @@ -486,13 +489,20 @@ clearable > - + + + + {{ form.wssmr }} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 4571b8626..d7d84b0f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -370,9 +370,12 @@ - + + + + @@ -449,13 +452,20 @@ clearable > - + + + + {{form.wssmr}} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index f5042d653..caca4b13c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -860,7 +860,7 @@ :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"> - + + + + + @@ -990,7 +1006,7 @@ clearable > - + + + + + @@ -1544,6 +1574,7 @@ export default { key1: 2, key2: 3, key3: 4, + key4: 5, defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], @@ -1553,6 +1584,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 modalShowTree: false, // 归档位置drawer开关 url: '', urlChild: '', @@ -2469,9 +2501,24 @@ export default { } }, + popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.dybxhcar = checkedData.map(item => item.model).join(",") + this.form.dymccar = checkedData.map(item => item.name).join(",") + } else { + this.form.dybxhcar = checkedData.model + this.form.dymccar = checkedData.name + } + this.modalShowFlag5 = false + } + }, popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverHideModelCancel2() { + this.modalShowFlag5 = false + }, processTable() { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 036269fef..f27f578df 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -322,7 +322,7 @@ clearable > - + + + + @@ -406,13 +414,20 @@ clearable > - + + + + diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 15e6262ed..775c6512a 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -584,18 +584,7 @@ @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"> - + + + +