Browse Source

修复

master_hella_20240701
赵雪冰 8 months ago
parent
commit
b22a0ebac9
  1. 6
      src/api/wms/productreceiptRequestMain/index.ts
  2. 30
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  3. 46
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

6
src/api/wms/productreceiptRequestMain/index.ts

@ -137,4 +137,10 @@ export const agree = (id) => {
// 处理 // 处理
export const handle = (id) => { export const handle = (id) => {
return request.put({ url: '/wms/productreceipt-request-main/handle?id=' + id }) return request.put({ url: '/wms/productreceipt-request-main/handle?id=' + id })
}
// 创建标签
export const productCreateLabel = async (data: ProductreceiptRequestMainVO) => {
return await request.post({ url: `/wms/productreceipt-request-main/productCreateLabel`, data })
} }

30
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@ -124,7 +124,7 @@
<ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/>
<!-- 标签打印 --> <!-- 标签打印 -->
<SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" /> <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -200,6 +200,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (formField == 'secondPackUnit') { if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit'] row['secondPackUnit'] = val[0]['packUnit']
row['secondPackQty'] = val[0]['packQty'] row['secondPackQty'] = val[0]['packQty']
}else if(formField == 'packUnit'){
row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty']
}else if (formField == 'itemCode') { }else if (formField == 'itemCode') {
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']
row['produceDate'] = dayjs().valueOf() row['produceDate'] = dayjs().valueOf()
@ -614,18 +617,17 @@ const searchFormClick = (searchData) => {
// //
const submitFormLabel = async (formType, data) => { const submitFormLabel = async (formType, data) => {
try { try {
detatableData.tableList.forEach(async (item) => { console.log("aaaaa",data);
// data.subList=detatableData.tableList
item.packUnit = null console.log("bbbbb",data);
item.inOfOut = 'in' //
await PackageApi.createPackageLabel(item).then(res => { await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
isCreateLabel.value = true isCreateLabel.value = true
message.success('创建标签成功') message.success('创建标签成功')
}).catch(err => { }).catch(err => {
isCreateLabel.value = false isCreateLabel.value = false
console.log(err) console.log(err)
message.error('创建标签失败') message.error('创建标签失败')
})
}) })
} finally { } finally {
formLabelRef.value.formLoading = false formLabelRef.value.formLoading = false
@ -717,7 +719,7 @@ const labelPrint = async (row) => {
} }
// -- // --
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val) console.log('批量打印',val)
// let rows:any = [] // let rows:any = []
// val.forEach(item=>{ // val.forEach(item=>{

46
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@ -1781,10 +1781,51 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
field: 'packUnit', field: 'packUnit',
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150,
componentProps: {
disabled: true,
isSearchList: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
]
}
}, },
tableForm: { tableForm: {
disabled: true disabled: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择订单行',
isMainValue: true
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}, },
}, },
{ {
@ -1806,7 +1847,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
{ {
label: '包装规格2', label: '包装规格2',
field: 'secondPackUnit', field: 'secondPackUnit',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150,

Loading…
Cancel
Save