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

src/components/CustomFormComponents/InputForStandards.vue

@@ -185,7 +185,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'ALL',
+        standType: 'INLAND',
         quoteIdList: '',
         validFlag: '0',
         menuId: 'nomenu'

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -196,7 +196,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'ALL',
+        standType: 'FOREIGN',
         quoteIdList: '',
         validFlag: '0',
         menuId: 'nomenu'

src/pages/details/otherStandardDetails/index.vue

@@ -369,7 +369,7 @@
               >
                 <div
                         :key="child.id"
-                        :class="'modular-item'"
+                        :class="'modular-item half'"
                 >
                   <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
                   <span
@@ -390,7 +390,7 @@
                       <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>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
                         <i
                                 title="下载"
                                 @click="downloadFile(file.id)"
@@ -411,7 +411,7 @@
 <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                       <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
                                 title="下载"
                                 @click="downloadFile(file.id)"