diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue
index 5edff0b..1c81f92 100644
--- a/src/views/modules/project/projectInfo/com_project_puotation.vue
+++ b/src/views/modules/project/projectInfo/com_project_puotation.vue
@@ -36,9 +36,20 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp] }}
-
+
+
+ 草稿
+ 已下达
+ 已完成报价
+ 已提交报价
+ 客户已反馈
+
+
![]()
+
+
+
{{ scope.row[item.columnProp] }}
+
![]()
+
@@ -85,9 +96,9 @@
columnList: [
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5QuotationNo',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1QuotationNo',
+ tableId: '102001Table1',
tableName: '询价信息表',
columnProp: 'quotationNo',
headerAlign: 'center',
@@ -100,107 +111,123 @@
status: true,
fixed: '',
columnWidth: 120
- },
- {
+ },{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5CustomerNo',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1QuotationBatchNo',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'customerNo',
+ columnProp: 'quotationBatchNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '客户编码',
+ columnLabel: '申请批次号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100
+ columnWidth: 120
+ },{
+ userId: this.$store.state.user.name,
+ functionId: 102001,
+ serialNumber: '102001Table1QuotationItemNo',
+ tableId: '102001Table1',
+ tableName: '询价信息表',
+ columnProp: 'quotationItemNo',
+ headerAlign: 'center',
+ align: 'right',
+ columnLabel: '序号',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 60
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5CustomerDesc',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1CustomerNo',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'customerDesc',
+ columnProp: 'customerNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '客户名称',
+ columnLabel: '客户编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 120
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5TrackerName',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1CustomerDesc',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'trackerName',
+ columnProp: 'customerDesc',
headerAlign: 'center',
- align: 'center',
- columnLabel: '跟单员',
+ align: 'left',
+ columnLabel: '客户名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 120
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5QuoterName',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1ProjectId',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'quoterName',
+ columnProp: 'projectId',
headerAlign: 'center',
align: 'center',
- columnLabel: '询价专员',
+ columnLabel: '项目编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 120
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5TestPartNo',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1ProjectName',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'testPartNo',
+ columnProp: 'projectName',
headerAlign: 'center',
- align: 'center',
- columnLabel: '产品编码',
+ align: 'left',
+ columnLabel: '项目名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100
+ columnWidth: 120
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5PriorityLevel',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1TrackerName',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'priorityLevel',
+ columnProp: 'trackerName',
headerAlign: 'center',
- align: 'center',
- columnLabel: '优先等级',
+ align: 'left',
+ columnLabel: '跟单员',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -211,68 +238,68 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5RequiredCompletionDate',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1QuoterName',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'requiredCompletionDate',
+ columnProp: 'quoterName',
headerAlign: 'center',
- align: 'center',
- columnLabel: '要求完成日期',
+ align: 'left',
+ columnLabel: '报价专员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 160
+ columnWidth: 80
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5quotationStatus',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1TestPartNo',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'quotationStatus',
+ columnProp: 'testPartNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '状态',
+ columnLabel: '项目料号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 160
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5CreateDate',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1PartName',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'createDate',
+ columnProp: 'partName',
headerAlign: 'center',
- align: 'center',
- columnLabel: '创建时间',
+ align: 'left',
+ columnLabel: '物料描述',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 160
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5CreateBy',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1PriorityLevel',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'createBy',
+ columnProp: 'priorityLevel',
headerAlign: 'center',
- align: 'center',
- columnLabel: '创建人',
+ align: 'left',
+ columnLabel: '优先等级',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -283,14 +310,14 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5UpdateDate',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1RequiredCompletionDate',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'updateDate',
+ columnProp: 'requiredCompletionDate',
headerAlign: 'center',
align: 'center',
- columnLabel: '更新时间',
+ columnLabel: '要求完成日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -301,22 +328,22 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table5UpdateBy',
- tableId: '101002001Table5',
+ functionId: 102001,
+ serialNumber: '102001Table1quotationStatus',
+ tableId: '102001Table1',
tableName: '询价信息表',
- columnProp: 'updateBy',
+ columnProp: 'quotationResultStatus',
headerAlign: 'center',
align: 'center',
- columnLabel: '更新人',
+ columnLabel: '状态',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
- }
+ columnWidth: 100
+ },
],
// 导出 start
exportData: [],
diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue
index c26b17b..75e98ca 100644
--- a/src/views/modules/project/projectInfo/com_project_sample.vue
+++ b/src/views/modules/project/projectInfo/com_project_sample.vue
@@ -36,9 +36,20 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp] }}
-
+
+
+ 草稿
+ 已下达
+ 已完成打样
+ 已提交打样
+ 客户已反馈
+
+
![]()
+
+
+
{{ scope.row[item.columnProp] }}
+
![]()
+
@@ -63,6 +74,7 @@
} from '@/api/quotation/quotationInformation.js'
import Chooselist from '@/views/modules/common/Chooselist'
+ import {proofingInformationSearch} from "../../../../api/proofing/proofingInformation";
export default {
components: {
Chooselist
@@ -83,14 +95,14 @@
columnList: [
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6SampleNo',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1ProofingNo',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'sampleNo',
+ columnProp: 'proofingNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '申请单号',
+ columnLabel: '打样单号',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -101,9 +113,9 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6CustomerNo',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1CustomerNo',
+ tableId: '103001Table1',
tableName: '打样信息表',
columnProp: 'customerNo',
headerAlign: 'center',
@@ -119,9 +131,9 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6CustomerDesc',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1CustomerDesc',
+ tableId: '103001Table1',
tableName: '打样信息表',
columnProp: 'customerDesc',
headerAlign: 'center',
@@ -137,68 +149,68 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6TrackerName',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1ProjectId',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'trackerName',
+ columnProp: 'projectId',
headerAlign: 'center',
align: 'center',
- columnLabel: '跟单员',
+ columnLabel: '项目编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 110
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6QuoterName',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1ProjectName',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'quoterName',
+ columnProp: 'projectName',
headerAlign: 'center',
align: 'center',
- columnLabel: '打样专员',
+ columnLabel: '项目名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 120
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6TestPartNo',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1TrackerName',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'testPartNo',
+ columnProp: 'trackerName',
headerAlign: 'center',
align: 'center',
- columnLabel: '产品编码',
+ columnLabel: '跟单员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100
+ columnWidth: 80
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6PriorityLevel',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1EngineerName',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'priorityLevel',
+ columnProp: 'engineerName',
headerAlign: 'center',
align: 'center',
- columnLabel: '优先等级',
+ columnLabel: '工程师',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -209,68 +221,68 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6RequiredCompletionDate',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1TestPartNo',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'requiredCompletionDate',
+ columnProp: 'testPartNo',
headerAlign: 'center',
align: 'center',
- columnLabel: '要求完成日期',
+ columnLabel: '项目料号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 160
+ columnWidth: 150
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6sampleStatus',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1PartName',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'sampleStatus',
+ columnProp: 'partName',
headerAlign: 'center',
align: 'center',
- columnLabel: '状态',
+ columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 100
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6CreateDate',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1PriorityLevel',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'createDate',
+ columnProp: 'priorityLevel',
headerAlign: 'center',
align: 'center',
- columnLabel: '创建时间',
+ columnLabel: '优先等级',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 160
+ columnWidth: 80
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6CreateBy',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1ProofingNumber',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'createBy',
+ columnProp: 'proofingNumber',
headerAlign: 'center',
align: 'center',
- columnLabel: '创建人',
+ columnLabel: '打样数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -281,14 +293,14 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6UpdateDate',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1RequiredDeliveryDate',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'updateDate',
+ columnProp: 'requiredDeliveryDate',
headerAlign: 'center',
align: 'center',
- columnLabel: '更新时间',
+ columnLabel: '要求交付日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -299,14 +311,14 @@
},
{
userId: this.$store.state.user.name,
- functionId: 101002001,
- serialNumber: '101002001Table6UpdateBy',
- tableId: '101002001Table6',
+ functionId: 103001,
+ serialNumber: '103001Table1ProofingStatus',
+ tableId: '103001Table1',
tableName: '打样信息表',
- columnProp: 'updateBy',
+ columnProp: 'proofingResultStatus',
headerAlign: 'center',
align: 'center',
- columnLabel: '更新人',
+ columnLabel: '状态',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -314,7 +326,25 @@
status: true,
fixed: '',
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
exportData: [],
@@ -353,11 +383,11 @@
//初始化参数
this.searchData = JSON.parse(JSON.stringify(inData));
//刷新表格
- // this.searchTable();
+ this.searchTable();
},
searchTable(){
- quotationInformationSearch(this.searchData).then(({data}) => {
+ proofingInformationSearch(this.searchData).then(({data}) => {
//区分请求成功和失败的状况
if (data && data.code == 0) {
this.dataList = data.page.list
diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue
index b6bfcb8..e48529e 100644
--- a/src/views/modules/project/projectInfo/com_project_test.vue
+++ b/src/views/modules/project/projectInfo/com_project_test.vue
@@ -35,9 +35,20 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp] }}
-
+
+
+ 草稿
+ 已下达
+ 已完成测试
+ 已提交测试
+ 客户已反馈
+
+
![]()
+
+
+
{{ scope.row[item.columnProp] }}
+
![]()
+
@@ -286,7 +297,7 @@ export default {
serialNumber: '103001Table1TestStatus',
tableId: '103001Table1',
tableName: '测试信息表',
- columnProp: 'testStatus',
+ columnProp: 'testResultStatus',
headerAlign: 'center',
align: 'center',
columnLabel: '状态',
@@ -298,78 +309,6 @@ export default {
fixed: '',
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
- },
- {
- userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1CreateBy',
- tableId: '103001Table1',
- tableName: '测试信息表',
- columnProp: 'createBy',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '创建人',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 80
- },
- {
- userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1UpdateDate',
- tableId: '103001Table1',
- tableName: '测试信息表',
- columnProp: 'updateDate',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '更新时间',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 160
- },
- {
- userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1UpdateBy',
- tableId: '103001Table1',
- tableName: '测试信息表',
- columnProp: 'updateBy',
- headerAlign: 'center',
- align: 'center',
- columnLabel: '更新人',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 80
- }
],
// 导出 start
exportData: [],