diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 05b9d1b6a..317eab843 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -558,14 +558,19 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } + }, //流程保存事件 handleSave() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index 40748bebc..632619635 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -289,15 +289,18 @@ export default { methods: { // 点击查看 handlePreview(item) { - console.log(item) - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue index f392d5e59..17a4ccf92 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue @@ -260,14 +260,18 @@ export default { }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.standId, - pageType: 'INLAND_STAND' - } - }) - window.open(routeUrl.href, '_blank') + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //获取数据 getData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 992c110ad..c967540c8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -401,14 +401,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 9fddc149a..b96666714 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -399,14 +399,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index bba4ddd89..10d134bd6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -401,14 +401,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index 139895ed7..e07c3d73f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -318,14 +318,18 @@ export default { }, // 点击查看 handlePreview (item) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.standId, - pageType: 'INLAND_STAND' - } - }) - window.open(routeUrl.href, '_blank') + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //获取数据 getData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index a40835243..18180843a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -344,14 +344,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index f6fd8c7e5..7a6509841 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -340,14 +340,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 9ec9a635a..72db29a5f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -250,14 +250,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index aaba103e5..1f0269507 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -604,14 +604,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index a45d42d0f..586efd7db 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -359,14 +359,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index f2cee0352..99393bbe3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -399,14 +399,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 1bc56c492..5ec19a0c2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -401,14 +401,18 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.standId, - pageType: "INLAND_STAND" - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standId){ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.standId, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('当前标准不存在,请检查'); + } }, //查询项目下的标准 getStandData() { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7dbd59c49..5e6ab0b3b 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -177,6 +177,9 @@ size="mini" @click="OCRAdd('2')" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑 + 移动标准 + @@ -1414,6 +1417,32 @@ :data="standSystemOptions" :defaultProps="defaultProps" :nodeKey="nodeKey" @popoverHide="TpopoverHide" @popoverHideCancel="TpopoverHideCancel"> + + +
+ + +
+ +

@@ -2917,6 +2946,7 @@ export default { // 分享数据 resType: '', drawerModal: false, // 分享 + mobileModal: false, // 移动标准 // start 分享相关的 // 消息推送保存对象 personShareEO: { @@ -3317,6 +3347,69 @@ export default { this.productModal = false this.closeDrawer() }, + //节点选中状态发生变化时的回调,当选中另一个后,当前的的节点状态变化也会触发这个事件 + handleCheckChange(item,checked,self){ + if(checked){ + this.editCheckd = item.id + this.$refs.menuTree.setCheckedKeys([item.id]); + // this.nodeClick(item) + }else{ + if(this.editCheckd === item.id){ + this.$refs.menuTree.setCheckedKeys([item.id]); + } + + } + }, + //移动标准 + MobileStandard(){ + let checkedObj = [] + if(this.selectSarMenu.parentId == null || this.selectSarMenu.parentId === '' || this.selectSarMenu.parentId === undefined){ + this.$message.error('请选择二级及以下目录') + }else if (this.selectedList < 1){ + this.$message.error('请至少选择一条标准') + }else { + this.mobileModal = true + } + }, + // 取消 + mobileeCancel() { + let checkedObj = [] + this.$nextTick(() => { + this.$refs.menuTree.setCheckedKeys(checkedObj); + }) + this.editCheckd = '' + this.mobileModal = false + + + }, + // 移动标准提交 + mobileStandardBt(){ + let checkedObj = [] + let search = {} + // 取最外层目录id + search.oldMenuId = this.selectSarMenu.id + search.menuId = this.editCheckd + search.idlist = [] + for (let i = 0; i < this.selectedList.length; i++) { + search.idlist.push(this.selectedList[i]) + } + if(search.menuId == '' || search.menuId == null || search.menuId == undefined){ + this.$message.error('请至少选择一个节点') + }else{ + this.$http.putData('lawss/sarStandMenu/moveStandInfo', search, { + _this: this + }, res => { + // this.$Message.success('取消配置成功!') + this.$nextTick(() => { + this.$refs.menuTree.setCheckedKeys(checkedObj); + }) + this.editCheckd = '' + this.mobileModal = false + this.getDomesticStandardTable() + }, e => { + }) + } + }, // 提交新增/修改 saveProduct(name) { this.$refs[name].validate((valid) => { diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 0141e39a0..7efcf13e7 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -284,6 +284,9 @@ size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;" v-btn-permission="'76742566e1cf930f384ef78cecb86f61'">企标复审计划 + 移动标准 +

@@ -489,6 +492,32 @@ @pageChange="pageChange" @pageSizeChange="pageSizeChange"> 数据获取中
+ + +
+ + +
+ +
{ + this.$http.get('sarResource/ts-resource/getListStandLimitData', { + sorDivide: 'BUSINESS_STAND', + userId: this.$store.getters.userInfo.userId + }, { + _this: this + }, res => { + this.treeList1 = res.data + }) + }) + }, selectMenuList() { return new Promise((resolve, reject) => { this.$http.get('sarResource/ts-resource/getListStandLimitData', { @@ -3192,6 +3236,75 @@ export default { } }) }, + //节点选中状态发生变化时的回调,当选中另一个后,当前的的节点状态变化也会触发这个事件 + handleCheckChange(item,checked,self){ + if(checked){ + console.log(item) + this.editCheckd = item.id + this.NewTreeType = item.treeType + this.$refs.menuTree.setCheckedKeys([item.id]); + // this.nodeClick(item) + }else{ + if(this.editCheckd === item.id){ + this.$refs.menuTree.setCheckedKeys([item.id]); + } + + } + }, + //移动标准 + MobileStandard(){ + let checkedObj = [] + if(this.selectSarMenu.parentId == null || this.selectSarMenu.parentId === '' || this.selectSarMenu.parentId === undefined){ + this.$message.error('请选择二级及以下目录') + }else if (this.selectedList < 1){ + this.$message.error('请至少选择一条标准') + }else { + this.selectMenuListNew1() + this.mobileModal = true + } + }, + // 取消 + mobileeCancel() { + let checkedObj = [] + this.$nextTick(() => { + this.$refs.menuTree.setCheckedKeys(checkedObj); + }) + this.editCheckd = '' + this.mobileModal = false + + + }, + // 移动标准提交 + mobileStandardBt(){ + let checkedObj = [] + let search = {} + // 取最外层目录id + search.oldMenuId = this.selectSarMenu.id + search.menuId = this.editCheckd + search.treeType = this.selectSarMenu.treeType + // search.oldTreeType = this.selectSarMenu.treeType + // search.NewTreeType = this.NewTreeType + search.idlist = [] + for (let i = 0; i < this.selectedList.length; i++) { + search.idlist.push(this.selectedList[i]) + } + if(search.menuId == '' || search.menuId == null || search.menuId == undefined){ + this.$message.error('请至少选择一个节点') + }else{ + this.$http.putData('lawss/sarBussStandMenu/moveStandInfo', search, { + _this: this + }, res => { + // this.$Message.success('取消配置成功!') + this.$nextTick(() => { + this.$refs.menuTree.setCheckedKeys(checkedObj); + }) + this.editCheckd = '' + this.mobileModal = false + this.getBussionStandTable() + }, e => { + }) + } + }, // 树点击 isTreeOk(checkedList) { this.shareStandardSelect = [] diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 4ef729ad8..4d5235c77 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -165,6 +165,9 @@ size="mini" @click="OCRAdd('2')" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑 + 移动标准 + + +
+ + +
+ +
{ + this.$refs.menuTree.setCheckedKeys(checkedObj); + }) + this.editCheckd = '' + this.mobileModal = false + + + }, + // 移动标准提交 + mobileStandardBt(){ + let checkedObj = [] + let search = {} + // 取最外层目录id + search.oldMenuId = this.selectSarMenu.id + search.menuId = this.editCheckd + search.idlist = [] + for (let i = 0; i < this.selectedList.length; i++) { + search.idlist.push(this.selectedList[i]) + } + console.log(search.menuId) + if(search.menuId == '' || search.menuId == null || search.menuId == undefined){ + this.$message.error('请至少选择一个节点') + }else{ + this.$http.putData('lawss/sarStandMenu/moveStandInfo', search, { + _this: this + }, res => { + // this.$Message.success('取消配置成功!') + this.$nextTick(() => { + this.$refs.menuTree.setCheckedKeys(checkedObj); + }) + this.editCheckd = '' + this.mobileModal = false + this.getDomesticStandardTable() + }, e => { + }) + } + }, // 表格排序 sortChange(sortObj) {