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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-03-03 15:45:54 +08:00
parent 88bff9ed10 23bda279d7
commit 5bfe05beb7
41 changed files with 1177 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+9
View File
@@ -192,6 +192,15 @@ router.beforeEach(function (to, from, next) {
if (prcType === '1') {
// 标准入库流程数据
extracted("bzrkStep5");
} else if (prcType === 'buss1') {
//标准清单发布流程数据
extracted("bussLibraryDetail");
} else if (prcType === 'buss2') {
//标准清单发布流程数据
extracted("bussLibraryProductDetail");
} else if (prcType === 'buss3') {
//标准清单发布流程数据
extracted("bussFsDetail");
} else if (prcType === '4') {
//标准清单发布流程数据
extracted("bzqdfbStep1-4");
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -461,7 +461,7 @@
</p>
</template>
<template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
>
<p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index">
src/pages/home2/components/solicitopinions/index.vue
+2 -2
View File
@@ -83,11 +83,11 @@ export default {
});
},
standForComments(item) {
this.$store.commit("setDetailMap", this.$router.path);
this.$store.commit("setDetailMap", this.$router.path);
this.$router.push({
name: "consultationDetails",
query: {
item: item
item: JSON.stringify(item)
}
});
}
src/pages/home2/components/todoList/index.vue
+12
View File
@@ -970,6 +970,18 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新起草') {
this.$router.push({
name: 'wfhxzgStep1',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
taskAssignee: row.taskAssignee,
prcName: row.prcName,
prcType: row.prcType
}
})
}else {
this.$router.push({
name: 'wfhxzgStep5',
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+2 -3
View File
@@ -329,12 +329,11 @@ export default {
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
stateText: "处理意见",
cause: "原因",
},
dataList: []
};
if (title === '上报意见.xls') {
params.columnName.stateText = "处理意见"
}
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
+897
View File
@@ -0,0 +1,897 @@
<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="false"-->
<!-- show-over2-->
<!-- show-submit2-->
<!-- show-transfer-->
<!-- :submitLoading="isSubmit"-->
<!-- :saveLoading="saveLoading"-->
<!-- @transfer="handleTransfer"-->
<!-- @submit2="handle2"-->
<!-- @over2="handle1"-->
<!-- >-->
<!-- </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,processCreateFsBuss } from "api/process";
import formList from './common/formListStep5.vue'
export default {
name: "bussFsDetail",
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: '',
approvalOpinion: '',
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:'',
},
formBuss: {
selListRep2:[],
id:'',
standNum:'',
standStatus:'', // 标准状态
planId:'',
planStatus:'',
reviseStatus:'',
standSn:'',
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
BARQ: '',
XGD: '',
XGDName: '',
// 基础信息
country:[],
// 基础信息
standSort: '',
standCode: '',
standYear: '',
standName: '',
standEnName: '',
textStatusBuss: '',
issueTime: '',
expirationDate: '',
putTime: '',
FZRQBUSS: '',
FSRQBUSS: '',
// 过程稿件
FBGBUSS: '',
FBGBUSSName: '',
BZSMBUSS: '',
BZSMBUSSName: '',
LSBBBUSS: '',
LSBBBUSSName: '',
QTWJBUSS: '',
QTWJBUSSName: '',
// 适用范围
QCDW: '',
QCDWID: '',
QCRBUSS: '',
QCRBUSSID: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId,
WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '',
NYLXCLASS: '',
SYCPXCLASS: '',
TXLBBUSS: '',
VPPSBMBUSS: '',
VPPSCNBUSS: '',
KCVPPSBMBUSS: '',
KCVPPSCNBUSS: '',
CYCVPPSBMBUSS: '',
CYCVPPSCNBUSS: '',
DYBXHBUSS: '',
DYMCBUSS: '',
// 关联信息
DTQBBHBUSS: '',
BDTQBBHBUSS: '',
XGJLBUSS: '',
XGLC: '',
GLWJBUSS: '',
GLWJBUSSName: '',
XCSJBUSS: '',
}, // 标准信息
roleForm:{
bussUser3: '',
bussUser3Name: '',
bussUser6: '',
bussUser6Name: '',
bussUser2: '', // 多实例
bussUser2Name:'', // 多实例
bussUser5:'', // 多实例
bussUser5Name:'', // 多实例
bussUser4:'',
bussUser4Name:'',
bussUser7:'',
bussUser7Name:'',
bussUser8:'',
bussUser8Name:'',
bussUser9:'',
bussUser9Name:'',
bussUser10:'',
bussUser10Name:'',
bussUser11:'',
bussUser11Name:'',
bussUser12:'',
bussUser12Name:'',
bussUser13:'',
bussUser13Name:'',
bussUser14:'',
bussUser14Name:'',
applyUpdUserId: '',
applyUpdUserName: '',
prcCreateUser: '',
prcCreateUserName: '',
},
formRules: {
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
},
}
},
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)
this.$nextTick(() => {
const bringData = standObj.data
const json = Object.assign(bringData, bringData.attrInfoMap,item);
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);
this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.LXDList=this.assemble(this.qbfsForm.LXD,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)
})
})
},
/**
* @description: 流程入库
* @date
*/
processCreateFsBuss(json) {
const _formData = new FormData()
_formData.append('infoJson', json)
processCreateFsBuss(_formData).then(res => {
if (res.result === '操作成功' || res.data === '入库成功') {
if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){
this.routerBussProStand()
}
if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.submitLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.isSubmit = false
}
})
},
async routerBussProStand(){
this.roleForm.bussUser3 = this.qbfsForm.QCRBUSSID
this.roleForm.bussUser3Name = this.qbfsForm.QCRBUSS
this.roleForm.bussUser6 = this.qbfsForm.QCRBUSSID
this.roleForm.bussUser6Name = this.qbfsForm.QCRBUSS
this.roleForm.applyUpdUserId = this.qbfsForm.QCRBUSSID
this.roleForm.applyUpdUserName = this.qbfsForm.QCRBUSS
this.roleForm.prcCreateUser = this.qbfsForm.QCRBUSSID
this.roleForm.prcCreateUserName = this.qbfsForm.QCRBUSS
this.formBuss.expirationDate = this.qbfsForm.expirationDate
this.formBuss.QCRBUSS = this.qbfsForm.QCRBUSS
this.formBuss.QCRBUSSID = this.qbfsForm.QCRBUSSID
this.formBuss.QCDW = this.qbfsForm.QCDW
this.formBuss.QCDWID = this.qbfsForm.QCDWID
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.qbfsForm.QCRBUSSID)
_formData.append('createUserName', this.qbfsForm.QCRBUSS)
_formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({
taskInfo: '发起企标制修订流程',
form: this.formBuss,
roleForm: this.roleForm,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('自动创建企标制修订-产品标准流程，跳转至主起草人流程中心草稿')
this.bpnId = res.result
}).catch(e => {
})
},
//流程提交
handleSubmit(){
this.getRule()
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.isSubmit = false
this.processCreateFsBuss(json)
}
}, e => {
});
}else {
this.$message.warning('请检查基础信息表单是否填写完整')
}
})
},
handleTransfer() {
this.drawerModal = true
this.drawerTitle = '转办处理人'
},
handle1(){
this.qbfsForm.approvalOpinion = 1
this.handleSubmit()
},
handle2(){
this.qbfsForm.approvalOpinion = 0
this.handleSubmit()
},
getRule(){
if (this.qbfsForm.approvalOpinion === 0) {
this.formRules.commentText[0].required = false;
this.$refs.qbfsForm.clearValidate('commentText')
}else {
this.formRules.commentText[0].required = true;
}
},
//确认转办
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
+1 -1
View File
@@ -2751,7 +2751,7 @@
_formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({
taskInfo: '发起企标制修订流程',
taskInfo: '起草',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+1 -1
View File
@@ -660,7 +660,7 @@
}
}]
},
taskInfo:'总院标准法规部产品标准工程师发布',
taskInfo:'发布',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+1 -1
View File
@@ -704,7 +704,7 @@
}
}]
},
taskInfo:'企标编写汇总修订',
taskInfo:'企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+1 -1
View File
@@ -826,7 +826,7 @@
editableTabsValue:"",
showDrawerTitle:"",
showDrawer:false,
taskInfo: '会签征求意见',
taskInfo: '征求意见',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+1 -1
View File
@@ -774,7 +774,7 @@
}
}]
},
taskInfo:'意见汇总及标准修改',
taskInfo:'意见汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+1 -1
View File
@@ -667,7 +667,7 @@
},
loading: false,
disabledState: true,
taskInfo:'标准法规工程师复审',
taskInfo:'标准化复审',
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+1 -1
View File
@@ -704,7 +704,7 @@
}
}]
},
taskInfo:'企标编写汇总修订',
taskInfo:'重新企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+1 -1
View File
@@ -774,7 +774,7 @@
}
}]
},
taskInfo:'意见汇总及标准修改',
taskInfo:'重新意见汇总修订',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+1 -1
View File
@@ -2734,7 +2734,7 @@
_formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
taskInfo: '发起企标制修订流程',
taskInfo: '起草',
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+1 -1
View File
@@ -2214,7 +2214,7 @@
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: '标准法规部标准化工程师发布',
taskInfo: '发布',
form: this.form,
roleForm: this.roleForm,
commentText: this.formTongGuo.commentText
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+1 -1
View File
@@ -701,7 +701,7 @@
}
}]
},
taskInfo:'企标编写汇总修订',
taskInfo:'企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+1 -1
View File
@@ -995,7 +995,7 @@
editableTabsValue:"",
showDrawerTitle:"",
showDrawer:false,
taskInfo: '会签征求意见',
taskInfo: '征求意见',
loading: false,
disabledState: true,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+1 -1
View File
@@ -933,7 +933,7 @@
}
}]
},
taskInfo:'技术委员会评审/评审意见修改评审',
taskInfo:'技术委员会评审、评审意见修改',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+1 -1
View File
@@ -768,7 +768,7 @@
},
loading: false,
disabledState: true,
taskInfo:'标准法规部标准化工程师复审',
taskInfo:'标准化复审',
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+4 -4
View File
@@ -1210,11 +1210,11 @@
},
calScope(){
if(this.evaluationMap){
const hqSum = this.evaluationMap["会签征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
const fsSum = this.evaluationMap["复审"]
const hqSum = this.evaluationMap["征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
return parseFloat(aveCount).toFixed(1)
}
return 0
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+5 -5
View File
@@ -1212,11 +1212,11 @@
},
calScope(){
if(this.evaluationMap){
const hqSum = this.evaluationMap["会签征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"]
const fsSum = this.evaluationMap["复审"]
const hqSum = this.evaluationMap["征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.evaluationMap["标准法规部高级经理审核"]
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0)
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3
return parseFloat(aveCount).toFixed(1)
}
return 0
@@ -2458,7 +2458,7 @@
_formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({
prcNum:this.prcNum,
taskInfo: '标准法规部标准化工程师发布',
taskInfo: '重新起草',
form: this.form,
roleForm: this.roleForm,
commentText: this.formTongGuo.commentText
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+1 -1
View File
@@ -701,7 +701,7 @@
}
}]
},
taskInfo:'企标编写汇总修订',
taskInfo:'重新企标编写汇总',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+1 -1
View File
@@ -933,7 +933,7 @@
}
}]
},
taskInfo:'技术委员会评审/评审意见修改评审',
taskInfo:'重新技术委员会评审、评审意见修改',
loading: false,
disabledState: false,
userId:this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+1 -1
View File
@@ -380,7 +380,7 @@ export default {
}
},
mounted(){
if(!this.qbfsForm.passFlag){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+1 -1
View File
@@ -401,7 +401,7 @@ export default {
}
},
mounted(){
if(!this.qbfsForm.passFlag){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+1 -1
View File
@@ -550,7 +550,7 @@ export default {
},
mounted(){
this.getWorkData()
if(!this.qbfsForm.passFlag){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+1 -1
View File
@@ -712,7 +712,7 @@ export default {
}
},
mounted() {
if(!this.qbfsForm.passFlag){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+1 -1
View File
@@ -389,7 +389,7 @@ export default {
}
},
mounted(){
if(!this.qbfsForm.passFlag){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
this.$http.get('sys/dictype/getDicTypeListCode', '',{
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+25 -29
View File
@@ -128,11 +128,11 @@
:color="roleForm.approver ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="approverName" style="margin-bottom: 0">
<h4>标准法规部高级经理</h4>
<h4>总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.approver" style="display: none;"></el-input>
<el-input v-model="roleForm.approverName" placeholder="选择标准法规部高级经理"
@click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
<el-input v-model="roleForm.approverName" placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长"
@click.native="choiceZRR('approver', '选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.approver)">
</el-input>
</div>
</el-form-item>
@@ -321,7 +321,7 @@ export default {
{required: true, message:'请选择标准体系工作组组长', trigger: "change" }
],
approverName:[
{required: true, message:'请选择标准法规部高级经理', trigger: "change" }
{required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: "change" }
],
engineerName:[
{required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" }
@@ -333,7 +333,7 @@ export default {
this.taskId = this.$route.query.taskIds
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDatas()
this.getData()
}
if(this.taskId){
this.approvalFlag = true
@@ -368,25 +368,20 @@ export default {
getData() {
this.formLoading = true
this.showFlag = false
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 => {
});
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.getFormFieldList(mes);
});
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
let type = item.qbfsForm.type
this.$nextTick(() => {
switch (item.type){
switch (type){
case '1':
this.comName = "merge"
break
@@ -403,18 +398,18 @@ export default {
this.comName = "establish"
break
}
this.qbfsForm = item;
this.qbfsForm = item.qbfsForm;
this.formLoading = false;
this.roleForm.dockUser = item.dockUser;
this.roleForm.dockUserName = item.dockUserName;
this.roleForm.countersigner = item.countersigner;
this.roleForm.countersignerName = item.countersignerName;
this.roleForm.approver = item.approver;
this.roleForm.approverName = item.approverName;
this.roleForm.engineer = item.engineer;
this.roleForm.engineerName = item.engineerName;
this.roleForm.examine = item.examine;
this.roleForm.examineName = item.examineName;
this.roleForm.dockUser = item.roleForm.dockUser;
this.roleForm.dockUserName = item.roleForm.dockUserName;
this.roleForm.countersigner = item.roleForm.countersigner;
this.roleForm.countersignerName = item.roleForm.countersignerName;
this.roleForm.approver = item.roleForm.approver;
this.roleForm.approverName = item.roleForm.approverName;
this.roleForm.engineer = item.roleForm.engineer;
this.roleForm.engineerName = item.roleForm.engineerName;
this.roleForm.examine = item.roleForm.examine;
this.roleForm.examineName = item.roleForm.examineName;
});
},
handleTabs(name) {
@@ -437,6 +432,7 @@ export default {
//流程保存
handleSave() {
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
qbzxdFrom.type = this.toggleType
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
@@ -471,7 +467,7 @@ export default {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
qbzxdFrom.commentText = this.commentText;
let json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/startProcessRollBack", {
createUser: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+117 -32
View File
@@ -324,7 +324,15 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
import {
startProcess,
completeTask,
saveTaskFirst,
queryTaskFirst,
taskDel,
processBack,
inboundLiaisonDetail
} from "@/api/process.js";
import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
export default {
@@ -332,6 +340,7 @@ export default {
data() {
return {
loading: false,
submitFlag: '', //是否是修改节点
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
@@ -367,6 +376,7 @@ export default {
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
},
nodeList: [],
hisListForm:{},
drawerTitle: '', //drawer标题
modalshowflag: false, // drawer开关
treeData: [], // 人员数据
@@ -388,8 +398,39 @@ export default {
if (this.bpnId !== undefined) {
this.getData()
}
if(this.$route.query.taskIds){
//被驳回时调用
this.getHistoryData()
}
},
methods: {
getHistoryData() {
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: 动态表单读取
*/
getFormFieldList (item) {
item.commentText = ''
this.$nextTick(() => {
this.hisListForm = JSON.parse(JSON.stringify(item))
this.submitFlag = '修改节点'
this.dataList = item.dockUserList[0].standardInfoList
this.roleForm.dockUserName = this.dataList[0].engineer
this.roleForm.dockUser = this.dataList[0].engineerId
})
},
getData() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
@@ -557,6 +598,7 @@ export default {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
engineer: this.roleForm.dockUser,
engineerName: this.roleForm.dockUserName,
standardInfoList: this.dataList,
commentText: this.commentText
}
@@ -566,43 +608,86 @@ export default {
if (this.roleForm.dockUserName === '') {
this.$message.warning('请完善人员信息')
} else {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
let paramsInfo = new FormData()
// paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '8')
paramsInfo.append('json', JSON.stringify({
roleForm: this.roleForm,
dataList: this.dataList,
commentText: this.commentText
}))
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('taskIds', this.taskID)
completeTask(params).then(res => {
if (res.success === true) {
this.$message.success('提交成功')
if (this.bpnId !== '') {
if(!this.submitFlag){
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
let paramsInfo = new FormData()
// paramsInfo.append('id', this.bpnId || '')
paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
paramsInfo.append('type', '8')
paramsInfo.append('json', JSON.stringify({
roleForm: this.roleForm,
dataList: this.dataList,
commentText: this.commentText
}))
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('taskIds', 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.isSubmit = false
})
})
}
})
}else{
this.$refs["roleForm"].validate((valid) => {
if (valid) {
let specialJson = {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: "8",
json: {
standardInfoList: this.dataList,
roleForm: this.roleForm,
commentText: this.commentText
}
};
this.$http.post("lawss/activiti/completeTaskNew", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json),
specialJson: JSON.stringify(specialJson)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
if (this.bpnId !== "") {
let taskId = {
id: this.bpnId
}
};
taskDel(taskId).then(res => {
return res
})
return res;
});
}
this.$router.push("/processCenter");
}
this.isSubmit = false
})
})
}
})
this.isSubmit = false;
});
} else {
this.isSubmit = false;
return this.$message.warning("请完善人员信息");
}
});
}
}
}
},
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+48
View File
@@ -150,9 +150,11 @@
show-save
show-submit
show-transfer
show-back
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:transferLoading="turnLoading"
@back="beforeBack"
@transfer="handleTurnTo"
@save="handleSave"
@submit="handleSubmit"
@@ -277,6 +279,7 @@ export default {
})
},
getFormFieldList (item) {
console.log(item);
this.$nextTick(() => {
if (item.passInfo !== undefined) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
@@ -336,6 +339,50 @@ export default {
this.saveLoading = false
})
},
//驳回按钮
beforeBack(){
if(!this.commentInfo){
this.$message.warning('请填写审批意见')
}else{
let zqa = new Map();
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
if( a == null){
a = {
id: lastDataListElement.dutyPeopleInfoId,
name: lastDataListElement.dutyPeopleInfo,
standardInfoList: []
}
}
a.standardInfoList.push(lastDataListElement);
zqa.set(a.id, a);
}
let list = [];
for(let item of zqa) {
list.push(item[1])
}
let json = {
dockUserList: list,
passInfo: this.passInfo,
passFlag: '1',
commentText: this.commentInfo
}
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskIds)
completeTask(params).then(res => {
if(res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
}).catch(e => {
this.isSubmit = false
})
}
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
@@ -359,6 +406,7 @@ export default {
let json = {
dockUserList: list,
passInfo: this.passInfo,
passFlag: '0',
commentText: this.commentInfo
}
let flag=false
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
-1
View File
@@ -152,7 +152,6 @@
<ProcessFooter
show-save
show-submit
show-back
show-transfer
:submitLoading="isSubmit"
:saveLoading="saveLoading"
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+1
View File
@@ -862,6 +862,7 @@ export default {
}else{
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].complianceReasons !== "" || (this.dataList[i].noCompliance !== "" && this.dataList[i].countermeasures !== "" && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance === "" && this.dataList[i].countermeasures === "" && this.dataList[i].completionTime === undefined)) {
this.comFlag = 0;
} else {
this.comFlag++;
}
src/pages/processCenter/pages/processDetail/index.vue
+3
View File
@@ -236,6 +236,9 @@ export default {
}else if(prcType === 'buss2'){
//企标入库
this.toProcessDetail('bussLibraryProductDetail',row)
}else if(prcType === 'buss3'){
//企标复审
this.toProcessDetail('bussFsDetail',row)
}else if(prcType === '4'){
//标准清单发布流程数据
this.toProcessDetail('bzqdfbStep1-4',row)
src/pages/processCenter/pages/processList/index.vue
+4 -4
View File
@@ -41,10 +41,10 @@ export default {
title: '已发流程',
name: 'AlreadySend'
},
// {
// title: '监控流程',
// name: 'MonitorProcess',
// },
{
title: '监控流程',
name: 'MonitorProcess',
},
{
title: '草稿',
name: 'TaskDraft'
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+12
View File
@@ -1212,6 +1212,18 @@ export default {
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新起草') {
this.$router.push({
name: 'wfhxzgStep1',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
taskAssignee: row.taskAssignee,
prcName: row.prcName,
prcType: row.prcType
}
})
}else {
this.$router.push({
name: 'wfhxzgStep5',
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+1 -1
View File
@@ -355,7 +355,7 @@
</el-input>
</div>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-form-item label="采用国内外标准情况" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
<el-radio label="是" value="是"></el-radio>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+1 -1
View File
@@ -190,7 +190,7 @@
label="标准名称">
</el-table-column>
<el-table-column
v-if="sarProject.position === '1'"
v-if="sarProject.position === '1' && !itemType"
prop="lastVersionNumber"
label="上一版本标准编号">
</el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+3 -39
View File
@@ -170,18 +170,6 @@
width="100"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
width="150"
show-overflow-tooltip
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
width="150"
show-overflow-tooltip
label="质量工程师">
</el-table-column>
<el-table-column
prop="planCloseTime"
width="150"
@@ -255,12 +243,6 @@
<el-form-item class="add-form-item" label="责任工程师:">
<div class="seeItem">{{ historySeeForm.dutyEngineerName }}</div>
</el-form-item>
<el-form-item class="add-form-item" label="认证工程师:">
<div class="seeItem">{{ historySeeForm.authEngineer }}</div>
</el-form-item>
<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="整改完成时间:">
<div class="seeItem">
{{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }}
@@ -514,22 +496,6 @@
@click.native="choiceZRR"
/>
</el-form-item>
<el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.authEngineer"
placeholder="请输入认证工程师"
@click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
/>
</el-form-item>
<el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.qaEngineer"
placeholder="请输入质量工程师"
@click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
/>
</el-form-item>
<el-form-item prop="planCloseTime" label="整改完成时间" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-date-picker
@@ -773,17 +739,15 @@ export default {
reason: "", //不合规项目
responsibleUnit: "", //责任部门
dutyEngineer: "", //责任工程师
authEngineer: "", //认证工程师
qaEngineer: "", //质量工程师
planCloseTime: "" //整改完成时间
}, //表单数据
formRules: {
standSerialNumber: [
{ required: true, message: "请输入标准号", trigger: "change" }
],
standName: [
{ required: true, message: "请输入标准名称", trigger: "change" }
],
// standName: [
// { required: true, message: "请输入标准名称", trigger: "change" }
// ],
itemsNum: [
{ required: true, message: "请输入条款号", trigger: "change" }
],
src/router/index.js
+9
View File
@@ -2000,6 +2000,15 @@ const routes = [
title: '企标复审流程'
}
},
{
path: '/bussFsDetail',
name: 'bussFsDetail',
component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue'),
meta: {
requireAuth: true,
title: '企标复审流程'
}
},
{
path: '/bussFs3',
name: 'bussFs3',