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:
zhangjun
2022-10-08 17:42:28 +08:00
parent e5a80e573c 4ae82a122b
commit 0b4a17b845
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+6 -3
View File
@@ -848,12 +848,15 @@
<!-- <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>
<!-- <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
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+1 -1
View File
@@ -561,7 +561,7 @@ export default {
_formData.append('standNumSplit', files.standNumSplit)
_formData.append('standNameSplit', files.standNameSplit)
_formData.append('fileType', files.fileType)
_formData.append('file', file.raw)
_formData.append('importFileId', files.attId)
this.$http.postData('importWkExcel/importData', _formData,{
_this: this
}, res => {