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/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 }, 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/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}}
- - - 次 - - - - - 小时 - - + + + + + + + + + + + + + + + + + + + + ([ 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" /> 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) 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 // 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'){ @@ -561,6 +564,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } }) + }else if(formField == 'workshopCode'){ + //车间 + setV['productionLineCode'] = ''//生产线代码 + tableData.value = [] } formRef.setValues(setV) if(formField == 'costCenterCode'){ 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