diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 1c810b044..e065aad8e 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => { // 编辑 // 评估代码值是1，接收时候，使用决策下拉列表是全部合格 if (row.estimateCode == 1) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1) } }) } else if (row.estimateCode == 2) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1) } @@ -430,7 +430,10 @@ const submitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } formRef.value.dialogVisible = false - handleOrderPub(rowData.value) + if (!data.isPublished) { + handleOrderPub(rowData.value) + } + // 刷新当前列表 getList() } finally { diff --git a/src/views/qms/inspectionRecord/useAddForm.vue b/src/views/qms/inspectionRecord/useAddForm.vue index c430495c8..d6e9dbd82 100644 --- a/src/views/qms/inspectionRecord/useAddForm.vue +++ b/src/views/qms/inspectionRecord/useAddForm.vue @@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any if(row.estimateCode == 1){ data.value.useDecision = '1' }else{ - data.value.useDecision ='' + data.value.useDecision =row.useDecision?row.useDecision:'' } // 全部合格时合格数量==数量 if(data.value.useDecision == 1){ diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 468dd88ff..d255a9fa8 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -952,13 +952,15 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index bbedb984b..2cdfb6bb1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -867,13 +867,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 4070f3ffd..8c8b5c11c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -658,13 +658,15 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { @@ -966,13 +968,15 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 175e76ec5..0846beac2 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -97,6 +97,7 @@ import Detail from '@/components/Detail/src/Detail.vue' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() +// 结算出库申请 defineOptions({ name: 'SaleShipmentMain' }) const message = useMessage() // 消息弹窗 @@ -248,7 +249,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理 - defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止 + // defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除 ] } @@ -323,7 +324,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'mainAbort') { // 废弃 + } else if (val == 'mainAbort') { // 结算出库废弃 await message.confirm('确认要终止吗？') tableObject.loading = true SaleShipmentMainApi.abort(row.masterId).then(() => { @@ -360,7 +361,7 @@ const openForm = (type: string, row?: any) => { const inputNumberChange = (field, val,row, index) => { if(field=='qty'){ if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){ - message.error(`物料${row['itemCode']}最大数量为${row['subSettleQty']}`) + message.error(`物料${row['itemCode']}最大数量为${row['subSettleQty']}`) } } console.log('inputNumberChange',field, val,row, index) @@ -375,7 +376,7 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach(item=>{ if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){ flag = false - message.error(`物料${item['itemCode']}最大数量为${item['subSettleQty']}`) + message.error(`物料${item['itemCode']}最大数量为${item['subSettleQty']}`) } }) if(!flag){ diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index cacd6c7b1..b9117e79d 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -361,7 +361,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ isMainValue: false }, { - key: 'customer_code', + key: 'customerCode', value: 'customerCode', isMainValue: true }] @@ -381,7 +381,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ isMainValue: false }, { - key: 'customer_code', + key: 'customerCode', value: 'customerCode', isMainValue: true }] diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index a0e70bc4b..515fe5a9d 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -742,7 +742,8 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index d0f7bcb28..0d0a935b4 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -761,14 +761,14 @@ export const ScrapJobMainRules = reactive({ * @returns {Array} 报废出库任务子表 */ export const ScrapJobDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, + // { + // label: '单据号', + // field: 'number', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, { label: '物料代码', field: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index c6a40668e..487282f3a 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -544,14 +544,14 @@ export const ScrapRecordMainRules = reactive({ * @returns {Array} 报废出库记录子表 */ export const ScrapRecordDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, + // { + // label: '单据号', + // field: 'number', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, { label: '物料代码', field: 'itemCode', diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 5042e58f1..76e26ea30 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -840,13 +840,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index e4b002ef2..7b43f9b8d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -839,13 +839,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 81391162f..de69f82d7 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -804,13 +804,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 47012f6f5..11019d913 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -792,13 +792,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 177693c90..7421e62e3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -203,7 +203,7 @@ const butttondata = (row,$index) => { // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index 8fa04a485..10112301c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -231,6 +231,24 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ }, isTable: false, }, + { + label: '是否已撤销', + field: 'recoveryRequestFlag', + sort: 'custom', + table: { + width: 150 + }, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value=='TRUE'){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建者', field: 'creator', @@ -569,24 +587,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - { - label: '是否已撤销', - field: 'recoveryRequestFlag', - sort: 'custom', - table: { - width: 150 - }, - detail:{ - dictType:'primary', - valueFilter:(value)=>{ - if(value=='TRUE'){ - return `是` - }else{ - return '否' - } - } - } - }, + { label: '单据号', field: 'number', @@ -760,7 +761,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 280, + width: 340, fixed: 'right' }, isTableForm:true, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 656b5cfff..518185c62 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -802,7 +802,7 @@ const tableFormButton = async (val, row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.masterId + number: row.number } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index fecce8199..202892c28 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1105,13 +1105,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 8f6e76a18..0cca3e6b5 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -240,7 +240,7 @@ const butttondata = (row,$index) => { defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 12595ed27..e697dda38 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -765,7 +765,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 350, + width: 410, fixed: 'right' }, hiddenInMain: false, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 2bb2f024b..8f14cd9e8 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -709,7 +709,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.masterId + number: row.number } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 7e2174154..951cf42af 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -1172,13 +1172,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index d88934572..839122910 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -943,14 +943,16 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', default:1, min: 0, - precision: 6 + max:9999, + // precision: 6 } }, {