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:
zhaokaiyao@91isoft.com
2021-08-27 15:55:58 +08:00
parent 9ab2466e74 83f0c0ec83
commit e7d2f7e1d2
36 changed files with 3848 additions and 2158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+4 -5
View File
@@ -159,11 +159,10 @@ export default {
path: '/nonConfomity',
menuId: '0119abd677e0204e061eb0f0b8cafda0'
},
// {
// title: '标准法规工作组',
// path: '/workGroup',
// menuId: 'QYRMD5TUNBP9XXFRNK5S'
// },
{
title: '工作组',
path: '/workingGroup',
},
// {
// title: '备案产品标准库',
// path: '/enterpriseStandardFiling',
src/pages/config/pages/attributeCustom/components/stand.vue
+1
View File
@@ -609,6 +609,7 @@ export default {
this.addOrEdit = 'add'
this.attributeTitle = '新增'
this.showInfoModal = true
this.attributeEO = {}
this.$nextTick(() => {
this.$refs['attributeEO'].resetFields()
})
src/pages/home1/components/empennage/index.vue
+4 -1
View File
@@ -3,7 +3,10 @@
<div class="link">
<ul>
<li v-for="(link, index) in linkList" v-if="index<5" :key="index">
<a @click="openLinkUrl(link.url)" v-html="link.name"></a>
<a v-if="link.name.length>15" @click="openLinkUrl(link.url)" v-html="link.name.substring(0,15)+'...'" :title="link.name"></a>
<a v-else @click="openLinkUrl(link.url)" v-html="link.name" :title="link.name"></a>
</li>
<li>
<router-link to="/linkManage">更多链接></router-link>
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+8 -4
View File
@@ -97,7 +97,7 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-if="splitStatus === '0'" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-if="splitStatus === '0' || splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
@@ -686,6 +686,7 @@ export default {
},
data () {
return {
editFlag: '',
splitStatus: this.$route.query.splitStatus,
auditFlag: this.$route.query.auditFlag,
splitCheckDialog: false,
@@ -769,6 +770,7 @@ export default {
busStandCover: '',
fileType: '',
ZRBM: '',
editFlag: ''
},
standItemEOBlank: {
id: '',
@@ -802,6 +804,7 @@ export default {
},
showItemInfoModal: false,
selectedList: [], // 选中的table数据的ID
selectedList1: [],
selectedAllList: [], // 选中的table数据
infoId: '',
itemsPage: 1,
@@ -1137,7 +1140,7 @@ export default {
this.selectedList = []
this.selectedAllList = data
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id)
this.selectedList.push(data[i].id,data[i].editFlag)
}
},
// 分页点击后方法
@@ -1403,9 +1406,9 @@ export default {
roundButton: false
}).then(() => {
this.deleteItemsModal = false
this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {
ids: this.selectedList.join(',')
ids: this.selectedList.join(','),
editFlag: this.selectedList1.join(','),
}, {
_this: this
}, res => {
@@ -2069,6 +2072,7 @@ export default {
case '删除':
this.selectedList = []
this.selectedList.push(command[0].id)
this.selectedList1.push(command[0].editFlag)
this.judgebatchDeleteItem()
break
// case '内容简介':
src/pages/localTool/standardWarning.vue
+21 -10
View File
@@ -47,14 +47,14 @@
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standCode" label="编号" align="center">
<el-table-column prop="standCode" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
@@ -112,14 +112,14 @@
<div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
</template>
</el-table-column>
<el-table-column prop="standCode" label="编号" align="center">
<el-table-column prop="standCode" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
@@ -170,12 +170,12 @@
>
<el-table-column prop="standCode" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="itemsId" label="条款号" align="center">
@@ -236,12 +236,12 @@
>
<el-table-column prop="standCode" label="标准编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standCode }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" label="标准名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="itemsId" label="条款号" align="center">
@@ -492,6 +492,17 @@ export default {
}, e => {
});
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
//获取政策预警数据(type用于区别分页器切换)
getPolicyDate() {
this.loading[this.field] = true
src/pages/login/index.vue
+625 -582
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+909 -876
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+32 -18
View File
@@ -131,20 +131,20 @@
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
prop="xcxssrqgj"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
prop="zccssrqgj"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -313,7 +313,7 @@
align="center">
</el-table-column>
<el-table-column
prop="countryArea"
prop="countryAreaShow"
label="国家/地区"
align="center">
</el-table-column>
@@ -822,14 +822,14 @@ export default {
code: "", //标准号
standName: "", //标准名称
issueTime: "", //发布日期
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
xcxssrqgj: "", //新车型实施日期
zccssrqgj: "", //在产车实施日期
textStatus: "", //文本状态
id: ""
}]
},
choiceForm: {}, //选择标准清单列表
// countryOptions: [], //适用区域下拉框数据
countryOptions: [], //国家地区
standStateOptions: [],
standardTypeOptions: [
{
@@ -963,7 +963,22 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
let arr = res.data.records;
//国家地区字段转换
arr.forEach(item => {
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) {
k[m] = this.countryOptions[i].label
}
item.countryAreaShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr;
this.total = res.data.total;
}, e => {
});
@@ -1292,15 +1307,14 @@ export default {
}
this.dataList = res.data.records;
this.dataList.forEach(item => {
if (item.xcxssrqgj === null){
this.$set(item, "XCXSSRQ", '');
this.$set(item, "ZCCSSRQ", '');
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
}
if(item.xcxssrqgj === 'undefined'){
item.xcxssrqgj = ''
}
if(item.zccssrqgj === 'undefined'){
item.zccssrqgj = ''
}
})
this.listForm.dataList = res.data.records;
this.listForm.dataList = this.dataList;
let formId = [];
this.dataList.map(item => {
formId.push(item.id);
@@ -1402,7 +1416,7 @@ export default {
_this: this
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES //适用车型
this.countryOptions = res.data.COUNTRY;
this.countryOptions = res.data.COUNTRY; //国家/地区
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+406
View File
@@ -0,0 +1,406 @@
<template>
<div class="bzdyStep9">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">工程研究总院院长批准</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<ProcessTitle>
<template slot="title">征求意见列表</template>
</ProcessTitle>
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞</el-button>
</div>
<el-table
ref="multipleTable"
:data="data"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="chapterNumber"
label="章条编号"
width="170px">
</el-table-column>
<el-table-column
prop="chapterName"
label="章节名称">
</el-table-column>
<el-table-column
align="center"
prop="commentText"
label="修改意见内容（包括理由或依据）">
<el-table-column
prop="oldText"
align="center"
label="修改前">
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="修改理由">
</el-table-column>
</el-table-column>
<el-table-column
prop="department"
label="提出部门">
</el-table-column>
<el-table-column
prop="responUserName"
label="提出人">
</el-table-column>
<el-table-column
prop="state"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
</el-table>
</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 class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</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') : '' }}</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') : '' }}</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>
</div>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
export default {
name: "bzzqyjStep1-9",
data() {
return {
histortData: [],
oldData: [],
data: [],
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
nodeList: [],
type: '',
defaultProps: {
children: 'children',
label: 'name'
},
treeData: [], // 人员数据
modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题
textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
},
formRules: {
responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' },
]
},
json: {}
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
upload (row, title) {
var params = {
columnName: {
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
},
stateText (row) {
if (row === '1') {
return '上报'
} else if (row === '2') {
return '处理后上报'
}
},
handleTabs(name) {
this.active = name
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzdyStep9 {
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
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;
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+363 -324
View File
@@ -1,337 +1,376 @@
<template>
<div class="bzdyStep2">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">对接人选择责任人</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
<el-input
v-model="form.responUserList"
style="display: none;"
clearable
></el-input>
<el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</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 class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</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') : '' }}</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') : '' }}</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>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
></Role-tree>
<div class="bzdyStep2">
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">对接人选择责任人</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
<el-input
v-model="form.responUserList"
style="display: none;"
clearable
></el-input>
<el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</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 class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</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") : "" }}</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") : "" }}</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>
</div>
<ProcessFooter
show-submit
show-save
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
export default {
name: "bzzqyjStep2",
data() {
return {
histortData: [],
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
nodeList: [],
type: '',
modalshowflag: false, // drawer开关
drawerTitle: '', //drawer标题
textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
responUserList: '',
responUserListName: ''
},
formRules: {
responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' },
]
},
json: {}
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
checkedRole2 (data) {
var idList = ''
var nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.form.responUserList = idList
this.form.responUserListName = nameList
},
choiceZRR () {
this.nodeList = []
if (this.form.responUserList.length > 0) {
this.nodeList = this.form.responUserList.split(',')
}
this.modalshowflag = true
},
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.responUserList = this.form.responUserList
json.responUserListName = this.form.responUserListName
json.introduce = false
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善基础信息')
}
})
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
this.json = data
}).catch(e => {
})
})
},
},
mounted () {
this.getHistoryData()
this.getData()
export default {
name: "bzzqyjStep2",
data() {
return {
histortData: [],
commentText: "",
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
nodeList: [],
type: "",
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
textarea: "", // 意见
ListModel: false, // 新增编辑抽屉开关
active: "1", // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
endTime: "", // 结束日期
cname: "", // 名称
responUserList: "",
responUserListName: ""
},
formRules: {
responUserList: [
{ required: true, message: "请选择责任人", trigger: "change" }
]
},
json: {}
};
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res;
}, e => {
});
},
checkedRole2(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
this.form.responUserList = idList;
this.form.responUserListName = nameList;
},
choiceZRR() {
this.nodeList = [];
if (this.form.responUserList.length > 0) {
this.nodeList = this.form.responUserList.split(",");
}
this.modalshowflag = true;
},
handleTabs(name) {
this.active = name;
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.form,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
handleSubmit() {
this.$refs["bzzqyjForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
var json = this.json;
json.commentText = this.commentText;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.introduce = false;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success("提交成功");
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
} else {
return this.$message.warning("请完善基础信息");
}
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
if (data.form === undefined) {
this.form.cid = data.cid;
this.form.endTime = data.endTime;
this.form.cname = data.cname;
this.json = data;
} else {
this.form = data.form
this.form.cid = data.form.cid;
this.form.endTime = data.form.endTime;
this.form.cname = data.form.cname;
this.json = data.form;
}
}).catch(e => {
});
});
}
},
mounted() {
this.getHistoryData();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzdyStep2 {
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
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;
}
}
}
@import '~@/assets/styles/style';
.bzdyStep2 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
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;
}
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+17 -14
View File
@@ -208,6 +208,7 @@
</div>
<ProcessFooter
show-submit
show-save
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@@ -325,20 +326,22 @@
this.active = name
},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
data: this.data,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.json,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
handleSubmit() {
if (this.data.length < 1) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+6
View File
@@ -228,6 +228,9 @@
oldData: [],
data: [],
commentText: '',
oldText : '',
newText : '',
reason : '' ,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
roleRow: {},
@@ -284,6 +287,9 @@
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容（包括理由或依据）',
oldText : '修改前',
newText : '修改后',
reason : '修改理由',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+9 -4
View File
@@ -380,7 +380,10 @@ export default {
},
// 批量删除按钮table，选择数据
selectedDelete(val) {
this.deleteDataList = val
this.deleteDataList = []
for (let i = 0; i < val.length; i++) {
this.deleteDataList.push(val[i].id);
}
},
// 点击批量删除事件
deleteList() {
@@ -415,8 +418,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
@@ -483,6 +486,9 @@ export default {
},
// 提交按钮
handleSubmit() {
this.dataList.forEach(item =>{
item.standId = item.standSerialNumber
})
let json = {
prcCreateUser: this.$store.getters.userInfo.userId,
prcCreateUserName: this.$store.getters.userInfo.userName,
@@ -502,7 +508,6 @@ export default {
type: '8'
}
startProcess(paramsInfo).then(res => {
console.log(res)
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+2 -3
View File
@@ -361,7 +361,6 @@ export default {
// 选择勾选项的集合
handleSelectionChange(value) {
this.multipleSelection = value
console.log(value)
},
handleTabs(name) {
this.active = name
@@ -487,8 +486,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -2
View File
@@ -398,8 +398,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+7 -6
View File
@@ -308,11 +308,12 @@ export default {
},
getFormFieldList (item) {
this.$nextTick(() => {
let listJSON = JSON.parse(JSON.stringify(item.responUserList))
if (listJSON.length !== undefined) {
this.dataList = listJSON[0].standardInfoList
} else {
if (item.responUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = [listJSON][0].standardInfoList
} else {
let listJSONInfo = item.info
this.dataList = [listJSONInfo]
}
this.dataList.forEach(item => {
if (item.fileText.length !== 0) {
@@ -397,8 +398,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+480
View File
@@ -0,0 +1,480 @@
<template>
<div class="wfhxzgStep5">
<ProcessHeader toggle>
<template slot="proName">未符合项整改流程</template>
<template slot="proNode">分发负责人审核材料</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active === '1'">
<div style="flex: auto;">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
size="small"
v-model="nonSearch.standId"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item">
<el-input
size="small"
v-model="nonSearch.productName"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-input v-model="nonSearch.responsibleUnit" v-show="false" />
<el-popover
placement="bottom"
popper-class="user-dept-popper"
trigger="click"
:value="false"
>
<el-input
size="small"
slot="reference"
v-model="nonSearch.responseUnitShow"
placeholder="根据责任部门查找"
readonly
clearable
id="searchResp"
/>
<div class="api">
<laws-tree
:zNodes="zNodesSItem"
treeDivId="zNodesSItemSearch"
deptSelect
showRMenu
@treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
class="ztree" style="width: 200px;height: 400px;overflow: auto">
</laws-tree>
</div>
</el-popover>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage(nonSearch)">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'5905d0743c3504799aee83ac9697f8c5'"
@click="clearAllSearch">
清空
</el-button>
</el-form-item>
</el-form>-->
<el-table
:data="dataList"
border
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" label="整改完成时间" align="center">
<template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyPeople" label="负责人" align="center"/>
<el-table-column prop="fileText" label="佐证材料" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="queryFile(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
</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 class="content" 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") : "" }}</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") : "" }}</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-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload
:action="''"
name="file"
:file-list="fileTextList"
:on-preview="handleOnPreview"
>
</el-upload>
</el-dialog>
</div>
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {interfaceUrl} from "@/sysConfig";
import {inboundLiaisonDetail} from "@/api/process";
export default {
name: "wfhxzgStep5-1",
data() {
return {
fileMadel: false,
detailData: [],
loading: false,
commentText: '',
title: '', // 新增编辑抽屉标题
saveLoading: false,
ListModel: false, // 新增编辑抽屉开关
nonSearch: {
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
},
fileTextList: [],
active: '1', // 默认显示
isSubmit: false,
backLoading: false,
dataList: [],
json: {},
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
// 当前页数
pageNo: 1,
total: 0,
myLoading: false,
// 责任部门
zNodesSItem: [],
// 驳回弹窗状态
backDialog: false,
}
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
created() {
this.processTable()
this.getData()
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
methods: {
queryFile(row) {
this.fileTextList = row.fileText
this.fileMadel = true
},
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 => {
});
},
getData() {
const params = {
taskIds: this.taskIds,
pId: this.pId,
}
inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
})
},
getFormFieldList (item) {
this.$nextTick(() => {
this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
/*this.dataList.forEach(item => {
item.fileText.forEach(item1 => {
this.fileTextList.push({
id: item1.id,
name: item1.name
})
})
})*/
})
},
handleTabs(name) {
this.active = name
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 点击上传的文件进行下载
handleOnPreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
},
// 提交按钮
handleSubmit() {
this.isSubmit = true
var json = this.json
json.info = {
fileDataList: this.dataList
}
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
this.backLoading = true
if (this.commentText) {
var json = {
responUserList: {
standardInfoList: this.dataList
},
actionFlag: 1,
commentText: this.commentText
}
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
this.backLoading = false
}
})
} else {
this.$message.warning('请输入反馈意见')
this.backLoading = false
}
},
//未整改项抽屉中的查询按钮
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
let matchUnit = true; // 部门 筛选
if (standId) {
const keysId = standId
.toUpperCase() // 转大写
.replace(' ', '') // 删掉空格
.split('') // 切割成 单个字
matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
}
if (productName) {
matchName = item.productName === productName;
}
if (responsibleUnit) {
matchUnit = item.responsibleUnit === responsibleUnit;
}
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
},
// 清空 查询条件
clearAllSearch (search = true) {
this.nonSearch = {
standId: '',
productName: '',
responsibleUnit: ''
}
this.getData()
},
download(row) {
let attId = row.fileTextId
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
},
// 分页事件
pageChange (page) {
this.pageNo = page
this.getTableByPage()
},
pageSizeChange () {
this.getTableByPage()
},
}
}
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.wfhxzgStep5 {
/deep/.el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
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;
}
}
/deep/.el-upload{
display: block;
}
// 上传信息回显多余隐藏
/deep/.el-upload-list__item .el-icon-close {
font-size: 0;
}
/deep/.el-upload-list__item .el-icon-close-tip {
font-size: 0;
}
.content-center {
padding: 10px 0px 10px 10px;
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+6 -2
View File
@@ -247,6 +247,7 @@ export default {
backLoading: false,
dataList: [],
json: {},
taskInfo: this.$route.query.taskInfo,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
// 当前页数
@@ -325,8 +326,8 @@ export default {
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
// pageType: 'FOREIGN_STAND'
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
@@ -342,6 +343,9 @@ export default {
handleSubmit() {
this.isSubmit = true
var json = this.json
json.info = {
fileDataList: this.dataList
}
json.actionFlag = 0
json.commentText = this.commentText
this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+18 -18
View File
@@ -452,24 +452,24 @@ export default {
},
//保存事件
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "5");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({
form: this.listForm,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
},
// handleSave() {
// this.saveLoading = true;
// let _formData = new FormData();
// _formData.append("id", this.bpnId || "");
// _formData.append("prcType", "5");
// _formData.append('taskIds', this.taskIds)
// _formData.append("json", JSON.stringify({
// form: this.listForm,
// commentText: this.commentText
// }));
// saveTaskForPub(_formData).then(res => {
// this.saveLoading = false;
// this.$message.success("保存成功");
// this.bpnId = res.result;
// }).catch(e => {
// this.saveLoading = false;
// });
// },
//提交事件
handleSubmit() {
this.listForm.breakdownList.forEach(item => {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+1 -1
View File
@@ -569,7 +569,7 @@ export default {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.prcCreateUserName = this.$store.getters.userInfo.userName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="xmpg2-step12">
<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/xmpg2/step1.vue
+1 -1
View File
@@ -570,7 +570,7 @@ export default {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.prcCreateUserName = this.$store.getters.userInfo.userName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+63 -13
View File
@@ -42,16 +42,18 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
</el-button>
</div>
</div>
<!-- <div class="tableTitle">-->
<!-- <div class="tableButton">-->
<!-- <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </div>-->
<el-table
:data="dataList"
style="width: 100%"
row-key="standId"
v-if="refreshTable"
height="70%"
border
ref="myTable"
@@ -95,10 +97,20 @@
>
</el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope" v-if="scope.row.workPeople">
<el-input v-model="scope.row.workPeopleId" style="display: none;" />
<el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
<template slot-scope="scope" >
<div v-if="selectList.length<=1">
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" readonly/>
</div>
<div v-else>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeopleId" style="display: none;" readonly/>
<el-input v-if="scope.row.workPeople" v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS('', 2, '')" readonly/>
</div>
<el-button style="width: 98%" :loading="buttonLoading" v-if="!scope.row.workPeople" size="small" type="primary" @click="choiceZRRS(scope.row, 3, '')">{{ "批量分发该标准下的责任人" }}</el-button>
</template>
<!-- <template slot-scope="scope">-->
<!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
@@ -226,6 +238,13 @@ export default {
},
data() {
return {
workPeopleList:[],
//防止按钮点击过快的按钮loading
buttonLoading: false,
//刷新表格
refreshTable: true,
//展开表格
// tableExpand: false,
hasChildren: true,
active: "1",
loading: false,
@@ -323,7 +342,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -357,7 +375,6 @@ export default {
workPeople: "请选择责任人"
};
children.push(aa);
console.log(children);
}
);
this.dataList.forEach(key => {
@@ -402,7 +419,6 @@ export default {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -440,6 +456,24 @@ export default {
this.$message.warning("请选择要分发的数据");
}
}
//批量分发某标准下的责任人
else if (type === 3){
//弹出选人框
// if (this.tableExpand === false){
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
// }
//展开表格
this.workPeopleList = row
// console.log('279',row.children)
this.refreshTable = false
// this.tableExpand = !this.tableExpand
this.$nextTick(() => {
this.refreshTable = true
});
}
},
//标准表格选择框改变
selectStandChange(data) {
@@ -494,6 +528,22 @@ export default {
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
}else if (this.type === 3){
// console.log("529",this.workPeopleList)
for (let i=0;i<this.workPeopleList.children.length;i++){
this.workPeopleList.children[i].workPeople = data[0].name
this.workPeopleList.children[i].workPeopleId = data[0].id
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
}
this.modalshowflag = false;
},
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+206 -1
View File
@@ -42,6 +42,12 @@
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
</el-button>
</div>
</div>
<el-table
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
@@ -237,6 +243,17 @@
</el-table-column>
</el-table-column>
</el-table-column>
<!-- 以后全选可能用-->
<!-- <el-table-column-->
<!-- prop="productionCompletionTime"-->
<!-- align="center"-->
<!-- fixed="right"-->
<!-- width="160"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<div>
@@ -331,6 +348,73 @@
@submit="handleSubmit"
>
</ProcessFooter>
<el-drawer
title="批量填写"
:visible.sync="modalshowflag"
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
<el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
<el-divider><span><b>在研产品</b></span></el-divider>
<el-formItem label="合规原因" class="add-form-item" >
<el-input
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
></el-input>
</el-formItem>
<el-form-item label="不合规项目" class="add-form-item" >
<el-input
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
></el-input>
</el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item" >
<el-input
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
></el-input>
</el-form-item>
<el-form-item label="完成时间" class="add-form-item" >
<el-date-picker
v-model="batchEditForm.completionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<br>
<el-divider><span><b>在产产品</b></span></el-divider>
<el-formItem label="合规原因" class="add-form-item" >
<el-input
v-model="batchEditForm.zcComplianceReasons"
placeholder="请输入合规原因"
></el-input>
</el-formItem>
<el-form-item label="不合规项目" class="add-form-item" >
<el-input
v-model="batchEditForm.zcNoCompliance"
placeholder="请输入不合规项目"
></el-input>
</el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item" >
<el-input
v-model="batchEditForm.zcCountermeasures"
placeholder="请输入不合规应对措施"
></el-input>
</el-form-item>
<el-form-item label="完成时间" class="add-form-item" >
<el-date-picker
v-model="batchEditForm.zcCompletionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveBatchEditForm">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消</el-button>
</div>
</el-drawer>
</div>
</template>
@@ -349,6 +433,27 @@ export default {
},
data() {
return {
batchEditForm: {
// 在研产品
// 合规
complianceReasons :'',
// 不合规
noCompliance :'',
// 应对措施
countermeasures :'',
// 完成时间
completionTime :'',
// 在产产品
// 合规
zcComplianceReasons :'',
// 不合规
zcNoCompliance:'',
// 应对措施
zcCountermeasures:'',
// 完成时间
zcCompletionTime:''
},
hasChildren: true,
active: "1",
loading: false,
@@ -398,6 +503,83 @@ export default {
};
},
methods: {
//批量编辑确定按钮事件
saveBatchEditForm() {
// console.log(this.selectList)
for( let a = 0; a < this.dataList.length; a++) {
for ( let b = 0; b < this.selectList.length; b++) {
if (this.dataList[a].id === this.selectList[b]) {
//合规
this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
//不合规
this.dataList[a].noCompliance = this.batchEditForm.noCompliance
//应对措施
this.dataList[a].countermeasures = this.batchEditForm.countermeasures
//完成时间
this.dataList[a].completionTime = this.batchEditForm.completionTime
//合规
this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
//不合规
this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
//应对措施
this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
//完成时间
this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
}else {
for (let i=0;i<this.dataList[a].children.length;i++){
if (this.dataList[a].children[i].id === this.selectList[b]){
//合规
this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
//不合规
this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
//应对措施
this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
//完成时间
this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
//合规
this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
//不合规
this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
//应对措施
this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
//完成时间
this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
}
}
}
}
}
this.modalshowflag = false
},
cancelBatchEditForm() {
this.modalshowflag = false
},
//批量编辑
batchEdit() {
if (this.selectList.length > 0) {
//合规
this.batchEditForm.complianceReasons = ''
//不合规
this.batchEditForm.noCompliance = ''
//应对措施
this.batchEditForm.countermeasures = ''
//完成时间
this.batchEditForm.completionTime = ''
//合规
this.batchEditForm.zcComplianceReasons = ''
//不合规
this.batchEditForm.zcNoCompliance = ''
//应对措施
this.batchEditForm.zcCountermeasures = ''
//完成时间
this.batchEditForm.zcCompletionTime = ''
this.modalshowflag = true
} else {
this.$message.warning('请选择要编辑的数据')
}
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -525,7 +707,11 @@ export default {
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
}
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
@@ -605,6 +791,25 @@ export default {
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%;
}
}
.accessStandardsAndRegulations {
height: 100%;
}
src/pages/processCenter/pages/processDetail/index.vue
+7 -4
View File
@@ -180,8 +180,6 @@ export default {
row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName
let prcType = this.detailData[index].prcType // 流程类型
console.log(prcType)
console.log(row.taskInfo);
// 判断当前流程是否已全部办理完成
this.detailData.map(item => {
if (!item.endTime) {
@@ -219,12 +217,17 @@ export default {
}else{
this.toProcessDetail('xmpg2Step1-2',row)
}
//标准解读流程
}else if(prcType === '9'){
} else if (prcType === '8') {
// 未符合项整改
this.toProcessDetail('wfhxzgStep5-1',row)
} else if(prcType === '9'){
this.toProcessDetail('bzjdStep1-6',row)
//标准调研流程
}else if(prcType === '2'){
this.toProcessDetail('bzdyStep1-9',row)
}else if(prcType === '3'){
//标准征求意见
this.toProcessDetail('bzzqyjStep1-9',row)
}
} else {
this.$message.warning('当前流程未全部办理完成，无法查看')
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+7 -1
View File
@@ -75,6 +75,9 @@
align="center"
width="150"
>
<template slot-scope="scope">
<a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcNum }}</a>
</template>
</el-table-column>
<el-table-column
prop="prcType"
@@ -83,7 +86,7 @@
width="180"
>
<template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType) }}</span>
<span @click="dealWith(scope.row)" class="table-jump">{{ getPrcName(scope.row.prcType) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -93,6 +96,9 @@
align="center"
min-width="250"
>
<template slot-scope="scope">
<a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcName }}</a>
</template>
</el-table-column>
<el-table-column
prop="creatUserName"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -2816,7 +2816,7 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
this.$http.delete("sarResource/ts-resource", {
this.$http.put("sarResource/ts-resource/delResourceById", {
resourceId: data.id
}, res => {
}, e => {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -2097,7 +2097,7 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
this.$http.delete("sarResource/ts-resource", {
this.$http.put("sarResource/ts-resource/delResourceById", {
resourceId: data.id
}, res => {
}, e => {
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -2552,7 +2552,7 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
this.$http.delete("sarResource/ts-resource", {
this.$http.put("sarResource/ts-resource/delResourceById", {
resourceId: data.id
}, res => {
}, e => {
src/pages/regulatoryRepository/workingGroup/index.vue
+324
View File
File diff suppressed because one or more lines are too long
src/pages/searchCenter/pages/advancedSearch.vue
+12 -3
View File
@@ -976,8 +976,8 @@
:label="$t('m.putTime')"
width="130">
<template slot-scope="scope">
<div v-if="scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== ''">
{{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
<div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
{{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
</div>
<div v-else></div>
</template>
@@ -987,7 +987,8 @@
width="180"
:label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
<template slot-scope="scope">
<div>
<div :style="selectIndex === 'BUSINESS_STAND' ? (scope.row.textStatusBussName === '参考' ? 'color: #E6A23C;' :
(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'color: #F56C6C;' : '')) : ''">
{{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
</div>
</template>
@@ -2492,6 +2493,14 @@ export default {
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/ .yellowClass{
color: #E6A23C !important;
}
/deep/ .redClass{
color: #F56C6C !important;
}
#advancedSearch {
background: #fff;
@borderColor: #BFBFBF;
src/pages/searchCenter/pages/standardSearch.vue
+21 -1
View File
@@ -109,6 +109,17 @@
<div v-else></div>
</template>
</el-table-column>
<el-table-column
align="center"
:label="$t('m.putTime')"
width="130">
<template slot-scope="scope">
<div v-if="selectIndex === 'stand' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
{{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
</div>
<div v-else></div>
</template>
</el-table-column>
<el-table-column
v-if="selectIndex !== 'msgdyinfo'"
align="center"
@@ -116,7 +127,9 @@
width="200">
<template slot-scope="scope">
<span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>
<div v-else>{{ scope.row.standstateshow }}</div>
<div v-else :class="selectIndex === 'enterprise' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
(scope.row.textStatusBussName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
{{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}</div>
</template>
</el-table-column>
<el-table-column
@@ -2530,6 +2543,13 @@
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/ .yellowClass{
color: #E6A23C;
}
/deep/ .redClass{
color: #F56C6C;
}
/deep/ p{
display: inline;
}
src/router/index.js
+39 -9
View File
@@ -574,6 +574,15 @@ const routes = [
title: '未符合项整改/更新流程'
}
},
{
path: '/wfhxzgStep5-1',
name: 'wfhxzgStep5-1',
component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue'),
meta: {
requireAuth: true,
title: '未符合项整改/更新流程'
}
},
{
path: '/bzrkStep1',
name: 'bzrkStep1',
@@ -745,6 +754,15 @@ const routes = [
title: '标准调研流程'
}
},
{
path: '/bzzqyjStep1-9',
name: 'bzzqyjStep1-9',
component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue'),
meta: {
requireAuth: true,
title: '标准调研流程'
}
},
{
path: '/bzdyStep4',
name: 'bzdyStep4',
@@ -1164,6 +1182,18 @@ const routes = [
menuId: 'PCZKM8TQJAH5UP5EAXTJ'
}
},
// 工作组
{
path: '/workingGroup',
name: 'workingGroup',
component: () =>
import('@/pages/regulatoryRepository/workingGroup/index'),
meta: {
requireAuth: true,
title: '工作组',
}
},
// 标准涉及项目
{
path: '/standInvolveProject',
@@ -2000,15 +2030,15 @@ router.onError((error) => {
})
router.beforeEach((to, from, next) => {
// let toName = to.name
// let token = store.state.token
// // 返回值为登录状态
// if ((token === null || token === '') && (toName !== 'Login' && to.meta.requireAuth)) {
// router.push({
// name: 'Login'
// })
// }
// // 流程页面权限判断
console.log(111);
let toName = to.name
let token = store.state.token
console.log(toName);
// 返回值为登录状态
if ((token === null || token === '') && (toName !== 'Login' && to.meta.requireAuth)) {
return next('/Login')
}
// 流程页面权限判断
// const processCenter = to.name === 'ProcessCenter' || (to.meta.parentPath && to.meta.parentPath === '/processCenter')
// if (processCenter) {
// if (to.meta.process) {
src/sysConfig/index.js
+4 -4
View File
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
const devIp = '10.96.10.171'
const devInterfacePORT = '9999'
// const devIp = '10.5.103.101'
// const devIp = '192.168.1.159'
// const devInterfacePORT = '9999'
const devIp = '62.234.136.153'
const devInterfacePORT = '8038'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -31,7 +31,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '62.234.136.153'
const prodInterfacePORT = '8033'
const prodInterfacePORT = '8038'
// 判断环境