From c4454e03cf04c835235b3797eedbfa1410642ad7 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Fri, 12 Jul 2024 18:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=97=A5=E6=9C=9F=EF=BC=8C=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=EF=BC=8C=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86?= =?UTF-8?q?ID=EF=BC=8C=E5=8C=85=E8=A3=85=E5=8F=B7=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 3 +- .../purchasereturnRequestMain.data.ts | 264 +++++++++--------- 2 files changed, 134 insertions(+), 133 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index de668c94d..0145d5de3 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -232,7 +232,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro nextTick(async () => { if (type == 'tableForm') { // 明细查询页赋值 - + if (formField == 'purchaseReceiptRecordNumber') { row[formField] = val[0][searchField] //搜索记录单号--回显数据 @@ -418,6 +418,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['singlePrice'] = val[0]['singlePrice'] setV['amount'] = val[0]['amount'] setV['projectCode'] = val[0]['projectCode'] + setV['packingNumber'] = val[0]['packingNumber'] if (formField == 'itemCode') { setV['batch'] = val[0]['toBatch'] diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index f4a706b9c..bc10f2178 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -895,7 +895,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive componentProps: { min: 0, precision: 6, - disabled:true + disabled:false } }, isTable:false, @@ -1014,28 +1014,28 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }] }, }, - { - label: '库存余额', - field: 'inventoryBalance', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 6 - } - }, - isForm:false, - tableForm:{ - hidden:false,//控制列是否展示 - type:'InputNumber', - min:0, - precision: 6 - } - }, + // { + // label: '库存余额', + // field: 'inventoryBalance', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0, + // precision: 6 + // } + // }, + // isForm:false, + // tableForm:{ + // hidden:false,//控制列是否展示 + // type:'InputNumber', + // min:0, + // precision: 6 + // } + // }, { label: '退货数量', field: 'qty', @@ -1137,115 +1137,115 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - { - label: '到货日期', - field: 'arriveDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - hiddenInMain: true, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - tableForm:{ - disabled:true, - type: 'FormDate', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - }, - isTableForm: false - }, - { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - hiddenInMain: true, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - disabled: true, - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - tableForm:{ - disabled:true, - type: 'FormDate', - format: 'YYYY-MM-DD', - valueFormat: 'x', - }, - isTableForm: false - }, - { - label: '过期日期', - field: 'expireDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - hiddenInMain: true, - form: { - component: 'DatePicker', - componentProps: { - disabled: true, - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - isTableForm: false, - isTable: false, - tableForm:{ - disabled:true, - type: 'FormDate', - format: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - { - label: '任务明细ID', - field: 'jobDetailId', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled:true - }, - isTableForm:false, - hiddenInMain: true, - isForm:false, - form: { - componentProps:{ - disabled:true - } - }, - }, + // { + // label: '到货日期', + // field: 'arriveDate', + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // hiddenInMain: true, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // tableForm:{ + // disabled:true, + // type: 'FormDate', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // }, + // isTableForm: false + // }, + // { + // label: '生产日期', + // field: 'produceDate', + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // hiddenInMain: true, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // disabled: true, + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // tableForm:{ + // disabled:true, + // type: 'FormDate', + // format: 'YYYY-MM-DD', + // valueFormat: 'x', + // }, + // isTableForm: false + // }, + // { + // label: '过期日期', + // field: 'expireDate', + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // hiddenInMain: true, + // form: { + // component: 'DatePicker', + // componentProps: { + // disabled: true, + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // isTableForm: false, + // isTable: false, + // tableForm:{ + // disabled:true, + // type: 'FormDate', + // format: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // { + // label: '任务明细ID', + // field: 'jobDetailId', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // disabled:true + // }, + // isTableForm:false, + // hiddenInMain: true, + // isForm:false, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + // }, { label: '项目代码', field: 'projectCode',