From f5c9e7f4c31756623ce437662fdba4cc9b7bb7d7 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Dec 2024 16:55:51 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index bc6f4a3ad..1b906d432 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -435,8 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ { label: t('ts.创建供应商发货申请'), name: 'supplierdeliver', - hide: isShowMainButton(row, ['4']), - // hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty Date: Thu, 5 Dec 2024 08:19:52 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B3=A8=E9=87=8A=E5=88=86=E9=92=9F=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/passwordRule/index.vue | 40 ++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue index 353879cba..9eb1b7806 100644 --- a/src/views/system/passwordRule/index.vue +++ b/src/views/system/passwordRule/index.vue @@ -26,26 +26,26 @@
{{passwordConfig.ruleDesc}}
- - - 次 - - - - - 小时 - - + + + + + + + + + + + + + + + + + + + + Date: Thu, 5 Dec 2024 09:42:21 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BA=BF=E8=BE=B9?= =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countManage/count/countJobMain/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index cb744daa7..41057a8b6 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -239,15 +239,15 @@ const butttondata = (row, $index) => { link: true, //文本展现按钮 hasPermi: '' // wms:count-job-main:importCountJob }, - { - label: '线边盘点', - name: 'lineTypeImport', - hide: !(row.status==2&&row.lineType==true), - type: 'success', - color: '', - link: true, //文本展现按钮 - hasPermi: '' // wms:count-job-main:lineTypeImport - }, + // { + // label: '线边盘点', + // name: 'lineTypeImport', + // hide: !(row.status==2&&row.lineType==true), + // type: 'success', + // color: '', + // link: true, //文本展现按钮 + // hasPermi: '' // wms:count-job-main:lineTypeImport + // }, defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃 { label: '完成', From 4abc1a0f3d7274fa044635178c784c6bcbf2d36d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Dec 2024 13:22:54 +0800 Subject: [PATCH 04/10] =?UTF-8?q?FWHL-81=E7=BA=BF=E8=BE=B9=E5=8E=9F?= =?UTF-8?q?=E6=96=99=E6=8A=A5=E5=BA=9F=E6=98=8E=E7=BB=86=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- src/components/TableForm/src/TableForm.vue | 4 ++-- .../productionscrapRequestMain.data.ts | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2953275d5..cda786aae 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,12 @@ tableForm:{ }] }, - +tableForm: { + type: 'InputNumber', + minField: 0, // 每行数据不同最小值 + precision: 2, + maxField:'maxQty' // 每行数据不同最大值 +} **主子表合并需要修改的代码** 1、影响Table表头 diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index eec0dcf8c..a49e1bad9 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -148,8 +148,8 @@ style="width: 100%" :key="headerItem.field + $index" v-model="row[headerItem.field]" - :max="headerItem?.tableForm?.max" - :min="headerItem?.tableForm?.min" + :max="headerItem?.tableForm?.maxField?row[headerItem?.tableForm?.maxField]:headerItem?.tableForm?.max" + :min="headerItem?.tableForm?.minField?row[headerItem?.tableForm?.minField]:headerItem?.tableForm?.min" :precision="headerItem?.tableForm?.precision" :disabled="itemIsDisabled(headerItem, row)" @change=" diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 4fe78c5f4..373a1ed42 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -1807,7 +1807,8 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive Date: Thu, 5 Dec 2024 13:29:16 +0800 Subject: [PATCH 05/10] FWHL-81 --- .../productionscrap/productionscrapRequestMain/index.vue | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 58f1f53d8..a047c09ed 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -254,19 +254,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['uom'] = val[0]['uom'] row['inventoryStatus'] = val[0]['inventoryStatus'] row['qty'] = val[0]['qty'] + // 如果有批次 赋值库存余额批次 无批次 赋值 000000 if (val[0]['batch'] !== '') { row['batch'] = val[0]['batch'] } else { row['batch'] = '000000' } - // 修改 tableform 属性 数量最大值设置为库存余额中数量 - // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制 - ProductionscrapRequestDetail.allSchemas.tableFormColumns.map(item => { - if(item.field == 'qty' && val[0]['qty'] > 0) { - item.tableForm.max = val[0]['qty'] - } - }) + row['maxQty'] = val[0]['qty'] let param = {'itemCodes':val[0]['itemCode']} let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param) console.log('resyStdcost',resyStdcost) From 7c80b42aa76224137b56b111e7fcb3faaa420591 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Dec 2024 13:29:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?FWHL-72=E5=88=B6=E5=93=81=E5=AD=90?= =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7=E4=B8=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BD=A6=E9=97=B4=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=80=BC=E5=90=8E=EF=BC=8C=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E5=92=8C=E6=98=8E=E7=BB=86=E5=BA=94=E8=AF=A5=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=EF=BC=9B=E7=9B=AE=E5=89=8D=E6=9C=AA=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrap/productscrapRequestMain/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 2c866ba12..7eea0a9ed 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -561,6 +561,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } }) + }else if(formField == 'workshopCode'){ + //车间 + setV['productionLineCode'] = ''//生产线代码 + tableData.value = [] } formRef.setValues(setV) if(formField == 'costCenterCode'){ From 5aa6a87cdaba21d7345e6f16da49cc1acc99256a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Dec 2024 13:33:49 +0800 Subject: [PATCH 07/10] bug --- src/components/BasicForm/src/BasicForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index c825bccf4..618f4c084 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -281,7 +281,7 @@ const props = defineProps({ }, //是否可以编辑子表 updateTypeEdiltSubList: { - type: String, + type: Boolean, required: false, default: false }, From 95e34c1f61a6008bf4f058d700554a23f4a16db2 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Dec 2024 16:44:04 +0800 Subject: [PATCH 08/10] =?UTF-8?q?FWHL-75=E9=BB=98=E8=AE=A4=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E4=BD=8D=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BF=9D?= =?UTF-8?q?=E5=AD=98BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrap/productscrapRequestMain/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 7eea0a9ed..900f61ccf 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -516,6 +516,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // buttonOperationClick(newRow,'Bom',tableData.value.indexOf(newRow),true) // } tableData.value.push(newRow) + if(newRow['fromLocationCode']){ + buttonOperationClick(newRow,'Bom',tableData.value.indexOf(newRow),true) + } }) }else if(formField == 'bomVersion'){ From 250560b99019d095e93ab21f434fc6be32d72d81 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 5 Dec 2024 17:08:38 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E6=98=8E=E7=BB=86=E9=87=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countadjustRequestMain/countadjustRequestMain.data.ts | 2 +- .../countManage/countadjust/countadjustRequestMain/index.vue | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index bcc8c248a..b8a8b0e8b 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -637,7 +637,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ field: 'action', isDetail: false, isForm: false , - isTable:false, + isTable:true, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index 3fc7452a7..5839b0a9d 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -71,6 +71,9 @@ :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail" fromeWhere="countadjustRequest" :detailButtonIsShowAdd="false" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="true" + :detailButtonIsShowAddStatusArray="['1']" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" /> From 6429057d84b1427e9c1b560217518659f6219bad Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Thu, 5 Dec 2024 17:34:57 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BA=BF=E8=BE=B9?= =?UTF-8?q?=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countManage/count/countJobMain/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index 41057a8b6..cb744daa7 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -239,15 +239,15 @@ const butttondata = (row, $index) => { link: true, //文本展现按钮 hasPermi: '' // wms:count-job-main:importCountJob }, - // { - // label: '线边盘点', - // name: 'lineTypeImport', - // hide: !(row.status==2&&row.lineType==true), - // type: 'success', - // color: '', - // link: true, //文本展现按钮 - // hasPermi: '' // wms:count-job-main:lineTypeImport - // }, + { + label: '线边盘点', + name: 'lineTypeImport', + hide: !(row.status==2&&row.lineType==true), + type: 'success', + color: '', + link: true, //文本展现按钮 + hasPermi: '' // wms:count-job-main:lineTypeImport + }, defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃 { label: '完成',