Browse Source

上传质量报告新增接口更换类

master_hella_20240701
chenfang 7 months ago
parent
commit
322af16210
  1. 4
      .env.development
  2. 27
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
  3. 20
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  4. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

4
.env.development

@ -4,10 +4,10 @@ NODE_ENV=development
VITE_DEV=false VITE_DEV=false
# 请求路径 # 请求路径
VITE_BASE_URL='http://localhost:12080' VITE_BASE_URL='http://192.168.0.113:12080'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload'
# 接口前缀 # 接口前缀
VITE_API_BASEPATH=/dev-api VITE_API_BASEPATH=/dev-api

27
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts

@ -18,8 +18,16 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
{ {
label: '计量单位', label: '计量单位',
field: 'uom', field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
isSearch: true, table: {
width: 150
},
tableForm: {
type: 'Select'
}
}, },
{ {
label: '批次', label: '批次',
@ -60,22 +68,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
field: 'extraProperties', field: 'extraProperties',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, isForm: false,
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '地点ID',
field: 'siteId',
sort: 'custom',
isSearch: true,
}, },
{ {
label: '操作', label: '操作',

20
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -77,7 +77,7 @@
:annexTable="[{ :annexTable="[{
label: '质检明细', label: '质检明细',
prop: 'uploadFile', prop: 'uploadFile',
tableName:'UploadQualityReport', tableName:'SupplierdeliverInspectionDetail',
hasSubDetail:true, // hasSubDetail:true, //
// //
subDetailTableData:{ subDetailTableData:{
@ -86,7 +86,7 @@
rowField:'id' rowField:'id'
}], // }], //
getSubList:SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage,// getSubList:SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage,//
tableColumns:UploadQualityReport.allSchemas.tableColumns, tableColumns:SupplierdeliverInspectionDetail.allSchemas.tableColumns,
tableList:[],// tableList:[],//
total:1, total:1,
pageSize:10, pageSize:10,
@ -132,15 +132,15 @@
<BasicForm <BasicForm
ref="ploadQualityReportRef" ref="ploadQualityReportRef"
@success="getList" @success="getList"
:formAllSchemas="UploadQualityReport.allSchemas" :formAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
:tableAllSchemas="UploadQualityReport.allSchemas" :tableAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
:tableData="ploadQualityReportTableData" :tableData="ploadQualityReportTableData"
@handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail" @handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail"
@handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail" @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail"
@submitForm="submitFormUploadQualityReport" @submitForm="submitFormUploadQualityReport"
:isShowReduceButton="true" :isShowReduceButton="true"
> >
<template #UploadQualityReport> <template #SupplierdeliverInspectionDetail>
<span>1111</span> <span>1111</span>
</template> </template>
</BasicForm> </BasicForm>
@ -157,9 +157,9 @@ import {
SupplierdeliverRequestMainRules, SupplierdeliverRequestMainRules,
SupplierdeliverRequestDetail, SupplierdeliverRequestDetail,
SupplierdeliverRequestDetailRules, SupplierdeliverRequestDetailRules,
SupplierdeliverRequestDetailLabel, SupplierdeliverRequestDetailLabel
UploadQualityReport
} from './supplierdeliverRequestMain.data' } from './supplierdeliverRequestMain.data'
import {   SupplierdeliverInspectionDetail} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain' import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail' import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
@ -592,14 +592,14 @@ const ploadQualityReportRef = ref()
const ploadQualityReportTableData = ref([]) const ploadQualityReportTableData = ref([])
/** 上传质量报告 */ /** 上传质量报告 */
const handleUploadQualityReport = async (row) => { const handleUploadQualityReport = async (row) => {
console.log('UploadQualityReport',UploadQualityReport.allSchemas) console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas)
const uploadFile = UploadQualityReport.allSchemas.formSchema.find(item=>item.field=='uploadFile') const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile')
if(uploadFile){ if(uploadFile){
uploadFile['componentProps']['upData']['tableId'] = row.id uploadFile['componentProps']['upData']['tableId'] = row.id
} }
ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')// createLabel ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')// createLabel
const tableFormKeys = {} const tableFormKeys = {}
UploadQualityReport.allSchemas.tableFormColumns.forEach((item) => { SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
tableFormKeys[item.field] = item.default ? item.default : '' tableFormKeys[item.field] = item.default ? item.default : ''
}) })
ploadQualityReportTableData.value = [tableFormKeys] ploadQualityReportTableData.value = [tableFormKeys]

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -1630,7 +1630,7 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '数量', label: '数量',
field: 'orderQty', field: 'planQty',
table: { table: {
width: 150 width: 150
}, },

Loading…
Cancel
Save