Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -111,9 +111,9 @@
|
||||
style="width: 100%"
|
||||
border
|
||||
@selection-change="selectStandChange"
|
||||
:height="sarProStateTableHeight"
|
||||
height="52%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
@@ -353,6 +353,27 @@
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <ProcessFooter-->
|
||||
<!-- show-submit-->
|
||||
<!-- show-transfer-->
|
||||
<!-- :submitLoading="isSubmit"-->
|
||||
<!-- :transfer-loading="isTransfer"-->
|
||||
<!-- :saveLoading="saveLoading"-->
|
||||
<!-- :approval="true"-->
|
||||
<!-- @back="beforeBack"-->
|
||||
<!-- @transfer="handleTransfer"-->
|
||||
<!-- @submit="handleSubmit"-->
|
||||
<!-- >-->
|
||||
<!-- </ProcessFooter>-->
|
||||
<!-- 福田全公司选人解决方案 -->
|
||||
<Role-tree
|
||||
check-box
|
||||
:is-title="drawerTitle"
|
||||
:is-visible.sync="drawerModal"
|
||||
@checkedRole="checkedTransferRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -360,7 +381,7 @@
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { inboundLiaisonDetail, queryDetail } from "api/process";
|
||||
import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "xmpgStep1-7",
|
||||
@@ -373,6 +394,11 @@ export default {
|
||||
return {
|
||||
//折叠的标志，true为折叠，false为不折叠
|
||||
foldFormFlag: false,
|
||||
nodeList:[],
|
||||
drawerTitle:'',
|
||||
isTransfer: false,
|
||||
// 调整处理人抽屉状态
|
||||
drawerModal: false,
|
||||
detailData: [],
|
||||
sarProStateTableHeight: null, // 项目列表高度
|
||||
// 当前流程类型(1待办/2已办)
|
||||
@@ -451,6 +477,47 @@ export default {
|
||||
foldForm() {
|
||||
this.foldFormFlag = !this.foldFormFlag
|
||||
},
|
||||
//确认转办
|
||||
checkedTransferRole (data) {
|
||||
this.assigneeNewLoading = true
|
||||
changeAssigneeNew({
|
||||
taskId: this.$route.query.taskIds, // 任务id
|
||||
assignee: data[0].id, // 被委托人
|
||||
userId: this.$store.getters.userInfo.userId, // 委托人
|
||||
pId: this.$route.query.prcId // 流程实例
|
||||
}).then(res => {
|
||||
this.isTransfer = false
|
||||
if (res.success) {
|
||||
this.drawerModal = false
|
||||
this.$message.success('调整成功')
|
||||
this.$router.push("/processCenter");
|
||||
this.processNum()
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
// 请求转换流程图
|
||||
processNum (row) {
|
||||
axios.request({
|
||||
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
|
||||
responseType: 'blob',
|
||||
method: 'get',
|
||||
params: {
|
||||
prcNum: this.$route.query.prcNum
|
||||
}
|
||||
}).then(res => {
|
||||
// let blob = new Blob([res.data], {type: 'image/jpg'})
|
||||
// let url = window.URL.createObjectURL(res.data)
|
||||
this.processStep = window.URL.createObjectURL(res.data)
|
||||
})
|
||||
},
|
||||
//转办事件
|
||||
handleTransfer(){
|
||||
this.drawerModal = true
|
||||
this.drawerTitle = '转办处理人'
|
||||
this.selectPeople = row
|
||||
},
|
||||
processTable () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
prcNum: this.$route.query.prcNum,
|
||||
@@ -517,9 +584,6 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
|
||||
this.$message.warning('请填写审批意见')
|
||||
} else {
|
||||
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
|
||||
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
|
||||
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
|
||||
@@ -545,7 +609,6 @@ export default {
|
||||
}, e => {
|
||||
|
||||
});
|
||||
}
|
||||
},
|
||||
//标准表格选择框改变
|
||||
selectStandChange(data) {
|
||||
@@ -580,7 +643,6 @@ export default {
|
||||
|
||||
<style lang="less" scoped>
|
||||
@import '~@/assets/styles/style';
|
||||
|
||||
.xmpg-step7 {
|
||||
/deep/ .el-drawer__container {
|
||||
.prc-content-border {
|
||||
@@ -651,6 +713,12 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
@selection-change="selectStandChange"
|
||||
height="56%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
@@ -781,9 +781,14 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
@selection-change="selectStandChange"
|
||||
height="55%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
@@ -727,5 +727,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>>
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
@selection-change="selectStandChange"
|
||||
height="55%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
@@ -717,5 +717,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -111,9 +111,9 @@
|
||||
style="width: 100%"
|
||||
border
|
||||
@selection-change="selectStandChange"
|
||||
height="55%"
|
||||
height="52%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
|
||||
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
@@ -713,6 +713,12 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
height="70%"
|
||||
border
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -529,5 +529,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
height="70%"
|
||||
border
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -598,5 +598,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
height="70%"
|
||||
border
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -574,5 +574,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
height="70%"
|
||||
border
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -597,5 +597,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
border
|
||||
@selection-change="selectStandChange"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -874,6 +874,12 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
height="70%"
|
||||
border
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -598,5 +598,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
height="70%"
|
||||
border
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -595,5 +595,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
height="70%"
|
||||
border
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
fontWeight: 'bold'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
@@ -597,5 +597,11 @@ export default {
|
||||
.demo-drawer-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
/deep/.el-table th > .cell{
|
||||
font-size: 12px;
|
||||
}
|
||||
/deep/.el-table thead.is-group th{
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user