From 89590874c23d7c89c772702c7af88ca0b6e9cd9f Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Sun, 9 Oct 2022 14:08:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Q/QCBFC=20=E5=BC=80=E5=A4=B4=E7=9A=84?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=B2=A1=E6=9C=89=E7=A9=BA=E6=A0=BC=EF=BC=8C?= =?UTF-8?q?=E5=85=B6=E4=BD=99=E7=9A=84=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index dba33210a..0141e39a0 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4010,7 +4010,11 @@ export default { if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') { nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss') } - nowstandinfo.standCode = nowstandinfo.standSort+""+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + if (nowstandinfo.standSort === 'Q/QCBFC'){ + nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + }else{ + nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + } this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, { _this: this, loading: 'isSubmit' From 58f621d9a1889f584180b65df0dc207908d0e5c1 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Sun, 9 Oct 2022 16:04:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E5=A4=9C=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 34221a9fc..9bfe22583 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -915,7 +915,7 @@ type="primary" class="common-button-primary" size="small" - @click="handleSearchStandard"> + @click="handleStandardPageChange(1)"> 查询 From c40520c88f6348c9f36fb4b86371fb473c5a6cad Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 9 Oct 2022 18:17:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 93 +++++++++++++++ .../components/EnterpriseStandardDatabase.vue | 112 ++++++++++++++++++ .../foreignStandardsAndRegulations/index.vue | 95 +++++++++++++++ 3 files changed, 300 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 48221be2e..d800ef135 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 f938f2acb..8eb6c1166 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,74 @@ 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.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.getDomesticStandardTable() + }, e => { + }) + } + }, // 树点击 isTreeOk(checkedList) { this.shareStandardSelect = [] diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 74572a5e1..16c38c177 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) { From d76dbef29681e8154529684c42bf0584e209be58 Mon Sep 17 00:00:00 2001 From: liyawei Date: Sun, 9 Oct 2022 20:48:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=8A=A8=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../components/EnterpriseStandardDatabase.vue | 5 +++-- .../foreignStandardsAndRegulations/index.vue | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a5883135d..5e6ab0b3b 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -177,7 +177,7 @@ size="mini" @click="OCRAdd('2')" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑 - 移动标准 diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index ac9ebe70c..66e8b4028 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -284,7 +284,7 @@ size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;" v-btn-permission="'76742566e1cf930f384ef78cecb86f61'">企标复审计划 - 移动标准 @@ -3281,6 +3281,7 @@ export default { // 取最外层目录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 = [] @@ -3299,7 +3300,7 @@ export default { }) this.editCheckd = '' this.mobileModal = false - this.getDomesticStandardTable() + this.getBussionStandTable() }, e => { }) } diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 96cefb965..4d5235c77 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -165,7 +165,7 @@ size="mini" @click="OCRAdd('2')" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑 - 移动标准