@@ -120,19 +120,19 @@
- 查看
- 删除
- 分享
+ 查看
+ 删除
+ 分享
收藏
取消收藏
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..2b5fcdb56 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -6,7 +6,6 @@
{
- this.myLoading.loadData = false
- this.nonList = res.data.records
- this.total = res.data.total
- }, e => {
- this.myLoading.loadData = false
- })
- },
// 批量选择分发责任人
dutyEngineerList() {
@@ -398,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) {
@@ -429,27 +337,15 @@ 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()
},
// 清空 查询条件
clearAllSearch (search = true) {
@@ -513,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 ea7b9bd79..2f2b95286 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -6,7 +6,6 @@
{
- 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) {
@@ -331,14 +250,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) {
@@ -350,26 +261,15 @@ export default {
},
// 流程节点负责人抽屉保存按钮
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
- }
+ // 选择责任人时input框内值
+ this.newDataList.dutyPeople = this.roleRow.name
this.modalshowflag = false
},
// 流程节点负责人抽屉取消按钮
cancleUserInfo () {
this.modalshowflag = false
},
- //未整改项抽屉中的查询按钮
+ //查询按钮
getTableByPage() {
},
// 清空 查询条件
@@ -434,19 +334,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/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index c95f7e89c..8641d0257 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -6,7 +6,6 @@
-
-
-
-
-
@@ -247,7 +173,8 @@ export default {
itemsName: '1',
planCloseTime: '1',
responsibleUnit: '1',
- dutyEngineer: '1'
+ dutyEngineer: '1',
+ dutyPeople: '13123'
},{
standId: '',
productName: '',
@@ -255,38 +182,19 @@ 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,
- },
- roleFormRules: {
- },
- nodeList: [],
- drawerTitle: '', //drawer标题
- modalshowflag: false, // drawer开关
- treeData: [], // 人员数据
- defaultProps: {
- children: 'children',
- label: 'name'
- },
}
},
components: {
@@ -297,78 +205,36 @@ 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() {},
// 提交按钮
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() {
},
@@ -434,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 @@
-
-
-
-
-
@@ -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 @@
-
-
基础信息
- 流程信息
@@ -16,18 +15,20 @@
-
-
+
+
+ @click="getTableByPage">
查询
@@ -104,7 +106,12 @@
-
+
{{scope.row.dutyPeople}}
@@ -126,74 +133,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 流程发起人
-
-
-
-
- 标准法规工程师
-
-
-
-
-
- 分发责任人
-
-
-
-
- 负责人
-
-
-
-
- 分发责任人
-
-
-
-
- 基础信息
- 流程信息
@@ -15,16 +14,20 @@
-
+
-
+
@@ -35,6 +38,7 @@
:value="false"
>
-
@@ -89,9 +92,21 @@
-
+
- 选择责任人
+
@@ -111,74 +126,6 @@
-
+
+
+
+ 选择
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 流程发起人
-
-
-
-
- 标准法规工程师
-
-
-
-
-
- 分发责任人
-
-
-
-
- 负责人
-
-
-
-
- 分发责任人
-
-
-
-
- 基础信息
- 流程信息
@@ -15,16 +14,20 @@
-
+
-
+
@@ -35,6 +38,7 @@
:value="false"
>
-
+
-
- 上传佐证材料
+
+ 上传佐证材料
@@ -112,74 +132,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 流程发起人
-
-
-
-
- 标准法规工程师
-
-
-
-
-
- 分发责任人
-
-
-
-
- 负责人
-
-
-
-
- 分发责任人
-
-
-
-
- 基础信息
- 流程信息
@@ -15,16 +14,20 @@
-
+
-
+
@@ -35,6 +38,7 @@
:value="false"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 流程发起人
-
-
-
-
- 标准法规工程师
-
-
-
-
-
- 分发责任人
-
-
-
-
- 负责人
-
-
-
-
- 分发责任人
-
-
-
-
-
-
-
- 标准征求意见流程
- 申请人发起流程
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/router/index.js b/src/router/index.js
index 6b1656014..d1c395fcf 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: '标准征求意见流程'
- }
- },
]
},
// 本地工具
-
- 基础信息
- 流程信息
-
-
-
-
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 流程发起人
-
-
-
- 责任对接人
-
-
-
-
-
- 责任人
-
-
-
- 标准法规工程师
-
-
-
- 责任对接人,标准法规部部门负责人
-
-
-
-