+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 清空
+
+
+
+
+
@@ -229,6 +300,7 @@ export default {
name: "bzzqyjStep1",
data() {
return {
+ commentText: '',
textarea: '', // 意见
title: '', // 新增抽屉标题
listModel: false, // 新增抽屉开关
@@ -241,6 +313,17 @@ export default {
endTime: '', // 结束日期
cname: '', // 名称
},
+ formRules: {
+ cid: [
+ { required: true, message: '请输入标准编号', trigger: 'change' },
+ ],
+ endTime: [
+ { required: true, message: '请输入标准结束日期', trigger: 'change' },
+ ],
+ cname: [
+ { required: true, message: '请输入标准名称', trigger: 'change' },
+ ],
+ },
// 标准征求意见数据可库
standCommonlySearch: {
categorg: '',
@@ -259,15 +342,41 @@ export default {
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
- dockUser: '',
- dockUserName: '',
- mainUser: '',
- mainUserName: '',
- engineerUser: '',
- engineerUserName: '',
- checkUser: '',
- checkUserName: '',
- }
+ dockUserList: '',
+ dockUserListName: '',
+ ministerUser: '',
+ ministerUserName: '',
+ directorUser: '',
+ directorUserName: '',
+ presidentUser: '',
+ presidentUserName: '',
+ },
+ roleFormRules: {
+ dockUserList: [
+ { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+ ],
+ ministerUser: [
+ { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+ ],
+ directorUser: [
+ { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+ ],
+ presidentUser: [
+ { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+ ]
+ },
+ treeData: [],
+ nodeList: [],
+ nodeList2: [],
+ type: '',
+ drawerTitle: '',
+ modalshowflag: false,
+ modalshowflag2: false,
+ defaultProps: {
+ children: 'children',
+ label: 'name'
+ },
+ roleRow: {},
}
},
components: {
@@ -276,6 +385,7 @@ export default {
ProcessTitle
},
mounted () {
+ this.getTree()
this.sarStandCompareHis()
this.tableHeight = $('.content').height() - 44
window.onresize = () => {
@@ -287,7 +397,6 @@ export default {
this.title = '标准征求意见库'
this.listModel = true
},
-
/** 标准征求意见库方法*
* **********************************************/
// 清空
@@ -348,7 +457,6 @@ export default {
for (let i = 0; i < this.selectedList.length; i++) {
bringData.push(deposit.get(this.selectedList[i]));
}
- console.log(bringData)
this.form.cid = bringData[0].cid
this.form.cname = bringData[0].cname;
this.form.endTime = bringData[0].endTime;
@@ -360,18 +468,107 @@ export default {
}
},
/*** **********************************************/
-
/** 流程节点负责人的选择 *****************************/
- choiceZRR() {
- // this.choice
+ choiceZRR (type, title, id) {
+ this.nodeList = []
+ this.nodeList.push(id)
+ this.type = type
+ this.drawerTitle = title
+ this.modalshowflag = true
+ },
+ getTree () {
+ this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+ this.treeData = res.data
+ })
+ },
+ saveUserInfo () {
+ 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
+ },
+ 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]
+ }
+ },
+ choiceZRRS () {
+ this.nodeList2 = []
+ if ( this.roleForm.dockUserList.length > 0) {
+ this.nodeList2 = this.roleForm.dockUserList.split(',')
+ }
+ this.modalshowflag2 = true
+ },
+ saveUserInfo2 () {
+ var idList = ''
+ var nameList = ''
+ this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id
+ nameList += item.name
+ })
+ this.roleForm.dockUserList = idList
+ this.roleForm.dockUserListName = nameList
+ this.modalshowflag2 = false
+ },
+ cancleUserInfo2 () {
+ this.modalshowflag2 = false
},
-
handleTabs(name) {
this.active = name
},
- // 流程也的提交按钮和保存按钮操作
handleSave() {},
- handleSubmit() {}
+ handleSubmit() {
+ this.$refs['bzzqyjForm'].validate((valid) => {
+ if (valid) {
+ this.$refs['Form'].validate((valid) => {
+ if (valid) {
+ this.$http.get('lawss/activiti/startProcess', {
+ type: '3'
+ }, {}, res => {
+ if (res.ok) {
+ var json = Object.assign(this.form, this.roleForm)
+ json.commentText = this.commentText
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: res.data,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('流程发起成功')
+ this.$router.push('/processCenter')
+ }
+ })
+ } else {
+ this.$message.warning('流程启动失败')
+ }
+ })
+ } else {
+ return this.$message.warning('请完善人员信息')
+ }
+ })
+ } else {
+ return this.$message.warning('请完善基础信息')
+ }
+ })
+ }
}
}
@@ -412,7 +609,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
- height: calc(~'100% - 103px');
+ height: calc(~'100% - 107px');
overflow: auto;
}
.standardForComments {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 6258074e3..b3580f59a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -1,13 +1,300 @@
-
+
+
+
+ 标准征求意见流程
+ 对接人选择责任人
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
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 @@
@@ -16,18 +15,20 @@
-
-
+
+
+ @click="getTableByPage">
查询
@@ -104,7 +106,12 @@
-
+
{{scope.row.dutyPeople}}
@@ -126,74 +133,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 @@
@@ -15,16 +14,20 @@
-
+
-
+
@@ -35,6 +38,7 @@
:value="false"
>
-
@@ -89,9 +92,21 @@
-
+
- 选择责任人
+
+
+
+
+ 选择
+
@@ -111,74 +126,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 @@
@@ -15,16 +14,20 @@
-
+
-
+
@@ -35,6 +38,7 @@
:value="false"
>
-
+
-
- 上传佐证材料
+
+ 上传佐证材料
@@ -112,74 +132,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 @@
@@ -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/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 3c007c8d7..0bdf9b2ad 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -76,7 +76,12 @@
-
+
+
+
+
@@ -270,12 +275,12 @@
align="center">
@@ -399,32 +404,14 @@ export default {
isSubmit: false,
saveLoading: false,
selectedList: [], //拆分标准的选择框
- dataList:[
- {
- id: 1,
- productLine: '风景线',
- cpxzrr: '李四',
- ffzrr: '张三',
- },
- {
- id: 2,
- productLine: '风景线',
- cpxzrr: '李四',
- ffzrr: '张三',
- }, {
- id: 3,
- productLine: '风景线',
- cpxzrr: '李四',
- ffzrr: '张三',
- },
-
- ],
+ dataList:[],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1,
totalNo: 0,
pageSizeNo: this.$store.getters.userInfo.configContent,
+ product: new Map(),
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
@@ -491,7 +478,20 @@ export default {
},
//确认添加事件
okStand() {
- this.standModel = false
+ if(this.standList.length >= 1){
+ let deposit = new Map();
+ this.sarAccessListDatas.forEach(item => {
+ deposit.set(item.id, item);
+ });
+ let bringData = [];
+ for (let i = 0; i < this.standList.length; i++) {
+ bringData.push(deposit.get(this.standList[i]));
+ }
+ console.log(bringData);
+ this.standModel = false
+ }else{
+ this.$message.warning('请选择一条数据进行添加')
+ }
},
//保存事件
handleSave() {
@@ -581,7 +581,10 @@ export default {
},
//添加产品线select的改变
selectThree(data) {
- this.standList = data;
+ this.standList = [];
+ for(let i=0;i {
+ this.productData = res.data
+ }, e => {
+
+ })
+ },
},
computed: {},
mounted() {
this.getTree();
+ this.getProductData()
}
};
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..b8dc2838e 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -11,7 +11,7 @@
标准发放申请流程
标准清单发布/更新流程
项目合规评估流程
- 未符合项整改流程
+ 未符合项整改流程
@@ -88,7 +88,7 @@ export default {
case '7':
//项目评估流程
this.$router.push({
- name:'xmpgStep1'
+ name: 'xmpgStep1'
})
break
case '8':
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index fe474ca29..5557de462 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -252,6 +252,7 @@ export default {
}
})
}
+ break
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
@@ -343,43 +344,59 @@ export default {
})
}
break;
+ break
+ case '3':
+ if (row.taskInfo === '责任对接人选择责任人') {
+ this.$router.push({
+ name: 'bzzqyjStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
//标准清单更新/发布流程
- case'4' :
- if (row.taskInfo === '进行会签,填写意见') {
- this.$router.push({
- name: 'bzqdfbStep2',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- } else if (row.taskInfo === '根据会签意见修订') {
- this.$router.push({
- name: 'bzqdfbStep3',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- }else if (row.taskInfo === '业务经理审批') {
- this.$router.push({
- name: 'bzqdfbStep4',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- }
- break;
+ case'4' :
+ if (row.taskInfo === '进行会签,填写意见') {
+ this.$router.push({
+ name: 'bzqdfbStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '根据会签意见修订') {
+ this.$router.push({
+ name: 'bzqdfbStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '业务经理审批') {
+ this.$router.push({
+ name: 'bzqdfbStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break;
+ break
//项目合规评估流程
case '5' :
if(row.taskInfo === ''){
@@ -394,6 +411,7 @@ export default {
}
})
}
+ break
}
},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 5be78956f..293b9748f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -189,14 +189,14 @@
清单条目
- 上移
- 下移
删除
+
+
+ 上移
+ 下移
+
+