wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

plm BM

master
ruanqi 1 year ago
parent
456b9fa60e
commit
ae7ce99e8c
2 changed files with 139 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/views/modules/project/projectInfo/projectInfo.vue
  2. 179
      src/views/modules/tooling/searchToolApply.vue

44
src/views/modules/project/projectInfo/projectInfo.vue
View File

@ -299,47 +299,7 @@
</el-tab-pane>
<el-tab-pane label="附件信息" name="down">
<oss-components height="25vh" label="项目编码" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.projectId"></oss-components>
<!--文件上传-->
<!-- <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">-->
<!-- <el-form :inline="true" label-position="top" style="margin-top: 0px">-->
<!-- <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>-->
<!-- </el-form>-->
<!-- </el-form>-->
<!-- <el-table-->
<!-- :data="fileContentList"-->
<!-- height="240"-->
<!-- border-->
<!-- v-loading="dataListLoading"-->
<!-- style="width: 100%; ">-->
<!-- <el-table-column-->
<!-- v-for="(item,index) in columnFileContentArray" :key="index"-->
<!-- :sortable="item.columnSortable"-->
<!-- :prop="item.columnProp"-->
<!-- :header-align="item.headerAlign"-->
<!-- :show-overflow-tooltip="item.showOverflowTooltip"-->
<!-- :align="item.align"-->
<!-- :fixed="item.fixed==''?false:item.fixed"-->
<!-- :min-width="item.columnWidth"-->
<!-- :label="item.columnLabel">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>-->
<!-- <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
<!-- style="width: 100px; height: 80px"/></span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="100"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>&ndash;&gt;-->
<!-- <a @click="downloadFile(scope.row)" >下载</a>-->
<!-- <a type="text" size="small" @click="deleteFile(scope.row)">删除</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
</el-tab-pane>
<el-tab-pane label="项目物料" name="part">
<projectPart ref="projectPart"></projectPart>
@ -1599,7 +1559,7 @@
// 刷新页签的table数据
refreshCurrentTabTable () {
if (this.activeName == 'down') {
this.getFileContentData();
// this.getFileContentData();
}
if (this.activeName == 'customer_contact') {
this.getCustomerContactData();

179
src/views/modules/tooling/searchToolApply.vue
View File

@ -128,47 +128,49 @@
</el-tab-pane>
<el-tab-pane label="附件信息" name="down">
<oss-components height="25vh" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
<!--文件上传-->
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
</el-form>
</el-form>
<el-table
:data="fileContentList"
height="240"
border
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnFileContentArray" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="100"
label="操作">
<template slot-scope="scope">
<!-- <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>-->
<a @click="downloadFile(scope.row)" >下载</a>
<a type="text" size="small" @click="deleteFile(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
<!-- <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">-->
<!-- <el-form :inline="true" label-position="top" style="margin-top: 0px">-->
<!-- <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>-->
<!-- </el-form>-->
<!-- </el-form>-->
<!-- <el-table-->
<!-- :data="fileContentList"-->
<!-- height="240"-->
<!-- border-->
<!-- v-loading="dataListLoading"-->
<!-- style="width: 100%; ">-->
<!-- <el-table-column-->
<!-- v-for="(item,index) in columnFileContentArray" :key="index"-->
<!-- :sortable="item.columnSortable"-->
<!-- :prop="item.columnProp"-->
<!-- :header-align="item.headerAlign"-->
<!-- :show-overflow-tooltip="item.showOverflowTooltip"-->
<!-- :align="item.align"-->
<!-- :fixed="item.fixed==''?false:item.fixed"-->
<!-- :min-width="item.columnWidth"-->
<!-- :label="item.columnLabel">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>-->
<!-- <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
<!-- style="width: 100px; height: 80px"/></span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="100"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>&ndash;&gt;-->
<!-- <a @click="downloadFile(scope.row)" >下载</a>-->
<!-- <a type="text" size="small" @click="deleteFile(scope.row)">删除</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
</el-tab-pane>
<!-- 审批信息 -->
<el-tab-pane label="审批信息" name="approvalInformation">
@ -297,12 +299,13 @@
getApprovalList, // 查询审批信息
} from '@/api/changeManagement/changeManagement.js'
import ApprovalInformation from "../changeManagement/approvalInformation.vue";
import OssComponents from "../oss/ossComponents";
/*組件*/
export default {
components: {
ApprovalInformation,
OssComponents,
Chooselist,
projectUploadFile,
@ -354,6 +357,98 @@
pageIndex: 1,
pageSize: 100,
totalPage: 0,
ossColumns:[
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2FileName',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'fileName',
headerAlign: 'center',
align: 'center',
columnLabel: '文件名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2FileRemark',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'fileRemark',
headerAlign: 'center',
align: 'center',
columnLabel: '备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 240
},
// {
// userId: this.$store.state.user.name,
// functionId: 103001,
// serialNumber: '103001Table2OrderRef3',
// tableId: '103001Table2',
// tableName: '文件信息表',
// columnProp: 'orderRef3',
// headerAlign: 'center',
// align: 'center',
// columnLabel: '文件描述',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120
// },
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2CreateDate',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'createDate',
headerAlign: 'center',
align: 'center',
columnLabel: '上传时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2CreatedBy',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'createBy',
headerAlign: 'center',
align: 'center',
columnLabel: '上传人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
}
],
// 导出 end
columnList1: [
{
@ -936,7 +1031,7 @@
this.searchToolApplyDetail();
}
if (this.activeName == 'down') {
this.getFileContentData();
// this.getFileContentData();
}
if (this.activeName === 'approvalInformation') {
this.getApprovalList()

Write Preview
Loading…
Cancel
Save