From 32dc25aad36dd13f9ef9bfe79644cbb9baf52013 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Tue, 6 Dec 2022 11:46:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug-286?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step5.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 9f812fcdf..7766de283 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -1482,6 +1482,7 @@ zrDeptIdName:this.$store.getters.userInfo.institutionName, children:[], }; + if(!this.form.modelData) this.form.modelData=[] this.form.modelData.push(list); this.$message.success("新增成功") this.showForm.modelNum = "" From 15d519c5e4a9493bf0591767414155c73b27f0b0 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Tue, 6 Dec 2022 14:48:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug-285?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbfs/common/formListStep5.vue | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue index 621baa4b9..7dde33af9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue @@ -426,9 +426,15 @@ - + + + + + + + @@ -878,6 +884,25 @@ export default { }) }) }, + cutChinese(str){ + // 截取中文 张兰英(zhanglanying),陈春梅(chenchunmei) => 张兰英,陈春梅 + let result = '', flag = false + if(str){ + for(let i = 0 ; i < str.length ; i++){ + if(str[i]==='('){ + flag = true + i++ + } + if(str[i]===')'){ + flag = false + if(i===str.length-1) break + i++ + } + if(!flag) result+= str[i] + } + } + return result + } }, mounted () { if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){ From b82086c7b1193fb65b58c37d4f1031870ec89e34 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Tue, 6 Dec 2022 15:38:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug-284?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step6.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 588cae0bd..0d663e0b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -263,6 +263,8 @@ show-transfer @transfer="handleTransfer" submitBTNText="同意" + showOver2 + @over2="handleSubmitNo" > Date: Tue, 6 Dec 2022 16:38:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=20=E7=82=B9=E5=87=BB=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 1aa9c3f33..8b0c13312 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2390,17 +2390,26 @@ clearFormData(data) { this.form = { // 基础信息 + standInData: '0', // 标准来源 + standSort: '', // 标准类别 + country: '', // 国家 + standSystem: '', // 标准体系 + standNumber: '', // 标准编号 + standNature: '', // 标准性质 + standEnName: '', // 英文名称 + standName: '', // 中文名称 + signFlag: '1', // 是否需要会签 textStatus: '', // 文本状态 standYear: '', // 标准年份 - standInData: data.standInData ? data.standInData : '0', // 标准类型 - standSort: data.standSort ? data.standSort : '', // 标准类别 - country: data.country ? data.country : '', // 国家 - standSystem: data.standSystem ? data.standSystem : '', // 标准体系 - standNumber: data.standNumber ? data.standNumber : '', // 标准编号 - standNature: data.standNature ? data.standNature : '', // 标准性质 - standEnName: data.standEnName ? data.standEnName : '', // 英文名称 - standName: data.standName ? data.standName : '', // 中文名称 - signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + // standInData: data.standInData ? data.standInData : '0', // 标准类型 + // standSort: data.standSort ? data.standSort : '', // 标准类别 + // country: data.country ? data.country : '', // 国家 + // standSystem: data.standSystem ? data.standSystem : '', // 标准体系 + // standNumber: data.standNumber ? data.standNumber : '', // 标准编号 + // standNature: data.standNature ? data.standNature : '', // 标准性质 + // standEnName: data.standEnName ? data.standEnName : '', // 英文名称 + // standName: data.standName ? data.standName : '', // 中文名称 + // signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 issueTime: '', // 发布时间 isRelateAccess: '', // 是否纳入认证清单 standSystemName: '',// 标准体系名称 @@ -2465,6 +2474,20 @@ treeListName: '' } // 标准信息 }, + clearFileListData(){ + // 文本信息文件 + this.xgdFileList =[] // 修改单 + this.FBGBJBDFileList=[]//发布稿 原文 + this.FBGYWBDFileList=[]// 发布稿 译文 + this.ssgFileList=[]// 送审稿 + this.caFileList=[]// 草案 + this.zbjbdFileList=[]// 增补件 + this.xdbFileList=[]//修订本 + this.kwjFileList=[]// 勘误件 + this.jdwjFileList=[]//相关文件 + this.bpgFileList=[]//报批稿 + this.zqyjgFileList=[]//征求意见稿 + }, handleProcessStandardNext(status) { this.submitType = status switch (status) { @@ -2475,7 +2498,9 @@ this.standardCheckedList = [] this.standardDrawer = false this.verifySarStandard = true - this.clearFormData(this.form) + // this.clearFormData(this.form) + this.clearFormData() + this.clearFileListData() break // 带入（确认） case 2: From 1788c3acbc31ce9241aa4313767e36a183718623 Mon Sep 17 00:00:00 2001 From: zeng yuneng Date: Wed, 7 Dec 2022 11:37:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9tree?= =?UTF-8?q?=E6=B8=B2=E6=9F=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/roleTree/index.vue | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index a90e71c3b..5bf1d07fc 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -26,6 +26,7 @@
+ {{ node.label }} + + :lazy="false" + :key="treeKey"> {{ node.label }} @@ -113,7 +116,7 @@ props: { checkBox: { // 单选/多选 type: Boolean, - default: false, + default: false,//默认false多选 }, isTitle: { // 标题 type: String @@ -135,16 +138,17 @@ }, data () { return { - defaultKey: [], + treeKey:1, + defaultKey: [],//默认展开的节点的 key 的数组 visible: false, selectList: [], - nodeList2: [], + nodeList2: [],//默认勾选的节点的 key 的数组 delList: [], roleList: [], filterText: '', - defaultProps: { - children: 'children', - label: 'name', + defaultProps: {//配置选项 + children: 'children',//指定子树为节点对象的某个属性值 + label: 'name',//指定节点标签为节点对象的某个属性值 }, treeData1: [], treeData: [], @@ -198,8 +202,9 @@ ) }, searchChange(){ + // 查询 if (this.filterText.length) { - this.open1 = false + this.open1 = false // 显示第二个tree this.treeLoading = true this.defaultKey = [] this.$http.get('SarInstitution/institution/getNextTwo', { @@ -211,8 +216,7 @@ }) this.treeLoading = false }) - - + // this.treeKey++ // this.$http.get('SarInstitution/institution/institutionAndUser', { @@ -265,6 +269,7 @@ } }, checkChange (row, type, c) { + //节点选中状态发生变化时的回调(传递给 data 属性的数组中该节点所对应的对象、节点本身是否被选中、节点的子树中是否有被选中的节点) if (this.checkBox) { } else { if (type) { @@ -328,7 +333,8 @@ } this.open1 = true }, - drawerCheck (data) { + drawerCheck (data) {//当复选框被点击的时候触发 + //共两个参数，依次为：传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象，包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性 if (this.checkBox) { // 单选 // 单选判断 let getlist = this.$refs.tree.getCheckedNodes() @@ -363,6 +369,7 @@ } }, loadNode(node, resolve) { + //加载子树数据的方法，仅当 lazy 属性为true 时生效 if (node.level === 0) { return resolve(this.treeData); }