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-07 19:58:27 +08:00
parent 8adf8b1767 99191bb218
commit 7ac4976e53
22 changed files with 251 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+4 -4
View File
@@ -1571,7 +1571,7 @@ export default {
prcType: row.prcType
}
})
} else if(row.taskInfo === '会签并填写意见') {
} else if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep3',
query:{
@@ -1605,7 +1605,7 @@ export default {
}
})
}
else if(row.taskInfo === '审定责任人审定') {
else if(row.taskInfo === '审定') {
this.$router.push({
name: 'qbfzStep6',
query:{
@@ -1616,7 +1616,7 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '批准负责人批准') {
}else if(row.taskInfo === '批准') {
this.$router.push({
name: 'qbfzStep7',
query:{
@@ -1674,7 +1674,7 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '企标制修订计划整改') {
}else if(row.taskInfo === '重新起草') {
this.$router.push({
name: 'qbzxdjhgkStep1',
query: {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+18 -1
View File
@@ -1456,6 +1456,7 @@ export default {
callback()
}
return {
gdType: '', //归档位置的赋值
standTypeModel: 'INLAND',
submitType: '',
nodeList3: [],
@@ -2223,6 +2224,7 @@ export default {
switch (status) {
// 新增
case 1:
this.gdType = '新增'
this.selectedList = []
this.standardCheckedList = []
this.standardDrawer = false
@@ -2231,6 +2233,7 @@ export default {
break
// 带入（确认）
case 2:
this.gdType = '带入'
if (this.standardCheckedList.length === 1) {
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
_this: this
@@ -2368,7 +2371,7 @@ export default {
}, {}, res => {
if (res.ok) {
this.treeListOptions = res.data
if(bringData.standNumber){
if(this.gdType === '带入'){
this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
standId: bringData.id,
}, {}, reson => {
@@ -2388,6 +2391,20 @@ export default {
this.form.treeListId = treeListId
}
})
}else{
let treeList = ''
let treeListId = ''
reson.data.forEach(item=>{
this.treeCheckedKeys.push(item.menuId)
if (treeList.length > 0) {
treeList += ','
treeListId += ','
}
treeList += item.menuName
treeListId += item.menuId
})
this.form.treeListName = treeList
this.form.treeListId = treeListId
}
}
})
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+88 -102
View File
@@ -67,6 +67,7 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -635,33 +636,16 @@
</el-form>
</div>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name="1">
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
:model="formTongGuo"
:rules="rules">
<!-- <el-form-item-->
<!-- prop="approvalOpinion"-->
<!-- >-->
<!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item
prop="commentText"
>
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="formTongGuo.commentText">
</el-input>
</el-form-item>
</el-form>
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
@@ -804,11 +788,11 @@
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail, processCreateStand } from "api/process";
import TreeSelect from "@/components/treeSelect/treeSelect.vue";
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
@@ -833,22 +817,23 @@ export default {
drawerModal: false,
drawerTitle: '',
nodeList: [],
selectPeople: '',
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId: '',
selectPeople: "",
xgdFileId: "",
fbgbjbdFileId: "",
bpgFileId: "",
ssgFileId: "",
zqyjgFileId: "",
jdwjFileId: "",
kwjFileId: "",
glwjFileId: "",
caFileId: "",
commentText: "",
zbjbdFileId: "",
rules: {
commentText: [{required: true, message: '请输入意见', trigger: 'blur'}],
approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}]
commentText: [{ required: true, message: "请输入意见", trigger: "blur" }],
approvalOpinion: [{ required: true, message: "请选择审批意见", trigger: "change" }]
},
activeName: '1',
activeName: "1",
// 当前流程类型(1待办/2已办)
processType: 1,
detailData: [],
@@ -1223,76 +1208,77 @@ export default {
},
handleSave() {
},
//流程驳回按钮
handle1() {
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
if (this.commentText) {
this.formTongGuo.approvalOpinion = 1;
this.handleSubmit();
} else {
this.$message.warning("请填写审批意见");
}
},
//流程提交按钮
handle2() {
this.formTongGuo.approvalOpinion = 0
this.handleSubmit()
this.formTongGuo.approvalOpinion = 0;
this.handleSubmit();
},
handleSubmit() {
this.getRule()
const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val !== "" && val !== null && typeof (val) !== "undefined") {
if (val instanceof Array) {
this.form.country = val.join(",");
} else {
this.form.country = val
this.form.country = val;
}
} else if (val === '') {
this.form.country = []
} else if (val === "") {
this.form.country = [];
}
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
console.log(this.form)
if (this.form.syrz.length === 0) {
this.form.syrz = ''
this.isSubmit = true;
this.form.commentText = this.commentText;
this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
console.log(this.form);
if (this.form.syrz.length === 0) {
this.form.syrz = "";
}
if (this.form.nylx.length === 0) {
this.form.nylx = "";
}
if (this.form.zrbm.length === 0) {
this.form.zrbm = "";
}
if (this.form.qcdw.length === 0) {
this.form.qcdw = "";
}
if (this.form.cllx.length === 0) {
this.form.cllx = "";
}
if (this.form.sycpx.length === 0) {
this.form.sycpx = "";
}
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = "";
}
this.form.menuIds = this.form.treeListId;
const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
if (this.formTongGuo.approvalOpinion == "1") {
this.$message.warning("驳回成功");
this.isSubmit = false;
this.formTongGuo.commentText = "";
// 流程提交之后，应该流转至待办任务页面
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
} else {
this.processCreateStand(json);
}
if (this.form.nylx.length === 0) {
this.form.nylx = ''
}
if (this.form.zrbm.length === 0) {
this.form.zrbm = ''
}
if (this.form.qcdw.length === 0) {
this.form.qcdw = ''
}
if (this.form.cllx.length === 0) {
this.form.cllx = ''
}
if (this.form.sycpx.length === 0) {
this.form.sycpx = ''
}
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = ''
}
this.form.menuIds = this.form.treeListId
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
if (this.formTongGuo.approvalOpinion == '1') {
this.$message.warning("驳回成功")
this.isSubmit = false
this.formTongGuo.commentText = ''
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
} else {
this.processCreateStand(json)
}
}
})
}
})
});
},
/**
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+10 -1
View File
@@ -67,6 +67,7 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -510,6 +511,7 @@
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input
v-model="form.dtbjh"
disabled
placeholder="请输入代替标准号"
clearable
></el-input>
@@ -517,6 +519,7 @@
<el-input
v-else
v-model="form.dtbjh"
disabled
placeholder="请输入代替标准号"
clearable
></el-input>
@@ -547,6 +550,7 @@
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
@@ -554,6 +558,7 @@
</el-tooltip>
<el-input
v-else
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
@@ -563,6 +568,7 @@
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -570,6 +576,7 @@
<el-input
v-else
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -578,12 +585,14 @@
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input
v-model="form.yybj"
disabled
placeholder="请输入引用标准"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
@@ -1186,10 +1195,10 @@ export default {
},
handleSubmit() {
this.isSubmit = true
this.form.submitType = this.submitType
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
json.submitType = this.submitType
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+19 -8
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>-->
</div>
<div class="content" v-if="active === '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="form"
@@ -875,10 +875,11 @@
:lazy=true
:multiple=true
:check-strictly=true
:show-checkBox=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:type="'TRUCK'"
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
@@ -895,6 +896,7 @@
:drawerTitle="drawerTitle"
:url="url"
:type="'CAR'"
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
@@ -1258,7 +1260,7 @@
</el-collapse>
</div>
</div>
<div class="content" v-if="active === '2'">
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
@@ -1305,7 +1307,7 @@
</el-timeline>
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
@@ -1596,6 +1598,7 @@ export default {
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
showCheckBox: true, // 树形控件是否展示多选框
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
@@ -1988,11 +1991,19 @@ export default {
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
this.url = "sarModelTree/list"
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
this.key3++
},
choiceZRR5(type, title, id) {
this.drawerTitle = title
this.modalShowFlag5 = true
this.url = ''
this.urlChild = ''
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
this.key4++
},
choiceTree(type, title, id) {
this.drawerTitle = title
this.getListTree(this.form)
@@ -2801,10 +2812,10 @@ export default {
if (res.ok) {
this.fileInfoHandle();
this.isSubmit = true
this.form.submitType = this.submitType
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
json.submitType = this.submitType
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -2829,10 +2840,10 @@ export default {
} else {
this.fileInfoHandle();
this.isSubmit = true
this.form.submitType = this.submitType
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
json.submitType = this.submitType
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+9
View File
@@ -52,6 +52,7 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -468,12 +469,14 @@
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input
v-model="form.dtbjh"
disabled
placeholder="请输入代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
@@ -507,12 +510,14 @@
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
v-model="form.bfbdtbzh"
disabled
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
@@ -522,6 +527,7 @@
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -529,6 +535,7 @@
<el-input
v-else
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -537,6 +544,7 @@
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input
v-model="form.yybj"
disabled
placeholder="请输入引用标准"
clearable
></el-input>
@@ -544,6 +552,7 @@
<el-input
v-else
v-model="form.yybj"
disabled
placeholder="请输入引用标准"
clearable
></el-input>
src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfz-step7">
<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/qbfz/step1.vue
+15 -15
View File
@@ -3,7 +3,7 @@
<div class="qbfz-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>
@@ -126,19 +126,19 @@
:model="roleForm"
:rules="roleFormRules"
class="label-input-form">
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<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="流程发起人"
<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"
:color="roleForm.dockUser ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
@@ -152,43 +152,43 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签人员进行会签" placement="top"
<el-timeline-item timestamp="会签" placement="top"
:color="roleForm.countersigner ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="countersignerName" style="margin-bottom: 0">
<h4>会签人员</h4>
<h4>相关责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.countersigner" style="display: none;"></el-input>
<el-input v-model="roleForm.countersignerName" placeholder="选择会签人员"
<el-input v-model="roleForm.countersignerName" placeholder="选择相关责任人"
@click.native="choiceZRRS">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择审定责任人审定" placement="top"
<el-timeline-item timestamp="审定" placement="top"
:color="roleForm.examine ? '#66b1ff' : ''" >
<el-card>
<el-form-item prop="examineName" style="margin-bottom: 0">
<h4>审定责任人</h4>
<h4>标准体系工作组组长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.examine" style="display: none;"></el-input>
<el-input v-model="roleForm.examineName" placeholder="选择审定责任人"
@click.native="choiceZRR('examine', '选择审定责任人', roleForm.examine)">
<el-input v-model="roleForm.examineName" placeholder="选择标准体系工作组组长"
@click.native="choiceZRR('examine', '选择标准体系工作组组长', roleForm.examine)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择批准负责人批准" placement="top"
<el-timeline-item timestamp="批准" placement="top"
: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>
src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfz-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/qbfz/step3.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfz-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/qbfz/step4.vue
+8 -6
View File
@@ -292,15 +292,17 @@ export default {
{ required: true, message: "请选择下一步状态", trigger: "change" }
]
},
associationOptions: [{
value: "修订",
label: "修订"
}, {
associationOptions: [
// {
// value: "修订",
// label: "修订"
// },
{
value: "废止",
label: "废止"
}, {
value: "有效",
label: "有效"
value: "现行有效",
label: "现行有效"
}]
};
},
src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfz-step5">
<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/qbfz/step6.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfz-step6">
<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/qbfz/step7.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="qbfz-step7">
<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/qbzxdjhgk/component/merge.vue
+1 -1
View File
@@ -786,7 +786,7 @@ export default {
_this: this
}, res => {
this.workData = res.data.records;
this.total = res.data.total;
this.totalNo = res.data.total;
}, e => {
});
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+33 -23
View File
@@ -275,6 +275,7 @@ export default {
},
data() {
return {
submitFlag: '',
toggleType: '5',
comFlag: 1,
active: "1",
@@ -338,7 +339,8 @@ export default {
if(this.taskId){
this.approvalFlag = true
this.processTable()
this.getData();
//被驳回时调用
this.getHistoryData()
}
},
methods: {
@@ -355,16 +357,6 @@ export default {
}, e => {
})
},
getDatas(){
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.roleForm = mes.roleForm
this.qbfsForm = mes.qbfsForm
this.commentText = mes.commentText
});
},
getData() {
this.formLoading = true
this.showFlag = false
@@ -375,11 +367,29 @@ export default {
this.getFormFieldList(mes);
});
},
getHistoryData() {
this.submitFlag = '重新起草'
this.showFlag = false
this.formLoading = true
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) {
let type = item.qbfsForm.type
console.log(item);
let type = item.type || item.qbfsForm.type
this.$nextTick(() => {
switch (type){
case '1':
@@ -398,18 +408,18 @@ export default {
this.comName = "establish"
break
}
this.qbfsForm = item.qbfsForm;
this.qbfsForm = item.qbfsForm || item;
this.formLoading = false;
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;
this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
this.roleForm.countersignerName = item.countersignerName || item.roleForm.countersignerName;
this.roleForm.approver = item.approver ||item.roleForm.approver;
this.roleForm.approverName = item.approverName || item.roleForm.approverName;
this.roleForm.engineer = item.engineer || item.roleForm.engineer;
this.roleForm.engineerName = item.engineerName || item.roleForm.engineerName;
this.roleForm.examine = item.examine || item.roleForm.examine;
this.roleForm.examineName = item.examineName || item.roleForm.examineName;
});
},
handleTabs(name) {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+24 -7
View File
@@ -531,13 +531,25 @@ export default {
this.$http.postData('importWkExcel/importData', _formData,{
_this: this
}, res => {
console.log(res);
if(res.ok){
this.qblx_pageData.qblxData = res.data
if(res.data.length){
this.qblx_pageData.qblxData = res.data
this.$message.success('文件上传成功')
}else{
this.$message.warning('请勿上传为空的文件')
}
}else{
alert(res.message)
this.$confirm(res.data, "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
}).catch(() => {
});
}
})
this.$message.success('文件上传成功')
this.importModalshowflag = false
this.$nextTick(() => {
this.$refs.importFileAboutStand.clearFiles()
@@ -946,9 +958,10 @@ export default {
},
//流程提交事件
handleSubmit() {
let jsonData = this.qblx_pageData.qblxData
this.qblx_pageData.qblxFile = this.fileInfoList
this.qblx_pageData.commentText = this.commentText;
if(this.qblx_pageData.qblxData.length){
let jsonData = this.qblx_pageData.qblxData
this.qblx_pageData.qblxFile = this.fileInfoList
this.qblx_pageData.commentText = this.commentText;
this.$refs["qblx_pageData"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate(async (valid) => {
@@ -960,7 +973,7 @@ export default {
.then(() => {
finishCount++
}).catch(e => {
})
})
}
if (finishCount === jsonData.length) {
this.isSubmit = false
@@ -975,6 +988,10 @@ export default {
return this.$message.warning("请完善基础信息");
}
});
}else{
this.$message.warning('立项列表不能为空')
}
},
}
src/pages/processCenter/pages/processDetail/index.vue
+5 -5
View File
@@ -38,11 +38,11 @@
<!-- @click="handlingTasks"-->
<!--&gt;办理任务</el-button>-->
<!--临时屏蔽 end-->
<el-button
class="common-button-default"
round
@click="urgeRow"
>催办</el-button>
<!-- <el-button-->
<!-- class="common-button-default"-->
<!-- round-->
<!-- @click="urgeRow"-->
<!-- >催办</el-button>-->
</div>
<div class="flow-list">
<el-table
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="''">
<el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
<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="''">
<el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
<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
+4 -4
View File
@@ -2081,7 +2081,7 @@ export default {
prcType: row.prcType
}
})
} else if(row.taskInfo === '会签并填写意见') {
} else if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep3',
query:{
@@ -2115,7 +2115,7 @@ export default {
}
})
}
else if(row.taskInfo === '审定责任人审定') {
else if(row.taskInfo === '审定') {
this.$router.push({
name: 'qbfzStep6',
query:{
@@ -2126,7 +2126,7 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '批准负责人批准') {
}else if(row.taskInfo === '批准') {
this.$router.push({
name: 'qbfzStep7',
query:{
@@ -2184,7 +2184,7 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '企标制修订计划整改') {
}else if(row.taskInfo === '重新起草') {
this.$router.push({
name: 'qbzxdjhgkStep1',
query:{
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+1 -1
View File
@@ -878,7 +878,7 @@ export default {
name: 'qbfzStep1',
query: {
type: '24',
processName: '企标废止流程',
processName: mes.taskInfo,
bpnId: id
}
})
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+4 -4
View File
@@ -3558,6 +3558,10 @@ export default {
idList += item.id
nameList += item.name
})
this.sarBussionessSearch.QCDW = data[0].institutionName
this.sarBussionessSearch.QCDWId = data[0].institutionId
this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId)
this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName)
if (this.drawerTitle === '查询起草人') {
this.sarBussionessSearch['QCRBUSS'] = nameList
}
@@ -3566,12 +3570,8 @@ export default {
this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
}
// this.sarBussionessStandEO['QCRBUSS'] = nameList
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
this.drawerTitle = title