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

This commit is contained in:
zhutianqi
2021-11-05 18:01:53 +08:00
16 changed files with 1215 additions and 521 deletions
+1 -1
View File
@@ -6655,7 +6655,7 @@ var PDFPageView = function () {
watermark_y_space: 180,//水印y轴间隔
watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
watermark_alpha: 0.5,//水印透明度
watermark_fontsize: '20px',//水印字体大小
watermark_fontsize: '25px',//水印字体大小
watermark_font: '微软雅黑',//水印字体
watermark_width: 120,//水印宽度
watermark_height: 80,//水印长度
+1
View File
@@ -1,6 +1,7 @@
<template>
<div class="roleTree">
<el-drawer
@keyup.enter.native="saveUserInfo"
:title="isTitle"
:visible.sync="isVisible2"
:wrapperClosable="false"
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<div class="details">
<com-header :isCollapsed="sideClose"></com-header>
<!-- <com-header :isCollapsed="sideClose"></com-header>-->
<div class="main">
<div class="details-container" :class="{ 'side-close': sideClose }">
<router-view />
+518 -322
View File
@@ -17,87 +17,122 @@
:key="index"
v-if="item.isShowImp === '0'"
>
<div class="modular-header" v-if="item.label !== '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
</div>
<div class="modular-header" v-if="item.label === '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
<div class="details-content-modular basic-information" style="border-top:none">
<div class="modular-header">
<!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>基础信息</span>-->
<!-- </div>-->
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
:loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<!-- <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
<!-- <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item :name="item.label">
<template slot="title">
<div class="modular-header" v-if="item.label === '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
<div class="details-content-modular basic-information" style="border-top:none">
<div class="modular-header">
<!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>基础信息</span>-->
<!-- </div>-->
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
:loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<!-- <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
<!-- <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modular-content">
<template v-if="item.label === '基础信息'">
<div class="details-content-modular basic-information" style="border-top:none">
<div class="basic-information-content">
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p style="color: #C42626;" class="half">
<label style=" margin-right: 164px;">标准号</label>
<span v-if="sarStandardsInfoEO.standYear">{{
<div class="modular-header" v-if="item.label !== '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
</div>
</template>
<div class="modular-content">
<template v-if="item.label === '基础信息'" >
<div class="details-content-modular basic-information" style="border-top:none">
<div class="basic-information-content">
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p style="color: #C42626;" class="half">
<label style=" margin-right: 164px;">标准号</label>
<span v-if="sarStandardsInfoEO.standYear">{{
sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
}}</span>
<span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
</p>
<!-- <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
<p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
standMap[sarStandardsInfoEO.standNature] || '-'
}}</span></p>
<p><label style=" margin-right: 150px;">中文名称</label><span>{{
<span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
</p>
<!-- <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
<template v-for="(child, childIndex) in item.child1">
<p class="half files-title"
v-for="(file, fileIndex) in child.value"
>
<label style=" margin-right: 102px;">{{ child.attrName }}</label>
<span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>-->
</span>
</p>
</template>
<p><label style=" margin-right: 150px;">中文名称</label><span>{{
sarStandardsInfoEO.standName || '-'
}}</span></p>
<p style="border: none;"><label style=" margin-right: 150px;">英文名称</label><span>{{
<p><label style=" margin-right: 150px;">英文名称</label><span>{{
sarStandardsInfoEO.standEnName || '-'
}}</span></p>
<p class="half">
<label style=" margin-right: 150px;"
title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
>文本状态</label>
<span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
</p>
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
<p class="half">
<label style=" margin-right: 150px;"
title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
>文本状态</label>
<span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
</p>
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
sarStandardsInfoEO.issueTime || '-'
}}</span></p>
<p class="half">
<label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
}}</span>
</p>
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{
<p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
standMap[sarStandardsInfoEO.standNature] || '-'
}}</span></p>
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{
sarStandardsInfoEO.standSystem || '-'
}}</span></p>
<!-- <p><label>文本说明</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
<!-- <p><label>重要度</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
<!-- <p><label>纳入标准法规清单的国家/地区</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
</div>
</div>
</template>
<template
v-for="(child, childIndex) in item.half"
v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
>
<!-- modular-item half 代替标准编号-->
<div
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span
class="modular-content-p-val"
:title="child.value || '-'"
<p class="half">
<label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
}}</span>
</p>
<template v-for="(child, childIndex) in item.child2">
<p class="half">
<label style=" margin-right: 143px;">{{child.attrName}}</label><span>
{{ child.value || '-' }}
</span>
</p>
</template>
<!-- <p><label>文本说明</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
<!-- <p><label>重要度</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
<!-- <p><label>纳入标准法规清单的国家/地区</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
</div>
</div>
</template>
<template
v-for="(child, childIndex) in item.half"
v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
>
<!-- modular-item half 代替标准编号-->
<div
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span
class="modular-content-p-val"
:title="child.value || '-'"
>
<div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0">
<!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value">
@@ -131,19 +166,19 @@
{{ '-' }}
</div>
</span>
</div>
<!-- 其他项-->
<div
v-else
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span
v-if="child.attrField === 'FGWHR'"
class="modular-content-p-val clearfix"
:title="child.value || '-'"
>
</div>
<!-- 其他项-->
<div
v-else
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span
v-if="child.attrField === 'FGWHR'"
class="modular-content-p-val clearfix"
:title="child.value || '-'"
>
<template v-if="child.value">
{{ child.value }}
<put-question-button
@@ -156,282 +191,359 @@
{{ '-' }}
</template>
</span>
<span
v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val"
>
<span
v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val"
>
{{ child.value ? child.value.substring(0, 10) : '-' }}
</span>
<span
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
<span
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value || '-' }}
</span>
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!--发布稿增补件单独设置下载权限-->
<template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>
</template>
<!-- <el-button-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
</p>
</div>
</div>
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!--发布稿增补件单独设置下载权限-->
<template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>-->
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>-->
</template>
<!-- <el-button-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
</p>
</div>
</div>
</template>
<template
v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0' && item.label === '关联信息'"
>
<div
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
</template>
<template
v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0' && item.label === '关联信息'"
>
<div
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
</template>
<template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
>
<p class="modular-content-p-val" v-if="child.value">
</p>
</template>
<template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
>
<p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
<span class="modular-content-p-val" v-else>-</span>
</template>
<span
v-else-if="child.attrField === 'SVPPS'"
class="modular-content-p-val"
:title="child.tips || '-'"
>
</p>
<span class="modular-content-p-val" v-else>-</span>
</template>
<span
v-else-if="child.attrField === 'SVPPS'"
class="modular-content-p-val"
:title="child.tips || '-'"
>
{{ !child.value || child.value === 'null' ? '-' : child.value }}
</span>
<span
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
<span
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value || '-' }}
</span>
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿增补件单独设置下载权限-->
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿增补件单独设置下载权限-->
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>-->
<span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>
</template>
</p>
<!-- <el-button-->
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
</div>
</div>
<!-- <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>-->
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template>
</p>
<!-- <el-button-->
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
</div>
</div>
</template>
<template
v-for="(child, childIndex) in item.one"
v-if="child.isShowImp === '0' && item.label !== '关联信息' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
>
<div
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
</template>
<template
v-for="(child, childIndex) in item.one"
v-if="child.isShowImp === '0' && item.label == '文本信息'"
>
<div
:key="child.id"
:class="'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span
v-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value || '-' }}
</span>
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
<!-- <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>-->
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template>
</p>
<el-button
v-if="child.attrField === itemNam "
v-for="(itemNam,index) in itemExistList"
:key="index"
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
icon="icon-separate"
>标准分解单
</el-button>
</div>
</div>
</template>
<template
v-for="(child, childIndex) in item.one"
v-if="child.isShowImp === '0' && item.label !== '关联信息' && item.label !== '文本信息' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
>
<div
:key="child.id"
:class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
</template>
<template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
>
<p class="modular-content-p-val" v-if="child.value">
</p>
</template>
<template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
>
<p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
class="span-line">{{ item }}</a>
</span>
</p>
<span class="modular-content-p-val" v-else>-</span>
</template>
<span
v-else-if="child.attrField === 'SVPPS'"
class="modular-content-p-val"
:title="child.tips || '-'"
>
</p>
<span class="modular-content-p-val" v-else>-</span>
</template>
<span
v-else-if="child.attrField === 'SVPPS'"
class="modular-content-p-val"
:title="child.tips || '-'"
>
{{ !child.value || child.value === 'null' ? '-' : child.value }}
</span>
<span
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
<span
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value || '-' }}
</span>
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
<!-- <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>-->
<!-- <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>-->
<span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>
</template>
</p>
<el-button
v-if="child.attrField === itemNam "
v-for="(itemNam,index) in itemExistList"
:key="index"
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
icon="icon-separate"
>标准分解单
</el-button>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</template>
</p>
<el-button
v-if="child.attrField === itemNam "
v-for="(itemNam,index) in itemExistList"
:key="index"
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
icon="icon-separate"
>标准分解单
</el-button>
</div>
</div>
</template>
<div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
<div class="wrap" @click="handleToggleShowAll(item)">
<span>{{ item.showAll ? '收起' : '更多' }}</span>
<img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png">
</div>
</div>
</div>
</template>
<div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
<div class="wrap" @click="handleToggleShowAll(item)">
<span>{{ item.showAll ? '收起' : '更多' }}</span>
<img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png">
</div>
</div>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
</div>
<!-- <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">-->
<!-- </div>-->
<!-- <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
<!--查看分解单-->
<el-drawer
@@ -1245,8 +1357,18 @@
CustomOrg,
RelatedTermsSelect
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 25) {
return value.slice(0,25) + '...'
}
return value
}
},
data() {
return {
activeNames: ['基础信息'],
itemExistList:[],
interpretationContent: '',
relatedTermsDrawerVisible: false,
@@ -1541,6 +1663,9 @@
props: {},
watch: {},
methods: {
handleChange(val) {
console.log(val);
},
judgeSuffix(fileName){
if ('pdf'===fileName.substring(fileName.lastIndexOf('.') + 1)){
return true;
@@ -2916,7 +3041,38 @@
}
})
})
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '文本信息'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
displayLocation.forEach(location => {
// 动态属性字段-FBGBJBD 单独添加至基础信息
const list = displayLocation.filter ( item => item.label === '文本信息');
if(location.label === '基础信息' && list && list.length > 0){
if (!list[0].child) {
location['child1'] = []
}else {
const childList = list[0].child.filter ( item => item.attrField === 'FBGBJBD');
location['child1'] = childList
}
}
// 动态属性字段-SYRZ 单独添加至基础信息
const list2 = displayLocation.filter ( item => item.label === '适用范围');
if(location.label === '基础信息' && list2 && list2.length > 0){
if (!list[0].child) {
location['child2'] = []
}else {
const childList = list2[0].child.filter ( item => item.attrField === 'SYRZ');
location['child2'] = childList
}
}
const child = location.child || []
const one = []
const half = []
@@ -2924,7 +3080,9 @@
if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
half.push(field)
} else {
one.push(field)
if(field.attrField && field.attrField !== 'FBGBJBD'){
one.push(field)
}
}
})
const fieldsIsTextAreaOrFile = child.filter(field => {
@@ -2958,7 +3116,6 @@
})
this.dynamicFormField = displayLocation
})
console.log(displayLocation)
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false
})
@@ -2985,6 +3142,13 @@
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/ .el-collapse-item__content {
padding-bottom: 0px;
font-size: 13px;
color: #303133;
line-height: 1.769230769230769;
}
/deep/ .btn1 #question {
padding: 0 10px;
margin-left: 10px;
@@ -3031,6 +3195,32 @@
margin-bottom: 10px;
}
/deep/ .icon-download {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
background-image: url("~assets/images/shangqi/img/download.png");
}
/deep/ .icon-download2 {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
background-image: url("~assets/images/shangqi/img/download2.png");
}
.action-bar {
border-top: 0px;
}
@@ -3111,6 +3301,7 @@
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 50px;
border-bottom: 1px solid #E5E5E5;
.modular-header-title {
@@ -3126,7 +3317,9 @@
background-size: 100% 100%;
background-position: center center;
background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
vertical-align: top;
position: relative;
top: 2px;
;
}
& > span {
@@ -3232,6 +3425,9 @@
& > div:not(.modular-item-more) {
border-bottom: 1px solid #E5E5E5;
min-height: 43px;
line-height: 43px;
height: 44px;
.modular-content-p-name {
display: inline-block;
@@ -3336,8 +3532,8 @@
.basic-information-content {
& > p {
min-height: 55px;
line-height: 55px;
min-height: 43px;
line-height: 43px;
border-bottom: 1px solid #E5E5E5;
}
}
@@ -18,7 +18,7 @@
<el-form ref="rh_pageData" :model="rh_pageData" :rules="rh_rules" label-width="150px">
<el-row>
<el-col :span="8">
<el-form-item label="协会名称:">
<el-form-item label="协会名称:" prop="comityName">
<el-select
v-model="rh_pageData.comityName"
placeholder="请选择标委会">
@@ -26,12 +26,12 @@
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.label"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item v-if="rh_pageData.comityName !== ''">
<el-form-item v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
<el-select
v-model="rh_pageData.comityNameOne"
placeholder="请选择分标委">
@@ -39,12 +39,12 @@
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.label"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
<el-form-item prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
<el-select
v-model="rh_pageData.comityNameTwo"
placeholder="请选择工作组">
@@ -52,7 +52,7 @@
v-for="item in comityNameOptions"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.label"/>
</el-select>
</el-form-item>
</el-col>
@@ -134,29 +134,30 @@
<el-row>
<el-col :span="8">
<el-form-item label="资质:">
<el-input v-model="rh_pageData.comityMake.makeQualification"></el-input>
<el-input
v-model="rh_pageData.comityMake.makeQualification" placeholder="请填写资质"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="成员:">
<el-input v-model="rh_pageData.comityMake.makeRole"></el-input>
<el-input v-model="rh_pageData.comityMake.makeRole" placeholder="请填写成员"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="费用估计:">
<el-input v-model="rh_pageData.comityMake.makeCost"></el-input>
<el-input v-model="rh_pageData.comityMake.makeCost" placeholder="请填写费用估计"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="职责:">
<el-input v-model="rh_pageData.comityMake.makeDuties"></el-input>
<el-input v-model="rh_pageData.comityMake.makeDuties" placeholder="请填写职责"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任期:">
<el-input v-model="rh_pageData.comityMake.makeTime"></el-input>
<el-input v-model="rh_pageData.comityMake.makeTime" placeholder="请填写任期"/>
</el-form-item>
</el-col>
</el-row>
@@ -164,7 +165,7 @@
</el-form-item>
<el-divider/>
<el-form-item label="工作方向:" prop="workPath">
<el-input v-model="rh_pageData.workPath" type="textarea"></el-input>
<el-input v-model="rh_pageData.workPath" type="textarea"/>
</el-form-item>
<el-divider/>
<el-form-item label="协会外部联系方式:" style="margin-bottom: 50px">
@@ -455,9 +456,17 @@ export default {
engineerUserId: '',
},
rh_rules: {},
rh_rules: {
comityName: [{required: true, message: "请选择协会名称", trigger: ['blur', 'change']}],
comityNameOne: [{required: true, message: "请选择分标委", trigger: ['blur', 'change']}],
comityNameTwo: [{required: true, message: "请选择工作组", trigger: ['blur', 'change']}]
},
roleFormRules: {
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}],
feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
},
roleShowflag: false,
roleShowflagOne: false,
@@ -700,6 +709,8 @@ export default {
this.isSubmit = false
})
})
} else {
this.$message.warning('请完成流程信息的人员选择')
}
})
}
@@ -269,7 +269,9 @@ export default {
engineerUserId: '',
engineerUser: '',
},
roleFormRules: {},
roleFormRules: {
engineerUser: [{required: true, message: "选择法规工程师", trigger: ['blur', 'change']}],
},
upDialog: false,
upThemeDialog: false,
@@ -378,7 +378,11 @@ export default {
engineerUserId: '',
},
roleFormRules: {
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}],
feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
},
deleteDataList: [],
@@ -23,16 +23,23 @@
<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-form-item label="政策号" prop="lawsNumber" class="add-form-item form-item-disabled">
<div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" @click="">选择征求意见政策</el-button>
<el-button size="small" type="primary" @click="handleSearchStandard">选择征求意见政策</el-button>
</div>
<el-input
v-model="form.cid"
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
/>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="截止时间" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.endTime"
@@ -88,7 +95,8 @@
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="责任对接人任务分发及审核" placement="top" :color="roleForm.responseDockerId ? '#66b1ff' : ''">
<el-timeline-item timestamp="责任对接人任务分发及审核" placement="top"
:color="roleForm.responseDockerId ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="responseDockerName" style="margin-bottom: 0">
<h4>责任对接人</h4>
@@ -101,7 +109,8 @@
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="法规认证工程师意见汇总并发起会签" placement="top" :color="roleForm.lawsProveEngineerId ? '#66b1ff' : ''">
<el-timeline-item timestamp="法规认证工程师意见汇总并发起会签" placement="top"
:color="roleForm.lawsProveEngineerId ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="lawsProveEngineerName" style="margin-bottom: 0">
<h4>法规认证工程师</h4>
@@ -114,7 +123,8 @@
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="法规认证部部长审核" placement="top" :color="roleForm.lawsProveMinisterId ? '#66b1ff' : ''">
<el-timeline-item timestamp="法规认证部部长审核" placement="top"
:color="roleForm.lawsProveMinisterId ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="lawsProveMinisterName" style="margin-bottom: 0">
<h4>法规认证部部长</h4>
@@ -127,7 +137,8 @@
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="法规认证部副总监审定" placement="top" :color="roleForm.lawsProveViceChiefId ? '#66b1ff' : ''">
<el-timeline-item timestamp="法规认证部副总监审定" placement="top"
:color="roleForm.lawsProveViceChiefId ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="lawsProveViceChiefName" style="margin-bottom: 0">
<h4>法规认证部副总监</h4>
@@ -172,6 +183,144 @@
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 选择标准的弹框 -->
<el-drawer
ref="standard"
title="查询结果"
size="1000px"
:visible.sync="standardDrawer"
direction="rtl"
:before-close="handleReviseDrawerClose">
<div class="standard-content">
<div class="content">
<div class="standard-table-search">
<el-form :model="standardSearchForm" inline class="label-input-form search-area">
<el-form-item label="政策编号" style="margin-right:10px" prop="lawsNumber" class="search-item">
<el-input
v-model="standardSearchForm.lawsNumber"
clearable placeholder="根据编号查找"
:maxlength="100"
@keyup.enter.native="handleSearchStandard"/>
</el-form-item>
<el-form-item label="政策名称" style="margin-right:10px" prop="lawsName" class="search-item">
<el-input
v-model="standardSearchForm.lawsName"
placeholder="请输入政策名称"
clearable
:maxlength="100"></el-input>
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
@click="handleSearchStandard"
round>
</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
@click="handleResetSearch"
round>
</el-button>
</el-form-item>
</el-form>
</div>
<div class="standard-table-wrap">
<el-table
ref="reviseDrawerTable"
:data="tableData.standardData"
tooltip-effect="dark"
style="width: 100%;"
:height="tableHeight.standardTableHeight"
border
class="drag-table"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
@selection-change="standSelectChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
type="index"
label="序号"
width="80"
align="center"
></el-table-column>
<el-table-column
label="政策编号"
align="center"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" style="color: #409eff;cursor: pointer">{{ scope.row.lawsNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="lawsName"
label="政策名称"
align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
align="center">
<template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
</el-table-column>
<el-table-column
prop="textStatus"
label="政策状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.standStatusShow }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button
class="opera-btn"
size="mini"
type="primary"
@click="handlePreview(scope.row)">查看
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
:page="standardSearchForm.page"
:total="standardSearchForm.total"
@pageChange="handleStandardPageChange"
@pageSizeChange="handleStandardPageSizeChange"></pagination>
<loading :loading="loadSarStandard">数据获取中</loading>
</div>
</div>
<div class="demo-drawer-footer">
<!-- <el-button-->
<!-- round-->
<!-- class="common-button-primary"-->
<!-- icon="el-icon-check"-->
<!-- type="primary"-->
<!-- @click="handleProcessStandardNext(1)">新增-->
<!-- </el-button>-->
<el-button
round
class="common-button-primary"
icon="el-icon-check"
type="primary"
@click="handleProcessStandardNext(2)">带入
</el-button>
<el-button
round
class="common-button-default"
icon="el-icon-close"
@click="handleProcessStandardNext(3)">取消
</el-button>
</div>
</el-drawer>
</div>
</template>
@@ -190,11 +339,34 @@ export default {
},
data() {
return {
tableHeight: {
standardTableHeight: null
},
tableData: {
// 标准表格数据
standardData: [],
// 任务分解单数据
taskTableData: []
},
loadSarStandard: false,
lawsTextStateOptions: [],
standardDrawer: false,
standardSearchForm: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
standType: 'INLAND',
standSort: '',
standName: '',
standEnName: '',
standNumber: ''
},
isSubmit: false,
active: "1", //默认显示基础信息页面
// 基础信息form表单
form: {
cid: '', // 政策编号
lawsNumber: '', // 政策编号
lawsName: "", // 政策名称
endTime: '', // 责任部门领导审批 截止时间
cycleTime: '',//政策征求意见周期
cname: '', // 名称
@@ -205,9 +377,12 @@ export default {
fjListId: ''
},
formRules: {
cid: [
lawsNumber: [
{required: true, message: '请输入政策编号', trigger: 'change'},
],
lawsName: [
{required: true, message: '请输入政策名称', trigger: 'change'},
],
endTime: [
{required: true, message: '请选择截止时间', trigger: 'change'},
],
@@ -230,18 +405,18 @@ export default {
roleForm: {
startUserName: this.$store.getters.userInfo.userName,//发起人
startUser: this.$store.getters.userInfo.userId,
responseDockerId:"",//责任对接人
responseDockerName:"",
responseUserId:"",//责任人
responseUserName:"",
lawsProveEngineerId:"",//法规认证工程师
lawsProveEngineerName:"",
lawsProveMinisterId:"",//法规认证部部长
lawsProveMinisterName:"",
lawsProveViceChiefId:"",//法规认证部副总监
lawsProveViceChiefName:"",
lawsProveChiefId:"",//法规认证部总监
lawsProveChiefName:"",
responseDockerId: "",//责任对接人
responseDockerName: "",
responseUserId: "",//责任人
responseUserName: "",
lawsProveEngineerId: "",//法规认证工程师
lawsProveEngineerName: "",
lawsProveMinisterId: "",//法规认证部部长
lawsProveMinisterName: "",
lawsProveViceChiefId: "",//法规认证部副总监
lawsProveViceChiefName: "",
lawsProveChiefId: "",//法规认证部总监
lawsProveChiefName: "",
},
// 角色验证
roleFormRules: {
@@ -269,6 +444,134 @@ export default {
}
},
methods: {
handleProcessStandardNext(status) {
switch (status) {
// 新增
case 1:
this.selectedList = []
this.standardCheckedList = []
this.standardDrawer = false
this.verifySarStandard = true
this.clearFormData(this.form)
break
// 带入
case 2:
if (this.standardCheckedList.length === 1) {
this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
_this: this
}, res => {
if (res && res.data) {
const bringData = res.data
const json = Object.assign(bringData, bringData.attrInfoMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : []
this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : []
this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : []
this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : []
this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : []
this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : []
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = bringData.id
this.standardDrawer = false
this.verifySarStandard = true
this.busVsFunc()
this.modelFunc()
this.$forceUpdate()
}
// 遍历对象初始化文件信息
for (const p in this.form) {
if (typeof (this.form[p]) != "function") {
this.initializeFileList(p, this.form[p]);
}
}
console.log("res", res);
})
} else if (this.standardCheckedList.length > 1) {
this.$message.warning('最多可以带入一条政策信息')
} else {
this.$message.warning('请选择要带入的政策信息')
}
break
// 取消
case 3:
this.selectedList = []
this.standardCheckedList = []
this.standardDrawer = false
break
}
},
handleStandardPageChange(page) {
this.standardSearchForm.page = page
this.handleSearchStandard()
},
handleStandardPageSizeChange(pageSize) {
this.standardSearchForm.pageSize = pageSize
this.handleSearchStandard()
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherLawsStandDetails',
params: {
id: item.id,
pageType: 'LAWS_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
standSelectChange(data) {
this.selectedList = []
for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id)
}
this.standardCheckedList = data
},
//清空搜索条件
handleResetSearch() {
this.standardSearchForm.lawsNumber = ''
this.standardSearchForm.lawsName = ''
this.standardSearchForm.standType = 'INLAND'
this.standardSearchForm.standNumber = ''
this.standardSearchForm.standSort = ''
this.standardSearchForm.standName = ''
this.standardSearchForm.standEnName = ''
setTimeout(() => {
this.handleSearchStandard()
}, 100)
},
/**
* 关闭修订 Drawer 的监听
* @param done
*/
handleReviseDrawerClose(done) {
done()
},
getDomesticStandardTable() {
this.loadSarStandard = true
this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => {
this.loadSarStandard = false
if (res.ok) {
this.tableData.standardData = res.data.list
this.standardSearchForm.total = res.data.count
}
}, e => {
this.loadSarStandard = false
})
},
handleSearchStandard() {
this.standardDrawer = true
this.$nextTick(() => {
// 动态设置表格高度
this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
window.onresize = () => {
this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
}
})
this.getDomesticStandardTable()
},
//基础信息/人员信息
handleTabs(type) {
this.active = type;
@@ -286,24 +589,19 @@ export default {
if (this.type === "responseDockerId") {
this.roleForm.responseDockerId = data[0].id;
this.roleForm.responseDockerName = data[0].name;
}
else if(this.type === "responseUserId"){
} else if (this.type === "responseUserId") {
this.roleForm.responseUserId = data[0].id;
this.roleForm.responseUserName = data[0].name;
}
else if(this.type === "lawsProveEngineerId"){
} else if (this.type === "lawsProveEngineerId") {
this.roleForm.lawsProveEngineerId = data[0].id;
this.roleForm.lawsProveEngineerName = data[0].name;
}
else if(this.type === "lawsProveMinisterId"){
} else if (this.type === "lawsProveMinisterId") {
this.roleForm.lawsProveMinisterId = data[0].id;
this.roleForm.lawsProveMinisterName = data[0].name;
}
else if(this.type === "lawsProveViceChiefId"){
} else if (this.type === "lawsProveViceChiefId") {
this.roleForm.lawsProveViceChiefId = data[0].id;
this.roleForm.lawsProveViceChiefName = data[0].name;
}
else if(this.type === "lawsProveChiefId"){
} else if (this.type === "lawsProveChiefId") {
this.roleForm.lawsProveChiefId = data[0].id;
this.roleForm.lawsProveChiefName = data[0].name;
}
@@ -340,9 +638,10 @@ export default {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: 'laws2'
}, {}, res => {
}, {_this: this}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
console.log('644',json)
json.commentText = this.commentText
json.filesId = this.addFjList
json.filesName = this.form.fjListName
@@ -350,7 +649,7 @@ export default {
json: JSON.stringify(json),
taskId: res.data,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
}, {_this: this}, res => {
if (res.success) {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
@@ -450,5 +749,31 @@ export default {
}
}
}
.standard-content {
height: 100%;
padding: 10px 0 0;
.content {
height: 100%;
display: flex;
flex-direction: column;
padding: 0 10px;
.standard-table-wrap {
flex: auto;
overflow-y: auto;
}
.pagination {
position: static;
/deep/ .pagination-slot {
padding: 0;
}
}
.search-area {
display: flex;
justify-content: left;
background: #FFF;
padding: 10px 10px 0;
}
}
}
}
</style>
@@ -23,14 +23,22 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
<el-input
v-model="form.responUserList"
@@ -168,13 +176,14 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 政策编号
lawsNumber: "", // 政策编号
lawsName: "", // 政策名称
endTime: "", // 责任部门领导审批 截止时间
cname: "", // 名称
fjList: [],
fjListId: '',
responUserList: "",
responUserListName: ""
responUserListName: "",
},
formRules: {
responUserList: [
@@ -234,6 +243,20 @@ export default {
checkedRole2(data) {
var idList = "";
var nameList = "";
var responUserAndInstitutionNameMap = "";
console.log('246',data)
//用来给后端传选择的责任人和对应的提出部门↓
data.forEach(item => {
responUserAndInstitutionNameMap += "{\"" + item.id + "\":\"" + item.institutionName + "\"}" + ",";
});
responUserAndInstitutionNameMap = "[" + responUserAndInstitutionNameMap;
responUserAndInstitutionNameMap = responUserAndInstitutionNameMap.substring(0, responUserAndInstitutionNameMap.length - 1)
responUserAndInstitutionNameMap = responUserAndInstitutionNameMap + "]";
this.form.responUserAndInstitutionNameMap = responUserAndInstitutionNameMap;
console.log('260',this.form.responUserAndInstitutionNameMap)
//用来给后端传选择的责任人和对应的提出部门↑
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
@@ -284,6 +307,8 @@ export default {
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.introduce = false;
//给后端用来判断人的map
json.responUserAndInstitutionNameMap = this.form.responUserAndInstitutionNameMap;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -307,7 +332,9 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
console.log('335',data)
this.form.lawsNumber = data.lawsNumber
this.form.lawsName = data.lawsName
this.form.endTime = data.endTime
this.form.cname = data.cname
this.form.fjList = data.fjList
@@ -23,14 +23,22 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -57,6 +65,7 @@
:data="data"
tooltip-effect="dark"
border
height="330px"
style="width: 100%; flex: auto;"
class="drag-table"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -113,11 +122,11 @@
</template>
</el-table-column>
<el-table-column
prop="updateReason"
prop="changeReason"
align="center"
label="修改理由">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.changeReason"></el-input>
</template>
</el-table-column>
</el-table-column>
@@ -264,9 +273,11 @@ export default {
acceptShow: false,
saveLoading: false,
form: {
cid: '', // 编号
lawsNumber: '', // 政策编号
lawsName: '', // 政策名称
endTime: '', // 结束日期
cname: '', // 名称
department: '',//提出部门
fjList: [],
fjListId: '',
},
@@ -364,11 +375,12 @@ export default {
commentText: '',
oldText: '',
newText: '',
changeReason: '',
reason: '',
department: '',
id: id,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId,
department: this.$store.getters.userInfo.orgName
}
this.data.push(json)
},
@@ -439,7 +451,10 @@ export default {
json.commentText = this.commentText
json.info = this.data
json.form = this.form
json.department = this.$store.getters.userInfo.orgName
for (let i = 0; i < json.info.length; i++) {
json.info[i].department = this.form.department
}
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -475,11 +490,16 @@ export default {
}
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
this.form.lawsName = data.lawsName || data.form.lawsName
this.form.endTime = data.endTime || data.form.endTime
this.form.department = data.department
this.todoId = res.id
this.json = data
this.data = data.info || data.data || data.form.data || []
for (let i = 0; i < this.data.length; i++) {
this.data[i].department = data.department
}
}).catch(e => {
})
})
@@ -23,14 +23,22 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -82,7 +90,7 @@
label="修改后">
</el-table-column>
<el-table-column
prop="updateReason"
prop="changeReason"
align="center"
label="修改理由">
</el-table-column>
@@ -92,9 +100,6 @@
align="center"
label="原因"
width="200px">
<!-- <template slot-scope="scope">-->
<!-- <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="department"
@@ -237,7 +242,8 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: '', // 编号
lawsNumber: '', // 政策编号
lawsName: '', // 政策名称
endTime: '', // 结束日期
cname: '', // 名称
fjList: [],
@@ -355,7 +361,8 @@ export default {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
this.form.lawsName = data.lawsName || data.form.lawsName
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.json = data
@@ -370,7 +377,8 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item));
this.form.cid = item.form.cid
this.form.lawsNumber = item.form.lawsNumber
this.form.lawsName = item.form.lawsName
});
},
},
@@ -24,14 +24,22 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -39,18 +47,6 @@
<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>-->
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@@ -58,22 +54,16 @@
@click="addModal"
size="mini">新增
</el-button>
<!-- <el-button type="primary"-->
<!-- class="common-button-primary add-button"-->
<!-- :disabled="acceptShow"-->
<!-- @click="addDelete"-->
<!-- size="mini">删除-->
<!-- </el-button>-->
<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">生成上报意见
size="mini">导出Excel
</el-button>
<!-- <el-button type="primary"-->
<!-- class="common-button-primary add-button"-->
<!-- @click="upload(oldData, '上报意见.xls')"-->
<!-- size="mini">导出Word-->
<!-- </el-button>-->
</div>
<el-table
ref="multipleTable"
@@ -97,42 +87,77 @@
sortable
label="章条编号"
width="101px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;background-color: red" v-model="scope.row.chapterNumber" v-if="changeFlag && scope.row.chapterNumber === ''"></el-input>
<el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterNumber" v-else-if="changeFlag && scope.row.addFlag"></el-input>
<el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterNumber" v-else-if="changeFlag && !scope.row.addFlag" readonly></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber" v-else readonly></el-input>
</template>
</el-table-column>
<el-table-column
prop="chapterName"
align="center"
width="200px"
label="章节名称">
<template slot-scope="scope">
<el-input style="margin: 10px 0;background-color: red" v-model="scope.row.chapterName" v-if="changeFlag && scope.row.chapterName === ''"></el-input>
<el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterName" v-else-if="changeFlag && scope.row.addFlag"></el-input>
<el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterName" v-else-if="changeFlag && !scope.row.addFlag" readonly></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName" v-else readonly></el-input>
</template>
</el-table-column>
<el-table-column
prop="commentText"
align="center"
label="修改意见内容(包括理由或依据)">
<el-table-column
prop="oldText"
align="center"
label="修改前">
<template slot-scope="scope">
<el-input style="margin: 10px 0;background-color: red" v-model="scope.row.oldText" v-if="changeFlag && scope.row.oldText === ''"></el-input>
<el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.oldText" v-else-if="changeFlag"></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.oldText" v-else readonly></el-input>
</template>
</el-table-column>
<el-table-column
prop="newText"
align="center"
label="修改后">
<template slot-scope="scope">
<el-input style="margin: 10px 0;background-color: red" v-model="scope.row.newText" v-if="changeFlag && scope.row.newText === ''"></el-input>
<el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.newText" v-else-if="changeFlag"></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.newText" v-else readonly></el-input>
</template>
</el-table-column>
<el-table-column
prop="updateReason"
prop="changeReason"
align="center"
label="修改理由">
<template slot-scope="scope">
<el-input style="margin: 10px 0;background-color: red" v-model="scope.row.changeReason" v-if="changeFlag && scope.row.changeReason === ''"></el-input>
<el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.changeReason" v-else-if="changeFlag"></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.changeReason" v-else readonly></el-input>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="原因"
width="200px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
<el-input style="margin: 10px 0;background-color: red" v-model="scope.row.reason" v-if="changeFlag && scope.row.reason === ''"></el-input>
<el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.reason" v-else-if="changeFlag"></el-input>
<el-input style="margin: 10px 0;" v-model="scope.row.reason" v-else readonly></el-input>
</template>
</el-table-column>
<el-table-column
prop="department"
align="center"
@@ -146,14 +171,16 @@
<el-table-column
prop="operation"
align="center"
width="150px"
label="操作">
<template slot-scope="scope">
<el-button type="primary"
class="common-button-primary add-button"
size="mini">修订</el-button>
@click="changeOpinion"
size="mini">{{changeFlag?'完成':'修订'}}</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="addDelete"
@click="addDelete(scope.$index, scope.row)"
size="mini">删除</el-button>
<div>{{ stateText(scope.row.state) }}</div>
</template>
@@ -267,6 +294,8 @@ export default {
name: "zczqyjStep5",
data() {
return {
//修订的标志
changeFlag:false,
acceptShow: false,
drawerModal: false,
histortData: [],
@@ -294,7 +323,9 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
lawsNumber: '', // 政策编号
lawsName: '', // 政策名称
department: '',//提出部门
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
@@ -314,10 +345,33 @@ export default {
ProcessTitle
},
methods: {
addDelete() {
this.data.splice(1, 1)
changeOpinion() {
this.changeFlag = !this.changeFlag
},
addDelete(index, row) {
console.log('362',index, row);
this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.data.splice(index, 1)
this.$message({
type: 'success',
message: '删除成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
console.log('379',this.data)
},
addModal() {
console.log('318',this.form.form.department)
this.changeFlag = true
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
var json = {
chapterNumber: '',
@@ -325,13 +379,16 @@ export default {
commentText: '',
oldText: '',
newText: '',
changeReason: '',
reason: '',
department: this.form.form.department,
id: id,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId,
department: this.$store.getters.userInfo.orgName
addFlag:true,
// department: this.$store.getters.userInfo.orgName
}
this.data.push(json)
this.data.unshift(json)
},
handleTransfer() {
this.drawerModal = true
@@ -389,24 +446,15 @@ export default {
commentText: "修改意见内容(包括理由或依据)",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
changeReason: "修改理由",
reason:"原因",
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 => {
this.$http.downloadFile("/api/policy/activiti/exportExcel", params, title, res => {
});
},
handleTabs(name) {
@@ -416,12 +464,14 @@ export default {
},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning("请输入征求意见");
this.$message.warning("请输入征求意见稿");
} else {
this.isSubmit = true;
var json = this.json;
json.actionFlag = 0;
json.commentText = this.commentText;
json.info = this.data
json.form = this.form
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -462,10 +512,19 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
}
let data = JSON.parse(res.mesg);
this.form.department = data.form.department
console.log(this.form.department,'517')
// 给后端的选人信息
this.form.responUserAndInstitutionNameMap = data.form.responUserAndInstitutionNameMap
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
this.form.lawsName = data.lawsName || data.form.lawsName
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
@@ -475,13 +534,26 @@ export default {
arr.push(item)
}
})
// for (let i = 0; i < this.data.length; i++) {
// this.data[i].department = data.department
// }
this.json = data
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
});
});
}
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item));
this.form.lawsNumber = item.form.lawsNumber
this.form.lawsName = item.form.lawsName
});
},
},
mounted() {
this.getHistoryData();
@@ -23,12 +23,20 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
disabled
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
</el-col>
@@ -82,7 +90,7 @@
label="修改后">
</el-table-column>
<el-table-column
prop="updateReason"
prop="changeReason"
align="center"
label="修改理由">
</el-table-column>
@@ -92,9 +100,6 @@
align="center"
label="原因"
width="200px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template>
</el-table-column>
<el-table-column
prop="department"
@@ -106,14 +111,14 @@
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="dealComment"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="dealComment"-->
<!-- align="center"-->
<!-- label="处理意见">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ stateText(scope.row.state) }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
lawsNumber: '', // 政策编号
lawsName: '', // 政策名称
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
@@ -395,7 +401,8 @@ export default {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
this.form.lawsName = data.lawsName || data.form.lawsName
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
@@ -23,12 +23,20 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
disabled
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
</el-col>
@@ -82,7 +90,7 @@
label="修改后">
</el-table-column>
<el-table-column
prop="updateReason"
prop="changeReason"
align="center"
label="修改理由">
</el-table-column>
@@ -92,9 +100,6 @@
align="center"
label="原因"
width="200px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template>
</el-table-column>
<el-table-column
prop="department"
@@ -106,14 +111,14 @@
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="dealComment"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="dealComment"-->
<!-- align="center"-->
<!-- label="处理意见">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ stateText(scope.row.state) }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
lawsNumber: '', // 政策编号
lawsName: '', // 政策名称
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
@@ -395,7 +401,8 @@ export default {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
this.form.lawsName = data.lawsName || data.form.lawsName
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
@@ -23,12 +23,20 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
disabled
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
</el-col>
@@ -82,7 +90,7 @@
label="修改后">
</el-table-column>
<el-table-column
prop="updateReason"
prop="changeReason"
align="center"
label="修改理由">
</el-table-column>
@@ -92,9 +100,6 @@
align="center"
label="原因"
width="200px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template>
</el-table-column>
<el-table-column
prop="department"
@@ -106,14 +111,14 @@
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="dealComment"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="dealComment"-->
<!-- align="center"-->
<!-- label="处理意见">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ stateText(scope.row.state) }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
lawsNumber: '', // 政策编号
lawsName: '', // 政策名称
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
@@ -395,7 +401,8 @@ export default {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
this.form.lawsName = data.lawsName || data.form.lawsName
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
@@ -23,12 +23,20 @@
<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-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
disabled
v-model="form.lawsNumber"
placeholder="请输入政策编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.lawsName"
placeholder="请输入政策名称"
clearable
></el-input>
</el-form-item>
</el-col>
@@ -82,7 +90,7 @@
label="修改后">
</el-table-column>
<el-table-column
prop="updateReason"
prop="changeReason"
align="center"
label="修改理由">
</el-table-column>
@@ -92,9 +100,6 @@
align="center"
label="原因"
width="200px">
<template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template>
</el-table-column>
<el-table-column
prop="department"
@@ -106,14 +111,14 @@
align="center"
label="提出人">
</el-table-column>
<el-table-column
prop="dealComment"
align="center"
label="处理意见">
<template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="dealComment"-->
<!-- align="center"-->
<!-- label="处理意见">-->
<!-- <template slot-scope="scope">-->
<!-- <div>{{ stateText(scope.row.state) }}</div>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
lawsNumber: '', // 政策编号
lawsName: '', // 政策名称
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
@@ -395,7 +401,8 @@ export default {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
this.form.lawsName = data.lawsName || data.form.lawsName
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))