From 27d4e7c1516f807ab0f751b52806dcc97ca2731e Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 09:00:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug:=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=8A=8A=E8=A2=AB?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=86=E8=BF=99=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 190 +++++------------- 1 file changed, 48 insertions(+), 142 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 5808ce1f2..1a71ac13d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -122,17 +122,12 @@ - - + :nodeKey="nodeKey" @popoverHide="popoverHide"> - - + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> - - + :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> - - + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - - - {{'手动查找'}} - + + + + + + + + + + + + + + @@ -1127,17 +1104,9 @@ import ProcessTitle from '../../components/ProcessTitle' import {saveTaskFirst} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; - import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; export default { name: "bzrkStep1", - components: { - ProcessHeader, - ProcessFooter, - ProcessTitle, - TreeSelect, - TreeSelectNew - }, data () { return { standardDrawer: false, @@ -1222,12 +1191,6 @@ key3:4, treeData: [], // 人员数据 modalShowFlag: false, // drawer开关 - modalShowFlag1: false, // drawer开关 - modalShowFlag2: false, // drawer开关 - modalShowFlag3: false, // drawer开关 - modalShowFlag4: false, // drawer开关 - url:'', - urlChild:'', drawerTitle: '', //drawer标题 nodeKey: 'id', defaultCheckedKeys: [], @@ -1367,9 +1330,7 @@ standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 busVppsOptions: [], // 车系体系架构 - busVppsChildOptions: [], // 车系体系架构子集合 modelOptions: [], // 模块体系架构 - modelChildOptions: [], // 模块体系架构子集合 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 @@ -1437,6 +1398,12 @@ }, }, }, + components: { + ProcessHeader, + ProcessFooter, + ProcessTitle, + TreeSelect + }, methods: { clearFormData(data){ this.form = { @@ -1661,6 +1628,7 @@ this.zrUserIds.push(data) } + console.log(this.zrUserIds) }else { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); if(getlist.length == 1) { @@ -1678,38 +1646,6 @@ this.drawerTitle = title this.modalShowFlag = true }, - choiceZRR1 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag1 = true - this.key++ - }, - choiceZRR2 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag2 = true - this.url = '' - this.urlChild = '' - this.url="sarVppsTree/list" - this.urlChild="sarVppsTree/childByList" - this.key1++ - }, - choiceZRR3 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag3 = true - this.url = '' - this.urlChild = '' - this.url="sarVppsTree/list" - this.urlChild="sarVppsTree/childByList" - this.key2++ - }, - choiceZRR4 (type, title, id) { - this.drawerTitle = title - this.modalShowFlag4 = true - this.url = '' - this.urlChild = '' - this.url="sarModelTree/list" - this.urlChild="sarModelTree/childByList" - this.key3++ - }, getTree () { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { this.treeData = res.data @@ -1953,51 +1889,29 @@ this.fileMadel = true this.fileType = type; }, - popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { + popoverHide (checkedIds, checkedData) { if(checkedData) { - if(checkedData.length > 0){ - this.form.standSystem = checkedData.map(item => item.menuName).join(",") - }else { - this.form.standSystem = checkedData.menuName - } + this.form.standSystem = checkedData.id + this.form.standSystemName = checkedData.menuName } - this.modalShowFlag1 = false }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.cycvppsbm = checkedData.map(item => item.code).join(",") - this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName - } + popoverHideBusVs (checkedIds, checkedData) { + if(checkedData){ + this.form.cycvppsbm = checkedData.code + this.form.cycvppscn = checkedData.chineseName } - this.modalShowFlag2 = false }, - popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.kccvppsbm = checkedData.map(item => item.code).join(",") - this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName - } + popoverHideCarVs (checkedIds, checkedData) { + if(checkedData){ + this.form.kccvppsbm = checkedData.code + this.form.kccvppscn = checkedData.chineseName } - this.modalShowFlag3 = false }, - popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.dybxh = checkedData.map(item => item.model).join(",") - this.form.dymc = checkedData.map(item => item.name).join(",") - }else { - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name - } + popoverHideModel (checkedIds, checkedData) { + if(checkedData){ + this.form.dybxh = checkedData.model + this.form.dymc = checkedData.name } - this.modalShowFlag4 = false }, closeDrawer() { this.ListModel = false @@ -2092,14 +2006,6 @@ this.busVppsOptions = res.data }) }, - busVsChildFunc(id){ - this.$http.get('sarVppsTree/childByList', {id:id}, { - _this: this - }, res => { - this.busVppsChildOptions = [] - this.busVppsChildOptions = res.data - }) - }, modelFunc(){ this.$http.get('sarModelTree/list', '', { _this: this From 7144830d04d495ff6285d0f9015a15f310e6d651 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 22 Jul 2021 09:25:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?bug:=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index fd1aa542f..dd246d9a4 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -764,13 +764,13 @@ + @keyup.enter.native="searchConfiguraStand(true)" clearable> {{ opt.label }} - From add0f76364549b77c89d1f0d04d95e1fa6607a10 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 22 Jul 2021 10:11:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5=E5=AD=98=E5=82=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 5808ce1f2..47e6fdc7c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1285,15 +1285,15 @@ // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 - qcdw: [], // 起草单位 - wssmr: [], // 我司署名人 + qcdw: '', // 起草单位 + wssmr: '', // 我司署名人 cysd: '', // 我司参与深度 - cllx: [], // 适用车型 - nylx: [],// 能源类型 - sycpx: [],// 适用产品线 - syrz: [], // 适用认证 - zrbm: [], // 责任部门 - zrgcs: [], // 责任工程师 + cllx: '', // 适用车型 + nylx: '',// 能源类型 + sycpx: '',// 适用产品线 + syrz: '', // 适用认证 + zrbm: '', // 责任部门 + zrgcs: '', // 责任工程师 cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 @@ -1485,15 +1485,15 @@ // 适用范围 txlb: '', // 体系类别 gkdw: '', // 归口管理部门 - qcdw: [], // 起草单位 - wssmr: [], // 我司署名人 + qcdw: '', // 起草单位 + wssmr: '', // 我司署名人 cysd: '', // 我司参与深度 - cllx: [], // 适用车型 - nylx: [],// 能源类型 - sycpx: [],// 适用产品线 - syrz: [], // 适用认证 - zrbm: [], // 责任部门 - zrgcs: [], // 责任工程师 + cllx: '', // 适用车型 + nylx: '',// 能源类型 + sycpx: '',// 适用产品线 + syrz: '', // 适用认证 + zrbm: '', // 责任部门 + zrgcs: '', // 责任工程师 cycvppsbm: '', // 关联模块--乘用车VPPS编码 cycvppscn: '', // 关联模块--乘用车vpps中文名称 kccvppsbm: '', // 关联模块--卡车VPPS编码 From 6858f5c5b67c72096d130bb595a8bee8c9dc857d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 22 Jul 2021 10:13:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=B9=E8=B1=A1=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/components/ProcessMixin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index ac50a05da..61b1a1d6e 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -22,7 +22,7 @@ export default { }, { label:'标准清单发布/更新流程', - value: '6' + value: '4' }, { label: '项目合规评估流程', From b41cd111c84d90ca39c26e828eea78747759697b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 22 Jul 2021 10:39:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 10 +- .../components/EnterpriseStandardDatabase.vue | 351 ++++++++++++++++-- 2 files changed, 333 insertions(+), 28 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index bbdbd002c..d5b998e22 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -125,11 +125,11 @@ export default { // // // title: '本地产品/项目库', // // // path: '/localProductsOrProjectLibrary' // // // }, - // { - // title: '企业标准库', - // path: '/enterpriseStandardDatabase', - // menuId: '3YVZP8R4TC' - // }, + { + title: '企业标准库', + path: '/enterpriseStandardDatabase', + menuId: '01ed8f752748227777b3572d56ee9ab5' + }, // { // title: '企标制修订计划', // path: '/enterBSysRevPlanManaLib', diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index f29cbcf88..be7ea2547 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4,27 +4,43 @@
- + + + {{ node.label}} + + + 新增 + + + 编辑 + + + 删除 + + + +
@@ -860,6 +876,64 @@ }" @confirm="isTreeOk" > + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 提交 + 取消 +
+
@@ -893,6 +967,60 @@ export default { }, data () { return { + props: { + label: 'menuName', + children: 'children' + }, + productModal: false, // 模态框是否打开 + modalType: '', + productTitle: '', // 模态框标题 + // 规范 + productRules: { + menuName: [ + {required: true, message: '一级菜单不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'} + ], + displaySeq: [ + {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'} + ], + remarks: [ + {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'} + ], + dicTypeName: [ + {required: true, message: '选项不能为空', trigger: 'blur'}, + {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'} + ], + showIndex: [ + {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'} + ], + describes: [ + {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'} + ] + }, + productModelAdd: { + id : "", + sorDivide : "INLAND_STAND", + menuName : "", + parentId : null, + parentIds : null, + parentIdsName : "", + displaySeq : "", + validFlag : "", + creationTime : "", + modifyTime : "", + remarks : "", + children : [], + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: "" + }, + treeList: [], standId: '', visibleOrgTable: false, visibleShare: false, @@ -1423,6 +1551,183 @@ export default { } }, methods: { + closeModal () { + this.productModal = false + this.closeDrawer() + }, + // 提交新增/修改 + saveProduct (name) { + this.$refs[name].validate((valid) => { + if (valid) { + if (this.modalType === 1) { + this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { + _this: this + }, res => { + if (res.ok) { + this.selectMenuList() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + } else { + this.productModal = true + } + }, e => {}) + } else if (this.modalType === 2) { + this.$http.putData('sarResource/ts-resource', this.productModelAdd, { + _this: this + }, res => { + this.selectMenuList() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }, e => { + }) + } + } else { + } + }) + }, + closeDrawer () { + this.$nextTick(() => { + this.$refs['productModelAdd'].resetFields() + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }) + this.productModal = false + }, + // 查询二级菜单 + selectMenuList () { + this.$http.get('sarResource/ts-resource', { + sorDivide: 'BUSINESS_STAND' + }, {}, res => { + if (res.ok) { + this.treeList = res.data + } + }) + }, + // 查询二级菜单 + selectChildMenu (row) { + this.$http.get('sarResource/ts-resource/getMenuById', { + menuId: row.id + }, {}, res => { + if (res.ok) { + if(this.modalType === 1){ + let idsName = "" + if(row.parentIds !== null){ + if(row.parentIds.indexOf(res.data.id) != -1){ + this.productModelAdd.parentIds = row.parentIds + }else { + this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id + idsName = row.parentIdsName + ',' + res.data.menuName + } + }else { + this.productModelAdd.parentIds = res.data.id + idsName = res.data.menuName; + } + this.productModelAdd.parentId = res.data.id + this.productModelAdd.parentIdsName = idsName + this.$forceUpdate() + }else { + this.productModelAdd = res.data + } + } + }) + }, + update(data) { + this.modalType = 2 + this.selectChildMenu(data) + this.productModal = true + this.productTitle = '编辑信息' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + append(data) { + this.modalType = 1 + this.selectChildMenu(data) + this.productModal = true + this.productTitle = '新增下级菜单信息' + this.productModelAdd.dicTypeCode = '' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + remove(node, data) { + this.$confirm('是否删除菜单?', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + roundButton: true, + type: 'warning' + }).then(() => { + this.$http.delete("sarResource/ts-resource", { + resourceId: data.id + }, res => { + }, e => { + if(e.ok){ + this.$message({ + type: 'success', + message: "删除成功" + }) + this.selectMenuList() + }else { + this.$message({ + type: 'warning', + message: e.message + }) + } + }) + }).catch(() => { + this.$refs.selections.clearSelection() + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) + // const parent = node.parent; + // const children = parent.data.children || parent.data; + // const index = children.findIndex(d => d.id === data.id); + // children.splice(index, 1); + }, + // 树节点鼠标移入移出 + mouseenter(data){ + console.log(data) + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } + }, + mouseleave(data){ + this.$set(data, 'show', false) + this.$set(data, 'showDel', false) + }, /** * @description: 起草人名称展示 * @author: chenxiaoxi @@ -3147,7 +3452,7 @@ export default { mounted () { this.treeReload = true // 进入页面后查询树形结构目录 - this.selectMenu() + this.selectMenuList() // 查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -3194,7 +3499,7 @@ export default { height: 100%; //background: #fff; .tree-content { - width: 16%; + width: 20%; position: relative; /*height: 100%;*/ background: #fff; From 6823af0eaaf56b5541a3ee693cb32a989a2b296e Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Thu, 22 Jul 2021 13:22:41 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix(45716=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=EF=BC=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=E5=90=97=EF=BC=8C=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=B9=B4=E6=9C=88=E6=97=A5=20):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 88ed4d9b9..ba58aec42 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -24,8 +24,8 @@ 项目经理: {{ localProEO.projectManager }} - 项目计划开始时间: {{ localProEO.projectStartDate}} - 项目计划完成时间: {{localProEO.projectEndDate }} + 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD')}} + 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }}
@@ -420,7 +420,7 @@ export default { okStand() { let _this = this; if (this.standList.length < 1) { - _this.$message.warning("请选择需要添加进清单的数据"); + _this.$message.warning("请选择标准"); } else { for (let i=0;i