sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

制品相关修改

master
李胜楠 1 year ago
parent
d1cd1eba9b
commit
87c4d9f2ef
6 changed files with 357 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
  2. 118
      src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
  3. 36
      src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
  4. 171
      src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
  5. 36
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  6. 64
      src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

35
src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
View File

@ -44,7 +44,6 @@
@success="getList" @success="getList"
:rules="ProductputawayRequestMainRules" :rules="ProductputawayRequestMainRules"
:formAllSchemas="ProductputawayRequestMain.allSchemas" :formAllSchemas="ProductputawayRequestMain.allSchemas"
:searchTableParams="searchTableParams"
:tableAllSchemas="ProductputawayRequestDetail.allSchemas" :tableAllSchemas="ProductputawayRequestDetail.allSchemas"
:tableFormRules="ProductputawayRequestDetailRules" :tableFormRules="ProductputawayRequestDetailRules"
:tableData="tableData" :tableData="tableData"
@ -64,12 +63,12 @@
:allSchemas="ProductputawayRequestMain.allSchemas" :allSchemas="ProductputawayRequestMain.allSchemas"
:detailAllSchemas="ProductputawayRequestDetail.allSchemas" :detailAllSchemas="ProductputawayRequestDetail.allSchemas"
:detailAllSchemasRules="ProductputawayRequestDetailRules" :detailAllSchemasRules="ProductputawayRequestDetailRules"
:searchTableParams="searchTableParams"
:apiCreate="ProductputawayRequestDetailApi.createProductputawayRequestDetail" :apiCreate="ProductputawayRequestDetailApi.createProductputawayRequestDetail"
:apiUpdate="ProductputawayRequestDetailApi.updateProductputawayRequestDetail" :apiUpdate="ProductputawayRequestDetailApi.updateProductputawayRequestDetail"
:apiPage="ProductputawayRequestDetailApi.getProductputawayRequestDetailPage" :apiPage="ProductputawayRequestDetailApi.getProductputawayRequestDetailPage"
:apiDelete="ProductputawayRequestDetailApi.deleteProductputawayRequestDetail" :apiDelete="ProductputawayRequestDetailApi.deleteProductputawayRequestDetail"
:Echo="Echo" :Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail"
/> />
<!-- 导入 --> <!-- 导入 -->
@ -99,41 +98,27 @@ const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
} }
// 查询列表页面参数设置
const searchTableParams = ref([
//{
// formField: 'productItemCode',
// searchTableTitle: '物料信息',
// searchTableAllSchemas: Itembasic.allSchemas,
// searchTablePage: ItembasicApi.getItembasicPage
//}
])
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// 明细查询页赋值 // 明细查询页赋值
//row[formField] = val[0][searchField] row[formField] = val[0][searchField]
//row['poLine'] = val[0]['poLine']
//row['batch'] = val[0]['toBatch']
//row['altBatch'] = val[0]['altBatch']
//row['itemCode'] = val[0]['itemCode']
//row['itemName'] = val[0]['itemName']
//row['itemDesc1'] = val[0]['itemDesc1']
//row['itemDesc2'] = val[0]['itemDesc2']
//row['projectCode'] = val[0]['projectCode']
//row['qty'] = val[0]['qty']
//row['uom'] = val[0]['uom']
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
//setV['ppNumber'] = val[0]['ppNumber']
//setV['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV) formRef.setValues(setV)
} }
}) })
} }
// 查询页面返回——详情
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
// 子表新增的时候选择表格之后需要会显得字段 // 子表新增的时候选择表格之后需要会显得字段
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = [] const Echo = []

118
src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
View File

@ -1,8 +1,12 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = { const queryParams = {
pageSize:10, pageSize:10,
@ -29,6 +33,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isSearch: true, isSearch: true,
isForm: false,
}, },
{ {
label: '从仓库代码', label: '从仓库代码',
@ -37,6 +42,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '从库位类型范围', label: '从库位类型范围',
@ -48,6 +54,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -56,6 +63,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '单据号', label: '单据号',
@ -80,7 +88,8 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
disabled: true disabled: true
} }
} },
isForm: false,
}, },
{ {
label: '备注', label: '备注',
@ -140,6 +149,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isForm: false,
}, },
{ {
label: '截止时间', label: '截止时间',
@ -230,6 +240,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '到库位类型范围', label: '到库位类型范围',
@ -242,6 +253,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '到库区代码范围', label: '到库区代码范围',
@ -250,6 +262,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '自动提交', label: '自动提交',
@ -345,18 +358,18 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const ProductputawayRequestMainRules = reactive({ export const ProductputawayRequestMainRules = reactive({
fromWarehouseCode: [ // fromWarehouseCode: [
{ required: true, message: '请输入从仓库代码', trigger: 'blur' } // { required: true, message: '请输入从仓库代码', trigger: 'blur' }
], // ],
fromLocationTypes: [ // fromLocationTypes: [
{ required: true, message: '请选择从库位类型范围', trigger: 'change' } // { required: true, message: '请选择从库位类型范围', trigger: 'change' }
], // ],
toWarehouseCode: [ // toWarehouseCode: [
{ required: true, message: '请输入到仓库代码', trigger: 'blur' } // { required: true, message: '请输入到仓库代码', trigger: 'blur' }
], // ],
toLocationTypes: [ // toLocationTypes: [
{ required: true, message: '请选择到库位类型范围', trigger: 'change' } // { required: true, message: '请选择到库位类型范围', trigger: 'change' }
], // ],
departmentCode: [ departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' } { required: true, message: '请输入部门', trigger: 'blur' }
], ],
@ -388,6 +401,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '器具号', label: '器具号',
@ -396,6 +411,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '批次', label: '批次',
@ -404,6 +421,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '库存状态', label: '库存状态',
@ -415,6 +434,9 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm: {
type: 'Select'
}
}, },
{ {
label: '订单号', label: '订单号',
@ -423,6 +445,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '订单行', label: '订单行',
@ -431,6 +455,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '从库位代码', label: '从库位代码',
@ -461,6 +487,26 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm:{
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
}
}
}, },
{ {
label: '备注', label: '备注',
@ -509,6 +555,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false
}, },
{ {
label: '物品描述1', label: '物品描述1',
@ -517,6 +565,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false
}, },
{ {
label: '物品描述2', label: '物品描述2',
@ -525,6 +575,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false
}, },
{ {
label: '项目代码', label: '项目代码',
@ -533,6 +585,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false
}, },
{ {
label: '数量', label: '数量',
@ -543,6 +597,15 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
}, },
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm:{
type: 'InputNumber',
min: 1,
precision: 6
} }
}, },
{ {
@ -555,6 +618,9 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm:{
type: 'Select'
}
}, },
{ {
label: '从货主代码', label: '从货主代码',
@ -563,6 +629,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -571,6 +639,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -619,19 +689,19 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
//表单校验 //表单校验
export const ProductputawayRequestDetailRules = reactive({ export const ProductputawayRequestDetailRules = reactive({
packingNumber: [ // packingNumber: [
{ required: true, message: '请输入包装号', trigger: 'blur' } // { required: true, message: '请输入包装号', trigger: 'blur' }
], // ],
batch: [ batch: [
{ required: true, message: '请输入批次', trigger: 'blur' } { required: true, message: '请输入批次', trigger: 'blur' }
], ],
inventoryStatus: [ // inventoryStatus: [
{ required: true, message: '请选择库存状态', trigger: 'change' } // { required: true, message: '请选择库存状态', trigger: 'change' }
], // ],
fromLocationCode: [ // fromLocationCode: [
{ required: true, message: '请输入从库位代码', trigger: 'blur' } // { required: true, message: '请输入从库位代码', trigger: 'blur' }
], // ],
itemCode: [ itemCode: [
{ required: true, message: '请输入物品代码', trigger: 'blur' } { required: true, message: '请选择物品代码', trigger: 'change' }
], ],
}) })

36
src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
View File

@ -44,7 +44,6 @@
@success="getList" @success="getList"
:rules="ProductrepairRequestMainRules" :rules="ProductrepairRequestMainRules"
:formAllSchemas="ProductrepairRequestMain.allSchemas" :formAllSchemas="ProductrepairRequestMain.allSchemas"
:searchTableParams="searchTableParams"
:tableAllSchemas="ProductrepairRequestDetaila.allSchemas" :tableAllSchemas="ProductrepairRequestDetaila.allSchemas"
:tableFormRules="ProductrepairRequestDetailaRules" :tableFormRules="ProductrepairRequestDetailaRules"
:tableData="tableData" :tableData="tableData"
@ -64,12 +63,12 @@
:allSchemas="ProductrepairRequestMain.allSchemas" :allSchemas="ProductrepairRequestMain.allSchemas"
:detailAllSchemas="ProductrepairRequestDetaila.allSchemas" :detailAllSchemas="ProductrepairRequestDetaila.allSchemas"
:detailAllSchemasRules="ProductrepairRequestDetailaRules" :detailAllSchemasRules="ProductrepairRequestDetailaRules"
:searchTableParams="searchTableParams"
:apiCreate="ProductrepairRequestDetailApi.createProductrepairRequestDetaila" :apiCreate="ProductrepairRequestDetailApi.createProductrepairRequestDetaila"
:apiUpdate="ProductrepairRequestDetailApi.updateProductrepairRequestDetaila" :apiUpdate="ProductrepairRequestDetailApi.updateProductrepairRequestDetaila"
:apiPage="ProductrepairRequestDetailApi.getProductrepairRequestDetailaPage" :apiPage="ProductrepairRequestDetailApi.getProductrepairRequestDetailaPage"
:apiDelete="ProductrepairRequestDetailApi.deleteProductrepairRequestDetaila" :apiDelete="ProductrepairRequestDetailApi.deleteProductrepairRequestDetaila"
:Echo="Echo" :Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail"
/> />
<!-- 导入 --> <!-- 导入 -->
@ -99,41 +98,28 @@ const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
} }
// 查询列表页面参数设置
const searchTableParams = ref([
//{
// formField: 'productItemCode',
// searchTableTitle: '物料信息',
// searchTableAllSchemas: Itembasic.allSchemas,
// searchTablePage: ItembasicApi.getItembasicPage
//}
])
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// 明细查询页赋值 // 明细查询页赋值
//row[formField] = val[0][searchField] row[formField] = val[0][searchField]
//row['poLine'] = val[0]['poLine']
//row['batch'] = val[0]['toBatch']
//row['altBatch'] = val[0]['altBatch']
//row['itemCode'] = val[0]['itemCode']
//row['itemName'] = val[0]['itemName']
//row['itemDesc1'] = val[0]['itemDesc1']
//row['itemDesc2'] = val[0]['itemDesc2']
//row['projectCode'] = val[0]['projectCode']
//row['qty'] = val[0]['qty']
//row['uom'] = val[0]['uom']
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
//setV['ppNumber'] = val[0]['ppNumber']
//setV['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV) formRef.setValues(setV)
} }
}) })
} }
// 查询页面返回——详情
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
// 子表新增的时候选择表格之后需要会显得字段 // 子表新增的时候选择表格之后需要会显得字段
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = [] const Echo = []

171
src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
View File

@ -1,8 +1,30 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as WorkshopApi from '@/api/wms/workshop'
import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
import * as ShiftApi from '@/api/wms/shift'
import { Shift } from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
import * as TeamApi from '@/api/wms/team'
import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
import * as ProductionlineApi from '@/api/wms/productionline'
import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
import * as WorkstationApi from '@/api/wms/workstation'
import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
import * as ProcessApi from '@/api/wms/process'
import { Process } from '@/views/wms/basicDataManage/factoryModeling/process/process.data'
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = { const queryParams = {
pageSize:10, pageSize:10,
@ -29,6 +51,17 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isSearch: true, isSearch: true,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择车间',
searchField: 'code',
searchTitle: '车间信息',
searchAllSchemas: Workshop.allSchemas,
searchPage: WorkshopApi.getWorkshopPage
}
}
}, },
{ {
label: '班组', label: '班组',
@ -37,6 +70,17 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择班组',
searchField: 'code',
searchTitle: '班组信息',
searchAllSchemas: Team.allSchemas,
searchPage: TeamApi.getTeamPage
}
}
}, },
{ {
label: '班次', label: '班次',
@ -45,6 +89,17 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择班次',
searchField: 'code',
searchTitle: '班次信息',
searchAllSchemas: Shift.allSchemas,
searchPage: ShiftApi.getShiftPage
}
}
}, },
{ {
label: '从仓库代码', label: '从仓库代码',
@ -53,6 +108,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '从库位类型范围', label: '从库位类型范围',
@ -64,6 +120,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -72,6 +129,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '单据号', label: '单据号',
@ -96,7 +154,8 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
disabled: true disabled: true
} }
} },
isForm: false,
}, },
{ {
label: '备注', label: '备注',
@ -156,6 +215,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isForm: false,
}, },
{ {
label: '截止时间', label: '截止时间',
@ -373,6 +433,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '生产线代码', label: '生产线代码',
@ -381,6 +443,25 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
}
}
}, },
{ {
label: '工位代码', label: '工位代码',
@ -389,6 +470,25 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择工位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage // 查询弹窗所需分页方法
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择工位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage // 查询弹窗所需分页方法
}
}
}, },
{ {
label: '工序代码', label: '工序代码',
@ -397,6 +497,25 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择工序代码',
searchField: 'code',
searchTitle: '工序信息',
searchAllSchemas: Process.allSchemas,
searchPage: ProcessApi.getProcessPage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择工序代码',
searchField: 'code',
searchTitle: '工序信息',
searchAllSchemas: Process.allSchemas,
searchPage: ProcessApi.getProcessPage
}
}
}, },
{ {
label: '包装号', label: '包装号',
@ -405,6 +524,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '器具号', label: '器具号',
@ -413,6 +534,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '批次', label: '批次',
@ -429,6 +552,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '库存状态', label: '库存状态',
@ -440,6 +565,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '单据号', label: '单据号',
@ -462,6 +589,26 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm:{
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
}
}
}, },
{ {
label: '备注', label: '备注',
@ -510,6 +657,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '物品描述1', label: '物品描述1',
@ -518,6 +667,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '物品描述2', label: '物品描述2',
@ -526,6 +677,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '项目代码', label: '项目代码',
@ -534,6 +687,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
}, },
{ {
label: '数量', label: '数量',
@ -544,6 +699,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
}, },
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
} }
}, },
{ {
@ -556,6 +720,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm: {
type: 'Select'
}
}, },
{ {
label: '最后更新时间', label: '最后更新时间',

36
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
View File

@ -44,7 +44,6 @@
@success="getList" @success="getList"
:rules="ProductscrapRequestMainRules" :rules="ProductscrapRequestMainRules"
:formAllSchemas="ProductscrapRequestMain.allSchemas" :formAllSchemas="ProductscrapRequestMain.allSchemas"
:searchTableParams="searchTableParams"
:tableAllSchemas="ProductscrapRequestDetail.allSchemas" :tableAllSchemas="ProductscrapRequestDetail.allSchemas"
:tableFormRules="ProductscrapRequestDetailRules" :tableFormRules="ProductscrapRequestDetailRules"
:tableData="tableData" :tableData="tableData"
@ -64,12 +63,12 @@
:allSchemas="ProductscrapRequestMain.allSchemas" :allSchemas="ProductscrapRequestMain.allSchemas"
:detailAllSchemas="ProductscrapRequestDetail.allSchemas" :detailAllSchemas="ProductscrapRequestDetail.allSchemas"
:detailAllSchemasRules="ProductscrapRequestDetailRules" :detailAllSchemasRules="ProductscrapRequestDetailRules"
:searchTableParams="searchTableParams"
:apiCreate="ProductscrapRequestDetailApi.createProductscrapRequestDetail" :apiCreate="ProductscrapRequestDetailApi.createProductscrapRequestDetail"
:apiUpdate="ProductscrapRequestDetailApi.updateProductscrapRequestDetail" :apiUpdate="ProductscrapRequestDetailApi.updateProductscrapRequestDetail"
:apiPage="ProductscrapRequestDetailApi.getProductscrapRequestDetailPage" :apiPage="ProductscrapRequestDetailApi.getProductscrapRequestDetailPage"
:apiDelete="ProductscrapRequestDetailApi.deleteProductscrapRequestDetail" :apiDelete="ProductscrapRequestDetailApi.deleteProductscrapRequestDetail"
:Echo="Echo" :Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail"
/> />
<!-- 导入 --> <!-- 导入 -->
@ -99,41 +98,28 @@ const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
} }
// 查询列表页面参数设置
const searchTableParams = ref([
//{
// formField: 'productItemCode',
// searchTableTitle: '物料信息',
// searchTableAllSchemas: Itembasic.allSchemas,
// searchTablePage: ItembasicApi.getItembasicPage
//}
])
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// 明细查询页赋值 // 明细查询页赋值
//row[formField] = val[0][searchField] row[formField] = val[0][searchField]
//row['poLine'] = val[0]['poLine']
//row['batch'] = val[0]['toBatch']
//row['altBatch'] = val[0]['altBatch']
//row['itemCode'] = val[0]['itemCode']
//row['itemName'] = val[0]['itemName']
//row['itemDesc1'] = val[0]['itemDesc1']
//row['itemDesc2'] = val[0]['itemDesc2']
//row['projectCode'] = val[0]['projectCode']
//row['qty'] = val[0]['qty']
//row['uom'] = val[0]['uom']
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
//setV['ppNumber'] = val[0]['ppNumber']
//setV['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV) formRef.setValues(setV)
} }
}) })
} }
// 查询页面返回——详情
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
// 子表新增的时候选择表格之后需要会显得字段 // 子表新增的时候选择表格之后需要会显得字段
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = [] const Echo = []

64
src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
View File

@ -1,8 +1,12 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = { const queryParams = {
pageSize:10, pageSize:10,
@ -28,6 +32,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '从库位类型范围', label: '从库位类型范围',
@ -39,6 +44,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -48,6 +54,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
isSearch: true, isSearch: true,
isForm: false,
}, },
{ {
label: '单据号', label: '单据号',
@ -72,7 +79,8 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
disabled: true disabled: true
} }
} },
isForm: false,
}, },
{ {
label: '备注', label: '备注',
@ -132,6 +140,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isForm: false,
}, },
{ {
label: '截止时间', label: '截止时间',
@ -352,6 +361,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '包装号', label: '包装号',
@ -360,6 +371,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '器具号', label: '器具号',
@ -368,6 +381,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '批次', label: '批次',
@ -384,6 +399,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '库存状态', label: '库存状态',
@ -395,6 +412,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '原因', label: '原因',
@ -406,6 +425,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '物品名称', label: '物品名称',
@ -414,6 +435,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '物品描述1', label: '物品描述1',
@ -422,6 +445,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '物品描述2', label: '物品描述2',
@ -430,6 +455,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '数量', label: '数量',
@ -440,6 +467,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
},
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
} }
}, },
{ {
@ -449,6 +485,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
isTableForm: false,
}, },
{ {
label: '计量单位', label: '计量单位',
@ -460,6 +498,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
tableForm: {
type: 'Select'
}
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -514,6 +555,25 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage
}
}
}, },
{ {
label: '备注', label: '备注',

Write Preview
Loading…
Cancel
Save