Merge branch 'develop' into FOTON
This commit is contained in:
Superman_Main
@@ -63,7 +63,6 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="200px"
|
||||
label="标准号"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
@@ -77,7 +76,6 @@
|
||||
prop="standName"
|
||||
align="center"
|
||||
label="中文名称"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||
@@ -87,12 +85,33 @@
|
||||
prop="standEnName"
|
||||
label="英文名称"
|
||||
align="center"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standEnName"
|
||||
label="分解单来源"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-select
|
||||
@change="fileTypeChange"
|
||||
v-model="scope.row.fileType"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in decomposeOptions"
|
||||
:value="item.attrField"
|
||||
:key="item.id"
|
||||
:label="item.attrName"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="ssrq"
|
||||
width="190px"
|
||||
@@ -129,32 +148,6 @@
|
||||
width="180px"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车vpps中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车vpps中文名称">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div>
|
||||
@@ -369,6 +362,8 @@ export default {
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
commentText: "",
|
||||
fileType: '',
|
||||
decomposeOptions: [], //分解单数据
|
||||
//表单的数据
|
||||
listForm: {
|
||||
projectNumber: "", //项目编号
|
||||
@@ -432,6 +427,22 @@ export default {
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
fileTypeChange(type){
|
||||
this.fileType = type
|
||||
let ids = [];
|
||||
let fileTypes = []
|
||||
this.dataList.forEach(item => {
|
||||
ids.push(item.standId);
|
||||
fileTypes.push(item.fileType)
|
||||
});
|
||||
this.standId = ids.join(",");
|
||||
this.fileType = fileTypes.join(",")
|
||||
if(fileTypes.includes('')){
|
||||
return
|
||||
}else{
|
||||
this.getClauseData()
|
||||
}
|
||||
},
|
||||
// 表格勾选
|
||||
handleSelectionChange(selection, val) {
|
||||
if (selection.length > 1) {
|
||||
@@ -527,14 +538,13 @@ export default {
|
||||
ids.push(item.standId);
|
||||
});
|
||||
this.standId = ids.join(",");
|
||||
this.getClauseData();
|
||||
});
|
||||
},
|
||||
//查询标准下的条款
|
||||
getClauseData() {
|
||||
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
|
||||
this.$http.get("SarStandItems/sar-stand-items/workflowFindItems", {
|
||||
ids: this.standId,
|
||||
type: "FBGBJBD"
|
||||
type: this.fileType
|
||||
},
|
||||
{
|
||||
_this: this
|
||||
@@ -591,6 +601,15 @@ export default {
|
||||
},
|
||||
//流程提交事件
|
||||
handleSubmit() {
|
||||
let fileFlag
|
||||
this.dataList.forEach(item => {
|
||||
if(!item.fileType){
|
||||
fileFlag = false
|
||||
}
|
||||
})
|
||||
if(!fileFlag){
|
||||
this.$message.warning('请选择分解单来源')
|
||||
}
|
||||
if (this.listForm.dataList.length < 1) {
|
||||
this.$message.warning("请选择带标准的项目");
|
||||
} else {
|
||||
@@ -654,6 +673,22 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
//查找分解单来源数据
|
||||
this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
|
||||
_this: this
|
||||
}, res => {
|
||||
this.decomposeOptions.push(
|
||||
{
|
||||
attrField: 'BDR',
|
||||
attrName: '不带入'
|
||||
}
|
||||
)
|
||||
res.data.forEach(item => {
|
||||
if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
|
||||
this.decomposeOptions.push(item)
|
||||
}
|
||||
})
|
||||
})
|
||||
this.getData();
|
||||
this.getProjectData();
|
||||
}
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="200px"
|
||||
label="标准号"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
@@ -69,7 +68,6 @@
|
||||
prop="standName"
|
||||
align="center"
|
||||
label="中文名称"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||
@@ -79,7 +77,6 @@
|
||||
prop="standEnName"
|
||||
label="英文名称"
|
||||
align="center"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
||||
@@ -121,32 +118,6 @@
|
||||
width="180px"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车vpps中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车vpps中文名称">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
@@ -73,7 +73,6 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="200px"
|
||||
label="标准号"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
@@ -87,7 +86,6 @@
|
||||
prop="standName"
|
||||
align="center"
|
||||
label="中文名称"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||
@@ -97,12 +95,33 @@
|
||||
prop="standEnName"
|
||||
label="英文名称"
|
||||
align="center"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standEnName"
|
||||
label="分解单来源"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-select
|
||||
@change="fileTypeChange"
|
||||
v-model="scope.row.fileType"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in decomposeOptions"
|
||||
:value="item.attrField"
|
||||
:key="item.id"
|
||||
:label="item.attrName"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="ssrq"
|
||||
width="190px"
|
||||
@@ -139,32 +158,6 @@
|
||||
width="180px"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车vpps中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车vpps中文名称">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div>
|
||||
@@ -365,6 +358,7 @@ import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { saveTaskFirst } from "api/process";
|
||||
import file from "@/pages/knowledgeGraph/components/file";
|
||||
|
||||
export default {
|
||||
name: "xmpg2Step1",
|
||||
@@ -378,6 +372,8 @@ export default {
|
||||
active: "1", //当前选中的type
|
||||
isSubmit: false,
|
||||
saveLoading: false,
|
||||
fileType: '',
|
||||
decomposeOptions: [], //分解单来源数据
|
||||
//表单的数据
|
||||
listForm: {
|
||||
projectNumber: "", //项目编号
|
||||
@@ -447,6 +443,22 @@ export default {
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
fileTypeChange(type){
|
||||
this.fileType = type
|
||||
let ids = [];
|
||||
let fileTypes = []
|
||||
this.dataList.forEach(item => {
|
||||
ids.push(item.standId);
|
||||
fileTypes.push(item.fileType)
|
||||
});
|
||||
this.standId = ids.join(",");
|
||||
this.fileType = fileTypes.join(",")
|
||||
if(fileTypes.includes('')){
|
||||
return
|
||||
}else{
|
||||
this.getClauseData()
|
||||
}
|
||||
},
|
||||
// 表格勾选
|
||||
handleSelectionChange(selection, val) {
|
||||
if (selection.length > 1) {
|
||||
@@ -532,6 +544,9 @@ export default {
|
||||
})
|
||||
this.listForm.dataList = res.data.records;
|
||||
this.dataList = res.data.records;
|
||||
this.dataList.forEach(item => {
|
||||
this.$set(item,'fileType', '')
|
||||
})
|
||||
this.listForm.dataList.forEach(item => {
|
||||
// 责任部门转换
|
||||
if (item.zrbm !== null || item.zrbm !== "") {
|
||||
@@ -551,14 +566,13 @@ export default {
|
||||
ids.push(item.standId);
|
||||
});
|
||||
this.standId = ids.join(",");
|
||||
this.getClauseData();
|
||||
});
|
||||
},
|
||||
//查询标准下的条款
|
||||
getClauseData() {
|
||||
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
|
||||
this.$http.get("SarStandItems/sar-stand-items/workflowFindItems", {
|
||||
ids: this.standId,
|
||||
type: "FBGBJBD"
|
||||
types: this.fileType
|
||||
},
|
||||
{
|
||||
_this: this
|
||||
@@ -604,6 +618,15 @@ export default {
|
||||
},
|
||||
//流程提交事件
|
||||
handleSubmit() {
|
||||
let fileFlag
|
||||
this.dataList.forEach(item => {
|
||||
if(!item.fileType){
|
||||
fileFlag = false
|
||||
}
|
||||
})
|
||||
if(!fileFlag){
|
||||
this.$message.warning('请选择分解单来源')
|
||||
}
|
||||
if (this.listForm.dataList.length < 1) {
|
||||
this.$message.warning("请选择带标准的项目");
|
||||
} else {
|
||||
@@ -687,6 +710,22 @@ export default {
|
||||
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
|
||||
}, e => {
|
||||
});
|
||||
//查找分解单来源数据
|
||||
this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
|
||||
_this: this
|
||||
}, res => {
|
||||
this.decomposeOptions.push(
|
||||
{
|
||||
attrField: 'BDR',
|
||||
attrName: '不带入'
|
||||
}
|
||||
)
|
||||
res.data.forEach(item => {
|
||||
if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
|
||||
this.decomposeOptions.push(item)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="200px"
|
||||
label="标准号"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
@@ -69,7 +68,6 @@
|
||||
prop="standName"
|
||||
align="center"
|
||||
label="中文名称"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||
@@ -79,7 +77,6 @@
|
||||
prop="standEnName"
|
||||
label="英文名称"
|
||||
align="center"
|
||||
width="180px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
|
||||
@@ -121,32 +118,6 @@
|
||||
width="180px"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="kccvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="卡车vpps中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppsbm"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="cycvppscn"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="乘用车vpps中文名称">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
@@ -5,36 +5,22 @@
|
||||
<template slot="proNode">选择分发责任人</template>
|
||||
</ProcessHeader>
|
||||
<div class="headerTabs">
|
||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||
<div :class="active === '1' ? 'active' : ''" class="headerTabsItem" @click="handleTabs('1')">基础信息</div>
|
||||
<div :class="active === '3' ? 'active' : ''" class="headerTabsItem" @click="handleTabs('3')">审批历史</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div v-show="active === '1'" class="content">
|
||||
<div style="flex: auto; overflow: auto">
|
||||
<process-title>
|
||||
<template slot="title">基础信息</template>
|
||||
</process-title>
|
||||
<el-form
|
||||
:model="listForm"
|
||||
class="label-input-form prc-content-border"
|
||||
label-width="150px"
|
||||
>
|
||||
<el-form :model="listForm" class="label-input-form prc-content-border" label-width="150px">
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.projectNumber"
|
||||
placeholder="请输入项目编号"
|
||||
disabled
|
||||
clearable
|
||||
></el-input>
|
||||
<el-form-item class="add-form-item form-item-disabled" label="项目编号" prop="projectNumber">
|
||||
<el-input v-model="listForm.projectNumber" clearable disabled placeholder="请输入项目编号"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
|
||||
<el-input
|
||||
v-model="listForm.projectName"
|
||||
placeholder="请输入项目名称"
|
||||
disabled
|
||||
clearable
|
||||
></el-input>
|
||||
<el-form-item class="add-form-item form-item-disabled" label="项目名称" prop="projectName">
|
||||
<el-input v-model="listForm.projectName" clearable disabled placeholder="请输入项目名称"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -42,75 +28,53 @@
|
||||
<process-title>
|
||||
<template slot="title">填写信息</template>
|
||||
</process-title>
|
||||
<!-- <div class="tableTitle">-->
|
||||
<!-- <div class="tableButton">-->
|
||||
<!-- <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<el-table
|
||||
:data="dataList"
|
||||
style="width: 100%"
|
||||
row-key="standId"
|
||||
|
||||
v-if="refreshTable"
|
||||
height="70%"
|
||||
border
|
||||
ref="myTable"
|
||||
@selection-change="selectStandChange"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
<div class="tableTitle">
|
||||
<div class="tableButton">
|
||||
<el-button class="common-button-primary" plain size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-table v-if="refreshTable" ref="myTable" :data="dataList" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}" border height="70%"
|
||||
row-key="standId" style="width: 100%" @select="select" @select-all="selectAll"
|
||||
@selection-change="selectStandChange">
|
||||
<el-table-column align="center" type="selection" width="55">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standNumber"
|
||||
label="标准号"
|
||||
>
|
||||
<el-table-column label="标准号" prop="standNumber">
|
||||
<template slot-scope="scope">
|
||||
<a v-if="scope.row.standYear" class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
|
||||
}}-{{ scope.row.standYear }}</a>
|
||||
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
|
||||
<a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }}
|
||||
{{ scope.row.standNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
label="标准名称"
|
||||
>
|
||||
<el-table-column label="标准名称" prop="standName">
|
||||
<template slot-scope="scope">
|
||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
>
|
||||
<el-table-column label="条款号" prop="itemsNum">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
>
|
||||
<el-table-column label="条款名称" prop="itemsName">
|
||||
</el-table-column>
|
||||
<el-table-column label="责任人" prop="workPeople" align="center">
|
||||
<template slot-scope="scope" >
|
||||
<el-table-column align="center" label="责任人" prop="workPeople">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="selectList.length<=1">
|
||||
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
|
||||
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" readonly
|
||||
style="display: none;" />
|
||||
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
|
||||
@click.native="choiceZRRS(scope.row, 1, scope.$index)" readonly/>
|
||||
readonly @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
|
||||
</div>
|
||||
|
||||
<div v-else>
|
||||
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
|
||||
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" readonly
|
||||
style="display: none;" />
|
||||
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
|
||||
@click.native="choiceZRRS('', 2, '')" readonly/>
|
||||
readonly @click.native="choiceZRRS('', 2, '')" />
|
||||
</div>
|
||||
|
||||
<el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>
|
||||
<!-- <el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>-->
|
||||
</template>
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
|
||||
@@ -124,77 +88,41 @@
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
placeholder="请输入意见"
|
||||
v-model="commentText">
|
||||
<el-input v-model="commentText" :rows="3" placeholder="请输入意见" resize="none" type="textarea">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '3'">
|
||||
<div v-show="active === '3'" class="content">
|
||||
<div class="flow-list" style="height: 100%">
|
||||
<el-table
|
||||
height="100%"
|
||||
ref="selection"
|
||||
:data="detailData"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
row-key="id"
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
<el-table ref="selection" :data="detailData" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
:no-data-text="listNoDataText" border height="100%"
|
||||
row-key="id" style="width: 100%"
|
||||
tooltip-effect="dark">
|
||||
<el-table-column align="center" type="selection" width="55">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
align="center"
|
||||
>
|
||||
<el-table-column align="center" label="任务步骤" prop="name">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
label="任务受理人"
|
||||
align="center"
|
||||
>
|
||||
<el-table-column align="center" label="任务受理人" prop="assignee">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createTime"
|
||||
label="创建时间"
|
||||
sortable="custom"
|
||||
align="center">
|
||||
<el-table-column align="center" label="创建时间" prop="createTime" sortable="custom">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="endTime"
|
||||
label="完成时间"
|
||||
align="center">
|
||||
<el-table-column align="center" label="完成时间" prop="endTime">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="comment"
|
||||
label="流程信息"
|
||||
align="center">
|
||||
<el-table-column align="center" label="流程信息" prop="comment">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.commentText }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="completeFlag"
|
||||
label="状态"
|
||||
align="center">
|
||||
<el-table-column align="center" label="状态" prop="completeFlag">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||
</template>
|
||||
@@ -203,34 +131,16 @@
|
||||
<loading :loading="loading">流程列表加载中</loading>
|
||||
</div>
|
||||
</div>
|
||||
<ProcessFooter
|
||||
show-save
|
||||
show-submit
|
||||
show-transfer
|
||||
:submitLoading="isSubmit"
|
||||
:transfer-loading="isTransfer"
|
||||
:saveLoading="saveLoading"
|
||||
@save="handleSave"
|
||||
@transfer="handleTransfer"
|
||||
@submit="handleSubmit"
|
||||
>
|
||||
<ProcessFooter :saveLoading="saveLoading" :submitLoading="isSubmit" :transfer-loading="isTransfer" show-save
|
||||
show-submit
|
||||
show-transfer @save="handleSave" @submit="handleSubmit" @transfer="handleTransfer">
|
||||
</ProcessFooter>
|
||||
<!-- 福田全公司选人解决方案 -->
|
||||
<Role-tree
|
||||
check-box
|
||||
:is-title="drawerTitle"
|
||||
:is-visible.sync="drawerModal"
|
||||
@checkedRole="checkedTransferRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<Role-tree :is-title="drawerTitle" :is-visible.sync="drawerModal" :nodeList="nodeList" check-box
|
||||
@checkedRole="checkedTransferRole"></Role-tree>
|
||||
<!-- 选择责任人-->
|
||||
<Role-tree
|
||||
check-box
|
||||
is-title="选择责任人"
|
||||
:is-visible.sync="modalshowflag"
|
||||
@checkedRole="checkedRole"
|
||||
:nodeList="nodeList"
|
||||
></Role-tree>
|
||||
<Role-tree :is-visible.sync="modalshowflag" :nodeList="nodeList" is-title="选择责任人"
|
||||
@checkedRole="checkedRole"></Role-tree>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -238,7 +148,7 @@
|
||||
import ProcessHeader from "../../components/ProcessHeader";
|
||||
import ProcessFooter from "../../components/ProcessFooter";
|
||||
import ProcessTitle from "../../components/ProcessTitle";
|
||||
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
|
||||
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process";
|
||||
|
||||
export default {
|
||||
name: "xmpg2Step5",
|
||||
@@ -252,7 +162,7 @@ export default {
|
||||
isTransfer: false,
|
||||
// 调整处理人抽屉状态
|
||||
drawerModal: false,
|
||||
workPeopleList:[],
|
||||
workPeopleList: [],
|
||||
//防止按钮点击过快的按钮loading
|
||||
buttonLoading: false,
|
||||
//刷新表格
|
||||
@@ -282,8 +192,8 @@ export default {
|
||||
},
|
||||
//表单的数据
|
||||
listForm: {
|
||||
projectNumber: "", //项目编号
|
||||
projectName: "", //项目名称
|
||||
projectNumber: "", //项目编号
|
||||
projectName: "", //项目名称
|
||||
dataList: [], //项目下的标准数据
|
||||
children: [] //标准下的分解单数据
|
||||
},
|
||||
@@ -298,45 +208,45 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
//确认转办
|
||||
checkedTransferRole (data) {
|
||||
this.assigneeNewLoading = true
|
||||
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
|
||||
this.isTransfer = false;
|
||||
if (res.success) {
|
||||
this.drawerModal = false
|
||||
this.$message.success('调整成功')
|
||||
this.drawerModal = false;
|
||||
this.$message.success("调整成功");
|
||||
this.$router.push("/processCenter");
|
||||
this.processNum()
|
||||
this.processNum();
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
this.$message.warning(res.message);
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
// 请求转换流程图
|
||||
processNum (row) {
|
||||
processNum(row) {
|
||||
axios.request({
|
||||
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
|
||||
responseType: 'blob',
|
||||
method: 'get',
|
||||
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)
|
||||
})
|
||||
this.processStep = window.URL.createObjectURL(res.data);
|
||||
});
|
||||
},
|
||||
//转办事件
|
||||
handleTransfer(){
|
||||
this.drawerModal = true
|
||||
this.drawerTitle = '转办处理人'
|
||||
this.selectPeople = row
|
||||
handleTransfer() {
|
||||
this.drawerModal = true;
|
||||
this.drawerTitle = "转办处理人";
|
||||
this.selectPeople = row;
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
@@ -407,6 +317,7 @@ export default {
|
||||
},
|
||||
//动态表单读取
|
||||
getFormFieldList(item) {
|
||||
console.log(item);
|
||||
this.$nextTick(() => {
|
||||
this.listForm = JSON.parse(JSON.stringify(item));
|
||||
if (item.form === undefined) {
|
||||
@@ -444,9 +355,18 @@ export default {
|
||||
}
|
||||
});
|
||||
this.listForm.children = children;
|
||||
this.dataList.forEach(item => {
|
||||
this.$set(item, "workPeople", "请选择责任人");
|
||||
});
|
||||
console.log(this.dataList);
|
||||
} else {
|
||||
this.listForm = item.form;
|
||||
this.dataList = item.form.dataList;
|
||||
this.dataList.forEach(item => {
|
||||
this.$set(item, "workPeople", "请选择责任人");
|
||||
this.$set(item, "workPeopleId", "");
|
||||
});
|
||||
console.log(this.dataList);
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -471,19 +391,21 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
let dataChildren = []
|
||||
let dataListChildren = []
|
||||
let dataChildren = [];
|
||||
let dataListChildren = [];
|
||||
this.dataList.forEach(item => {
|
||||
dataChildren.push(item.children)
|
||||
})
|
||||
dataChildren.forEach((item,index) => {
|
||||
dataListChildren = dataListChildren.concat(item)
|
||||
})
|
||||
dataChildren.push(item.children);
|
||||
});
|
||||
dataChildren.forEach((item, index) => {
|
||||
dataListChildren = dataListChildren.concat(item);
|
||||
});
|
||||
this.isSubmit = true;
|
||||
this.listForm.commentText = this.commentText;
|
||||
this.listForm.children = dataListChildren
|
||||
this.listForm.dataList = this.dataList
|
||||
this.listForm.children = dataListChildren;
|
||||
this.listForm.dataList = this.dataList;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
console.log(json);
|
||||
return;
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -501,7 +423,8 @@ export default {
|
||||
},
|
||||
//批量分发按钮
|
||||
choiceZRRS(row, type, index) {
|
||||
this.selectedId = row.id;
|
||||
console.log(row);
|
||||
this.selectedId = row.id || row.standId;
|
||||
this.type = type;
|
||||
if (type === 1) {
|
||||
this.drawerTitle = "选择责任人";
|
||||
@@ -522,24 +445,86 @@ export default {
|
||||
}
|
||||
}
|
||||
//批量分发某标准下的责任人
|
||||
else if (type === 3){
|
||||
else if (type === 3) {
|
||||
|
||||
//弹出选人框
|
||||
// if (this.tableExpand === false){
|
||||
this.modalshowflag = true;
|
||||
this.drawerTitle = "批量选择责任人";
|
||||
this.modalshowflag = true;
|
||||
this.drawerTitle = "批量选择责任人";
|
||||
// }
|
||||
//展开表格
|
||||
this.workPeopleList = row
|
||||
this.workPeopleList = row;
|
||||
// console.log('279',row.children)
|
||||
this.refreshTable = false
|
||||
this.refreshTable = false;
|
||||
// this.tableExpand = !this.tableExpand
|
||||
this.$nextTick(() => {
|
||||
this.refreshTable = true
|
||||
this.refreshTable = true;
|
||||
});
|
||||
|
||||
}
|
||||
},
|
||||
setChildren(children, type) {
|
||||
// 编辑多个子层级
|
||||
children.map(j => {
|
||||
this.toggleSelection(j, type);
|
||||
if (j.children) {
|
||||
this.setChildren(j.children, type);
|
||||
}
|
||||
});
|
||||
},
|
||||
// 选中父节点时，子节点一起选中取消
|
||||
select(selection, row) {
|
||||
const hasSelect = selection.some(el => {
|
||||
return row.id === el.id;
|
||||
});
|
||||
if (hasSelect) {
|
||||
if (row.children) {
|
||||
// 解决子组件没有被勾选到
|
||||
this.setChildren(row.children, true);
|
||||
}
|
||||
} else {
|
||||
if (row.children) {
|
||||
this.setChildren(row.children, false);
|
||||
}
|
||||
}
|
||||
},
|
||||
toggleSelection(row, select) {
|
||||
if (row) {
|
||||
this.$nextTick(() => {
|
||||
this.$refs.myTable &&
|
||||
this.$refs.myTable.toggleRowSelection(row, select);
|
||||
});
|
||||
}
|
||||
},
|
||||
// 选择全部
|
||||
selectAll(selection) {
|
||||
// dataList第一层只要有在selection里面就是全选
|
||||
const isSelect = selection.some(el => {
|
||||
const dataListIds = this.dataList.map(j => j.id);
|
||||
return dataListIds.includes(el.id);
|
||||
});
|
||||
// dataList第一层只要有不在selection里面就是全不选
|
||||
const isCancel = !this.dataList.every(el => {
|
||||
const selectIds = selection.map(j => j.id);
|
||||
return selectIds.includes(el.id);
|
||||
});
|
||||
if (isSelect) {
|
||||
selection.map(el => {
|
||||
if (el.children) {
|
||||
// 解决子组件没有被勾选到
|
||||
this.setChildren(el.children, true);
|
||||
}
|
||||
});
|
||||
}
|
||||
if (isCancel) {
|
||||
this.dataList.map(el => {
|
||||
if (el.children) {
|
||||
// 解决子组件没有被勾选到
|
||||
this.setChildren(el.children, false);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
//标准表格选择框改变
|
||||
selectStandChange(data) {
|
||||
this.selectList = data;
|
||||
@@ -559,14 +544,28 @@ export default {
|
||||
}
|
||||
},
|
||||
checkedRole(data) {
|
||||
var idList = "";
|
||||
var nameList = "";
|
||||
data.forEach(item => {
|
||||
if (nameList.length > 0) {
|
||||
nameList += ",";
|
||||
idList += ",";
|
||||
}
|
||||
idList += item.id;
|
||||
nameList += item.name;
|
||||
});
|
||||
//单选操作
|
||||
if (this.type === 1) {
|
||||
this.dataList.forEach(item => {
|
||||
if(item.standId === this.selectedId){
|
||||
item.workPeople = nameList;
|
||||
item.workPeopleId = idList;
|
||||
}
|
||||
if (item.children) {
|
||||
item.children.forEach(items => {
|
||||
if (items.id === this.selectedId) {
|
||||
items.workPeople = data[0].name;
|
||||
items.workPeopleId = data[0].id;
|
||||
items.workPeople = nameList;
|
||||
items.workPeopleId = idList;
|
||||
// this.$set(items,'workPeople',data[0].name)
|
||||
//this.$set(items,'workPeopleId',data[0].id)
|
||||
}
|
||||
@@ -577,37 +576,37 @@ export default {
|
||||
} else if (this.type === 2) {
|
||||
this.selectList.forEach(item => {
|
||||
this.dataList.map(items => {
|
||||
if (item.id === items.id) {
|
||||
items.workPeople = "";
|
||||
items.workPeopleId = "";
|
||||
this.$message.warning('您只能针对条款进行分发')
|
||||
if (item.standId === items.standId) {
|
||||
items.workPeople = nameList;
|
||||
items.workPeopleId = idList;
|
||||
// this.$message.warning('您只能针对条款进行分发')
|
||||
}
|
||||
if (items.children.length) {
|
||||
if (items.children) {
|
||||
items.children.map(childrenItem => {
|
||||
if (childrenItem.id === item.id) {
|
||||
childrenItem.workPeople = data[0].name;
|
||||
childrenItem.workPeopleId = data[0].id;
|
||||
childrenItem.workPeople = nameList;
|
||||
childrenItem.workPeopleId = idList;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
this.dataList = JSON.parse(JSON.stringify(this.dataList));
|
||||
}else if (this.type === 3){
|
||||
} else if (this.type === 3) {
|
||||
// console.log("529",this.workPeopleList)
|
||||
for (let i=0;i<this.workPeopleList.children.length;i++){
|
||||
for (let i = 0; i < this.workPeopleList.children.length; i++) {
|
||||
|
||||
this.workPeopleList.children[i].workPeople = data[0].name
|
||||
this.workPeopleList.children[i].workPeopleId = data[0].id
|
||||
this.workPeopleList.children[i].workPeople = data[0].name;
|
||||
this.workPeopleList.children[i].workPeopleId = data[0].id;
|
||||
// console.log(row.children[i].id)
|
||||
// console.log(row.children[i].workPeople)
|
||||
}
|
||||
|
||||
// items.children.map(childrenItem => {
|
||||
//
|
||||
// childrenItem.workPeople = data[0].name;
|
||||
// childrenItem.workPeopleId = data[0].id;
|
||||
// })
|
||||
// items.children.map(childrenItem => {
|
||||
//
|
||||
// childrenItem.workPeople = data[0].name;
|
||||
// childrenItem.workPeopleId = data[0].id;
|
||||
// })
|
||||
|
||||
}
|
||||
this.modalshowflag = false;
|
||||
@@ -704,4 +703,3 @@ export default {
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user