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!301
This commit is contained in:
王夏晖
2022-01-24 15:18:58 +08:00
parent 603e6808dc 167eb37ade
commit fe9effa90f
21 changed files with 3136 additions and 2482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/treeSelect/treeSelectStand.vue
+1 -1
View File
@@ -167,7 +167,7 @@ export default {
methods: {
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
return data.menuName.indexOf(value) !== -1;
},
loadNode(node, resolve) {
const that = this;
src/pages/config/pages/mechanismManage/pages/mechanism.vue
+2 -2
View File
@@ -450,7 +450,7 @@ export default {
this.page = 1
}
this.peopleType = 2;
this.$http.post('SarInstitution/institution/user', {
this.$http.post('SarInstitution/institution/userUnderInstitution', {
current: this.page,
size: this.pageSize,
uname: this.searchForm.uname,
@@ -475,7 +475,7 @@ export default {
},
getData() {
this.peopleType = 1;
this.$http.post('SarInstitution/institution/user', {
this.$http.post('SarInstitution/institution/userUnderInstitution', {
current: this.page,
size: this.pageSize,
institutionId: this.id,
src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
+40 -2
View File
@@ -312,11 +312,49 @@ export default {
},
//提交
handleSubmit(){
this.listForm.commentText = this.commentText
this.listForm.stepFlag = '0'
const json = JSON.stringify(this.listForm);
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 => {
});
},
//驳回
beforeBack(){
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.listForm.commentText = this.commentText
this.listForm.stepFlag = '1'
const json = JSON.stringify(this.listForm);
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 => {
});
}
},
//确认转办
checkedRole (data) {
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+650 -3
View File
@@ -1,13 +1,660 @@
<!--标准合规评估 业务经理审批-->
<template>
<div class="bzpg-step3">
<ProcessHeader toggle>
<template slot="proName">标准合规评估流程</template>
<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>
<div class="content" v-show="active === '1'">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-collapse-transition>
<el-form
v-if="!foldFormFlag"
: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="standNumber" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
class="input-jump"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.certifiedEngineerName"
placeholder="--"
></el-input>
</el-form-item>
<el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
></el-input>
</el-form-item>
<el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="listForm.qualityEngineerName"
placeholder="--"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button class="common-button-primary" plain size="mini" @click="addProject">添加
</el-button>
<el-button plain class="common-button-primary" type="primary" size="mini" @click="deleteList">批量删除
</el-button>
</div>
</div>
<el-table
:data="dataList"
border
ref="selection"
height="100%"
style="width: 100%;"
@selection-change="selectProjectGroup"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center"/>
<el-table-column
align="center"
prop="managementHostName"
label="管理主体"/>
<el-table-column
align="center"
prop="developmentHostName"
label="开发主体"/>
<el-table-column
align="center"
prop="categoryName"
label="项目细分类"/>
<el-table-column
align="center"
prop="projectStatus"
label="项目状态"/>
<el-table-column
align="center"
prop="projectNumber"
label="项目编号"/>
<el-table-column
align="center"
prop="projectName"
label="项目名称"/>
<el-table-column
align="center"
prop="projectManager"
label="项目经理"/>
</el-table>
<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>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '3'">
<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-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{scope.row.commentText}}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 添加抽屉-->
<el-drawer
title="添加项目"
:visible.sync="ProjectModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="项目状态" class="search-item search-item-last">
<el-select v-model="projectSearch.projectStatus" placeholder="请选择项目状态" filterable clearable>
<el-option
v-for="(item, index) in projectStatus"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
v-btn-permission=""
@click="getProductDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission=""
@click="clearProject">清空
</el-button>
</el-form-item>
</el-form>
</div>
<div style="height: calc(100% - 65px); overflow: auto">
<el-table
:data="productData"
tooltip-effect="dark"
style="width: 100%"
border
ref="projectTable"
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProject"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column
align="center"
prop="projectName"
label="项目名称"/>
<el-table-column
align="center"
prop="projectStatus"
label="项目状态"/>
<el-table-column
align="center"
prop="projectName"
label="当前节点"/>
<el-table-column
align="center"
prop="projectGroup"
label="项目群"/>
<el-table-column
align="center"
prop="projectManager"
label="项目经理"/>
</el-table>
</div>
</div>
<pagination
:page="pageNo"
:pageSize="pageSizeNo"
:total="totalNo"
@pageChange="pageChangeNo"
@pageSizeChange="pageSizeChangeNo"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="cancelStand">取消</el-button>
<el-button type="primary" size="mini" @click="okProject">添加</el-button>
</div>
</el-drawer>
<ProcessFooter
show-back
show-transfer
show-submit
:transfer-loading="isTransfer"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from "process/components/ProcessHeader";
import ProcessFooter from "process/components/ProcessFooter";
import ProcessTitle from "process/components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "bzpgStep3"
name: "bzpgStep3",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
data(){
return {
active: '1',
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
drawerModal: false,
loading: false,
isTransfer: false,
isSubmit: false,
saveLoading: false,
ProjectModel: false,
pageNo: 1,
totalNo: 0,
pageSizeNo: this.$store.getters.userInfo.configContent,
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: '',
drawerTitle: '',
projectGroup: '', //用来查询项目
listForm: {},
dataList: [],
detailData: [],
nodeList: [],
selectProjectList: [],
selectProjectGroupList: [],
productData: [], //项目群下的项目
projectStatus: [], //项目状态下拉框
projectSearch: {
projectStatus: "", //项目状态
},
}
},
mounted() {
this.getData()
this.processTable()
this.getProductData()
},
methods: {
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
}
}).catch(e => {
})
})
},
/**
* @description: 动态表单读取
*/
getFormFieldList (item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
this.projectGroup = item.dataList[0].projectGroup
this.dataList.distributePerson = item.dataList[0].distributePerson
this.listForm.breakdownList = item.breakdownList
})
},
//查询项目群下的项目
getProductData(){
this.$http.get('sarStandProjectLibrary/queryProjects',{
projectGroup: this.projectGroup,
current: this.pageNo,
PageSize: this.pageSizeNo,
...this.projectSearch
}, {
_this: this
}, res => {
this.productData = res.data.records
this.totalNo = res.data.count
})
},
//查询项目按钮
getProductDataBtn(){
this.pageNo = 1
this.getProductData()
},
//清空按钮
clearProject(){
this.projectSearch = {
projectStatus: "",
}
this.getProductData()
},
selectProjectGroup(data){
this.selectProjectGroupList = data
},
//添加项目
addProject(){
this.projectModel= true
},
//批量删除
deleteList(){
if(!this.selectProjectGroupList.length){
this.$message.warning('请至少选择一条数据进行删除')
}else{
this.$confirm("您确认删除这些数据？", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
}).catch(() => {
});
}
},
cancelStand(){
this.projectModel = false
},
okProject(){
if(this.selectProjectList.length){
}else{
this.$message.warning('请至少选择一条数据进行添加')
}
},
selectProject(data){
this.selectProjectList = data
},
pageChangeNo(page){
this.pageNo = page
this.getProductData()
},
pageSizeChangeNo(pageSize){
this.pageSizeNo = pageSize
this.getProductData()
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
//提交
handleSubmit(){
},
//驳回
beforeBack(){
},
//确认转办
checkedRole (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,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
}, e => {})
},
},
computed: {
listNoDataText () {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
},
},
};
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzpg-step3 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
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;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+9 -4
View File
@@ -1505,6 +1505,7 @@ export default {
fileType: '',
countryArr: '',
form: {
standId: '',
// 基础信息
country: '',
textStatus: '', // 文本状态
@@ -2156,6 +2157,7 @@ export default {
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.getListTree(bringData)
this.form.standId = bringData.id
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : ''
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : ''
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : ''
@@ -2280,17 +2282,20 @@ export default {
}, {}, reson => {
if (reson.ok) {
let treeList = ''
let treeListId = ''
reson.data.forEach(item=>{
this.treeCheckedKeys.push(item.menuId)
if (item.menuId.length > 0) {
if (treeList.length > 0) {
treeList += ','
treeListId += ','
}
treeList = item.menuName
this.treeListName = treeList
treeList += item.menuName
treeListId += item.menuId
})
this.form.treeListName = treeList
this.form.treeListId = treeListId
}
})
this.form.treeListId = this.treeCheckedKeys.join(',')
}
})
},
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+224 -257
View File
@@ -178,24 +178,6 @@
v-model="form.zccssrq"
:disabled="true"
></cus-tom-data-picker-group>
<!-- <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择标准实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择在产车实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<cus-tom-data-picker-group
@@ -204,42 +186,6 @@
v-model="form.xcxssrq"
:disabled="true"
></cus-tom-data-picker-group>
<!-- <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择新车型实施日期(标准文本"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -247,91 +193,91 @@
<template slot="title">文本信息</template>
</ProcessTitle>
<div class="prc-content-border">
<!-- <el-row :gutter="24">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">-->
<!-- <div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">-->
<!-- {{ form.xgdName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">-->
<!-- <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">-->
<!-- {{ form.fbgbjbdName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">-->
<!-- {{ form.zbjbdName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">-->
<!-- {{ form.ssgName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">-->
<!-- {{ form.caName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">-->
<!-- {{ form.kwjName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">-->
<!-- {{ form.jdwjName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">-->
<!-- {{ form.bpgName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">-->
<!-- {{ form.zqyjgName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="24">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">-->
<!-- <div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">-->
<!-- {{ form.xgdName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">-->
<!-- <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">-->
<!-- {{ form.fbgbjbdName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">-->
<!-- {{ form.zbjbdName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">-->
<!-- {{ form.ssgName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">-->
<!-- {{ form.caName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">-->
<!-- {{ form.kwjName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">-->
<!-- {{ form.jdwjName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">-->
<!-- {{ form.bpgName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">-->
<!-- <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">-->
<!-- {{ form.zqyjgName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- - - -->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
<!-- {{ value.name }} -->
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -339,7 +285,7 @@
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -347,7 +293,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -355,7 +301,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -363,7 +309,7 @@
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -373,7 +319,7 @@
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -381,7 +327,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="修订本" prop="xdbName" class="add-form-item form-item-disabled">
<div v-if="xdbFileMap.length>0" v-for="(value,index) in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xdb',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -391,7 +337,7 @@
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -399,7 +345,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -407,7 +353,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -422,7 +368,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -515,7 +461,7 @@
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -548,16 +494,16 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<span>{{form.wssmr}}</span>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
<!-- <el-option-->
<!-- v-for="item in wssmrOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<span>{{ form.wssmr }}</span>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
<!-- <el-option-->
<!-- v-for="item in wssmrOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
@@ -605,7 +551,7 @@
</el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
{{value.name}}
{{ value.name }}
</div>
<div v-else>
- -
@@ -644,7 +590,7 @@
</div>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<el-collapse-item title="审批意见" name="1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
@@ -691,7 +637,8 @@
<h4>责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="user2" placeholder="选择责任人">
</el-input></div>
</el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
@@ -770,7 +717,7 @@
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{scope.row.commentText}}</span>
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
@@ -778,7 +725,7 @@
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
<span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template>
</el-table-column>
</el-table>
@@ -811,17 +758,17 @@
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default {
export default {
name: "bzrkStep2",
data () {
data() {
return {
xgdFileMap: [],
fbgbjbdFileMap: [],
@@ -836,14 +783,11 @@
zbjbdFileMap: [],
// 调整处理人抽屉状态
drawerModal: false,
drawerTitle: '',
nodeList: [],
selectPeople:'',
selectPeople: '',
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
@@ -853,16 +797,16 @@
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
zbjbdFileId: '',
rules: {
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
commentText: [{required: true, message: '请输入意见', trigger: 'blur'}],
approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}]
},
activeName:'1',
activeName: '1',
// 当前流程类型(1待办/2已办)
processType: 1,
detailData: [],
userId:this.$store.getters.userInfo.userId,
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
formTongGuo: {
@@ -896,6 +840,8 @@
standSystem: '',// 标准体系
standSystemName: '',// 标准体系
gxhbq: '', // 标签
treeListId: '',
treeListName: '',
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
@@ -931,7 +877,7 @@
qcdw: '', // 起草单位
wssmr: '', // 我司署名人
cysd: '', // 我司参与深度
cyzbpm:[],// 我司参与制标排名
cyzbpm: [],// 我司参与制标排名
cllx: '', // 适用车型
nylx: '',// 能源类型
sycpx: '',// 适用产品线
@@ -954,17 +900,17 @@
xglc: '', // 相关流程
chjl: '', // 参会记录
//流程信息
prcNum:'',
commentText:'',
prcName:'',
prcNum: '',
commentText: '',
prcName: '',
standType: '',
}, // 标准信息
nodeKeyCode: 'code',
nodeKeyModel: 'model',
key:1,
key1:2,
key2:3,
key3:4,
key: 1,
key1: 2,
key2: 3,
key3: 4,
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
@@ -976,7 +922,7 @@
children: 'children',
label: 'model'
},
countryOptions:[],//国家地区
countryOptions: [],//国家地区
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别
@@ -989,7 +935,7 @@
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
cyzbpmOptions:[], // 我司参与制标排名
cyzbpmOptions: [], // 我司参与制标排名
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线
@@ -1004,8 +950,8 @@
user4: '',
user5: '',
// 流程路由信息
prcNum : this.$route.query.prcNum,
prcName : this.$route.query.prcName,
prcNum: this.$route.query.prcNum,
prcName: this.$route.query.prcName,
}
},
components: {
@@ -1016,16 +962,16 @@
TreeSelect
},
computed: {
listNoDataText () {
listNoDataText() {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
},
},
methods: {
checkedRole (data) {
checkedRole(data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
userId: this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
@@ -1035,72 +981,72 @@
this.$message.success('调整成功')
this.processNum()
this.queryProcess()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
}
})
},
downloadFile (fileType) {
downloadFile(fileType) {
//文件id中出现了','字符,去除掉
if(fileType === 'fbgbjbd'){
if(this.fbgbjbdFileId.search(',')){
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
if (fileType === 'fbgbjbd') {
if (this.fbgbjbdFileId.search(',')) {
this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
}
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
} else if (fileType === 'xgd') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
} else if (fileType === 'bpg') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
} else if (fileType === 'ssg') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
} else if (fileType === 'zqyjg') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
} else if (fileType === 'jdwj') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
} else if (fileType === 'kwj') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
} else if (fileType === 'glwj') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
} else if (fileType === 'ca') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
} else if (fileType === 'zbjbd') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
getRule(){
getRule() {
if (this.formTongGuo.approvalOpinion === 0) {
this.rules.commentText[0].required = false;
this.$refs.formTongGuo.clearValidate('commentText')
}else {
} else {
this.rules.commentText[0].required = true;
}
},
popoverHide (checkedIds, checkedData) {
if(checkedData) {
popoverHide(checkedIds, checkedData) {
if (checkedData) {
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
}
},
popoverHideBusVs (checkedIds, checkedData) {
if(checkedData){
popoverHideBusVs(checkedIds, checkedData) {
if (checkedData) {
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
},
popoverHideCarVs (checkedIds, checkedData) {
if(checkedData){
popoverHideCarVs(checkedIds, checkedData) {
if (checkedData) {
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
},
popoverHideModel (checkedIds, checkedData) {
if(checkedData){
popoverHideModel(checkedIds, checkedData) {
if (checkedData) {
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
},
busVsFunc(){
busVsFunc() {
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
@@ -1109,7 +1055,7 @@
this.key2++
})
},
modelFunc(){
modelFunc() {
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
@@ -1117,7 +1063,7 @@
this.key3++
})
},
processTable () {
processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '',
@@ -1127,14 +1073,15 @@
_this: this
}, res => {
this.detailData = res
}, e => {})
}, e => {
})
},
assemble(ids,names){
let list= new Array();
let idArray=ids.split(',');
let nameArray=names.split(',');
for(var i=0;i<idArray.length;i++){
list.push({id:idArray[i],name:nameArray[i]});
assemble(ids, names) {
let list = new Array();
let idArray = ids.split(',');
let nameArray = names.split(',');
for (var i = 0; i < idArray.length; i++) {
list.push({id: idArray[i], name: nameArray[i]});
}
return list;
@@ -1160,27 +1107,27 @@
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
this.xgdFileMap = this.assemble(processForm.xgd, processForm.xgdName);
this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
this.fbgbjbdFileMap = this.assemble(processForm.fbgbjbd, processForm.fbgbjbdName);
// fbgbjbdFileMap: {},
this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
this.bpgFileMap = this.assemble(processForm.bpg, processForm.bpgName);
// bpgFileMap: {},
this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName);
this.ssgFileMap = this.assemble(processForm.ssg, processForm.ssgName);
// ssgFileMap: {},
this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName);
this.zqyjgFileMap = this.assemble(processForm.zqyjg, processForm.zqyjgName);
// zqyjgFileMap: {},
this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName);
this.jdwjFileMap = this.assemble(processForm.jdwj, processForm.jdwjName);
// jdwjFileMap: {},
this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
// kwjFileMap: {},
this.xdbFileMap=this.assemble(processForm.xdb,processForm.xdbName);
this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName);
// xdbFileMap: {},
this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
// glwjFileMap: {},
this.caFileMap=this.assemble(processForm.ca,processForm.caName);
this.caFileMap = this.assemble(processForm.ca, processForm.caName);
// caFileMap: {},
this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName);
this.zbjbdFileMap = this.assemble(processForm.zbjbd, processForm.zbjbdName);
// zbjbdFileMap: {},
}
@@ -1191,7 +1138,7 @@
/**
* @description: 动态表单读取
*/
getFormFieldList (item) {
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.form.standSystem]
@@ -1200,8 +1147,8 @@
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){
this.form.country=this.form.country.split(",");
if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
this.form.country = this.form.country.split(",");
}
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
@@ -1229,18 +1176,19 @@
this.drawerModal = true
this.drawerTitle = '转办处理人'
},
handleSave() {},
handle1(){
handleSave() {
},
handle1() {
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
},
handle2(){
handle2() {
this.formTongGuo.approvalOpinion = 0
this.handleSubmit()
},
handleSubmit() {
this.getRule()
const val= this.form.country;
const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.form.country = val.join(",");
@@ -1280,24 +1228,25 @@
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
if(this.formTongGuo.approvalOpinion == '1'){
if (this.formTongGuo.approvalOpinion == '1') {
this.$message.warning("驳回成功")
this.isSubmit = false
this.formTongGuo.commentText = ''
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else{
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
} else {
this.processCreateStand(json)
}
}
})
}})
}
})
},
/**
@@ -1306,12 +1255,22 @@
* @auth: chenxiaoxi
*/
processCreateStand(json) {
console.log(json)
const _formData = new FormData()
_formData.append('infoJson', json)
processCreateStand(_formData).then(res => {
if (res.result === '操作成功' || res.data === '入库成功') {
this.$message.success(res.data)
let menuList = {
idlist: [this.form.standId],
menuIds: this.form.treeListId
}
this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, {
_this: this,
}, resMenu => {
if (resMenu.ok) {
console.log(resMenu)
}
})
setTimeout(() => {
this.$router.push({
name: 'ProcessCenter'
@@ -1325,15 +1284,15 @@
})
},
},
created(){
created() {
},
mounted () {
mounted() {
this.getData()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.countryOptions=res.data.COUNTRY//国家地区
this.countryOptions = res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
@@ -1356,20 +1315,23 @@
this.busVsFunc()
this.modelFunc()
}
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzrkStep2 {
/deep/.el-drawer__container {
@import '~@/assets/styles/style';
.bzrkStep2 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
@@ -1377,6 +1339,7 @@
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
@@ -1384,18 +1347,21 @@
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
@@ -1403,6 +1369,7 @@
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
@@ -1410,5 +1377,5 @@
}
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+151 -154
View File
@@ -8,7 +8,7 @@
<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="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>-->
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>-->
</div>
<div class="content" v-if="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -123,10 +123,10 @@
placeholder="请选择标准体系"
clearable
></el-input>
<!-- <tree-select-->
<!-- :data="standSystemOptions"-->
<!-- :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"-->
<!-- :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>-->
<!-- <tree-select-->
<!-- :data="standSystemOptions"-->
<!-- :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"-->
<!-- :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>-->
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
@@ -136,6 +136,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="归档位置" class="add-form-item form-item-disabled">
<el-input
style="display: none"
v-model="form.treeListId"
></el-input>
<el-tooltip effect="dark" :content=form.treeListName placement="top-start">
<el-input
v-model="form.treeListName"
clearable
placeholder="选择归档位置"
readonly>
</el-input>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -145,57 +159,27 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
<cus-tom-data-picker-group
:key="'ssrq'"
:config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
v-model="form.ssrq"
type="date"
placeholder="请选择标准实施日期(标准文本)">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
:disabled="true"
></cus-tom-data-picker-group>
<cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq"
type="date"
placeholder="请选择在产车实施日期(标准文本)">
</el-date-picker>
</el-form-item>
:disabled="true"
></cus-tom-data-picker-group>
</el-col>
<el-col :span="12">
<cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
v-model="form.xcxssrq"
:disabled="true"
></cus-tom-data-picker-group>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择实施日期(国际)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrqgj"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(国家)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</div>
<ProcessTitle>
@@ -289,7 +273,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -397,7 +381,7 @@
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -432,10 +416,10 @@
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-input v-model="form.wssmr">
</el-input>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
<!-- <el-option label="署名人1" value="1"></el-option>-->
<!-- <el-option label="署名人2" value="2"></el-option>-->
<!-- </el-select>-->
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
<!-- <el-option label="署名人1" value="1"></el-option>-->
<!-- <el-option label="署名人2" value="2"></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
@@ -470,14 +454,14 @@
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.xglc"-->
<!-- placeholder="请输入相关流程"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.xglc"-->
<!-- placeholder="请输入相关流程"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwjName }}
@@ -515,45 +499,45 @@
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.byybj"-->
<!-- placeholder="请输入被引用标准"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.chjl"-->
<!-- placeholder="请输入参会记录"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.byybj"-->
<!-- placeholder="请输入被引用标准"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.chjl"-->
<!-- placeholder="请输入参会记录"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
</el-form>
</div>
<div>
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="意见填写">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="意见填写">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
</div>
</div>
<div class="content" v-if="active === '2'">
@@ -572,7 +556,8 @@
<h4>责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="user2" placeholder="选择责任人">
</el-input></div>
</el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
@@ -651,7 +636,7 @@
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{scope.row.commentText}}</span>
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
@@ -659,35 +644,36 @@
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
<span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- <ProcessFooter-->
<!-- show-save-->
<!-- show-submit-->
<!-- :submitLoading="isSubmit"-->
<!-- :saveLoading="saveLoading"-->
<!-- @save="handleSave"-->
<!-- @submit="handleSubmit"-->
<!-- >-->
<!-- </ProcessFooter>-->
<!-- <ProcessFooter-->
<!-- show-save-->
<!-- show-submit-->
<!-- :submitLoading="isSubmit"-->
<!-- :saveLoading="saveLoading"-->
<!-- @save="handleSave"-->
<!-- @submit="handleSubmit"-->
<!-- >-->
<!-- </ProcessFooter>-->
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
export default {
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, processCreateStand} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default {
name: "bzrkStep5",
data () {
data() {
return {
xgdFileId: '',
fbgbjbdFileId: '',
@@ -698,11 +684,11 @@
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
zbjbdFileId: '',
// 当前流程类型(1待办/2已办)
processType: 1,
detailData: [],
userId:this.$store.getters.userInfo.userId,
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
approvalOpinion: '', // 通过/驳回
@@ -778,9 +764,9 @@
xglc: '', // 相关流程
chjl: '', // 参会记录
//流程信息
prcNum:'',
commentText:'',
prcName:'',
prcNum: '',
commentText: '',
prcName: '',
standType: '',
}, // 标准信息
standSortOptions: [], // 标准类别
@@ -806,56 +792,57 @@
user4: '',
user5: '',
// 流程路由信息
prcNum : this.$route.query.prcNum,
prcName : this.$route.query.prcName,
prcNum: this.$route.query.prcNum,
prcName: this.$route.query.prcName,
}
},
components: {
CusTomDataPickerGroup,
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect
},
computed: {
listNoDataText () {
listNoDataText() {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
},
},
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
if(this.fbgbjbdFileId.search(',')){
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
downloadFile(fileType) {
if (fileType === 'fbgbjbd') {
if (this.fbgbjbdFileId.search(',')) {
this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
console.log(this.fbgbjbdFileId);
}
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
} else if (fileType === 'xgd') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
} else if (fileType === 'bpg') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
} else if (fileType === 'ssg') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
} else if (fileType === 'zqyjg') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
} else if (fileType === 'jdwj') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
} else if (fileType === 'kwj') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
} else if (fileType === 'glwj') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
} else if (fileType === 'ca') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
} else if (fileType === 'zbjbd') {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
popoverHide (checkedIds, checkedData) {
popoverHide(checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
this.form.standSystem = checkedData.id
console.log(this.sarStandardsInfoEO.standSystem);
},
processTable () {
processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '',
@@ -865,7 +852,8 @@
_this: this
}, res => {
this.detailData = res
}, e => {})
}, e => {
})
},
getData() {
return new Promise((resolve, reject) => {
@@ -899,7 +887,7 @@
/**
* @description: 动态表单读取
*/
getFormFieldList (item) {
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.form.standSystem];
@@ -926,7 +914,8 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
},
handleSubmit() {
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
@@ -934,7 +923,7 @@
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
userId: this.userId,
json: json
}, {
_this: this
@@ -943,7 +932,7 @@
if (res.success) {
this.processCreateStand(json)
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
}
})
},
@@ -970,7 +959,7 @@
})
},
},
mounted () {
mounted() {
this.getData()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -993,20 +982,23 @@
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
})
}
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzrkStep2 {
/deep/.el-drawer__container {
@import '~@/assets/styles/style';
.bzrkStep2 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
@@ -1014,6 +1006,7 @@
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
@@ -1021,18 +1014,21 @@
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
@@ -1040,6 +1036,7 @@
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
@@ -1047,5 +1044,5 @@
}
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+2 -2
View File
@@ -2323,10 +2323,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+2 -2
View File
@@ -1908,10 +1908,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+2 -2
View File
@@ -1875,10 +1875,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+2 -2
View File
@@ -1966,10 +1966,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+2 -2
View File
@@ -1875,10 +1875,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+2 -2
View File
@@ -1966,10 +1966,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+2 -2
View File
@@ -2371,10 +2371,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+2 -2
View File
@@ -1861,10 +1861,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+2 -2
View File
@@ -1862,10 +1862,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+2 -2
View File
@@ -1912,10 +1912,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+2 -2
View File
@@ -2253,10 +2253,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+2 -2
View File
@@ -1912,10 +1912,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+2 -2
View File
@@ -2253,10 +2253,10 @@
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
name: 'OtherBussStandardDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
pageType: 'BUSINESS_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+5 -5
View File
@@ -876,11 +876,11 @@ export default {
})
}
break
//项目合规评估流程
//标准合规评估
case '5' :
if(row.taskInfo === '标准法规部业务经理审批'){
if(row.taskInfo === '审核(标准法规业务经理)'){
this.$router.push({
name: 'xmpgStep2',
name: 'bzpgStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -889,9 +889,9 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '标准评估任务下发'){
}else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){
this.$router.push({
name: 'xmpgStep3',
name: 'bzpgStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,