diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 92cec2464..5dc3edbb4 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -127,17 +127,25 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Q2.allSchemas.tableColumns) + const clearSearchInput = (formField) => { if (formField == 'itemCode') { basicFormRef.value.formRef.setValues({ itemName: '', - SupplierCode: '', - SupplierName: '' + supplierCode: '', + supplierName: '', + purchaseReceiptNumber: '' + }) + Q2.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.options = [] + } }) } if (formField == 'lightItemCode') { basicFormRef.value.formRef.setValues({ standardCostPrice: '', + lightItemName: '', lightQty: 0, claimAmount: '', otherClaimAmount: 0, @@ -147,7 +155,9 @@ const clearSearchInput = (formField) => { }) const params2 = { by: 'ASC', - filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + filters: [ + { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode } + ], pageNo: 1, pageSize: 500, sort: '' @@ -212,22 +222,22 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { setV['summaryAmount'] = 0 setV['disbursementAmount'] = 0 setV['remainingAmount'] = 0 -  const params2 = { -        by: 'ASC', -        filters: [{ column: 'itemCode', action: '==', value: val[0].code }], -        pageNo: 1, -        pageSize: 500, -        sort: '' -      } -      params2.isSearch = true -      StdcostpriceApi.getStdcostpricePage(params2).then((res) => { -        if (res.list?.length > 0) { -          priceObj.value = res.list[0] -          formRef.setValues({ -            standardCostPrice: priceObj.value.price -          }) -        } -      }) + const params2 = { + by: 'ASC', + filters: [{ column: 'itemCode', action: '==', value: val[0].code }], + pageNo: 1, + pageSize: 500, + sort: '' + } + params2.isSearch = true + StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + if (res.list?.length > 0) { + priceObj.value = res.list[0] + formRef.setValues({ + standardCostPrice: priceObj.value.price + }) + } + }) setV[formField] = val[0][searchField] formRef.setValues(setV) } @@ -245,8 +255,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } if (formField == 'itemCode') { - setV['SupplierCode'] = '' - setV['SupplierName'] = '' + setV['supplierCode'] = '' + setV['supplierName'] = '' setV['itemName'] = '' setV['uom'] = val[0].supplierUom @@ -293,8 +303,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } }) - - if (val[0].lightItemCode == null) { + if (basicFormRef.value.formRef.formModel.lightItemCode == null|| + basicFormRef.value.formRef.formModel.lightItemCode == '' + ) { setV['standardCostPrice'] = '' setV['lightQty'] = 0 setV['claimAmount'] = '' @@ -403,6 +414,76 @@ const onChange = (field, e) => { } }) } + + // if (field == 'itemCode') { + // basicFormRef.value.formRef.formModel.supplierCode = '' + // basicFormRef.value.formRef.formModel.supplierName = '' + // basicFormRef.value.formRef.formModel.itemName = '' + + // Q2Api.getEmail().then((res) => { + // if (res) { + // basicFormRef.value.formRef.formModel.cashierEmail =res + // } + // }) + + // const supplieritemParams = { + // by: 'ASC', + // filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + // supplieritemParams.isSearch = true + // SupplieritemApi.getSupplieritemPage(supplieritemParams).then((res) => { + // if (res.list?.length > 0) { + // basicFormRef.value.formRef.formModel.supplierCode = res.list[0].supplierCode + // basicFormRef.value.formRef.formModel.supplierName = res.list[0].supplierName + // Q2.allSchemas.formSchema.forEach((item) => { + // if (item.field == 'supplierCode') { + // item.componentProps.options = res.list + // } + // }) + // } + // }) + // const itembasicParams = { + // by: 'ASC', + // filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + + // itembasicParams.isSearch = true + // ItembasicApi.getItembasicPage(itembasicParams).then((res) => { + // if (res.list?.length > 0) { + // basicFormRef.value.formRef.formModel.itemName = res.list[0].name + // } + // }) + + // if (basicFormRef.value.formRef.formModel.lightItemCode == null) { + // basicFormRef.value.formRef.formModel.standardCostPrice = '' + // basicFormRef.value.formRef.formModel.lightQty = 0 + // basicFormRef.value.formRef.formModel.claimAmount= '' + // basicFormRef.value.formRef.formModel.otherClaimAmount = 0 + // basicFormRef.value.formRef.formModel.summaryAmount= 0 + // basicFormRef.value.formRef.formModel.disbursementAmount = 0 + // basicFormRef.value.formRef.formModel.remainingAmount = 0 + // const params2 = { + // by: 'ASC', + // filters: [{ column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }], + // pageNo: 1, + // pageSize: 500, + // sort: '' + // } + // params2.isSearch = true + // StdcostpriceApi.getStdcostpricePage(params2).then((res) => { + // if (res.list?.length > 0) { + // priceObj.value = res.list[0] + // basicFormRef.value.formRef.formModel.standardCostPrice = priceObj.value.price + // } + // }) + // } + // } } // 字段设置 更新主列表字段 diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 6c84aa7c4..0aca9f690 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -487,6 +487,9 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + tableData.value.forEach((item,index)=>{ + item['orderNumber'] = index+1 + }) data.subList = tableData.value // 拼接子表数据参数 if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index fc5a31ada..2261f19a7 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -100,22 +100,22 @@ export const ProductscrapRecordMain = useCrudSchemas( width: 150 } }, - { - label: '班组', - field: 'team', - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '班次', - field: 'shift', - sort: 'custom', - table: { - width: 150 - } - }, + // { + // label: '班组', + // field: 'team', + // sort: 'custom', + // table: { + // width: 150 + // } + // }, + // { + // label: '班次', + // field: 'shift', + // sort: 'custom', + // table: { + // width: 150 + // } + // }, { label: '报废原因', field: 'scrappingReason', @@ -270,15 +270,15 @@ export const ProductscrapRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '是否已撤销', field: 'revokeFlag', @@ -729,22 +729,22 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ }, isTable: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - search: { - component: 'Input', - componentProps: { - placeholder: '请输入备注' - } - }, - isTable: true, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // search: { + // component: 'Input', + // componentProps: { + // placeholder: '请输入备注' + // } + // }, + // isTable: true, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index b92bb9d2b..51c90e5f1 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -390,6 +390,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 明细查询页赋值 if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] + tableData.value = [] }else if(formField == 'fromLocationCode'){ // val.forEach(item=>{ // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) @@ -458,6 +459,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //成本中心代码 //成本中心类型 setV['costCenterType'] = val[0]['costcentreType'] + }else if(formField == 'productionLineCode'){ + tableData.value = [] } formRef.setValues(setV) } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index eaf2e2a4e..b68f7d8cb 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -723,7 +723,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, + isTable:false, + isSearch: false, sortTableDefault: 10, }, { @@ -733,6 +734,8 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + isSearch: false, sortTableDefault: 10, }, { @@ -746,6 +749,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ hiddenInMain:true, isTableForm: false, isForm: false, + isTable:false, }, // { // label: '器具号', @@ -820,6 +824,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ }, sortTableDefault: 16, hiddenInMain:true, + isTable:false, }, { label: '到货主代码', @@ -830,6 +835,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ }, sortTableDefault: 16, hiddenInMain:true, + isTable:false, }, { label: '订单号',