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:
zhutianqi
2022-03-02 17:20:32 +08:00
parent 5df597dd55 8c2f7a9a35
commit 44b7ead145
41 changed files with 1112 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+20 -20
View File
@@ -117,7 +117,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '企标编写汇总修订'){
}else if (row.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibrary3',
query: {
@@ -128,7 +128,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){
}else if (row.taskInfo === '重新起草'){
this.$router.push({
name: 'bussLibraryC1',
query: {
@@ -139,7 +139,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '标准化员初审'){
}else if (row.taskInfo === '标准化初审'){
this.$router.push({
name: 'bussLibrary4',
query: {
@@ -150,7 +150,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新企标汇总修订'){
}else if (row.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryC3',
query: {
@@ -161,7 +161,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '会签征求意见'){
}else if (row.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibrary5',
query: {
@@ -172,7 +172,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '技术委员会评审/评审意见修改评审'){
}else if (row.taskInfo === '技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibrary6',
query: {
@@ -183,7 +183,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '复审'){
}else if (row.taskInfo === '标准化复审'){
this.$router.push({
name: 'bussLibrary7',
query: {
@@ -194,7 +194,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新技术委员会评审/评审意见修改评审'){
}else if (row.taskInfo === '重新技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibraryC6',
query: {
@@ -249,7 +249,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '培训'){
}else if (row.taskInfo === '主起草人培训'){
this.$router.push({
name: 'bussLibrary12',
query: {
@@ -285,7 +285,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '企标编写汇总修订'){
}else if (row.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibraryProduct3',
query: {
@@ -296,7 +296,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新企标编写汇总修订'){
}else if (row.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryProductC3',
query: {
@@ -307,7 +307,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '标准化员初审'){
}else if (row.taskInfo === '标准化初审'){
this.$router.push({
name: 'bussLibraryProduct4',
query: {
@@ -318,7 +318,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '会签征求意见'){
}else if (row.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibraryProduct5',
query: {
@@ -329,7 +329,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '意见汇总及标准修改'){
}else if (row.taskInfo === '意见汇总修订'){
this.$router.push({
name: 'bussLibraryProduct6',
query: {
@@ -340,7 +340,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新意见汇总及标准修改'){
}else if (row.taskInfo === '重新意见汇总修订'){
this.$router.push({
name: 'bussLibraryProductC6',
query: {
@@ -420,7 +420,7 @@ export default {
}
break;
case 'buss3':
if (row.taskInfo === '对接人选择复审人') {
if (row.taskInfo === '选择复审人') {
this.$router.push({
name: 'qbfsStepSub1',
query: {
@@ -431,7 +431,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '复审人选择复审结果'){
}else if (row.taskInfo === '复审'){
this.$router.push({
name: 'qbfsStepSub2',
query: {
@@ -442,7 +442,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '发起人汇总结果'){
}else if (row.taskInfo === '汇总'){
this.$router.push({
name: 'bussFs2',
query: {
@@ -453,7 +453,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新发起人汇总结果'){
}else if (row.taskInfo === '重新汇总'){
this.$router.push({
name: 'bussFsC2',
query: {
@@ -464,7 +464,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '标准法规部高级经理批准'){
}else if (row.taskInfo === '批准'){
this.$router.push({
name: 'bussFs3',
query: {
src/pages/processCenter/pages/components/ProcessMixin.vue
+1 -1
View File
@@ -126,7 +126,7 @@ export default {
methods: {
getPrcNameFilter(row){
if(row && row.prcType === 'buss3'){
return row.prcName + '-' + row.taskInfo
return row.prcName
}else {
return row.prcName
}
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+17 -5
View File
@@ -3,7 +3,7 @@
<div class="qbfs-step1">
<ProcessHeader toggle>
<template slot="proName">企标复审流程</template>
<template slot="proNode">发起流程</template>
<template slot="proNode">起草</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -253,19 +253,31 @@
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top">
<el-timeline-item timestamp="起草" placement="top">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>流程发起人</h4>
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
<el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
<el-input v-model="roleForm.prcCreateUserName" placeholder="标准法规工程师"
disabled></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择标准法规部高级经理" placement="top" >
<el-timeline-item timestamp="汇总" placement="top">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
<el-input v-model="roleForm.prcCreateUserName" placeholder="标准法规工程师"
disabled></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" >
<el-card>
<el-form-item prop="bussFsUser3Name" style="margin-bottom: 0">
<h4>标准法规部高级经理</h4>
src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfs-step2">
<ProcessHeader toggle>
<template slot="proName">企标复审流程</template>
<template slot="proNode">对接人选择复审人</template>
<template slot="proNode">选择复审人</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfs-step2">
<ProcessHeader toggle>
<template slot="proName">企标复审流程</template>
<template slot="proNode">复审人选择复审结果</template>
<template slot="proNode">复审</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfs-step2">
<ProcessHeader toggle>
<template slot="proName">企标复审流程</template>
<template slot="proNode">发起人汇总结果</template>
<template slot="proNode">汇总</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfs-step2">
<ProcessHeader toggle>
<template slot="proName">企标复审流程</template>
<template slot="proNode">标准法规部高级经理批准</template>
<template slot="proNode">批准</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+791
View File
@@ -0,0 +1,791 @@
<template>
<div class="qbfs-step2">
<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">
<el-form
ref="qbfsForm"
:model="qbfsForm"
:rules="formRules"
style="border: none"
class="label-input-form"
label-width="150px"
>
<div style="flex: auto; overflow: auto" v-show="active === '1'">
<formList
:key = "formKey"
:formSub = "qbfsForm"
:FBGBUSSFileList = "FBGBUSSFileList"
:LSBBBUSSFileList = "LSBBBUSSFileList"
:BZSMBUSSFileList = "BZSMBUSSFileList"
:QTWJBUSSFileList = "QTWJBUSSFileList"
:GLWJBUSSFileList = "GLWJBUSSFileList"
:LXDListSub = "LXDList === undefined ? [] : LXDList"
:FSDListSub = "FSDList === undefined ? [] : FSDList"
:disabledState = "disabledState"
:opinionsShow2 = "true"
:verifySarStandard = "verifySarStandard"
@formCancel="formCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
></formList>
<div>
<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 style="padding-top: 20px;" v-show="active === '3'">
<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>
</el-form>
</div>
<ProcessFooter
v-show="verifySarStandard"
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRoles"
:nodeList="nodeList"
></Role-tree>
<!-- 选择责任人-->
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<loading :loading="dataLoading">正在加载数据</loading>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
import formList from './common/formList.vue'
export default {
name: "bussFsC2",
components:{
ProcessHeader,
ProcessFooter,
ProcessTitle,
formList
},
data() {
const validateLxOnlineFile = async (rule, value, callback) => {
if(this.qbfsForm.LXD){
let fileObj = await this.processEditFile(this.qbfsForm.LXD)
if (fileObj) {
const editFileInfo = fileObj
if (editFileInfo && editFileInfo.editStatus === '1') {
callback()
} else {
callback(new Error('请先在线编辑,再提交流程！'))
}
}
}
};
const validateFsOnlineFile = async (rule, value, callback) => {
if(this.qbfsForm.FSD){
let fileObj = await this.processEditFile(this.qbfsForm.FSD)
if (fileObj) {
const editFileInfo = fileObj
console.log(editFileInfo)
if (editFileInfo && editFileInfo.editStatus === '1') {
callback()
} else {
callback(new Error('请先在线编辑,再提交流程！'))
}
}
}
};
return {
dataLoading:true,
bpnId: '',
formKey:1,
active: '1',
modalShowRoleFlag:false,
disabledState:true,
verifySarStandard:true,
FBGBUSSFileList: [],
BZSMBUSSFileList: [],
LSBBBUSSFileList: [],
QTWJBUSSFileList: [],
GLWJBUSSFileList: [],
LXDList: [],
FSDList: [],
fileList: [],
commentText: '',
detailData: [],
nodeList: [],
nodeList2: [],
isSubmit: false,
saveLoading: false,
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
loading: false,
qbfsForm:{
entNumber: '',
cnName: '',
enName: '',
entCategory: '',
replaceNumber: '',
replacedNumber: '',
releaseDate: '',
implementDate: '',
reviewDate: '',
jgUser: '',
jgUserId: '',
bussFsSubUser2:'',
bussFsSubUser2Name:'',
},
roleForm: {
jgUser: ""
},
formRules: {
jgUser: [
{required: true, message: "请选择工作组成员", trigger: "change"}
],
bussFsSubUser2Name: [
{required: true, message: "请选择企标复审人", trigger: "change"}
],
QCRBUSS: [
{required: true, message: "请选择主起草人", trigger: "change"}
],
reviewResults: [
{required: true, message: "请选择复审结果", trigger: "change"}
],
draftTime: [
{required: true, message: "请选择初稿完成日期", trigger: "change"}
],
releaseTime: [
{required: true, message: "请选择计划标准发布日期", trigger: "change"}
],
expirationDate: [
{required: true, message: "请选择截止日期", trigger: "change"}
],
FSDName: [
{ required: true, validator: validateFsOnlineFile, trigger: 'blur' }
],
LXDName: [
{ required: true, validator: validateLxOnlineFile, trigger: 'blur' }
],
},
}
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDataS()
}
this.processTable()
this.getData()
},
watch:{
'qbfsForm.reviewResults': {
handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if(val === '1'){
if (this.bpnId === undefined) {
}
}
}
}
},
},
methods:{
async getFile(){
},
getSaveFile(model) {
return new Promise((resolve, reject) => {
this.$http.get('/lawss/activiti/saveEditFile', {
model: model
}, {
_this: this
}, res => {
const history = res;
resolve(history)
})
})
},
checkedRole2 (data) {
let idList = ''
let nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if(this.userType === 'QCRBUSS'){
this.qbfsForm.QCRBUSSID=idList;
this.qbfsForm.QCRBUSS=nameList;
this.formKey++
}
if(data !== undefined && data && data.length > 0){
const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
choiceZRRList (type, title, id) {
this.nodeList2 = []
if(type === 'QCRBUSS'){
if ( this.qbfsForm.QCRBUSSID !== undefined && this.qbfsForm.QCRBUSSID.length > 0) {
this.nodeList2 = this.qbfsForm.QCRBUSSID.split(',')
}
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
formChoiceZRRListCancel(type, title, id){
this.choiceZRRList(type, title, id)
},
formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
this.qbfsForm = form
this.FBGBUSSFileList = list1
this.LSBBBUSSFileList = list2
this.BZSMBUSSFileList = list3
this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5
this.LXDList = list6
this.FSDList = list7
},
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 => {
})
},
assemble(ids,names){
let list= new Array();
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
}
return list;
},
getStandInfoUpdateById(standId) {
return new Promise((resolve, reject) => {
this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: standId}, {
_this: this
}, res => {
if(res && res.data){
const history = res;
resolve(history)
}
})
})
},
getDataS(){
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.qbfsForm = mes.qbfsForm
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.standardDrawer = false
this.verifySarStandard = true
this.commentText = mes.commentText
this.formKey++
this.$forceUpdate()
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
}
}).catch(e => {
})
})
},
/**
* @description: 动态表单读取
*/
async getFormFieldList (item) {
let standObj = await this.getStandInfoUpdateById(item.standId)
let fileObjFx = await this.getSaveFile("model_fs")
let fileObjLx = await this.getSaveFile("model_lx")
this.$nextTick(() => {
const bringData = standObj.data
const obj = {
reviewResults: "",
reviewResultsContent:"",
reviewUserId:this.$store.getters.userInfo.userId,
reviewUserName:this.$store.getters.userInfo.userName,
draftTime:"",
releaseTime:"",
expirationDate:"",
LXDName:"",
LXD:"",
FSDName:"",
FSD:"",
QCRBUSSID:"",
QCRBUSS:"",
}
const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
this.qbfsForm = JSON.parse(JSON.stringify(json))
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
if(fileObjFx){
this.qbfsForm.FSD = fileObjFx.id
if(this.qbfsForm.standName){
this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
}else {
this.qbfsForm.FSDName = '复审单'
}
this.FSDList=this.assemble(fileObjFx.id,this.qbfsForm.FSDName);
}
if(fileObjLx){
this.qbfsForm.LXD = fileObjLx.id
if(this.qbfsForm.standName){
this.qbfsForm.LXDName = this.qbfsForm.standName + '-立项单'
}else {
this.qbfsForm.LXDName = '立项单'
}
this.LXDList=this.assemble(fileObjLx.id,this.qbfsForm.LXDName);
}
this.standardDrawer = false
this.verifySarStandard = true
this.formKey++
this.$forceUpdate()
this.dataLoading = false
})
},
handleTabs(name) {
this.active = name;
},
//流程保存
handleSave(){
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({
qbfsForm: this.qbfsForm,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
processEditFile(id) {
return new Promise((resolve, reject) => {
processEditFile({
id
}).then(res => {
if (res) {
const history = res;
resolve(history)
} else {
reject()
}
}).catch(e => {
reject(e)
})
})
},
//流程提交
handleSubmit(){
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.saveLoading = true
this.qbfsForm.commentText = this.commentText
let json = JSON.stringify(this.qbfsForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
if (this.bpnId !== undefined && this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
})
}
}
this.isSubmit = false
this.saveLoading = false
}, e => {
});
}else {
this.$message.warning('请检查基础信息表单是否填写完整')
}
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
//确认转办
checkedRoles (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)
})
},
choiceZRRS() {
this.drawerTitle = '请选择企标复审人'
this.nodeList2 = [];
if (this.qbfsForm.bussFsSubUser2) {
this.nodeList2 = this.qbfsForm.bussFsSubUser2.split(",");
}
this.modalshowflag = true;
},
checkedRole(data) {
let idList = "";
let nameList = "";
data.forEach(item => {
if (nameList.length) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
this.$set(this.qbfsForm, 'jgUser', nameList)
this.$set(this.qbfsForm, 'jgUserId', idList)
if(this.qbfsForm.jgUser){
this.$refs.qbfsForm.validateField('jgUser')
}
this.$set(this.qbfsForm, 'bussFsSubUser2Name', nameList)
this.$set(this.qbfsForm, 'bussFsSubUser2', idList)
if(this.qbfsForm.bussFsSubUser2Name){
this.$refs.qbfsForm.validateField('bussFsSubUser2Name')
}
},
/**
* @Description: 点击下载
*/
downloadFile(attId) {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
} else {
this.$message.error("请选择要下载的文件");
}
},
downloadFileByWater(attId, fileSuffix) {
let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
if (fileExtension !== "pdf" && fileExtension !== "PDF") {
this.$message.error("水印下载仅支持PDF,pdf格式文件");
} else {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
} else {
this.$message.error("请选择要下载的文件");
}
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.qbfs-step2 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
p {
& > a {
cursor: pointer;
}
& > i {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
}
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
.icon-download2 {
background-image: url("~assets/images/shangqi/img/download2.png");
}
}
.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%;
}
}
}
.add-form-el-select {
/deep/ .el-select {
width: 210px;
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+34 -44
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">发起企标制修订流程</template>
<template slot="proNode">起草</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -66,7 +66,7 @@
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-show="form.standStatus === '3'" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-form-item v-if="form.standStatus === '3'" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-input v-model="form.standYear"
disabled
placeholder="请输入标准年份"
@@ -520,17 +520,17 @@
:model="roleForm"
:rules="roleRules"
class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
<h4>流程发起人</h4>
<h4>标准起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.prcCreateUserName" placeholder="流程发起人"></el-input>
<el-input disabled v-model="roleForm.prcCreateUserName" placeholder="标准起草人"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择其他起草人" prop="bussUser2Name" placement="top" :color="roleForm.bussUser2Name ? '#66b1ff' : ''">
<el-timeline-item timestamp="企标编写" prop="bussUser2Name" placement="top" :color="roleForm.bussUser2Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser2Name" style="margin-bottom: 0">
<h4>其他起草人</h4>
@@ -540,12 +540,12 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="企标编写汇总修订人" placement="top" :color="roleForm.bussUser3Name ? '#66b1ff' : ''">
<el-timeline-item timestamp="企标编写汇总" placement="top" :color="roleForm.bussUser3Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser3Name" style="margin-bottom: 0">
<h4>企标编写汇总修订人</h4>
<h4>标准起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.bussUser3Name" readonly="readonly" clearable placeholder="企标编写汇总修订人"></el-input>
<el-input disabled v-model="roleForm.bussUser3Name" readonly="readonly" clearable placeholder="标准起草人"></el-input>
</div>
</el-form-item>
</el-card>
@@ -553,29 +553,29 @@
<el-timeline-item timestamp="标准化初审" prop="bussUser4Name" placement="top" :color="roleForm.bussUser4Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser4Name" style="margin-bottom: 0">
<h4>总院各中心兼职标准化员/各事业部标准化员</h4>
<h4>标准法规工程师/事业部标准化员</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser4Name" readonly="readonly" placeholder="选择总院各中心兼职标准化员/各事业部标准化员" @click.native="choiceZRR('bussUser4', '选择总院各中心兼职标准化员/各事业部标准化员', roleForm.bussUser4)"></el-input>
<el-input v-model="roleForm.bussUser4Name" readonly="readonly" placeholder="选择标准法规工程师/事业部标准化员" @click.native="choiceZRR('bussUser4', '选择标准法规工程师/事业部标准化员', roleForm.bussUser4)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="征求意见" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-timeline-item timestamp="征求意见（各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT）" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser5Name" style="margin-bottom: 0">
<h4>会签征求意见人员</h4>
<h4>各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择会签征求意见人员" @click.native="choiceZRRList('bussUser5', '选择会签征求意见人员', roleForm.bussUser5)"></el-input>
<el-input v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT" @click.native="choiceZRRList('bussUser5', '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT', roleForm.bussUser5)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="意见汇总及标准修改" placement="top" :color="roleForm.bussUser6Name ? '#66b1ff' : ''">
<el-timeline-item timestamp="意见汇总修订" placement="top" :color="roleForm.bussUser6Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser6Name" style="margin-bottom: 0">
<h4>意见汇总及标准修改人员</h4>
<h4>标准起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.bussUser6Name" placeholder="意见汇总及标准修改人员"></el-input>
<el-input disabled v-model="roleForm.bussUser6Name" placeholder="标准起草人"></el-input>
</div>
</el-form-item>
</el-card>
@@ -583,9 +583,9 @@
<el-timeline-item timestamp="标准化复审" prop="bussUser7Name" placement="top" :color="roleForm.bussUser7Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser7Name" style="margin-bottom: 0">
<h4>总院标准法规部产品标准工程师/各事业部标准法规部人员</h4>
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser7Name" readonly="readonly" placeholder="总院标准法规部产品标准工程师/各事业部标准法规部人员" @click.native="choiceZRR('bussUser7', '选择总院标准法规部产品标准工程师/各事业部标准法规部人员', roleForm.bussUser7)"></el-input>
<el-input v-model="roleForm.bussUser7Name" readonly="readonly" placeholder="标准法规工程师" @click.native="choiceZRR('bussUser7', '选择标准法规工程师', roleForm.bussUser7)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -593,9 +593,9 @@
<el-timeline-item timestamp="审核" prop="bussUser8Name" placement="top" :color="roleForm.bussUser8Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser8Name" style="margin-bottom: 0">
<h4>总院:项目总工、标准法规部高级经理/各事业部:整车所产品经理、标准业务/认证业务经理</h4>
<h4>总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser8Name" readonly="readonly" placeholder="选择总院:项目总工、标准法规部高级经理/各事业部:整车所产品经理、标准业务/认证业务经理" @click.native="choiceZRRList('bussUser8', '选择总院:项目总工、标准法规部高级经理/各事业部:整车所产品经理、标准业务/认证业务经理', roleForm.bussUser8)"></el-input>
<el-input v-model="roleForm.bussUser8Name" readonly="readonly" placeholder="选择总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理" @click.native="choiceZRRList('bussUser8', '选择总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理', roleForm.bussUser8)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -613,9 +613,9 @@
<el-timeline-item timestamp="审定" prop="bussUser10Name" placement="top" :color="roleForm.bussUser10Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser10Name" style="margin-bottom: 0">
<h4>总院:产品工程经理、技术管理中心主任/各事业部:技术中心主任、主管标准业务高级经理</h4>
<h4>产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser10Name" readonly="readonly" placeholder="选择总院:产品工程经理、技术管理中心主任/各事业部:技术中心主任、主管标准业务高级经理" @click.native="choiceZRRList('bussUser10', '选择总院:产品工程经理、技术管理中心主任/各事业部:技术中心主任、主管标准业务高级经理', roleForm.bussUser10)"></el-input>
<el-input v-model="roleForm.bussUser10Name" readonly="readonly" placeholder="选择产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理" @click.native="choiceZRRList('bussUser10', '选择总院:产品工程经理、技术管理中心主任/各事业部:技术中心主任、主管标准业务高级经理', roleForm.bussUser10)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -633,9 +633,9 @@
<el-timeline-item timestamp="批准" prop="bussUser12Name" placement="top" :color="roleForm.bussUser12Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser12Name" style="margin-bottom: 0">
<h4>总院平台总监/各事业部研发副总裁</h4>
<h4>总院项目经理/事业部研发副总裁</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser12Name" readonly="readonly" placeholder="选择总院平台总监/各事业部研发副总裁" @click.native="choiceZRR('bussUser12', '选择总院平台总监/各事业部研发副总裁', roleForm.bussUser12)"></el-input>
<el-input v-model="roleForm.bussUser12Name" readonly="readonly" placeholder="选择总院项目经理/事业部研发副总裁" @click.native="choiceZRR('bussUser12', '选择总院项目经理/事业部研发副总裁', roleForm.bussUser12)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -643,9 +643,9 @@
<el-timeline-item timestamp="发布" prop="bussUser13Name" placement="top" :color="roleForm.bussUser13Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser13Name" style="margin-bottom: 0">
<h4>总院:标准法规部产品标准工程师;各事业部:各事业部标准化员</h4>
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.bussUser13Name" readonly="readonly" placeholder="选择总院:标准法规部产品标准工程师;各事业部:各事业部标准化员" @click.native="choiceZRR('bussUser13', '选择总院:标准法规部产品标准工程师;各事业部:各事业部标准化员', roleForm.bussUser13)"></el-input>
<el-input v-model="roleForm.bussUser13Name" readonly="readonly" placeholder="选择标准法规工程师" @click.native="choiceZRR('bussUser13', '选择标准法规工程师', roleForm.bussUser13)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1385,34 +1385,25 @@
{ required: true, message: '选择其他起草人', trigger: 'blur' },
],
bussUser4Name: [
{ required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'blur' },
{ required: true, message: '选择标准法规工程师/事业部标准化员', trigger: 'blur' },
],
bussUser5Name: [
{ required: true, message: '选择会签征求意见人员', trigger: 'blur' },
{ required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT', trigger: 'blur' },
],
bussUser7Name: [
{ required: true, message: '选择总院标准法规部产品标准工程师/各事业部标准法规部人员', trigger: 'blur' },
{ required: true, message: '选择标准法规工程师', trigger: 'blur' },
],
bussUser8Name: [
{ required: true, message: '选择总院项目总工/各事业部整车所产品经理', trigger: 'blur' },
],
bussUser9Name: [
{ required: true, message: '选择标总院标准法规部高级经理/各事业部标准业务/认证业务经理', trigger: 'blur' },
{ required: true, message: '选择总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理', trigger: 'blur' },
],
bussUser10Name: [
{ required: true, message: '选择总院标准法规部高级经理/各事业部标准业务/认证业务经理', trigger: 'blur' },
],
bussUser11Name: [
{ required: true, message: '选择总院技术管理中心主任/各事业部主管标准业务高级经理', trigger: 'blur' },
{ required: true, message: '选择产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理', trigger: 'blur' },
],
bussUser12Name: [
{ required: true, message: '选择总院平台总监/各事业部研发副总裁', trigger: 'blur' },
{ required: true, message: '选择总院项目经理/事业部研发副总裁', trigger: 'blur' },
],
bussUser13Name: [
{ required: true, message: '选择总院标准法规部产品标准工程师/各事业部标准化员', trigger: 'blur' },
],
bussUser14Name: [
{ required: true, message: '选择抄送人员', trigger: 'blur' },
{ required: true, message: '选择标准法规工程师', trigger: 'blur' },
],
},
rules:{
@@ -1437,7 +1428,6 @@
],
standYear: [
{ required: false, message: '请输入标准年份'},
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
],
standName: [
{ required: true, message: '请输入企标中文名称', trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">企标编写流程</template>
<template slot="proNode">企标编写</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">企标编写汇总修订</template>
<template slot="proNode">企标编写汇总</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">标准化员初审</template>
<template slot="proNode">标准化初审</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">会签征求意见</template>
<template slot="proNode">征求意见</template>
</ProcessHeader>
<div class="headerTabs">
<!-- <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">会签评分</div>-->
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">意见汇总及标准修改</template>
<template slot="proNode">意见汇总修订</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">复审</template>
<template slot="proNode">标准化复审</template>
</ProcessHeader>
<div class="headerTabs">
<!-- <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">复审评分</div>-->
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">重新企标编写汇总修订</template>
<template slot="proNode">重新企标编写汇总</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-产品标准</template>
<template slot="proNode">重新意见汇总及标准修改</template>
<template slot="proNode">重新意见汇总修订</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+30 -27
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">发起企标制修订流程</template>
<template slot="proNode">起草</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -522,17 +522,17 @@
:model="roleForm"
:rules="roleRules"
class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
<h4>流程发起人</h4>
<h4>标准起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.prcCreateUserName" placeholder="流程发起人"></el-input>
<el-input disabled v-model="roleForm.prcCreateUserName" placeholder="标准起草人"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择其他起草人" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="企标编写" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="qcUserName" style="margin-bottom: 0">
<h4>其他起草人</h4>
@@ -542,12 +542,12 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="企标编写汇总修订人" placement="top" :color="roleForm.hzUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="企标编写汇总" placement="top" :color="roleForm.hzUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hzUserName" style="margin-bottom: 0">
<h4>企标编写汇总修订人</h4>
<h4>标准起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.hzUserName" readonly="readonly" clearable placeholder="企标编写汇总修订人"></el-input>
<el-input disabled v-model="roleForm.hzUserName" readonly="readonly" clearable placeholder="标准起草人"></el-input>
</div>
</el-form-item>
</el-card>
@@ -562,32 +562,32 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="征求意见" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hqUserName" style="margin-bottom: 0">
<h4>会签征求意见人员</h4>
<h4>张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.hqUserName" placeholder="选择会签征求意见人员" readonly="readonly" @click.native="choiceZRRList('hqUserId', '选择会签征求意见人员', roleForm.hqUserId)"></el-input>
<el-input v-model="roleForm.hqUserName" placeholder="选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师" readonly="readonly" @click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="评审/评审意见修改" placement="top" :color="roleForm.xdUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="技术委员会评审、评审意见修改" placement="top" :color="roleForm.xdUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="xdUserName" style="margin-bottom: 0">
<h4>技术委员会评审/评审意见修改人员</h4>
<h4>标准起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.xdUserName" readonly="readonly" placeholder="技术委员会评审/评审意见修改人员"></el-input>
<el-input disabled v-model="roleForm.xdUserName" readonly="readonly" placeholder="标准起草人"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="复审" prop="fggcsUserName" placement="top" :color="roleForm.fggcsUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="标准化复审" prop="fggcsUserName" placement="top" :color="roleForm.fggcsUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="fggcsUserName" style="margin-bottom: 0">
<h4>标准法规部标准化工程师</h4>
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.fggcsUserName" readonly="readonly" placeholder="标准法规部标准化工程师" @click.native="choiceZRR('fggcsUserId', '选择标准法规部标准化工程师', roleForm.fggcsUserId)"></el-input>
<el-input v-model="roleForm.fggcsUserName" readonly="readonly" placeholder="标准法规工程师" @click.native="choiceZRR('fggcsUserId', '选择标准法规工程师', roleForm.fggcsUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -625,9 +625,9 @@
<el-timeline-item timestamp="批准" prop="zhrUserName" placement="top" :color="roleForm.zhrUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="zhrUserName" style="margin-bottom: 0">
<h4>总院院长或总院主管副院长</h4>
<h4>总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.zhrUserName" readonly="readonly" placeholder="选择总院院长或总院主管副院长" @click.native="choiceZRR('zhrUserId', '选择总院院长或总院主管副院长', roleForm.zhrUserId)"></el-input>
<el-input v-model="roleForm.zhrUserName" readonly="readonly" placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长" @click.native="choiceZRR('zhrUserId', '选择总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.zhrUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -635,9 +635,9 @@
<el-timeline-item timestamp="培训" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hzUserName" style="margin-bottom: 0">
<h4>主起草人培训</h4>
<h4>标准起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.pxUserName" readonly="readonly" clearable placeholder="主起草人培训"></el-input>
<el-input disabled v-model="roleForm.pxUserName" readonly="readonly" clearable placeholder="标准起草人"></el-input>
</div>
</el-form-item>
</el-card>
@@ -645,9 +645,9 @@
<el-timeline-item timestamp="发布" prop="fbUserName" placement="top" :color="roleForm.fbUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="fbUserName" style="margin-bottom: 0">
<h4>标准法规部标准化工程师发布人员</h4>
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.fbUserName" readonly="readonly" placeholder="选择标准法规部标准化工程师" @click.native="choiceZRR('fbUserId', '选择标准法规部标准化工程师发布人员', roleForm.fbUserId)"></el-input>
<el-input v-model="roleForm.fbUserName" readonly="readonly" placeholder="选择标准法规工程师" @click.native="choiceZRR('fbUserId', '选择标准法规工程师', roleForm.fbUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1445,10 +1445,10 @@
{ required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'blur' },
],
hqUserName: [
{ required: true, message: '选择会签征求意见人员', trigger: 'blur' },
{ required: true, message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'blur' },
],
fggcsUserName: [
{ required: true, message: '选择标准法规部标准化工程师', trigger: 'blur' },
{ required: true, message: '选择标准法规工程师', trigger: 'blur' },
],
jsfzrUserName: [
{ required: true, message: '选择起草单位高级经理', trigger: 'blur' },
@@ -1460,10 +1460,10 @@
{ required: true, message: '选择起草单位中心主任', trigger: 'blur' },
],
zhrUserName: [
{ required: true, message: '选择总院院长或总院主管副院长', trigger: 'blur' },
{ required: true, message: '选择总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: 'blur' },
],
fbUserName: [
{ required: true, message: '选择标准法规部标准化工程师发布人员', trigger: 'blur' },
{ required: true, message: '选择标准法规工程师', trigger: 'blur' },
],
},
rules:{
@@ -1959,6 +1959,9 @@
// 起草部门带入
this.form.QCDW = this.filterDate(this.standardCheckedList[0].unitName)
this.form.QCDWID = this.filterDate(this.standardCheckedList[0].unit)
this.form.TXLBBUSS = this.filterDate(this.standardCheckedList[0].tsJsonName)
this.form.menuId = this.filterDate(this.standardCheckedList[0].tsJson)
this.form.treeType = 'sarMs'
this.standardDrawer = false
this.verifySarStandard = true
this.planDisabled = false
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">培训</template>
<template slot="proNode">主起草人培训</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">企标编写流程</template>
<template slot="proNode">企标编写</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" v-show="form.fsRejectStatus === 2" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">历史评分</div>
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">企标编写汇总修订</template>
<template slot="proNode">企标编写汇总</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">标准化员初审</template>
<template slot="proNode">标准化初审</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">会签征求意见</template>
<template slot="proNode">征求意见</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">会签评分</div>
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">技术委员会评审/评审意见修改评审</template>
<template slot="proNode">技术委员会评审、评审意见修改</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">复审</template>
<template slot="proNode">标准化复审</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">复审评分</div>
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">起草单位高级经理审核</template>
<template slot="proNode">审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">标准法规部高级经理审核</template>
<template slot="proNode">审核</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">审核评分</div>
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">重新发起企标制修订-技术标准流程</template>
<template slot="proNode">重新起草</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">历史评分</div>
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">重新企标编写汇总修订</template>
<template slot="proNode">重新企标编写汇总</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<!-- 标准入库流程-->
<ProcessHeader toggle>
<template slot="proName">企标制修订-技术标准</template>
<template slot="proNode">重新技术委员会评审/评审意见修改评审</template>
<template slot="proNode">重新技术委员会评审、评审意见修改</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+2 -1
View File
@@ -869,13 +869,14 @@ export default {
//IE浏览器、微软浏览器
/* 经过测试，微软浏览器Microsoft Edge下载文件时必须要重命名文件才可以打开，
IE可不重命名，以防万一，所以都写上比较好 */
window.navigator.msSaveBlob(blob, '立项.xls');
window.navigator.msSaveBlob(blob, '企标制修订立项计划模板.xls');
} else {
//其他浏览器
let link = document.createElement('a'); // 创建a标签
link.style.display = 'none';
let objectUrl = URL.createObjectURL(blob);
link.href = objectUrl;
link.download = '企标制修订立项计划模板.xls';
link.click();
URL.revokeObjectURL(objectUrl);
}
src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue
+1 -1
View File
@@ -359,7 +359,7 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.standId,
id: item.key || item.standId,
pageType: "INLAND_STAND"
}
});
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+74 -3
View File
@@ -244,6 +244,41 @@
<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.managementHostName"
@change="optionsChange(projectSearch)"
placeholder="请选择管理主体" filterable clearable>
<el-option
v-for="(item, index) in managementHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="开发主体" class="search-item search-item-last">
<el-select v-model="projectSearch.developmentHostName" @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
<el-option
v-for="(item, index) in developmentHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目细分类" class="search-item search-item-last">
<el-select v-model="projectSearch.categoryName" @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
<el-option
v-for="(item, index) in categoryName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectNumber"
@@ -418,6 +453,9 @@ export default {
},
data() {
return {
managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框
categoryName: [], //项目细分类下拉框
foldFormFlag: false,
standModel: false,
addShow: true,
@@ -477,7 +515,10 @@ export default {
//项目检索条件
projectSearch: {
projectNumber: "",
projectName: ""
projectName: "",
managementHostName: "", //管理主体
developmentHostName: "", //开发主体
categoryName: "" //项目细分类
},
//项目数据
ProjectDatas: [],
@@ -492,6 +533,32 @@ export default {
};
},
methods: {
optionsChange(){
/**
* 获取项目群筛选项的值
*/
this.$http.post("sarStandProjectLibrary/querySelect", {
...this.projectSearch
}, {
_this: this
}, res => {
res.data.managementHostList.forEach(item => {
if (item) {
this.managementHostName.push(item); //管理主体
}
});
res.data.developmentHostList.forEach(item => {
if (item) {
this.developmentHostName.push(item); //开发主体
}
});
res.data.categoryList.forEach(item => {
if (item) {
this.categoryName.push(item); //项目细分类
}
});
});
},
fileTypeChange(type){
this.fileType = type
let ids = [];
@@ -562,7 +629,10 @@ export default {
clearSearch() {
this.projectSearch = {
projectName: "",
projectNumber: ""
projectNumber: "",
managementHostName: "", //管理主体
developmentHostName: "", //开发主体
categoryName: "" //项目细分类
};
this.getProjectData();
},
@@ -646,7 +716,7 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", {
id: this.projectId,
current: this.pageNo,
PageSize: this.pageSizeNo
PageSize: this.pageSizeNo,
}, {
_this: this
}, res => {
@@ -852,6 +922,7 @@ export default {
},
},
mounted() {
this.optionsChange()
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getData()
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+1 -1
View File
@@ -373,7 +373,7 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.standId,
id: item.key || item.standId,
pageType: "INLAND_STAND"
}
});
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+1 -1
View File
@@ -370,7 +370,7 @@ export default {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.standId,
id: item.key || item.standId,
pageType: "INLAND_STAND"
}
});
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+2 -2
View File
@@ -220,7 +220,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
<el-card shadow="hover" v-btn-permission="''">
<div class="card-box" @click="handleCreateProcess('23')">
<div class="card-top">
<div class="card-top-left">
@@ -250,7 +250,7 @@
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
<el-card shadow="hover" v-btn-permission="''">
<div class="card-box" @click="handleCreateProcess('25')">
<div class="card-top">
<div class="card-top-left">
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+20 -20
View File
@@ -331,7 +331,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '企标编写汇总修订'){
}else if (row.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibrary3',
query: {
@@ -342,7 +342,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){
}else if (row.taskInfo === '重新起草'){
this.$router.push({
name: 'bussLibraryC1',
query: {
@@ -353,7 +353,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '标准化员初审'){
}else if (row.taskInfo === '标准化初审'){
this.$router.push({
name: 'bussLibrary4',
query: {
@@ -364,7 +364,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新企标编写汇总修订'){
}else if (row.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryC3',
query: {
@@ -375,7 +375,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '会签征求意见'){
}else if (row.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibrary5',
query: {
@@ -386,7 +386,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '技术委员会评审/评审意见修改评审'){
}else if (row.taskInfo === '技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibrary6',
query: {
@@ -397,7 +397,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '复审'){
}else if (row.taskInfo === '标准化复审'){
this.$router.push({
name: 'bussLibrary7',
query: {
@@ -408,7 +408,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新技术委员会评审/评审意见修改评审'){
}else if (row.taskInfo === '重新技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibraryC6',
query: {
@@ -463,7 +463,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '培训'){
}else if (row.taskInfo === '主起草人培训'){
this.$router.push({
name: 'bussLibrary12',
query: {
@@ -524,7 +524,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '企标编写汇总修订'){
}else if (row.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibraryProduct3',
query: {
@@ -535,7 +535,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新企标编写汇总修订'){
}else if (row.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryProductC3',
query: {
@@ -546,7 +546,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '标准化员初审'){
}else if (row.taskInfo === '标准化初审'){
this.$router.push({
name: 'bussLibraryProduct4',
query: {
@@ -557,7 +557,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '会签征求意见'){
}else if (row.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibraryProduct5',
query: {
@@ -568,7 +568,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '意见汇总及标准修改'){
}else if (row.taskInfo === '意见汇总修订'){
this.$router.push({
name: 'bussLibraryProduct6',
query: {
@@ -579,7 +579,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新意见汇总及标准修改'){
}else if (row.taskInfo === '重新意见汇总修订'){
this.$router.push({
name: 'bussLibraryProductC6',
query: {
@@ -659,7 +659,7 @@ export default {
}
break;
case 'buss3':
if (row.taskInfo === '对接人选择复审人') {
if (row.taskInfo === '选择复审人') {
this.$router.push({
name: 'qbfsStepSub1',
query: {
@@ -670,7 +670,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '复审人选择复审结果'){
}else if (row.taskInfo === '复审'){
this.$router.push({
name: 'qbfsStepSub2',
query: {
@@ -681,7 +681,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '发起人汇总结果'){
}else if (row.taskInfo === '汇总'){
this.$router.push({
name: 'bussFs2',
query: {
@@ -692,7 +692,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新发起人汇总结果'){
}else if (row.taskInfo === '重新汇总'){
this.$router.push({
name: 'bussFsC2',
query: {
@@ -703,7 +703,7 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '标准法规部高级经理批准'){
}else if (row.taskInfo === '批准'){
this.$router.push({
name: 'bussFs3',
query: {
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+71 -16
View File
@@ -292,7 +292,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '发起企标制修订流程'){
}else if (mes.taskInfo === '起草'){
this.$router.push({
name: 'bussLibrary1',
query: {
@@ -302,7 +302,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新发起企标制修订-技术标准流程'){
}else if (mes.taskInfo === '重新起草'){
this.$router.push({
name: 'bussLibraryC1',
query: {
@@ -312,7 +312,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '企标编写汇总修订'){
}else if (mes.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibrary3',
query: {
@@ -323,7 +323,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '标准化员初审'){
}else if (mes.taskInfo === '标准化初审'){
this.$router.push({
name: 'bussLibrary4',
query: {
@@ -333,7 +333,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新企标编写汇总修订'){
}else if (mes.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryC3',
query: {
@@ -344,7 +344,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '会签征求意见'){
}else if (mes.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibrary5',
query: {
@@ -355,7 +355,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '技术委员会评审/评审意见修改评审'){
}else if (mes.taskInfo === '技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibrary6',
query: {
@@ -366,7 +366,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '复审'){
}else if (mes.taskInfo === '标准化复审'){
this.$router.push({
name: 'bussLibrary7',
query: {
@@ -377,7 +377,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新技术委员会评审/评审意见修改评审'){
}else if (mes.taskInfo === '重新技术委员会评审、评审意见修改'){
this.$router.push({
name: 'bussLibraryC6',
query: {
@@ -430,7 +430,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '培训'){
}else if (mes.taskInfo === '主起草人培训'){
this.$router.push({
name: 'bussLibrary12',
query: {
@@ -458,7 +458,7 @@ export default {
name: 'bussLibrary1',
query: {
type: 'buss1',
processName: '发起企标制修订流程',
processName: '起草',
bpnId: id,
verifySarStandard: true,
}
@@ -477,7 +477,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '发起企标制修订流程'){
}else if (mes.taskInfo === '起草'){
this.$router.push({
name: 'bussLibraryProduct1',
query: {
@@ -487,7 +487,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '企标编写汇总修订'){
}else if (mes.taskInfo === '企标编写汇总'){
this.$router.push({
name: 'bussLibraryProduct3',
query: {
@@ -497,7 +497,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新企标编写汇总修订'){
}else if (mes.taskInfo === '重新企标编写汇总'){
this.$router.push({
name: 'bussLibraryProductC3',
query: {
@@ -507,7 +507,7 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '会签征求意见'){
}else if (mes.taskInfo === '征求意见'){
this.$router.push({
name: 'bussLibraryProduct5',
query: {
@@ -553,13 +553,68 @@ export default {
name: 'bussLibraryProduct1',
query: {
type: 'buss2',
processName: '发起企标制修订流程',
processName: '起草',
bpnId: id,
verifySarStandard: true,
}
})
}
break
case 'buss3':
if(mes !== null && mes.taskInfo !== null) {
if (mes.taskInfo === '起草'){
this.$router.push({
name: 'bussLibraryProduct1',
query: {
type: 'buss3',
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '汇总'){
this.$router.push({
name: 'bussFs2',
query: {
type: 'buss3',
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新汇总'){
this.$router.push({
name: 'bussFsC2',
query: {
type: 'buss3',
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '复审'){
this.$router.push({
name: 'qbfsStepSub2',
query: {
type: 'buss3',
processName: mes.taskInfo,
bpnId: id,
verifySarStandard: true,
}
})
}
}else {
this.$router.push({
name: 'qbfsStep1',
query: {
type: 'buss3',
processName: '起草',
bpnId: id,
verifySarStandard: true,
}
})
}
break
// 法规入库及评估流程
case '2':
this.$router.push({
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+8 -2
View File
@@ -3160,7 +3160,11 @@ export default {
},
treeClick(treeNode) {
this.selectSarMenu = treeNode
this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
this.sarStandardsSearch.treeType = treeNode.treeType
this.sarStandardsSearch.page = 1
this.standCommonlySearch.menuId = treeNode.id
this.standCommonlySearch.treeType = treeNode.treeType
this.standCommonlySearch.page = 1
this.getDomesticStandardTable()
},
@@ -3899,9 +3903,11 @@ export default {
}
const formData = {...data}
if (!item) {
formData.menuId = this.selectSarMenu.id
} else {
formData.menuId = this.standCommonlySearch.menuId
formData.treeType = this.standCommonlySearch.treeType
} else {
formData.menuId = this.selectSarMenu.id
formData.treeType = this.selectSarMenu.treeType
}
formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+6 -6
View File
@@ -185,7 +185,7 @@
<el-table-column
prop="planCloseTime"
width="150"
label="计划关闭时间">
label="整改完成时间">
<template slot-scope="scope">
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
</template>
@@ -261,7 +261,7 @@
<el-form-item class="add-form-item" label="质量工程师:">
<div class="seeItem">{{ historySeeForm.qaEngineer }}</div>
</el-form-item>
<el-form-item class="add-form-item" label="计划关闭时间:">
<el-form-item class="add-form-item" label="整改完成时间:">
<div class="seeItem">
{{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }}
</div>
@@ -530,12 +530,12 @@
@click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
/>
</el-form-item>
<el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px"
<el-form-item prop="planCloseTime" label="整改完成时间" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-date-picker
v-model="addForm.planCloseTime"
type="date"
placeholder="请选择计划关闭时间"
placeholder="请选择整改完成时间"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
@@ -775,7 +775,7 @@ export default {
dutyEngineer: "", //责任工程师
authEngineer: "", //认证工程师
qaEngineer: "", //质量工程师
planCloseTime: "" //计划关闭时间
planCloseTime: "" //整改完成时间
}, //表单数据
formRules: {
standSerialNumber: [
@@ -812,7 +812,7 @@ export default {
{ required: true, message: "请输入责任工程师", trigger: "change" }
],
planCloseTime: [
{ required: true, message: "请选择计划关闭时间", trigger: "change" }
{ required: true, message: "请选择整改完成时间", trigger: "change" }
]
},
drawerTable: false, //表单模态窗
src/router/index.js
+9
View File
@@ -1991,6 +1991,15 @@ const routes = [
title: '企标复审流程'
}
},
{
path: '/bussFsC2',
name: 'bussFsC2',
component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue'),
meta: {
requireAuth: true,
title: '企标复审流程'
}
},
{
path: '/bussFs3',
name: 'bussFs3',