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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-01-27 22:35:39 +08:00
parent d60b2b47a4 c91d25d7bb
commit a81b065bf3
15 changed files with 1290 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+1 -1
View File
@@ -200,7 +200,7 @@ router.beforeEach(function (to, from, next) {
if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") {
extracted("xmpgStep1-2");
} else {
extracted("xmpgStep1-7");
extracted("bzpgStep8-1");
}
} else if (prcType === '6') {
//标准项目合规评估 项目维度
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+7 -7
View File
@@ -125,13 +125,6 @@
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
</template>
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="180"
@@ -162,6 +155,13 @@
prop="zrUserName"
align="center">
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+8 -8
View File
@@ -173,14 +173,6 @@
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
</template>
</el-table-column>
<el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint"
width="150"
label="相对于国行标差异点"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="180"
@@ -228,6 +220,14 @@
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
v-show="sarType === 'FOREIGN' && form.itemsNum1"
prop="changePoint"
width="150"
label="相对于国行标差异点"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
label="责任人"
width="170"
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+7 -7
View File
@@ -132,13 +132,6 @@
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="newData"
width="180"
@@ -163,6 +156,13 @@
{{ scope.row.applyArctic.toString() }}
</template>
</el-table-column>
<el-table-column
v-if="!form.itemsNum1"
prop="technicalRequir"
label="核心技术要求"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="changePoint"
v-if="form.itemsNum1"
src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+11 -12
View File
@@ -86,7 +86,7 @@
</el-button>
</div>
</div>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane
v-for="(item, index) in projectTabName"
:key="index"
@@ -97,7 +97,7 @@
</el-tabs>
<el-table
ref="multipleTable"
:data="dataList"
:data="dataList.filter(item =>{return item.projectName === projectName})"
style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="100%"
border
@@ -318,7 +318,8 @@ export default {
data(){
return {
active: '1',
activeName: 'first',
projectName: '',
activeName: '',
fileType: '', //条款文件类型
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
@@ -351,13 +352,7 @@ export default {
},
methods: {
handleClick(tab) {
let projectData = this.dataList
this.dataList = []
projectData.forEach(item => {
if(item.projectName === tab.name){
this.dataList.push(item)
}
})
this.projectName = tab.name
},
getData() {
return new Promise((resolve, reject) => {
@@ -377,6 +372,7 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList (item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.fileType = item.fileType
@@ -389,6 +385,7 @@ export default {
this.projectTabName.push(item.projectName)
}
})
this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
this.listForm.resDats = []
this.listForm.breakdownList = []
this.dataList.distributePerson = item.dataList[0].distributePerson
@@ -533,6 +530,7 @@ export default {
this.selectProject = data
},
choiceZRRS(row, type, index) {
localStorage.setItem('selectProject', JSON.stringify(this.selectProject))
this.type = type;
if (type === 1) {
this.nodeList2 = [];
@@ -574,6 +572,7 @@ export default {
projectList[this.lsIndex].implementer = nameList;
this.dataList = projectList
} else if (this.type === 2) {
this.selectProject = JSON.parse(localStorage.getItem('selectProject'))
let projectList = JSON.parse(JSON.stringify(this.dataList))
projectList.forEach(item => {
this.selectProject.forEach(items => {
@@ -671,8 +670,8 @@ export default {
}
}
}
/deep/.el-tabs__header{
margin: 0;
/deep/.el-tabs--border-card>.el-tabs__content{
padding: 0;
}
.demo-drawer-content {
margin-top: 10px;
src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+25 -1
View File
@@ -135,9 +135,18 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane
v-for="(item, index) in projectTabName"
:key="index"
:label="item"
:value="item"
:name="item">
</el-tab-pane>
</el-tabs>
<el-table
ref="multipleTable"
:data="dataList"
:data="dataList.filter(item =>{return item.projectName === projectName})"
tooltip-effect="dark"
style="width: 100%"
border
@@ -387,7 +396,9 @@ export default {
data() {
return {
//折叠的标志，true为折叠，false为不折叠
activeName: '',
foldFormFlag: false,
projectTabName: [],
comFlag: 0,
nodeList:[],
drawerTitle:'',
@@ -455,10 +466,14 @@ export default {
user3: "",
user4: "",
user5: "",
projectName: "",
standMap: new Map()
};
},
methods: {
handleClick(tab) {
this.projectName = tab.name
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -584,6 +599,12 @@ export default {
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList
item.dataList.forEach(item => {
if(!this.projectTabName.includes(item.projectName)){
this.projectTabName.push(item.projectName)
}
})
this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
@@ -727,6 +748,9 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-tabs--border-card>.el-tabs__content{
padding: 0;
}
/deep/.el-table th > .cell{
font-size: 14px;
}
src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
+761
View File
@@ -0,0 +1,761 @@
<!--标准合规评估 标准法规部部长审批-->
<template>
<div class="bzpg-step8">
<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 === false"
: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>
<el-form
v-if="foldFormFlag === true"
style="display: none"
: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
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
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>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane
v-for="(item, index) in projectTabName"
:key="index"
:label="item"
:value="item"
:name="item">
</el-tab-pane>
</el-tabs>
<el-table
ref="multipleTable"
:data="dataList.filter(item =>{return item.projectName === projectName})"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectGroup"
label="项目群">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="projectNumber"
label="项目编号">
</el-table-column>
<el-table-column
min-width="300"
:show-overflow-tooltip="true"
align="center"
prop="projectName"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
label="条款内容"
width="200"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
查看条款内容
</el-button>
</template>
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="140"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop="implementer"
align="center"
width="180"
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>
</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>
<!-- <ProcessFooter-->
<!-- show-submit-->
<!-- show-transfer-->
<!-- :submitLoading="isSubmit"-->
<!-- :saveLoading="saveLoading"-->
<!-- :transfer-loading="isTransfer"-->
<!-- :approval="true"-->
<!-- @transfer="handleTransfer"-->
<!-- @submit="handleSubmit"-->
<!-- >-->
<!-- </ProcessFooter>-->
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<el-dialog
title="查看条款内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import Moment from 'moment';
import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
export default {
name: "bzpgStep8-1",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
data() {
return {
//折叠的标志，true为折叠，false为不折叠
activeName: '',
foldFormFlag: false,
projectTabName: [],
comFlag: 0,
nodeList:[],
drawerTitle:'',
fileType: '',
itermsConditionsTitle: '',
itermsConditionsFlag: false,
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
processType: 1,
loading: false,
dataList: [],//清单里的标准数据
active: "1",
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
submitShow: false,
acceptShow: false,
todoId: '',
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
certifiedEngineerName: "", //认证工程师
qualityEngineerName: "", //质量工程师
dataList: [{
projectManager: "",
itemsName: "",
uname: "",
projectNumber: "",
implementer: "",
implementerId: "",
productLine: "",
itemNum: "",
distributePerson: "",
projectName: "",
distributePersonId: "",
complianceReasons: "", //在研合规原因
noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施
completionTime: "", //在研完成时间
zcComplianceReasons: "", //在产的合规原因
zcNoCompliance: "", //在产不合规项目
zcCountermeasures: "", //在产的应对措施
zcCompletionTime: "" //在产的完成时间
}]
},
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
user1: "",
projectName: "",
user2: "",
user3: "",
user4: "",
user5: "",
standMap: new Map()
};
},
methods: {
handleClick(tab) {
this.projectName = tab.name
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, e => {
});
},
//tab发生变化
handleTabs(name) {
this.active = name;
},
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.$http.get('SarStandItems/sar-stand-items/findItemById',{
type:this.fileType,
ids: row.id
},{
_this: this
}, res => {
this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'')
})
this.itermsConditionsFlag = true
},
//点击查看详情
handlePreview(item){
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank")
},
//将时间戳转换为日期格式
getLocalTime(item) {
return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
},
// 时间戳（毫秒）转化为标准时间格式
getFullTime(item) {
const stamp = new Date(item);
const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
return item = time
},
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) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
this.fileType = item.fileType
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList
item.dataList.forEach(item => {
if(!this.projectTabName.includes(item.projectName)){
this.projectTabName.push(item.projectName)
}
})
this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
}
});
},
//提交事件
handleSubmit() {
this.listForm.dataList = this.dataList
this.listForm.commentText = this.commentText;
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 => {
});
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
// for (let i = 0; i < data.length; i++) {
// this.selectList.push(data[i].id);
// }
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize
this.searchData();
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzpg-step8 {
/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%;
}
}
.datePickLen {
/deep/ .el-icon-circle-close:before {
margin-left: -180px;
}
}
.input-jump {
/deep/.el-input__inner{
color: #409EFF;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-tabs--border-card>.el-tabs__content{
padding: 0;
}
/deep/.el-table th > .cell{
font-size: 14px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+26 -2
View File
@@ -1,4 +1,4 @@
<!--标准合规评估 标准法规部部长审批-->
<!--标准合规评估 标准法规部部长审批-->
<template>
<div class="bzpg-step8">
<ProcessHeader toggle>
@@ -135,9 +135,18 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane
v-for="(item, index) in projectTabName"
:key="index"
:label="item"
:value="item"
:name="item">
</el-tab-pane>
</el-tabs>
<el-table
ref="multipleTable"
:data="dataList"
:data="dataList.filter(item =>{return item.projectName === projectName})"
tooltip-effect="dark"
style="width: 100%"
border
@@ -387,7 +396,9 @@ export default {
data() {
return {
//折叠的标志，true为折叠，false为不折叠
activeName: '',
foldFormFlag: false,
projectTabName: [],
comFlag: 0,
nodeList:[],
drawerTitle:'',
@@ -451,6 +462,7 @@ export default {
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
user1: "",
projectName: "",
user2: "",
user3: "",
user4: "",
@@ -459,6 +471,9 @@ export default {
};
},
methods: {
handleClick(tab) {
this.projectName = tab.name
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -584,6 +599,12 @@ export default {
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.dataList = item.dataList
item.dataList.forEach(item => {
if(!this.projectTabName.includes(item.projectName)){
this.projectTabName.push(item.projectName)
}
})
this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
@@ -727,6 +748,9 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-tabs--border-card>.el-tabs__content{
padding: 0;
}
/deep/.el-table th > .cell{
font-size: 14px;
}
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+192 -45
View File
@@ -50,7 +50,7 @@
</el-form-item>
<el-form-item class="add-form-item">
<div style="margin-top: 10px;margin-bottom: 10px">
<el-button type="primary" size="small" @click="addQblx">新增</el-button>
<el-button type="primary" size="small" @click="addQblx('add','企标制修订立项计划')">新增</el-button>
<el-button type="plain" size="small" @click="uploadQblx">上传</el-button>
<el-button type="success" size="small" @click="qblxTemplate">模板下载</el-button>
<el-button type="danger" size="small" @click="delQblx">删除</el-button>
@@ -65,14 +65,19 @@
@selection-change="selectedDelete"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="esName" label="企标名称" align="center" width="300" show-overflow-tooltip></el-table-column>
<el-table-column prop="dutyUnit" label="责任单位" align="center"></el-table-column>
<el-table-column prop="dutyPeople" label="责任人" align="center"></el-table-column>
<el-table-column type="selection" fixed="left" width="55"/>
<el-table-column type="index" label="序号" fixed="left" align="center" width="50"/>
<el-table-column prop="esName" label="企标名称" fixed="left" align="center" width="300" show-overflow-tooltip></el-table-column>
<el-table-column prop="dutyUnit" label="责任单位" width="200" align="center"></el-table-column>
<el-table-column prop="dutyPeople" label="责任人" width="150" align="center"></el-table-column>
<el-table-column prop="firstDraftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="planTime" label="计划完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="endTime" label="截止日期" width="150" align="center"></el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="editRow('edit','编辑信息',scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-form>
@@ -98,7 +103,6 @@
<el-form
ref="roleForm"
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
@@ -117,7 +121,7 @@
<h4>责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择标准法规工程师" @click.native="choiceZRR('dockUser', '选择标准责任人', roleForm.dockUser)">
<el-input v-model="roleForm.dockUserName" placeholder="责任人" disabled>
</el-input>
</div>
</el-form-item>
@@ -130,18 +134,53 @@
<!-- 新增/编辑弹框 -->
<el-drawer
title="企标制修订立项计划"
:title="qblxTitle"
:visible.sync="qblxModel"
size="600px"
:wrapper-closable="false"
custom-class="demo-drawer"
>
<el-form class="label-input-form" ref="addQblxData" style="height: 100%" :model="addQblxData" :rules="addRule">
<el-form-item class="add-form-item" label="企标名称"></el-form-item>
<el-form-item class="add-form-item" label="责任单位"></el-form-item>
<el-form-item class="add-form-item" label="责任人"></el-form-item>
<el-form-item class="add-form-item" label="初稿完成日期"></el-form-item>
<el-form-item class="add-form-item" label="计划完成日期"></el-form-item>
<el-form-item class="add-form-item" label="截止日期"></el-form-item>
<el-form-item class="add-form-item" label="企标名称">
<el-input style="width: 90%" v-model="addQblxData.esName" placeholder="请输入企标名称"></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="责任单位">
<el-input style="width: 90%" v-model="addQblxData.dutyUnit" placeholder="请填写责任单位"></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="责任人" prop="dutyPeople">
<el-input v-model="addQblxData.dutyPeopleId" style="display: none"/>
<el-input style="width: 90%" v-model="addQblxData.dutyPeople" placeholder="请选择责任人" @click.native="choiceZRR"/>
</el-form-item>
<el-form-item class="picker_style" label="初稿完成日期">
<el-date-picker
v-model="addQblxData.firstDraftTime"
type="datetime"
:picker-options="datePicker"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择初稿完成日期"
align="right">
</el-date-picker>
</el-form-item>
<el-form-item class="picker_style" label="计划完成日期">
<el-date-picker
v-model="addQblxData.planTime"
type="datetime"
:picker-options="datePicker"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择计划完成日期"
align="right">
</el-date-picker>
</el-form-item>
<el-form-item class="picker_style" label="截止日期">
<el-date-picker
v-model="addQblxData.endTime"
type="datetime"
:picker-options="datePicker"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择截止日期"
align="right">
</el-date-picker>
</el-form-item>
</el-form>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
@@ -172,7 +211,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst } from '@/api/process.js'
import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst} from '@/api/process.js'
export default {
components: {
@@ -193,8 +232,8 @@ export default {
qblxRule: {},
roleForm: {
startUser: '',
startUserName: '',
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
dockUser: '',
dockUserName: '',
},
@@ -205,16 +244,21 @@ export default {
fillFileList: [],
// 新增弹框
qblxTitle: '',
btnType: '',
qblxModel: false,
addQblxData: {
esName: '',
dutyUnit: '',
dutyPeopleId: '',
dutyPeople: '',
firstDraftTime: '',
planTime: '',
endTime: '',
},
addRule: {},
addRule: {
dutyPeople: [{required: true, message: '请选择责任人', trigger: ['blur', 'change']}]
},
isSubmit: false,
saveLoading: false,
@@ -225,6 +269,15 @@ export default {
taskID: '',
bpnId: '',
// 表格勾选数据储存
deleteDataList: [],
// 设置当前日期之前不可选择
datePicker: {
disabledDate(date) {
return date.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
}
}
},
@@ -315,7 +368,8 @@ export default {
},
// 表格勾选事件
selectedDelete() {
selectedDelete(val) {
this.deleteDataList = val
},
// 流程阶段负责人选择
@@ -323,24 +377,90 @@ export default {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.modalshowflag = true
},
// 选人组件确认
drawerCheck(data) {
this.roleForm.dockUser = data[0].id
this.roleForm.dockUserName = data[0].name
this.addQblxData.dutyPeopleId = data[0].id
this.addQblxData.dutyPeople = data[0].name
this.modalshowflag = false
},
/** 新增按钮 */
addQblx() {
addQblx(type,title) {
this.btnType = type
this.qblxTitle = title
this.qblxModel = true
},
// 抽屉确认按钮
OkDrawer() {},
OkDrawer() {
this.$refs['addQblxData'].validate((valid) => {
if (valid) {
if (this.btnType === 'add') {
this.qblx_pageData.qblxData.push(this.addQblxData)
}
this.addQblxData = {}
this.qblxModel = false
}
})
},
// 抽屉取消按钮
closeDrawer() {},
closeDrawer() {
if (this.btnType === 'edit') {
let Items = JSON.parse(localStorage.getItem('obj'))
this.addQblxData.esName = Items.esName
this.addQblxData.dutyUnit = Items.dutyUnit
this.addQblxData.dutyPeopleId = Items.dutyPeopleId
this.addQblxData.dutyPeople = Items.dutyPeople
this.addQblxData.firstDraftTime = Items.firstDraftTime
this.addQblxData.planTime = Items.planTime
this.addQblxData.endTime = Items.endTime
} else {
this.addQblxData = {}
}
this.qblxModel = false
},
editRow(type,title,val) {
this.btnType = type
this.qblxTitle = title
localStorage.setItem('obj', JSON.stringify(val))
this.addQblxData = val
this.qblxModel = true
},
/** 删除按钮*/
delQblx() {
if (this.deleteDataList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
let exits = [];
this.deleteDataList.map(item => {
let index;
index = this.qblx_pageData.qblxData.findIndex(items => {
return items === item;
});
if (index > -1) {
this.qblx_pageData.qblxData.splice(index, 1);
}
exits.push(item);
});
this.deleteDataList = [];
}).catch(() => {
});
}
},
/** 数据上传到列表 */
uploadQblx() {},
/** 模板下载 */
qblxTemplate() {},
// 保存按钮
handleSave() {
this.saveLoading = true
@@ -368,7 +488,6 @@ export default {
let json = {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
roleForm: this.roleForm,
qblx_pageData: this.qblx_pageData,
commentText: this.commentText
}
@@ -386,23 +505,37 @@ export default {
processBack(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskID)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res => {
return res
})
}
this.$router.push("/processCenter");
this.qblx_pageData.qblxData.forEach((item, index) => {
let newJson = {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
qblx_pageData: {
projectTarget: this.qblx_pageData.projectTarget,
qblxFile: this.qblx_pageData.qblxFile,
qblxData: item,
},
commentText: this.commentText
}
this.isSubmit = false
params.set('json', JSON.stringify(newJson))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskID)
completeTask(params).then(res => {
if (res.success === true) {
if (index === this.qblx_pageData.qblxData.length) {
this.$message.success('提交成功')
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res => {
return res
})
}
this.$router.push("/processCenter");
}
}
this.isSubmit = false
})
})
})
} else {
@@ -425,10 +558,11 @@ export default {
position: relative;
height: 100%;
/deep/.el-upload-list__item-name {
/deep/ .el-upload-list__item-name {
margin-left: 48px;
}
/deep/.el-upload-list {
/deep/ .el-upload-list {
width: 50%;
margin-bottom: 10px;
}
@@ -500,10 +634,23 @@ export default {
/deep/ .el-textarea__inner {
font-family: inherit;
}
/deep/ .el-table th {
padding: 0px;
}
}
.picker_style {
margin-left: 10px;
margin-bottom: 0;
min-height: 50px;
line-height: 50px;
border-bottom: 1px dashed #e5e5e5;
/deep/.el-input__inner{
border: 0;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+202 -24
View File
@@ -1,12 +1,12 @@
<template>
<div class="qbzxdlxStep1">
<div class="qbzxdlxStep2">
<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 === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -18,7 +18,7 @@
<el-form-item label="项目目标:" class="add-form-item">
<el-input
style="width: 90%"
clearable
readonly
v-model="qblx_pageData.projectTarget"
placeholder="请输入项目目标"/>
</el-form-item>
@@ -39,25 +39,40 @@
></el-button>
</div>
</el-form-item>
<el-form-item class="add-form-item">
<el-table
:data="qblx_pageData.qblxData"
border
ref="entryTable"
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="esName" label="企标名称" align="center" width="300" show-overflow-tooltip></el-table-column>
<el-table-column prop="dutyUnit" label="责任单位" align="center"></el-table-column>
<el-table-column prop="dutyPeople" label="责任人" align="center"></el-table-column>
<el-table-column prop="firstDraftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="planTime" label="计划完成日期" width="150" align="center"></el-table-column>
<el-table-column prop="endTime" label="截止日期" width="150" align="center"></el-table-column>
</el-table>
</el-form-item>
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="企标名称">
<!--<a>{{ qblx_pageData.qblxData.esName || '-' }}</a>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="责任单位:">
<!--<a>{{ qblx_pageData.qblxData.dutyUnit || '-' }}</a>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="责任人:">
<!--<a>{{ qblx_pageData.qblxData.dutyPeople || '-' }}</a>-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="add-form-item" label="初稿完成日期:">
<!--<a>{{ qblx_pageData.qblxData.firstDraftTime || '-' }}</a>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="计划完成日期:">
<!--<a>{{ qblx_pageData.qblxData.planTime || '-' }}</a>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="add-form-item" label="截止时间:">
<!--<a>{{ qblx_pageData.qblxData.endTime || '-' }}</a>-->
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
@@ -75,6 +90,73 @@
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<div class="flow-list">
<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>
<ProcessFooter
show-submit
@@ -118,6 +200,10 @@ export default {
modalshowflag: false,
nodeList: [],
infoSourcesLength: '',
detailData: [],
loading: false,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
}
},
@@ -131,6 +217,9 @@ export default {
this.getData()
},
methods: {
handleTabs(name) {
this.active = name
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -158,7 +247,6 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.qblx_pageData = JSON.parse(JSON.stringify(item)).qblx_pageData
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
this.infoSourcesLength = this.qblx_pageData.qblxFile.length
})
},
@@ -226,6 +314,96 @@ export default {
}
</script>
<style scoped>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.qbzxdlxStep2 {
position: relative;
height: 100%;
/deep/ .el-upload-list__item-name {
margin-left: 48px;
}
/deep/ .el-upload-list {
width: 50%;
margin-bottom: 10px;
}
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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;
}
}
}
.content_form {
padding-top: 15px;
.el-divider--horizontal {
margin-top: 0px;
}
/deep/ .el-table__body-wrapper {
height: auto !important;
}
/deep/ .el-textarea__inner {
font-family: inherit;
}
/deep/ .el-table th {
padding: 0px;
}
}
}
</style>
src/pages/processCenter/pages/processAcceptDetail/index.vue
+2 -6
View File
@@ -231,12 +231,8 @@ export default {
//标准清单发布流程数据
this.toProcessDetail('bzqdfbStep1-4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
if(row.taskInfo === '标准法规部领导审核'){
this.toProcessDetail('xmpgStep1-7',row)
}else{
this.toProcessDetail('xmpgStep1-2',row)
}
//标准项目合规评估
this.toProcessDetail('bzpgStep8-1',row)
}else if(prcType === '6'){
//标准项目合规评估 项目维度
if(row.taskInfo === '标准法规部部长审批'){
src/pages/processCenter/pages/processDetail/index.vue
+2 -6
View File
@@ -240,12 +240,8 @@ export default {
//标准清单发布流程数据
this.toProcessDetail('bzqdfbStep1-4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
if(row.taskInfo === '标准法规部领导审核'){
this.toProcessDetail('xmpgStep1-7',row)
}else{
this.toProcessDetail('xmpgStep1-2',row)
}
//标准项目合规评估
this.toProcessDetail('bzpgStep8-1',row)
}else if(prcType === '6'){
//标准项目合规评估 项目维度
if(row.taskInfo === '标准法规部部长审批'){
src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue
+6 -6
View File
@@ -33,9 +33,9 @@
<el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
<el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
</el-form-item>
<el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
<el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
</el-form-item>
<!-- <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
<!-- <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
<!-- </el-form-item>-->
</el-form>
</div>
<div class="demo-drawer-footer">
@@ -59,7 +59,7 @@
newText: '',
reason: '',
chapterName: '',
cause: '',
// cause: '',
},
opinionContentRules: {
partCode: [
@@ -91,7 +91,7 @@
reason: this.opinionContent.reason,
partCode: this.opinionContent.partCode,
chapterName: this.opinionContent.chapterName,
cause: this.opinionContent.cause,
// cause: this.opinionContent.cause,
userId: this.$route.query.userId || '',
userName: this.$route.query.userName || '',
deptName: this.$route.query.institutionName || '',
@@ -109,7 +109,7 @@
this.opinionContent.reason = ''
this.opinionContent.oldText = ''
this.opinionContent.newText = ''
this.opinionContent.cause = ''
// this.opinionContent.cause = ''
this.opinionContent.chapterName = ''
}
})
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+31 -13
View File
@@ -141,13 +141,6 @@
>
</el-table-column>
</el-table-column>
<el-table-column
prop="cause"
align="center"
label="原因"
width="170"
>
</el-table-column>
<el-table-column
prop="deptName"
align="center"
@@ -162,6 +155,21 @@
label="提出人"
>
</el-table-column>
<el-table-column
prop="state"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
<el-table-column
prop="cause"
align="center"
label="原因"
width="170"
>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
@@ -219,9 +227,9 @@
<el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
<el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
</el-form-item>
<el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
<el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
</el-form-item>
<!-- <el-form-item label="原因" prop="cause" label-width="" class="add-form-item">-->
<!-- <el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>-->
<!-- </el-form-item>-->
</el-form>
</div>
<div class="demo-drawer-footer">
@@ -272,7 +280,7 @@
newText: '',
reason: '',
chapterName: '',
cause: '',
// cause: '',
},
opinionContentRules: {
partCode: [
@@ -302,6 +310,15 @@
}
},
methods: {
stateText(row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
} else {
return '不上报'
}
},
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
@@ -355,6 +372,7 @@
_this: this
}, res => {
this.standinfoList = res.data.records
console.log(res.data.records);
this.total = res.data.total
this.spinShow = false
}, e => {
@@ -485,7 +503,7 @@
reason: this.opinionContent.reason,
partCode: this.opinionContent.partCode,
chapterName: this.opinionContent.chapterName,
cause: this.opinionContent.cause,
// cause: this.opinionContent.cause,
userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.institutionName || '',
@@ -512,7 +530,7 @@
this.opinionContent.reason = ''
this.opinionContent.oldText = ''
this.opinionContent.newText = ''
this.opinionContent.cause = ''
// this.opinionContent.cause = ''
}
}
})
src/router/index.js
+9
View File
@@ -592,6 +592,15 @@ const routes = [
title: '标准合规评估流程'
}
},
{
path: '/bzpgStep8-1',
name: 'bzpgStep8-1',
component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue'),
meta: {
requireAuth: true,
title: '标准合规评估流程'
}
},
{
path: '/xmpgStep1',
name: 'xmpgStep1',