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:
yanyizhou
2021-11-22 16:10:35 +08:00
parent c978efe84b 2916c2abd3
commit 5fed4ea091
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForStandards.vue
+1 -1
View File
@@ -185,7 +185,7 @@ export default {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
standType: 'ALL', standType: 'INLAND',
quoteIdList: '', quoteIdList: '',
validFlag: '0', validFlag: '0',
menuId: 'nomenu' menuId: 'nomenu'
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+1 -1
View File
@@ -196,7 +196,7 @@ export default {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
standType: 'ALL', standType: 'FOREIGN',
quoteIdList: '', quoteIdList: '',
validFlag: '0', validFlag: '0',
menuId: 'nomenu' menuId: 'nomenu'
src/pages/details/otherStandardDetails/index.vue
+3 -3
View File
@@ -369,7 +369,7 @@
> >
<div <div
:key="child.id" :key="child.id"
:class="'modular-item'" :class="'modular-item half'"
> >
<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
@@ -390,7 +390,7 @@
<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">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -411,7 +411,7 @@
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</template> </template>
<template v-else> <template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"