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:
11528
2022-03-21 09:20:17 +08:00
parent f0c50b86e9 1a85e921d5
commit 7bb3a1bc72
5 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/File.vue
+1 -1
View File
@@ -106,7 +106,7 @@ export default {
allowType: {
type: Array,
default: () => {
return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX']
return ['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX', '.pdg', '.PDG']
}
},
// 栅格比例
src/pages/details/otherStandardDetails/index.vue
+14 -11
View File
@@ -69,7 +69,7 @@
<label style="margin-right: 164px;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0">
<!-- 单个文件时-->
<div v-for="(file, fileIndex) in child1Func(child.value)">
<div v-for="(file, fileIndex) in child1Func(child.value)" style="position: relative;display: flex;">
<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;"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -110,12 +110,11 @@
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</div>
<el-button
v-if="child.attrField === itemNam "
v-if="child.attrField === itemNam"
v-for="(itemNam,index) in itemExistList"
:key="index"
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
style="right:62px"
>标准分解单
</el-button>
</div>
@@ -613,12 +612,11 @@
<el-button
v-if="child.attrField === itemNam "
v-for="(itemNam,index) in itemExistList"
:key="index"
:key="itemNam"
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
>标准分解单
</el-button>
</div>
</div>
</template>
@@ -864,16 +862,21 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="termsConditions"
min-width="200"
label="条款内容"
:resizable="false"
>
<template slot-scope="scope">
<div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
</div>
<!-- <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
<!-- {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
<!-- </div>-->
<el-tooltip placement="top">
<div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>
<div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
@@ -2852,7 +2855,7 @@ export default {
_this: this
}, res => {
this.sarStandardsInfoEO = res.data || {}
this.itemExistList = this.sarStandardsInfoEO.attrInfoMap.itemExistList;
this.itemExistList = new Set(this.sarStandardsInfoEO.attrInfoMap.itemExistList)
if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
}
@@ -3697,7 +3700,7 @@ export default {
})
},*/
async mounted() {
this.sarStandardsInfoEO.id = this.$route.params.id
this.sarStandardsInfoEO.id = this.$route.params.id
// await this.selectStandMessage()
this.standItemEO.standId = this.$route.params.id
// 从数据库中查询各下拉框数据
src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准调研流程</template>
<template slot="proNode"></template>
<template slot="proNode">批准</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1 -7
View File
@@ -56,19 +56,13 @@
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -8
View File
@@ -61,20 +61,13 @@
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input