FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!278
This commit is contained in:
王夏晖
2022-01-04 13:55:54 +08:00
parent 9048bd12c5 e93e07d598
commit 3a00fcf382
9 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standCalendar/index.vue
+2
View File
@@ -505,6 +505,8 @@ export default {
}
this.lastYear = selYear
this.lastMonth = selMonth
// 获取日历变化的日期并显示
this.value = new Date(this.value.setDate(1))
this.value = new Date(this.value.setMonth(this.value.getMonth() - monthNum))
this.value = new Date(this.value.setFullYear(this.value.getFullYear() - yearNum))
},
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+2
View File
@@ -222,6 +222,7 @@
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
:file-list="form.modelList"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -242,6 +243,7 @@
:on-success="importFileSuccess2"
:on-remove="importFileRemove2"
:show-file-list="true"
:file-list="form.fjList"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+2
View File
@@ -224,6 +224,7 @@
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
:file-list="form.fjList"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -244,6 +245,7 @@
:on-success="importFileSuccess2"
:on-remove="importFileRemove2"
:show-file-list="true"
:file-list="form.modelList"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+1 -1
View File
@@ -176,7 +176,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentStep1">
v-model="commentInfo">
</el-input>
</div>
</el-collapse-item>
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+2 -1
View File
@@ -354,6 +354,7 @@
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
:file-list="form.modelList"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -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(',')
}
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+2 -1
View File
@@ -363,6 +363,7 @@
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
:file-list="form.modelList"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -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(',')
}
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+29 -25
View File
@@ -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]);
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+9 -4
View File
@@ -222,7 +222,7 @@
label="我司在工作组排名顺序"
prop="deptOrder"
align="center"
width="150">
width="170">
<template slot-scope="scope">
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
</template>
@@ -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)
});
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+9 -5
View File
@@ -222,7 +222,7 @@
label="我司在工作组排名顺序"
prop="deptOrder"
align="center"
width="150">
width="170">
<template slot-scope="scope">
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.deptOrder"></el-input>
</template>
@@ -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)
});