From f976fb4ecd010431848b78af7e2a5054171f6aa8 Mon Sep 17 00:00:00 2001 From: duanwenbin <12345678> Date: Thu, 8 Jul 2021 15:59:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9=EF=BC=8C=E5=B0=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standContrast/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue index eed9456a1..cbf624ed1 100644 --- a/src/pages/localTool/standContrast/index.vue +++ b/src/pages/localTool/standContrast/index.vue @@ -31,8 +31,8 @@
- 比对 - 批量删除 + 比对 + 批量删除
@@ -120,19 +120,19 @@ - 查看 - 删除 - 分享 + 查看 + 删除 + 分享 收藏 取消收藏 From 70f0dffef046cf1f6cfd28558d08e0afdee605e1 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 8 Jul 2021 16:32:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 25 ++---- .../pages/creatProcess/wfhxzg/step2.vue | 19 ++++- .../pages/creatProcess/wfhxzg/step3.vue | 79 +++++++++-------- .../pages/creatProcess/wfhxzg/step4.vue | 84 +++++++++++-------- 4 files changed, 116 insertions(+), 91 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 1f8c0c162..6007a1d32 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -198,7 +198,7 @@ height="100%" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - @selection-change="selectThree" + @selection-change="selectedChange" > @@ -316,6 +316,9 @@ export default { ProcessFooter, ProcessTitle }, + mounted () { + this.getTree() + }, methods: { //点击新增事件 addList() { @@ -367,27 +370,15 @@ export default { //未符合项整合确定事件 OkDrawer() { if (this.selectedList.length !== 0) { - let deposit = new Map(); - this.unqualidiedData.forEach(item => { - deposit.set(item.id, item); - }); - let bringData = []; - for (let i = 0; i < this.selectedList.length; i++) { - bringData.push(deposit.get(this.selectedList[i])); - } - this.dataList.standId = bringData[0].standId - this.dataList.productName = bringData[0].productName; - this.dataList.itemsNum = bringData[0].itemsNum; - this.dataList.itemsName = bringData[0].itemsName; - this.dataList.planCloseTime = bringData[0].planCloseTime; - this.dataList.responsibleUnit = bringData[0].responsibleUnit; - this.dataList.dutyEngineer = bringData[0].dutyEngineer; + this.dataList = this.selectedList this.ListModel = false; } else { this.$message.warning("请选择至少一条数据进行带入"); } }, - selectThree() {}, + selectedChange(val) { + this.selectedList = val + }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index de7d8b846..1b615d619 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -16,18 +16,20 @@ - - + + + @click="getTableByPage"> 查询 @@ -104,7 +107,12 @@ @@ -429,6 +437,8 @@ export default { this.multipleSelection = [] this.$refs.multipleTable.clearSelection(); } + + if (this.type === 'dockUser') { this.roleForm.dockUser = this.roleRow.id this.roleForm.dockUserName = this.roleRow.name @@ -450,6 +460,7 @@ export default { }, //未整改项抽屉中的查询按钮 getTableByPage() { + this.getData() }, // 清空 查询条件 clearAllSearch (search = true) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index ea7b9bd79..52bbaa3b1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -15,16 +15,20 @@ - + - + @@ -35,6 +39,7 @@ :value="false" > - @@ -89,9 +93,21 @@ - + @@ -246,7 +262,8 @@ export default { itemsName: '1', planCloseTime: '1', responsibleUnit: '1', - dutyEngineer: '1' + dutyEngineer: '1', + dutyPeople: '13123' },{ standId: '', productName: '', @@ -254,12 +271,11 @@ export default { itemsName: '', planCloseTime: '', responsibleUnit: '', - dutyEngineer: '' + dutyEngineer: '', + dutyPeople: '' }], - // 当前页数 - pageNo: 1, - total: 0, - myLoading: false, + newDataList: [], + // 责任部门 zNodesSItem: [], unqualidiedData: [{ @@ -271,7 +287,7 @@ export default { responsibleUnit: '', dutyEngineer: '' }], - selectedList: [], //未整改项的选择框 + roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, @@ -294,26 +310,13 @@ export default { ProcessTitle }, created() { + this.getTree() }, methods: { - getList() { - this.myLoading.loadData = true - this.$http.get('sarStandUnqualified/sar-stand-unqualified', { - ...this.nonConformitySearch, - current: this.pageNo, - size: this.$store.getters.userInfo.configContent - }, { - _this: this - }, res => { - this.myLoading.loadData = false - this.nonList = res.data.records - this.total = res.data.total - }, e => { - this.myLoading.loadData = false - }) - }, - - selectPeople(row) { + // 选择责任人的按钮操作 + selectPeople(val) { + this.newDataList = val + this.nodeList = [] this.modalshowflag = true }, handleTabs(name) { @@ -350,6 +353,10 @@ export default { }, // 流程节点负责人抽屉保存按钮 saveUserInfo () { + // 选择责任人时input框内值 + this.newDataList.dutyPeople = this.roleRow.name + + if (this.type === 'dockUser') { this.roleForm.dockUser = this.roleRow.id this.roleForm.dockUserName = this.roleRow.name diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index c95f7e89c..8495e4b64 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -87,11 +87,27 @@ - + @@ -247,7 +263,8 @@ export default { itemsName: '1', planCloseTime: '1', responsibleUnit: '1', - dutyEngineer: '1' + dutyEngineer: '1', + dutyPeople: '13123' },{ standId: '', productName: '', @@ -255,24 +272,21 @@ export default { itemsName: '', planCloseTime: '', responsibleUnit: '', - dutyEngineer: '' + dutyEngineer: '', + dutyPeople: '13123' }], // 当前页数 pageNo: 1, total: 0, myLoading: false, + // 上传路径 + uploadPath: 'api/att/attFile/upload', + // 上传文件所储存的数组 + uploadFileList: [], // 责任部门 zNodesSItem: [], - unqualidiedData: [{ - standId: '', - productName: '', - itemsNum: '', - itemsName: '', - planCloseTime: '', - responsibleUnit: '', - dutyEngineer: '' - }], - selectedList: [], //未整改项的选择框 + + roleForm: { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, @@ -297,29 +311,31 @@ export default { created() { }, methods: { - getList() { - this.myLoading.loadData = true - this.$http.get('sarStandUnqualified/sar-stand-unqualified', { - ...this.nonConformitySearch, - current: this.pageNo, - size: this.$store.getters.userInfo.configContent - }, { - _this: this - }, res => { - this.myLoading.loadData = false - this.nonList = res.data.records - this.total = res.data.total - }, e => { - this.myLoading.loadData = false - }) - }, - uploadText(row) { - }, + handleTabs(name) { this.active = name }, - + /************ 上传佐证材料 *****************/ + // 上传材料 + handleUpload() {}, + // 文件上传成功 + handleOnsuccess(res, file) { + this.$message.success('上传成功!') + console.log(file) + }, + // 文件上传失败后回调 + handleOnError(res, file) {}, + // 文件上传限制条件 + handleBeforeUpload() {}, + // 移除上传的文件 + handleBeforeRemove() {}, + handleOnRemove() {}, + // 文件超过限制数量提示 + handleExceed() { + this.$message.error(``) + }, + /************ ********* *****************/ // 保存按钮 handleSave() {}, // 提交按钮 From 5595dbf3dc8a58d52e1ccd6078e30ac4208917a5 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 8 Jul 2021 16:55:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step2.vue | 130 +--------- .../pages/creatProcess/wfhxzg/step3.vue | 122 +--------- .../pages/creatProcess/wfhxzg/step4.vue | 189 +-------------- .../pages/creatProcess/wfhxzg/step5.vue | 223 ++--------------- .../pages/creatProcess/zqyj/step1.vue | 225 ------------------ .../processCenter/pages/newProcess/index.vue | 2 +- 6 files changed, 30 insertions(+), 861 deletions(-) delete mode 100644 src/pages/processCenter/pages/creatProcess/zqyj/step1.vue diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 1b615d619..2b5fcdb56 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -6,7 +6,6 @@
基础信息
-
流程信息
@@ -134,74 +133,6 @@
-
-
- - - - - -

流程发起人

-
- - -
-
-
-
- - - -

标准法规工程师

-
- - - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
- - - -

负责人

-
- - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
-
-
-
-
{ - this.myLoading.loadData = false - this.nonList = res.data.records - this.total = res.data.total - }, e => { - this.myLoading.loadData = false - }) - }, // 批量选择分发责任人 dutyEngineerList() { @@ -406,14 +314,6 @@ export default { this.treeData = res.data }) }, - // 流程阶段负责人选择 - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, drawerCheck (data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); if(getlist.length == 1) { @@ -437,28 +337,13 @@ export default { this.multipleSelection = [] this.$refs.multipleTable.clearSelection(); } - - - if (this.type === 'dockUser') { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - } else if (this.type === 'ministerUser') { - this.roleForm.ministerUser = this.roleRow.id - this.roleForm.ministerUserName = this.roleRow.name - } else if (this.type === 'directorUser') { - this.roleForm.directorUser = this.roleRow.id - this.roleForm.directorUserName = this.roleRow.name - } else if (this.type === 'presidentUser') { - this.roleForm.presidentUser = this.roleRow.id - this.roleForm.presidentUserName = this.roleRow.name - } this.modalshowflag = false }, // 流程节点负责人抽屉取消按钮 cancleUserInfo () { this.modalshowflag = false }, - //未整改项抽屉中的查询按钮 + //查询按钮 getTableByPage() { this.getData() }, @@ -524,19 +409,6 @@ export default { justify-content: space-between; height: calc(~'100% - 103px'); overflow: auto; - .tableTitle { - margin-bottom: 10px; - height: 30px; - line-height: 30px; - position: relative; - font-size: 13px; - font-weight: bold; - .tableButton { - position: absolute; - right: 0; - top: 0; - } - } } } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 52bbaa3b1..2f2b95286 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -6,7 +6,6 @@
基础信息
-
流程信息
@@ -127,74 +126,6 @@
-
-
- - - - - -

流程发起人

-
- - -
-
-
-
- - - -

标准法规工程师

-
- - - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
- - - -

负责人

-
- - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 8495e4b64..8641d0257 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -6,7 +6,6 @@
基础信息
-
流程信息
@@ -15,16 +14,20 @@ - + - + @@ -35,6 +38,7 @@ :value="false" >
-
-
- - - - - -

流程发起人

-
- - -
-
-
-
- - - -

标准法规工程师

-
- - - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
- - - -

负责人

-
- - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
-
-
-
-
- - - - -
@@ -285,22 +195,6 @@ export default { uploadFileList: [], // 责任部门 zNodesSItem: [], - - - roleForm: { - startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.userId, - }, - roleFormRules: { - }, - nodeList: [], - drawerTitle: '', //drawer标题 - modalshowflag: false, // drawer开关 - treeData: [], // 人员数据 - defaultProps: { - children: 'children', - label: 'name' - }, } }, components: { @@ -341,50 +235,6 @@ export default { // 提交按钮 handleSubmit() {}, - // 获取流程节点数据 - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, - // 流程阶段负责人选择 - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - // 流程节点负责人抽屉保存按钮 - saveUserInfo () { - if (this.type === 'dockUser') { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - } else if (this.type === 'ministerUser') { - this.roleForm.ministerUser = this.roleRow.id - this.roleForm.ministerUserName = this.roleRow.name - } else if (this.type === 'directorUser') { - this.roleForm.directorUser = this.roleRow.id - this.roleForm.directorUserName = this.roleRow.name - } else if (this.type === 'presidentUser') { - this.roleForm.presidentUser = this.roleRow.id - this.roleForm.presidentUserName = this.roleRow.name - } - this.modalshowflag = false - }, - // 流程节点负责人抽屉取消按钮 - cancleUserInfo () { - this.modalshowflag = false - }, //未整改项抽屉中的查询按钮 getTableByPage() { }, @@ -450,19 +300,6 @@ export default { justify-content: space-between; height: calc(~'100% - 103px'); overflow: auto; - .tableTitle { - margin-bottom: 10px; - height: 30px; - line-height: 30px; - position: relative; - font-size: 13px; - font-weight: bold; - .tableButton { - position: absolute; - right: 0; - top: 0; - } - } } } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 6b4411df1..c157cb998 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -6,7 +6,6 @@
基础信息
-
流程信息
@@ -15,16 +14,20 @@ - + - + @@ -35,6 +38,7 @@ :value="false" >
-
-
- - - - - -

流程发起人

-
- - -
-
-
-
- - - -

标准法规工程师

-
- - - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
- - - -

负责人

-
- - -
-
-
-
- - - -

分发责任人

-
- - -
-
-
-
-
-
-
-
- - - - -
@@ -259,34 +169,9 @@ export default { myLoading: false, // 责任部门 zNodesSItem: [], - unqualidiedData: [{ - standId: '', - productName: '', - itemsNum: '', - itemsName: '', - planCloseTime: '', - responsibleUnit: '', - dutyEngineer: '' - }], - selectedList: [], //未整改项的选择框 - roleForm: { - startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.userId, - }, - roleFormRules: { - }, // 驳回弹窗状态 backDialog: false, - - nodeList: [], - drawerTitle: '', //drawer标题 - modalshowflag: false, // drawer开关 - treeData: [], // 人员数据 - defaultProps: { - children: 'children', - label: 'name' - }, } }, components: { @@ -297,80 +182,13 @@ export default { created() { }, methods: { - getList() { - this.myLoading.loadData = true - this.$http.get('sarStandUnqualified/sar-stand-unqualified', { - ...this.nonConformitySearch, - current: this.pageNo, - size: this.$store.getters.userInfo.configContent - }, { - _this: this - }, res => { - this.myLoading.loadData = false - this.nonList = res.data.records - this.total = res.data.total - }, e => { - this.myLoading.loadData = false - }) - }, - // 批准俺妞妞操作 - handleBack() { - this.backDialog = true - }, - handleSuccess() {}, + handleTabs(name) { this.active = name }, - // 保存按钮 - handleSave() {}, // 提交按钮 handleSubmit() {}, - - // 获取流程节点数据 - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, - // 流程阶段负责人选择 - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - // 流程节点负责人抽屉保存按钮 - saveUserInfo () { - if (this.type === 'dockUser') { - this.roleForm.dockUser = this.roleRow.id - this.roleForm.dockUserName = this.roleRow.name - } else if (this.type === 'ministerUser') { - this.roleForm.ministerUser = this.roleRow.id - this.roleForm.ministerUserName = this.roleRow.name - } else if (this.type === 'directorUser') { - this.roleForm.directorUser = this.roleRow.id - this.roleForm.directorUserName = this.roleRow.name - } else if (this.type === 'presidentUser') { - this.roleForm.presidentUser = this.roleRow.id - this.roleForm.presidentUserName = this.roleRow.name - } - this.modalshowflag = false - }, - // 流程节点负责人抽屉取消按钮 - cancleUserInfo () { - this.modalshowflag = false - }, //未整改项抽屉中的查询按钮 getTableByPage() { }, @@ -436,19 +254,6 @@ export default { justify-content: space-between; height: calc(~'100% - 103px'); overflow: auto; - .tableTitle { - margin-bottom: 10px; - height: 30px; - line-height: 30px; - position: relative; - font-size: 13px; - font-weight: bold; - .tableButton { - position: absolute; - right: 0; - top: 0; - } - } } } diff --git a/src/pages/processCenter/pages/creatProcess/zqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zqyj/step1.vue deleted file mode 100644 index 041e1ceb1..000000000 --- a/src/pages/processCenter/pages/creatProcess/zqyj/step1.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index b9d8407a2..1aadf2757 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -11,7 +11,7 @@
标准发放申请流程
标准清单发布/更新流程
项目合规评估流程
-
未符合项整改流程
+
未符合项整改流程
From 8ce62cf21d4610533c97be634c18592633c51e12 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 8 Jul 2021 16:57:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index f48a856dd..3dabec601 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -501,15 +501,6 @@ const routes = [ title: '标准调研流程' } }, - { - path: '/zqyjStep1', - name: 'zqyjStep1', - component: () => import('@/pages/processCenter/pages/creatProcess/zqyj/step1.vue'), - meta: { - requireAuth: true, - title: '标准征求意见流程' - } - }, ] }, // 本地工具