@@ -244,6 +245,7 @@
:on-success="importFileSuccess2"
:on-remove="importFileRemove2"
:show-file-list="true"
+ :file-list="form.modelList"
>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 999e05d59..2e614ea85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -354,6 +354,7 @@
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
+ :file-list="form.modelList"
>
@@ -787,7 +788,7 @@ export default {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
} else {
- this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任'
+ this.drawerTitle2 = '技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任'
if (this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 679272a01..3e72263b0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -363,6 +363,7 @@
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
+ :file-list="form.modelList"
>
@@ -786,7 +787,7 @@ export default {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
} else {
- this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任'
+ this.drawerTitle2 = '技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任'
if (this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 5f71a91bc..d44502ae5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -903,35 +903,39 @@ export default {
standList.push(item);
}
});
- this.listForm.breakdownList = standList;
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
- this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId;
- this.listForm.commentText = this.commentText;
- this.listForm.approvalOpinion = "";
- this.listForm.signFlag = "";
- const json = JSON.stringify(this.listForm.breakdownList);
- this.isSubmit = true;
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- }, e => {
- });
+ if(standList.length < 1){
+ this.$message.warning('请选择落实人')
+ }else{
+ this.listForm.breakdownList = standList;
+ this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+ this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+ this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+ this.listForm.zrUserId = this.$store.getters.userInfo.userId;
+ this.listForm.commentText = this.commentText;
+ this.listForm.approvalOpinion = "";
+ this.listForm.signFlag = "";
+ const json = JSON.stringify(this.listForm.breakdownList);
+ this.isSubmit = true;
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ }, e => {
+ });
+ }
}
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
- if (getlist.length == 1) {
+ if (getlist.length === 1) {
this.roleRow = getlist[0];
} else {
this.$refs.tree.setCheckedKeys([data.id]);
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
index c2fdb3a50..8fb1ea55b 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
@@ -222,7 +222,7 @@
label="我司在工作组排名顺序"
prop="deptOrder"
align="center"
- width="150">
+ width="170">
@@ -1555,6 +1555,7 @@
this.addForm.wgMeetingInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
+ this.addForm.status = '3'
this.$http.postData('wg_work_group/add', this.addForm, {
_this: this
}, res => {
@@ -1590,7 +1591,7 @@
this.destoryGraph()
this.getData()
} else {
- this.$message.warning('修改失败')
+ // this.$message.warning(res.message)
}
})
}
@@ -1670,6 +1671,7 @@
drawShape: function drawShape(cfg, group) {
const level = cfg.level
const nodeType = cfg.nature
+ const processType = cfg.status
if (nodeType === '0') {
const circle = group.addShape('circle', {
attrs: {
@@ -1760,7 +1762,11 @@
radius: (bbox.height + 12) / 2
});
// 自定义层级颜色
- if (nodeType === '1') {
+ if (processType !== '1') {
+ rect.attr({
+ fill: '#666'
+ });
+ } else if (nodeType === '1') {
rect.attr({
fill: '#1C98B8'
});
@@ -1880,7 +1886,6 @@
graph.setItemState(ce, 'click', false);
});
const edgeItem = e.item; // 获取被点击的边元素对象
- console.log('EdgeClick', edgeItem)
graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
this.handleEdgeClick (edgeItem)
});
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
index 966207c0f..1dc9f030e 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
@@ -222,7 +222,7 @@
label="我司在工作组排名顺序"
prop="deptOrder"
align="center"
- width="150">
+ width="170">
@@ -1411,6 +1411,7 @@
this.addForm.wgMeetingInfos.forEach(item => {
item.joinfile = JSON.stringify(item.joinfile)
})
+ this.addForm.status = '3'
this.$http.postData('wg_work_group/add', this.addForm, {
_this: this
}, res => {
@@ -1446,7 +1447,7 @@
this.destoryGraph()
this.getData()
} else {
- this.$message.warning('修改失败')
+ // this.$message.warning('修改失败')
}
})
}
@@ -1474,7 +1475,6 @@
this.headerNo = true
let row = node._cfg.model
this.addForm.pName = row.name
- console.log(row);
if (row.level === '2') {
this.standId = row.wgStandorpolicyInfos[0].standId
}
@@ -1512,6 +1512,7 @@
drawShape: function drawShape(cfg, group) {
const level = cfg.level
const nodeType = cfg.nature
+ const processType = cfg.status
if (nodeType === '0') {
const circle = group.addShape('circle', {
attrs: {
@@ -1602,7 +1603,11 @@
radius: (bbox.height + 12) / 2
});
// 自定义层级颜色
- if (nodeType === '1') {
+ if (processType !== '1') {
+ rect.attr({
+ fill: '#666'
+ });
+ } else if (nodeType === '1') {
rect.attr({
fill: '#1C98B8'
});
@@ -1722,7 +1727,6 @@
graph.setItemState(ce, 'click', false);
});
const edgeItem = e.item; // 获取被点击的边元素对象
- console.log('EdgeClick', edgeItem)
graph.setItemState(edgeItem, 'click', true); // 设置当前边的 click 状态为 true
this.handleEdgeClick (edgeItem)
});