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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-21 11:46:29 +08:00
parent 854bf6d9d3 7e78df01e3
commit bd109c9dcf
9 changed files with 14641 additions and 32903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+6506 -24729
View File
File diff suppressed because it is too large Load Diff
src/main.js
+2
View File
@@ -168,6 +168,8 @@ router.beforeEach(function (to, from, next) {
if ((token === null || token === '' ) && toName !== 'Login') { if ((token === null || token === '' ) && toName !== 'Login') {
if(toName !== 'phoneIndex'){ if(toName !== 'phoneIndex'){
if(toName === 'phoneHome'){ if(toName === 'phoneHome'){
// 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852
window.sessionStorage.clear()
next('/loginVerifyPhone') next('/loginVerifyPhone')
}else { }else {
if(fromName === 'phoneHome'){ if(fromName === 'phoneHome'){
src/pages/personal/pages/my-questions/components/answerItem.vue
+2 -1
View File
@@ -136,7 +136,7 @@ export default {
this.$message.warning(res.message) this.$message.warning(res.message)
fileList.pop() fileList.pop()
} }
this.importModalshowflagtemp = false // this.importModalshowflagtemp = false
}, },
//文件上传前 //文件上传前
beforeUpload(file){ beforeUpload(file){
@@ -192,6 +192,7 @@ export default {
}, res => { }, res => {
if(res.respCode === '200'){ if(res.respCode === '200'){
this.$emit('emitInsState',true) this.$emit('emitInsState',true)
this.$message.success('归档成功')
} }
}, e => { }, e => {
}) })
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+28 -4
View File
@@ -12,7 +12,9 @@
<div class="row"> <div class="row">
<div class="item" @click="clickButtonTo"> <div class="item" @click="clickButtonTo">
<div style="cursor: pointer;">附件： <div style="cursor: pointer;">附件：
<span style="color: #409EFF">{{answer.appendixName}}</span> <div v-if="fileList.length > 0" v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
<span style="" @click="clickButtonTo(item.id)" :title="item.name"> {{ item.name }}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -24,7 +26,7 @@
</div> </div>
</div> </div>
<div style="float: right; margin-top: 20px"> <div style="float: right; margin-top: 20px">
<el-checkbox v-if="answer.checkedShow" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox> <el-checkbox v-if="answer.checkedShow && (answer.answerer !== answererNowUserName)" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox>
</div> </div>
</div> </div>
<!-- <div class="footer-box">--> <!-- <div class="footer-box">-->
@@ -40,16 +42,35 @@ export default {
data(){ data(){
return{ return{
checked: '', checked: '',
answererNowUserId: this.$store.getters.userInfo.userId,
answererNowUserName: this.$store.getters.userInfo.userName,
fileList:[],
} }
}, },
methods:{ methods:{
assemble(ids,names){
let list= [];
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
}
return list;
},
//点击预览 //点击预览
clickButtonTo() { clickButtonTo(attId) {
const attId = this.answer.appendixId // 过滤
if(attId.indexOf("ATT_FILE") !== -1){
this.$preview(attId) this.$preview(attId)
}
}, },
answerChang(){} answerChang(){}
}, },
mounted () {
this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName)
},
watch:{ watch:{
answer: { answer: {
immediate: true, immediate: true,
@@ -63,6 +84,9 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/deep/ .fileClass{
line-height: 22px !important;
}
#answer-item{ #answer-item{
width: 100%; width: 100%;
min-width: 130px; min-width: 130px;
src/pages/personal/pages/my-questions/index.vue
+18 -7
View File
@@ -396,7 +396,7 @@
<loading :loading="dataLoading">正在加载数据</loading> <loading :loading="dataLoading">正在加载数据</loading>
</div> </div>
<div class="info-answer"> <div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item> <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div> </div>
</el-tab-pane> </el-tab-pane>
</template> </template>
@@ -457,7 +457,7 @@
<loading :loading="dataLoading">正在加载数据</loading> <loading :loading="dataLoading">正在加载数据</loading>
</div> </div>
<div class="info-answer"> <div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item> <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div> </div>
</el-tab-pane> </el-tab-pane>
</template> </template>
@@ -520,7 +520,7 @@
<loading :loading="dataLoading">正在加载数据</loading> <loading :loading="dataLoading">正在加载数据</loading>
</div> </div>
<div class="info-answer"> <div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item> <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div> </div>
</el-tab-pane> </el-tab-pane>
</template> </template>
@@ -830,7 +830,7 @@
</el-form> </el-form>
</div> </div>
<span>相似历史问题：</span> <span>相似历史问题：</span>
<div style="height: 200px; width: 80%; margin-left: 80px;"> <div style="height: 200px; width: 80%; margin-left: 80px;overflow-y: auto;">
<div v-for="item in historyList" :key="item.id" @click="historyJump(item)"> <div v-for="item in historyList" :key="item.id" @click="historyJump(item)">
<span class="history-item">{{item.problemDescription}}</span> <span class="history-item">{{item.problemDescription}}</span>
<span class="history-item">{{item.questionTime}}</span> <span class="history-item">{{item.questionTime}}</span>
@@ -872,7 +872,6 @@
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
v-model="handleSelectForm.lawNumber" v-model="handleSelectForm.lawNumber"
@change="lawNumberSearch"
placeholder="根据标准号/标准名称查找" placeholder="根据标准号/标准名称查找"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -1454,6 +1453,7 @@ export default {
}, },
//选择标准的查询按钮 //选择标准的查询按钮
searchLawBtn(){ searchLawBtn(){
this.lawNumberSearch()
this.lawInfoTableLoading = true this.lawInfoTableLoading = true
if (this.handleSelectForm.dataSource === 'INLAND'){ if (this.handleSelectForm.dataSource === 'INLAND'){
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{
@@ -1842,6 +1842,17 @@ export default {
this.activeName = "myQue" this.activeName = "myQue"
this.activeType = this.standType this.activeType = this.standType
this.searchBtn() this.searchBtn()
this.queSearch()
this.handleSelectForm.lawNumber = ''
this.handleSelectForm.textStatus = ''
this.handleSelectForm.isRelateAccess = ''
this.handleSelectForm.standNumber = ''
this.handleSelectForm.lawsNumber = ''
this.handleSelectForm.standCode = ''
//清空标准名称/政策名称的查询
this.handleSelectForm.lawName = ''
this.handleSelectForm.standName = ''
this.handleSelectForm.numberName = ''
}, e => { }, e => {
}) })
@@ -1860,13 +1871,13 @@ export default {
overflow: auto !important; overflow: auto !important;
} }
#my-questions{ #my-questions{
height: 100%; height: calc(100vh - 75px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: #F5F7FA; background: #F5F7FA;
margin-bottom: 10px; margin-bottom: 10px;
.tab-box{ .tab-box{
height: 100%; height: 93%;
} }
.type-tabs { .type-tabs {
/deep/.el-tabs__header { /deep/.el-tabs__header {
src/pages/phone/domesticDetails.vue
+51 -129
View File
@@ -1,6 +1,6 @@
<!--国内标准法规详情页--> <!--国内标准法规详情页-->
<template> <template>
<div class="other-standard-details v-class" :style="'width:' + (500) + 'px;'+'height:' + (screenHeight) + 'px'"> <div class="other-standard-details v-class" :style="'height:' + (screenHeight) + 'px'">
<!--title 标题--> <!--title 标题-->
<div class="details-header"> <div class="details-header">
<span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{ <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
@@ -14,16 +14,9 @@
<div class="details-content" style="position: relative"> <div class="details-content" style="position: relative">
<div class="details-content-modular basic-information"> <div class="details-content-modular basic-information">
</div> </div>
<div <div class="details-content-modular clearfix" v-for="(item, index) in dynamicFormField" :key="index" v-if="item.isShowImp === '0'">
class="details-content-modular clearfix"
v-for="(item, index) in dynamicFormField"
:key="index"
v-if="item.isShowImp === '0'"
>
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<div v-if="item.label === '基础信息'" class="details-content-modular basic-information" <div v-if="item.label === '基础信息'" class="details-content-modular basic-information" style="border-top:none;position: absolute;right: 36px;"> </div>
style="border-top:none;position: absolute;right: 36px;">
</div>
<el-collapse-item :name="item.label" @click.native="handleChange1(item.label)"> <el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
<template slot="title"> <template slot="title">
<div class="modular-header" v-if="item.label === '基础信息'"> <div class="modular-header" v-if="item.label === '基础信息'">
@@ -78,6 +71,8 @@
</div> </div>
</div> </div>
</template> </template>
</p>
</template>
<template v-else-if="child.value === null">-</template> <template v-else-if="child.value === null">-</template>
<!--修订本--> <!--修订本-->
<template v-for="(child, childIndex) in item.child5"> <template v-for="(child, childIndex) in item.child5">
@@ -104,8 +99,7 @@
<template v-for="(child, childIndex) in item.child4"> <template v-for="(child, childIndex) in item.child4">
<p class="files-title"> <p class="files-title">
<label style=" margin-right: 164px;">{{ child.attrName }}</label> <label style=" margin-right: 164px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child4Func(child.value)">
v-for="(file, fileIndex) in child4Func(child.value)">
<span> <span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -142,39 +136,25 @@
<template v-if="child.value === null">-</template> <template v-if="child.value === null">-</template>
</p> </p>
</template> </template>
</p>
<p class="half"> <p class="half">
<label style=" margin-right: 150px;" <label style=" margin-right: 150px;" title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
>文本状态</label>
<span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span> <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
</p> </p>
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{ <p class="half">
sarStandardsInfoEO.issueTime || '-' <label style=" margin-right: 150px;">发布日期</label>
}}</span></p> <span>{{ sarStandardsInfoEO.issueTime || '-' }}</span>
<!-- <p class="half" v-if="saveStandType === 'INLAND_STAND'"><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 class="half"><label
style=" margin-right: 150px;">标准体系</label><span>{{
sarStandardsInfoEO.standSystem || '-'
}}</span>
</p> </p>
<p class="half"> <p class="half">
<label style=" margin-right: 11em;">是否纳入认证清单</label><span>{{ <label style=" margin-right: 150px;">标准体系</label>
sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' <span>
}}</span> {{ sarStandardsInfoEO.standSystem || '-' }}
</span>
</p>
<p class="half">
<label style=" margin-right: 11em;">是否纳入认证清单</label>
<span>
{{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}
</span>
</p> </p>
<template v-for="(child, childIndex) in item.child2"> <template v-for="(child, childIndex) in item.child2">
<p class="half"> <p class="half">
@@ -182,9 +162,8 @@
<span>{{ child.value || '-' }}</span> <span>{{ child.value || '-' }}</span>
</p> </p>
</template> </template>
<!-- <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>--> </div>
<!-- <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>--> </div>
<!-- <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
</template> </template>
<div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6"> <div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
<div class="wrap" @click="handleToggleShowAll(item)"> <div class="wrap" @click="handleToggleShowAll(item)">
@@ -192,24 +171,11 @@
<img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png"> <img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png">
</div> </div>
</div> </div>
</div> <template v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'">
</div>
</template>
<template
v-for="(child, childIndex) in item.half"
v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
>
<!-- modular-item half 代替标准编号--> <!-- modular-item half 代替标准编号-->
<div <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' ">
: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> <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span <span class="modular-content-p-val" :title="child.value || '-'">
class="modular-content-p-val"
:title="child.value || '-'"
>
<div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0"> <div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0">
<!--相关流程--> <!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value"> <template v-if="child.attrField === 'XGLC' && child.value">
@@ -245,17 +211,9 @@
</span> </span>
</div> </div>
<!-- 其他项--> <!-- 其他项-->
<div <div v-else :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
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> <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span <span v-if="child.attrField === 'FGWHR'" class="modular-content-p-val clearfix" :title="child.value || '-'">
v-if="child.attrField === 'FGWHR'"
class="modular-content-p-val clearfix"
:title="child.value || '-'"
>
<template v-if="child.value"> <template v-if="child.value">
{{ child.value }} {{ child.value }}
<put-question-button <put-question-button
@@ -268,50 +226,31 @@
{{ '-' }} {{ '-' }}
</template> </template>
</span> </span>
<span <span v-else-if="child.attrType === 'DATE_PICKER'" class="modular-content-p-val">
v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val"
>
{{ child.value ? child.value : '-' }} {{ child.value ? child.value : '-' }}
</span> </span>
<span <span v-else-if="child.attrType !== 'FILE'" class="modular-content-p-val" :title="child.value || '-'">
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value || '-' }} {{ child.value || '-' }}
</span> </span>
<div v-else class="modular-content-p-flies"> <div v-else class="modular-content-p-flies">
<p <p class="files-title" v-for="(file, fileIndex) in child.value" :key="fileIndex">
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!--发布稿、增补件单独设置下载权限--> <!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'"> <template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
<a :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ <a :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">
file.oldFileName {{ file.oldFileName }}
}}</a> </a>
</template> </template>
<template v-else> <template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
file.oldFileName {{file.oldFileName}}
}}</a> </a>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
</p> </p>
</div> </div>
</div> </div>
</template> </template>
<template <template v-for="(child, childIndex) in item.child" v-if="child.isShowImp === '0' && item.label === '关联信息'">
v-for="(child, childIndex) in item.child" <div :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
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> <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<!--相关流程--> <!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value"> <template v-if="child.attrField === 'XGLC' && child.value">
@@ -322,9 +261,7 @@
</span> </span>
</p> </p>
</template> </template>
<template <template v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'">
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
>
<p class="modular-content-p-val" v-if="child.value"> <p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index"> <span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
@@ -333,49 +270,34 @@
</p> </p>
<span class="modular-content-p-val" v-else>-</span> <span class="modular-content-p-val" v-else>-</span>
</template> </template>
<span <span v-else-if="child.attrField === 'SVPPS'" class="modular-content-p-val" :title="child.tips || '-'">
v-else-if="child.attrField === 'SVPPS'"
class="modular-content-p-val"
:title="child.tips || '-'"
>
{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ !child.value || child.value === 'null' ? '-' : child.value }}
</span> </span>
<span <span v-else-if="child.attrType !== 'FILE'" class="modular-content-p-val" :title="child.value || '-'">
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value || '-' }} {{ child.value || '-' }}
<!-- 被代替标准号--> <!-- 被代替标准号-->
</span> </span>
<div v-else class="modular-content-p-flies"> <div v-else class="modular-content-p-flies">
<p <p class="files-title" v-for="(file, fileIndex) in child.value" :key="fileIndex">
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>--> <!-- <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' <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA' || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
file.oldFileName {{file.oldFileName}}
}}</a> </a>
</template> </template>
<template v-else> <template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
file.oldFileName {{file.oldFileName}}
}}</a> </a>
</template> </template>
</p> </p>
</div> </div>
</div> </div>
</template> </template>
<template <template v-for="(child, childIndex) in item.one" v-if="child.isShowImp === '0' && item.label == '过程稿件'">
v-for="(child, childIndex) in item.one"
v-if="child.isShowImp === '0' && item.label == '过程稿件'"
>
<!-- 增补件（必读）和勘误件不放在过程稿件里了--> <!-- 增补件（必读）和勘误件不放在过程稿件里了-->
<div <div
v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'" v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
@@ -486,6 +408,8 @@
</el-collapse> </el-collapse>
</div> </div>
</div> </div>
</div>
</template>
<!--查看分解单--> <!--查看分解单-->
<el-drawer <el-drawer
title="查看分解单" title="查看分解单"
@@ -1475,8 +1399,6 @@
<el-button type="primary" size="large" @click="itemsTextDialogs = false">关闭</el-button> <el-button type="primary" size="large" @click="itemsTextDialogs = false">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div>
</template>
<script> <script>
import PutQuestionButton from '@/components/PutQuestionButton' import PutQuestionButton from '@/components/PutQuestionButton'
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS' import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+1 -1
View File
@@ -220,7 +220,7 @@
align="center" align="center"
label="电话"> label="电话">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.tel_phone" placeholder="请填写单位"/> <el-input v-model="scope.row.tel_phone" placeholder="请填写电话"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/regulatoryRepository/standQA/index.vue
+18 -19
View File
@@ -408,11 +408,11 @@
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C" <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333" <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333"> <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
{{ scope.row.standSortShow }} {{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
@@ -486,19 +486,14 @@
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{ <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
scope.row.standSortShow {{scope.row.standSortShow}} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{ {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
scope.row.standSortShow <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{ <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
scope.row.standSortShow {{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1033,7 +1028,8 @@ export default {
questionClick(){ questionClick(){
sessionStorage.setItem('queId', this.activeQue) sessionStorage.setItem('queId', this.activeQue)
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
id: this.activeQue id: this.activeQue,
state: 'yes'
},{ },{
_this: this _this: this
}, res => { }, res => {
@@ -1068,6 +1064,7 @@ export default {
questioner: this.$store.getters.userInfo.userId, //提问人 questioner: this.$store.getters.userInfo.userId, //提问人
problemDescription: '', //关键词/问题描述 problemDescription: '', //关键词/问题描述
} }
this.standSearch2()
}, },
searchBtn(){ searchBtn(){
this.questionSerach.classification = this.activeType this.questionSerach.classification = this.activeType
@@ -1082,8 +1079,10 @@ export default {
}, },
//问题查询 //问题查询
queSearch(){ queSearch(){
this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{ this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
standardId: this.activestand, standardId: this.activestand,
classification: this.activeName,
problemDescription: this.questionSerach.problemDescription
},{ },{
_this: this _this: this
}, res => { }, res => {
@@ -1256,13 +1255,13 @@ export default {
overflow: auto; overflow: auto;
} }
#my-questions{ #my-questions{
height: 100%; height: calc(100vh - 75px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: #F5F7FA; background: #F5F7FA;
margin-bottom: 10px; margin-bottom: 10px;
.tab-box{ .tab-box{
height: 100%; height: 93%;
} }
.type-tabs { .type-tabs {
/deep/.el-tabs__header { /deep/.el-tabs__header {
src/pages/searchCenter/pages/standardSearch.vue
+3 -1
View File
@@ -267,8 +267,8 @@
<div class="AllBoxTitle"> <div class="AllBoxTitle">
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span> <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span> <span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
</div> </div>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 0;top: 13px;">详情</span>
<div class="AllBoxContent" v-html="item.textContent"></div> <div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime"> <div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
<div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div> <div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
@@ -2809,6 +2809,7 @@
height: 29px; height: 29px;
} }
.AllBox { .AllBox {
position: relative;
margin-top: 20px; margin-top: 20px;
background-color: #fff; background-color: #fff;
border-radius: 20px; border-radius: 20px;
@@ -2817,6 +2818,7 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
.AllBoxTitle { .AllBoxTitle {
width: 98%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
text-overflow:ellipsis; text-overflow:ellipsis;