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

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

Browse Source
This commit is contained in:
super_liu
2022-04-01 16:54:02 +08:00
parent fcc92554a4 71e43dc947
commit eee64e65fd
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+4 -4
View File
@@ -356,7 +356,7 @@
<div class="files-title"> <div class="files-title">
<label style="float: left;min-height: 43px;line-height: 43px;" >{{ child.attrName }}</label> <label style="float: left;min-height: 43px;line-height: 43px;" >{{ child.attrName }}</label>
<template style="margin-left: 220px;"> <template style="margin-left: 220px;">
<div style="position: relative;margin-left: 214px;min-height: 42px;"> <div style="position: relative;margin-left: 214px; line-height: 32px">
<div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex"> <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex">
<!-- 单个文件--> <!-- 单个文件-->
<span v-if="child.value && child.value.length > 0 && child.value.length === 1"> <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
@@ -377,7 +377,7 @@
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<!-- 多个文件--> <!-- 多个文件-->
<div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;"> <div v-else-if="child.value && child.value.length > 0" style="line-height: 32px;">
<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"
@@ -3445,8 +3445,8 @@ export default {
width: calc(~'100% - 225px'); width: calc(~'100% - 225px');
& > .files-title{ & > .files-title{
width: calc(~'100% - 120px'); width: calc(~'100% - 120px');
min-height: 50px; min-height: 32px;
line-height: 50px; line-height: 32px;
font-size: 16px; font-size: 16px;
color: #409EFF; color: #409EFF;
& > a{ & > a{
src/pages/details/otherStandardDetails/index.vue
+4 -2
View File
@@ -69,7 +69,7 @@
<label style="float: left">{{ child.attrName }}</label> <label style="float: left">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0"> <template v-if="child.value && child.value.length > 0">
<!-- 单个文件时--> <!-- 单个文件时-->
<div style="position: relative;margin-left: 214px;"> <div style="position: relative;margin-left: 214px; line-height: 32px">
<div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;"> <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
<span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;"> <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
<a style="font-size: 16px;color: #409EFF;cursor: pointer;" <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
@@ -253,7 +253,7 @@
</template> </template>
</div> </div>
<p class="half"> <p class="half">
<label style=" margin-right: 150px;" <label style=" margin-right: 100px;"
title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
>文本状态</label> >文本状态</label>
<span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span> <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
@@ -4272,6 +4272,7 @@ export default {
} }
.modular-content-p-val { .modular-content-p-val {
line-height: 32px;
display: inline-block; display: inline-block;
width: calc(~'100% - 225px'); width: calc(~'100% - 225px');
//min-height: 50px; //min-height: 50px;
@@ -4285,6 +4286,7 @@ export default {
} }
.modular-content-p-flies { .modular-content-p-flies {
line-height: 32px;
//position: relative; //position: relative;
display: inline-block; display: inline-block;
width: calc(~'100% - 225px'); width: calc(~'100% - 225px');
src/pages/processCenter/pages/processDetail/index.vue
+1 -1
View File
@@ -24,7 +24,7 @@
class="common-button-default" class="common-button-default"
round round
@click="seeProcessLast" @click="seeProcessLast"
>查看流12程数据</el-button> >查看流程数据</el-button>
<el-button <el-button
v-if="tzclrEnable" v-if="tzclrEnable"
class="common-button-default" class="common-button-default"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+11 -10
View File
@@ -828,17 +828,18 @@
> >
<template slot="label">起草单位</template> <template slot="label">起草单位</template>
<div style="display: flex;justify-content: space-between;align-items: center;"> <div style="display: flex;justify-content: space-between;align-items: center;">
<el-tooltip v-if="sarStandardsInfoEO['QCDW']" class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start"> <!-- <el-tooltip v-if="sarStandardsInfoEO['QCDW']" :class="sarStandardsInfoEO['QCDW'] ? 'item' : ''" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">-->
<el-input <!-- <el-input-->
:config="field" <!-- :config="field"-->
clearable <!-- clearable-->
@input="change($event)" <!-- @input="change($event)"-->
v-model="sarStandardsInfoEO['QCDW']" <!-- v-model="sarStandardsInfoEO['QCDW']"-->
:disabled="formdisableflag" placeholder="选择或输入起草单位"> <!-- :disabled="formdisableflag" placeholder="选择或输入起草单位">-->
</el-input> <!-- </el-input>-->
</el-tooltip> <!-- </el-tooltip>-->
<div v-else> <div>
<el-input <el-input
:title="sarStandardsInfoEO['QCDW']"
:config="field" :config="field"
clearable clearable
@input="change($event)" @input="change($event)"
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+1
View File
@@ -423,6 +423,7 @@ export default {
if (type === 'edit') { if (type === 'edit') {
this.id = row.id this.id = row.id
this.opiniontitle = '编辑意见内容' this.opiniontitle = '编辑意见内容'
this.opinionContent.chapterName = row.chapterName
this.opinionContent.partCode = row.partCode this.opinionContent.partCode = row.partCode
this.opinionContent.reason = row.reason this.opinionContent.reason = row.reason
this.opinionContent.oldText = row.oldText this.opinionContent.oldText = row.oldText