Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
liuchen864 6 months ago
parent
commit
d82b03a11a
  1. 5
      src/api/wms/deliverRecordDetail/index.ts
  2. 8
      src/views/mes/process/process.data.ts
  3. 22
      src/views/mes/processroute/components/configDialog.vue
  4. 2
      src/views/mes/workScheduling/index.vue
  5. 7
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  6. 1
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  7. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  8. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
  9. 2
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  10. 2
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
  11. 2
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
  12. 2
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

5
src/api/wms/deliverRecordDetail/index.ts

@ -74,3 +74,8 @@ export const exportDeliverRecordDetail = async (params) => {
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/deliver-record-detail/get-import-template' }) return request.download({ url: '/wms/deliver-record-detail/get-import-template' })
} }
// 查询发货记录子列表
export const getDeliverRecordDetailListToRepeat = async (params) => {
return await request.get({ url: `/wms/deliver-record-detail/listToRepeat`, params })
}

8
src/views/mes/process/process.data.ts

@ -423,10 +423,10 @@ export const TabsList = [
label: "模具", label: "模具",
prop: 'PatternTab', prop: 'PatternTab',
}, },
{ // {
label: "物料", // label: "物料",
prop: 'ItembasicTab', // prop: 'ItembasicTab',
} // }
] ]

22
src/views/mes/processroute/components/configDialog.vue

@ -259,7 +259,7 @@ const deleteNode=(row)=>{
const openDetail = (row: any) => { const openDetail = (row: any) => {
rowData.value = row rowData.value = row
console.log('rowData',rowData.value) //console.log('rowData',rowData.value)
titleNameRef.value = rowData.value.processName titleNameRef.value = rowData.value.processName
titleValueRef.value =rowData.value.processrouteCode titleValueRef.value =rowData.value.processrouteCode
processRouteId.value = rowData.value.id processRouteId.value = rowData.value.id
@ -498,33 +498,26 @@ const deleteAnnexSuccess = async () => {
const handleCurrentChange=(value: number)=>{ const handleCurrentChange=(value: number)=>{
let index=(value-1)*page.value.size let index=(value-1)*page.value.size
page.value.current=value page.value.current=value
//console.log('index',index)
showProcessNodeData.value=processData.value.slice(index,index+page.value.size) showProcessNodeData.value=processData.value.slice(index,index+page.value.size)
//console.log('processData.value-472',processData.value)
//console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handlePrevClick=(value: number)=>{ const handlePrevClick=(value: number)=>{
page.value.current=value-1 page.value.current=value-1
if(page.value.current==0) { if(page.value.current==0) {
page.value.current=1 page.value.current=1
} }
// let index=(value-1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handleNextClick=(value: number)=>{ const handleNextClick=(value: number)=>{
page.value.current=value+1 page.value.current=value+1
if(page.value.current>page.value.total/page.value.size) { if(page.value.current>page.value.total/page.value.size) {
page.value.current=page.value.total/page.value.size -1 page.value.current=page.value.total/page.value.size -1
} }
// let index=(value+1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handleCurrentChangeM=(value: number)=>{ const handleCurrentChangeM=(value: number)=>{
let index=(value-1)*pageM.value.size let index=(value-1)*pageM.value.size
pageM.value.current=value pageM.value.current=value
//console.log('index',index)
showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size) showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size)
} }
@ -533,18 +526,13 @@ const handlePrevClickM=(value: number)=>{
if(pageM.value.current==0) { if(pageM.value.current==0) {
pageM.value.current=1 pageM.value.current=1
} }
// let index=(value-1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
const handleNextClickM=(value: number)=>{ const handleNextClickM=(value: number)=>{
pageM.value.current=value+1 pageM.value.current=value+1
if(pageM.value.current>pageM.value.total/page.value.size) { if(pageM.value.current>pageM.value.total/page.value.size) {
pageM.value.current=page.value.total/pageM.value.size -1 pageM.value.current=page.value.total/pageM.value.size -1
} }
// let index=(value+1)*page.value.size
// showProcessNodeData.value=processData.value.slice(index,page.value.size)
// console.log('showProcessNodeData.value-472',showProcessNodeData.value)
} }
// //
onUnmounted?.(() => {}) onUnmounted?.(() => {})

2
src/views/mes/workScheduling/index.vue

@ -29,7 +29,7 @@
> >
<template #schedulingCode="{row}"> <template #schedulingCode="{row}">
<el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)"> <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
<span>{{ row.planMasterCode }}</span> <span>{{ row.schedulingCode }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">

7
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -552,9 +552,9 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const CustomerreturnRequestMainRules = reactive({ export const CustomerreturnRequestMainRules = reactive({
// deliverRecordNumber: [ deliverRecordNumber: [
// { required: true, message: '请选择发货记录单号', trigger: 'change' } { required: true, message: '请选择发货记录单号', trigger: 'change' }
// ], ],
customerCode: [ customerCode: [
{ required: true, message: '请选择客户代码', trigger: 'blur' } { required: true, message: '请选择客户代码', trigger: 'blur' }
], ],
@ -1051,6 +1051,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
fixed: 'right' fixed: 'right'
}, },
isTableForm:false, isTableForm:false,
hiddenInMain:true
} }
])) ]))

1
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@ -1072,6 +1072,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
hiddenInMain:true,
isTableForm:false, isTableForm:false,
} }
])) ]))

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -1028,7 +1028,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '收货数量', label: '收货数量',
field: 'receivedQty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@ -677,7 +677,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
}, },
{ {
label: '收货数量', label: '收货数量',
field: 'receivedQty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

2
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -210,7 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
tableData.value.forEach((item) => { tableData.value.forEach((item) => {
item.batch = item.toBatch item.batch = item.toBatch
item.packingNumber = '' item.packingNumber = item.toPackingNumber
item.containerNumber = item.toContainerNumber item.containerNumber = item.toContainerNumber
item.receiptQty = item.qty item.receiptQty = item.qty
item.toLocationGroupCode = null item.toLocationGroupCode = null

2
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts

@ -1026,7 +1026,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '收货数量', label: '收货数量',
field: 'receivedQty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

2
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts

@ -676,7 +676,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
}, },
{ {
label: '收货数量', label: '收货数量',
field: 'receivedQty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

2
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@ -803,7 +803,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}, },
{ {
label: '收货数量', label: '收货数量',
field: 'receivedQty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

Loading…
Cancel
Save