|
|
@ -36,9 +36,20 @@ |
|
|
:min-width="item.columnWidth" |
|
|
:min-width="item.columnWidth" |
|
|
:label="item.columnLabel"> |
|
|
:label="item.columnLabel"> |
|
|
<template slot-scope="scope"> |
|
|
<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> |
|
|
|
|
|
|
|
|
<div v-if="item.columnProp === 'proofingResultStatus'"> |
|
|
|
|
|
<span v-if="!item.columnHidden"> |
|
|
|
|
|
<span v-show="scope.row.proofingResultStatus === 'B'">草稿</span> |
|
|
|
|
|
<span v-show="scope.row.proofingResultStatus === 'C'">已下达</span> |
|
|
|
|
|
<span v-show="scope.row.proofingResultStatus === 'E'">已完成打样</span> |
|
|
|
|
|
<span v-show="scope.row.proofingResultStatus === 'S'">已提交打样</span> |
|
|
|
|
|
<span v-show="scope.row.proofingResultStatus === 'R'">客户已反馈</span> |
|
|
|
|
|
</span> |
|
|
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div v-else> |
|
|
|
|
|
<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> |
|
|
|
|
|
</div> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
<!-- <el-table-column--> |
|
|
<!-- <el-table-column--> |
|
|
@ -63,6 +74,7 @@ |
|
|
|
|
|
|
|
|
} from '@/api/quotation/quotationInformation.js' |
|
|
} from '@/api/quotation/quotationInformation.js' |
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
|
|
|
import {proofingInformationSearch} from "../../../../api/proofing/proofingInformation"; |
|
|
export default { |
|
|
export default { |
|
|
components: { |
|
|
components: { |
|
|
Chooselist |
|
|
Chooselist |
|
|
@ -83,14 +95,14 @@ |
|
|
columnList: [ |
|
|
columnList: [ |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6SampleNo', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1ProofingNo', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'sampleNo', |
|
|
|
|
|
|
|
|
columnProp: 'proofingNo', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '申请单号', |
|
|
|
|
|
|
|
|
columnLabel: '打样单号', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -101,9 +113,9 @@ |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6CustomerNo', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1CustomerNo', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'customerNo', |
|
|
columnProp: 'customerNo', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
@ -119,9 +131,9 @@ |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6CustomerDesc', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1CustomerDesc', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'customerDesc', |
|
|
columnProp: 'customerDesc', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
@ -137,68 +149,68 @@ |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6TrackerName', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1ProjectId', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'trackerName', |
|
|
|
|
|
|
|
|
columnProp: 'projectId', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '跟单员', |
|
|
|
|
|
|
|
|
columnLabel: '项目编码', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
|
|
|
|
|
|
columnWidth: 110 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6QuoterName', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1ProjectName', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'quoterName', |
|
|
|
|
|
|
|
|
columnProp: 'projectName', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '打样专员', |
|
|
|
|
|
|
|
|
columnLabel: '项目名称', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
|
|
|
|
|
|
columnWidth: 120 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6TestPartNo', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1TrackerName', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'testPartNo', |
|
|
|
|
|
|
|
|
columnProp: 'trackerName', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '产品编码', |
|
|
|
|
|
|
|
|
columnLabel: '跟单员', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 100 |
|
|
|
|
|
|
|
|
columnWidth: 80 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6PriorityLevel', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1EngineerName', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'priorityLevel', |
|
|
|
|
|
|
|
|
columnProp: 'engineerName', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '优先等级', |
|
|
|
|
|
|
|
|
columnLabel: '工程师', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -209,68 +221,68 @@ |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6RequiredCompletionDate', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1TestPartNo', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'requiredCompletionDate', |
|
|
|
|
|
|
|
|
columnProp: 'testPartNo', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '要求完成日期', |
|
|
|
|
|
|
|
|
columnLabel: '项目料号', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 160 |
|
|
|
|
|
|
|
|
columnWidth: 150 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6sampleStatus', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1PartName', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'sampleStatus', |
|
|
|
|
|
|
|
|
columnProp: 'partName', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '状态', |
|
|
|
|
|
|
|
|
columnLabel: '物料名称', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
|
|
|
|
|
|
columnWidth: 100 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6CreateDate', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1PriorityLevel', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'createDate', |
|
|
|
|
|
|
|
|
columnProp: 'priorityLevel', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '创建时间', |
|
|
|
|
|
|
|
|
columnLabel: '优先等级', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 160 |
|
|
|
|
|
|
|
|
columnWidth: 80 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6CreateBy', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1ProofingNumber', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'createBy', |
|
|
|
|
|
|
|
|
columnProp: 'proofingNumber', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '创建人', |
|
|
|
|
|
|
|
|
columnLabel: '打样数量', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -281,14 +293,14 @@ |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6UpdateDate', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1RequiredDeliveryDate', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'updateDate', |
|
|
|
|
|
|
|
|
columnProp: 'requiredDeliveryDate', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '更新时间', |
|
|
|
|
|
|
|
|
columnLabel: '要求交付日期', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -299,14 +311,14 @@ |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 101002001, |
|
|
|
|
|
serialNumber: '101002001Table6UpdateBy', |
|
|
|
|
|
tableId: '101002001Table6', |
|
|
|
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1ProofingStatus', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
tableName: '打样信息表', |
|
|
tableName: '打样信息表', |
|
|
columnProp: 'updateBy', |
|
|
|
|
|
|
|
|
columnProp: 'proofingResultStatus', |
|
|
headerAlign: 'center', |
|
|
headerAlign: 'center', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
columnLabel: '更新人', |
|
|
|
|
|
|
|
|
columnLabel: '状态', |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -314,7 +326,25 @@ |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
columnWidth: 80 |
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
functionId: 103001, |
|
|
|
|
|
serialNumber: '103001Table1CreateDate', |
|
|
|
|
|
tableId: '103001Table1', |
|
|
|
|
|
tableName: '打样信息表', |
|
|
|
|
|
columnProp: 'createDate', |
|
|
|
|
|
headerAlign: 'center', |
|
|
|
|
|
align: 'center', |
|
|
|
|
|
columnLabel: '创建时间', |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 160 |
|
|
|
|
|
}, |
|
|
], |
|
|
], |
|
|
// 导出 start |
|
|
// 导出 start |
|
|
exportData: [], |
|
|
exportData: [], |
|
|
@ -353,11 +383,11 @@ |
|
|
//初始化参数 |
|
|
//初始化参数 |
|
|
this.searchData = JSON.parse(JSON.stringify(inData)); |
|
|
this.searchData = JSON.parse(JSON.stringify(inData)); |
|
|
//刷新表格 |
|
|
//刷新表格 |
|
|
// this.searchTable(); |
|
|
|
|
|
|
|
|
this.searchTable(); |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
searchTable(){ |
|
|
searchTable(){ |
|
|
quotationInformationSearch(this.searchData).then(({data}) => { |
|
|
|
|
|
|
|
|
proofingInformationSearch(this.searchData).then(({data}) => { |
|
|
//区分请求成功和失败的状况 |
|
|
//区分请求成功和失败的状况 |
|
|
if (data && data.code == 0) { |
|
|
if (data && data.code == 0) { |
|
|
this.dataList = data.page.list |
|
|
this.dataList = data.page.list |
|
|
|