Browse Source

制品拆解收货修改

master
李胜楠 1 year ago
parent
commit
eec570afe6
  1. 23
      src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
  2. 85
      src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
  3. 12
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  4. 52
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

23
src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@ -104,7 +104,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
nextTick(() => {
if (type == 'tableForm') {
//
row[formField] = val[0][searchField]
if(formField == 'packingNumber'){
row['containerNumber'] = val[0]['containerNumber']
row['itemCode'] = val[0]['itemCode']
row['packingNumber'] = val[0]['packingNumber']
row['batch'] = val[0]['batch']
row['uom'] = val[0]['uom']
row['inventoryStatus'] = val[0]['inventoryStatus']
row['fromLocationCode'] = val[0]['locationCode']
row['produceDate'] = val[0]['produceDate']
row['expireDate'] = val[0]['expireDate']
} else {
row[formField] = val[0][searchField]
}
} else {
const setV = {}
setV[formField] = val[0][searchField]
@ -117,6 +129,15 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
setV['containerNumber'] = val[0]['containerNumber']
setV['itemCode'] = val[0]['itemCode']
setV['packingNumber'] = val[0]['packingNumber']
setV['batch'] = val[0]['batch']
setV['uom'] = val[0]['uom']
setV['inventoryStatus'] = val[0]['inventoryStatus']
setV['fromLocationCode'] = val[0]['locationCode']
setV['produceDate'] = val[0]['produceDate']
setV['expireDate'] = val[0]['expireDate']
formRef.setValues(setV)
})
}

85
src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@ -20,8 +20,8 @@ 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 ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
const { t } = useI18n() // 国际化
@ -518,8 +518,25 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
table: {
width: 150
},
isTableForm: false,
isForm: false,
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: Balance.allSchemas,
searchPage: BalanceApi.getBalancePage
}
}
},
{
label: '器具号',
@ -528,8 +545,9 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
table: {
width: 150
},
isTableForm: false,
isForm: false,
tableForm: {
disabled: true
}
},
{
label: '批次',
@ -538,6 +556,9 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
table: {
width: 150
},
tableForm: {
disabled: true
}
},
{
label: '生产日期',
@ -559,8 +580,11 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
valueFormat: 'x',
}
},
isTableForm: false,
isForm: false,
tableForm: {
disabled: true,
type: 'FormDateTime',
valueFormat: 'x',
}
},
{
label: '过期日期',
@ -582,8 +606,11 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
valueFormat: 'x',
}
},
isTableForm: false,
isForm: false,
tableForm: {
disabled: true,
type: 'FormDateTime',
valueFormat: 'x',
}
},
{
label: '库存状态',
@ -595,8 +622,10 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
table: {
width: 150
},
isTableForm: false,
isForm: false,
tableForm: {
disabled: true,
type: 'Select'
}
},
{
label: '标包数量',
@ -631,6 +660,17 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
isTableForm: false,
isForm: false,
},
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
}
},
{
label: '单据号',
field: 'number',
@ -652,25 +692,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
table: {
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 // 查询弹窗所需分页方法
}
tableForm: {
disabled: true
}
},
{

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

@ -104,21 +104,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
//
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 {
const setV = {}
setV[formField] = val[0][searchField]
//setV['ppNumber'] = val[0]['ppNumber']
//setV['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV)
}
})

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

@ -1,21 +1,30 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
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 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'
import * as ProductionlineApi from '@/api/wms/productionline'
import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
const queryParams = {
pageSize:10,
@ -438,8 +447,25 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTableForm: false,
isForm: false
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: '工位代码',
@ -522,6 +548,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTableForm: false,
isForm: false
},
{
label: '生产日期',
@ -609,6 +637,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
},
},
isTableForm: false,
isForm: false
@ -670,10 +702,10 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage
searchField: 'code',
searchTitle: '物品基础信息信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage
}
}
},
@ -846,9 +878,9 @@ export const ProductreceiptRequestDetailRules = reactive({
// packingNumber: [
// { required: true, message: '请输入包装号', trigger: 'change' }
// ],
batch: [
{ required: true, message: '请输入批次', trigger: 'blur' }
],
// batch: [
// { required: true, message: '请输入批次', trigger: 'blur' }
// ],
// produceDate: [
// { required: true, message: '请选择生产日期', trigger: 'change' }
// ],

Loading…
Cancel
Save