From cda5da22f672c6bde13b25d321d24706cdbd2318 Mon Sep 17 00:00:00 2001 From: "hongrui.an" <297504645@qq.com> Date: Tue, 17 Jun 2025 17:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/components/ediTtablePage/index.vue | 35 +++++-------- Web/src/utils/common/apiTableColumns.js | 52 +++++++++++++++---- .../logisticsPlan/supplierConPo/index.vue | 38 ++++++++++++++ 3 files changed, 92 insertions(+), 33 deletions(-) create mode 100644 Web/src/views/logisticsPlan/supplierConPo/index.vue diff --git a/Web/src/components/ediTtablePage/index.vue b/Web/src/components/ediTtablePage/index.vue index 0da2817..5fa94f8 100644 --- a/Web/src/components/ediTtablePage/index.vue +++ b/Web/src/components/ediTtablePage/index.vue @@ -74,7 +74,7 @@ - + item.prop == prop) - let _name = null - if(_item && _item.length > 0){ - _name = _item[0].title - } - return _name - } - // 获取当前第几行数据的明细 function getIndexById(id){ let _id = id || state.currentDetailId @@ -791,15 +780,13 @@ getCommonDetailById(props.apiName,row.id) .then((res) => { state.headerInfoData = [] - for(let item in res.data){ - let _label = getDeatilLableByProp(item) - if(_label){ - state.headerInfoData.push({ - label:_label, - value:res.data[item] - }) - } - } + let _colums = apiTableColumns[props.detailColumName] + _colums.forEach(item=>{ + state.headerInfoData.push({ + label:item.title, + value:res.data[item.prop] + }) + }) }) .finally(() => (state.detailLoading = false)) @@ -890,9 +877,13 @@ } } ::v-deep .headerInfoEmpty{ - height:145px; + height:195px; .el-empty__image{ width:90px !important } } +::v-deep .el-descriptions__body{ + max-height: 165px; + overflow: auto; +} \ No newline at end of file diff --git a/Web/src/utils/common/apiTableColumns.js b/Web/src/utils/common/apiTableColumns.js index d5dd73b..60e262b 100644 --- a/Web/src/utils/common/apiTableColumns.js +++ b/Web/src/utils/common/apiTableColumns.js @@ -138,11 +138,11 @@ const apiTableColumns = { {prop:'quantityDemand12',title:'需求数量12',width:130}, {prop:'requestDate',title:'请求日期',width:180}, // {prop:'remark',title:'备注',align:'left',width:300}, - {prop:'createByUser',title:'创建人'}, - {prop:'createTime',title:'创建时间',width:180}, + // {prop:'createByUser',title:'创建人'}, + // {prop:'createTime',title:'创建时间',width:180}, // {prop:'creationTime',title:'创建时间(接收)',width:180}, - {prop:'updateByUser',title:'修改人'}, - {prop:'updateTime',title:'修改时间',width:180}, + // {prop:'updateByUser',title:'修改人'}, + // {prop:'updateTime',title:'修改时间',width:180}, {prop:'version',title:'版本号'}, // {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether}, // {prop:'isUpdate',title:'是否更新',type:'tagFilter',options:EnumList.whether}, @@ -279,10 +279,10 @@ const apiTableColumns = { {prop:'quantityDemand30',title:'需求数量30'}, {prop:'quantityDemand31',title:'需求数量31'}, // {prop:'is_update',title:'是否更新',type:'tagFilter',options:EnumList.whether}, - {prop:'createByUser',title:'创建人'}, - {prop:'creationTime',title:'创建时间'}, - {prop:'updateByUser',title:'修改人'}, - {prop:'updateTime',title:'修改时间'}, + // {prop:'createByUser',title:'创建人'}, + // {prop:'creationTime',title:'创建时间'}, + // {prop:'updateByUser',title:'修改人'}, + // {prop:'updateTime',title:'修改时间'}, // {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether}, {prop:'version',title:'版本号'}, ], @@ -333,15 +333,45 @@ const apiTableColumns = { ], // 采购订单风险确认 cherysupplierconpo:[ - {prop:'supplierCode',title:'供应商代码'}, + {prop:'supplierCode',title:'供应商代码',width:120}, {prop:'purchaseOrder',title:'采购订单号',width:120}, - {prop:'serialNumber',title:'行项目号'}, + {prop:'serialNumber',title:'行项目号',width:120}, {prop:'feedbackResults',title:'反馈结果',type:'filterSelect',options:EnumList.feedbackResults,required:true}, {prop:'ventureType',title:'风险类型',type:'filterSelect',options:EnumList.ventureType}, {prop:'ventureSpecific',title:'具体风险',type:'input'}, {prop:'measures',title:'应对措施',type:'input'}, - {prop:'creationTime',title:'创建时间',width:180}, {prop:'quantityMeet',title:'满足数量',type:'numberInput'}, + {prop:'creationTime',title:'创建时间',width:180}, + ], + // 采购订单风险确认-明细 + cherysupplierconPoDetail:[ + {prop:'purchaseOrder',title:'采购订单号',width:120}, + {prop:'serialNumber',title:'行项目号'}, + {prop:'plantId',title:'工厂代码'}, + {prop:'plantName',title:'工厂名称',width:160}, + {prop:'voucherDate',title:'凭证日期',width:180}, + {prop:'requestDate',title:'请求时间',width:180}, + {prop:'purchaser',title:'需方联系人'}, + {prop:'supplier',title:'供方联系人'}, + {prop:'materialCode',title:'物料编码',width:180}, + {prop:'materialDescription',title:'物料描述',width:180}, + {prop:'quantityDemand',title:'需求数量'}, + {prop:'materialUnit',title:'物料单位'}, + {prop:'deliveryDate',title:'交货日期',width:180}, + {prop:'deliveryPlace',title:'交货地点'}, + {prop:'quantityDelivery',title:'到货数量'}, + {prop:'itemType',title:'项目类别文本',width:150}, + {prop:'tradeTerms',title:'国际贸易条件',width:150}, + {prop:'country',title:'出口国家'}, + {prop:'batch',title:'批次'}, + {prop:'version',title:'版本号'}, + {prop:'note',title:'备注',width:200}, + // // {prop:'createByUser',title:'创建人'}, + // // {prop:'creationTime',title:'创建时间',width:180}, + // // {prop:'updateByUser',title:'修改人'}, + // // {prop:'updateTime',title:'修改时间',width:180}, + // // {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether}, + ], // 过焊装未过总装 cherysupplierporhschedul:[ diff --git a/Web/src/views/logisticsPlan/supplierConPo/index.vue b/Web/src/views/logisticsPlan/supplierConPo/index.vue new file mode 100644 index 0000000..5e8aabb --- /dev/null +++ b/Web/src/views/logisticsPlan/supplierConPo/index.vue @@ -0,0 +1,38 @@ + + + + \ No newline at end of file