Browse Source

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

master_hella_20240701
zhaoxuebing 7 months ago
parent
commit
975da3a8ce
  1. 63
      src/api/mes/workSchedulingQaform/index.ts
  2. 38
      src/views/mes/orderDay/components/schedule.vue
  3. 4
      src/views/mes/orderDay/index.vue
  4. 119
      src/views/mes/workScheduling/workScheduling.data.ts
  5. 244
      src/views/mes/workSchedulingQaform/index.vue
  6. 208
      src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts
  7. 1
      src/views/qms/basicDataManage/inspectionScheme/addForm.vue
  8. 2
      src/views/qms/basicDataManage/inspectionScheme/index.vue
  9. 1
      src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts
  10. 2
      src/views/qms/inspection/inspectionRequest/index.vue
  11. 22
      src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts
  12. 11
      src/views/qms/sampleCode/sampleCode.data.ts
  13. 35
      src/views/qms/samplingProcess/samplingProcess.data.ts
  14. 168
      src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
  15. 183
      src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
  16. 212
      src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
  17. 166
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
  18. 191
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
  19. 216
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts

63
src/api/mes/workSchedulingQaform/index.ts

@ -0,0 +1,63 @@
import request from '@/config/axios'
export interface WorkSchedulingQaformVO {
deleteTime: Date
id: number
status: string
concurrencyStamp: number
remark: string
deleter: string
siteId: number
planMaserCode: string
schedulingCode: string
nodeCode: string
qaFormNo: string
qaFormName: string
qaFormType: string
qaTime: Date
qaCount: number
qaCountPassed: number
qaCountNotpassed: number
qaPassRate: string
}
// 查询任务质检单列表
export const getWorkSchedulingQaformPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/mes/work-scheduling-qaform/senior', data })
} else {
return await request.get({ url: `/mes/work-scheduling-qaform/page`, params })
}
}
// 查询任务质检单详情
export const getWorkSchedulingQaform = async (id: number) => {
return await request.get({ url: `/mes/work-scheduling-qaform/get?id=` + id })
}
// 新增任务质检单
export const createWorkSchedulingQaform = async (data: WorkSchedulingQaformVO) => {
return await request.post({ url: `/mes/work-scheduling-qaform/create`, data })
}
// 修改任务质检单
export const updateWorkSchedulingQaform = async (data: WorkSchedulingQaformVO) => {
return await request.put({ url: `/mes/work-scheduling-qaform/update`, data })
}
// 删除任务质检单
export const deleteWorkSchedulingQaform = async (id: number) => {
return await request.delete({ url: `/mes/work-scheduling-qaform/delete?id=` + id })
}
// 导出任务质检单 Excel
export const exportWorkSchedulingQaform = async (params) => {
return await request.download({ url: `/mes/work-scheduling-qaform/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/mes/work-scheduling-qaform/get-import-template' })
}

38
src/views/mes/orderDay/components/schedule.vue

@ -36,24 +36,25 @@
<el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%" @cell-dblclick="userAddNode"> <el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%" @cell-dblclick="userAddNode">
<el-table-column prop="code" label="工序编码" /> <el-table-column prop="code" label="工序编码" />
<el-table-column prop="name" label="工序名称" /> <el-table-column prop="name" label="工序名称" />
<el-table-column prop="opera" label="" width="60"> <!-- <el-table-column prop="opera" label="" width="60">
<template #header> <template #header>
<span>操作</span> <span>操作</span>
</template> </template>
<!-- <template #default="scope"> <template #default="scope">
<el-button type="danger" size="mini" text @click="deleteNode(scope.row)" <el-button type="danger" size="mini" text @click="deleteNode(scope.row)"
>移除</el-button >移除</el-button
> >
</template> --> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
</el-card> </el-card>
</el-aside> </el-aside>
<el-main style="height: 320px;width: calc(100% - 980px);padding: 0px; margin:0px 20px"> <el-main style="height: 480px; width: calc(100% - 980px);padding: 0px; margin:0px 20px">
<div ref="graphContainer"></div <div ref="graphContainer"></div
></el-main> ></el-main>
<el-aside width="640px"> <el-aside width="640px">
<el-tabs v-model="activeName"> <el-tag>工序编码{{currentNode.id}} -工序名称:{{currentNode.attrs.title.text }}</el-tag>
<el-tabs v-model="activeName" >
<el-tab-pane label="工序工位" name="workstation"> <el-tab-pane label="工序工位" name="workstation">
<el-table :data="workstationData" ref="tableWorkstations" style="width: 100%; height: 80%"> <el-table :data="workstationData" ref="tableWorkstations" style="width: 100%; height: 80%">
<el-table-column prop="stationName" label="工位名称" /> <el-table-column prop="stationName" label="工位名称" />
@ -76,7 +77,17 @@
<el-table-column prop="sourceMaterialCounts" label="需求物料数"> <el-table-column prop="sourceMaterialCounts" label="需求物料数">
<template #default="scope">{{ getTotalcounts(scope.row.repMaterialCounts) }}</template> <template #default="scope">{{ getTotalcounts(scope.row.repMaterialCounts) }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="replaceFlag" label="是否替换" /> <el-table-column prop="replaceFlag" label="是否替换" >
<template #default="scope">
<el-switch
v-model="scope.row.replaceFlag"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="是"
inactive-text="否"
/>
</template>
</el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工序人员" name="workers"> <el-tab-pane label="工序人员" name="workers">
@ -211,7 +222,7 @@ const graphContainer = ref<HTMLElement | null>(null)
const graph = ref<Graph>() const graph = ref<Graph>()
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
const activeName = ref('process') const activeName = ref('workstation')
const formLoading = ref(false) const formLoading = ref(false)
const dialogFormVisibleUser = ref(false) const dialogFormVisibleUser = ref(false)
const processData = ref([]) const processData = ref([])
@ -249,6 +260,7 @@ const workstationData=ref([])
const dialogVisible = ref(false) // const dialogVisible = ref(false) //
const dialogTitle = ref('') // const dialogTitle = ref('') //
const graphJson =ref() const graphJson =ref()
const currentNode = ref({})
/*班组数据*/ /*班组数据*/
const teamData = ref([]) const teamData = ref([])
/*班组弹窗搜索条件*/ /*班组弹窗搜索条件*/
@ -309,9 +321,9 @@ const open = async (type: string, row?: any, titleName?: any) => {
queryParams.batchCode=row.batchCode queryParams.batchCode=row.batchCode
// //
if (titleName) { if (titleName) {
dialogTitle.value = t('action.' + titleName) dialogTitle.value = titleName
} else { } else {
dialogTitle.value = t('action.' + type) dialogTitle.value = type
} }
nextTick?.(() => { nextTick?.(() => {
graph.value = createGraph(graphContainer.value as HTMLElement, true, 240, 320) graph.value = createGraph(graphContainer.value as HTMLElement, true, 240, 320)
@ -388,6 +400,7 @@ const nodeClick = (e, x, y, node, view) => {
getConfigProcessWorker(node.id) getConfigProcessWorker(node.id)
getConfigProcessEquipment(node.id) getConfigProcessEquipment(node.id)
processCode.value = node.id processCode.value = node.id
currentNode.value=node
} }
const searchTableRef = ref() const searchTableRef = ref()
@ -453,9 +466,10 @@ const doPublishPlan= ()=>{
endTime: detailData.value.endTime, endTime: detailData.value.endTime,
taskMode: detailData.value.taskMode taskMode: detailData.value.taskMode
} }
//console.log("-------",data)
let res = OrderDayApi.publishPlan(data) let res = OrderDayApi.publishPlan(data)
if(res.code==0){ console.log("---doPublishPlan-- 458--",res)
if(res.code===0){
message.success("计划发布成功") message.success("计划发布成功")
}else { }else {
message.error(res.msg) message.error(res.msg)

4
src/views/mes/orderDay/index.vue

@ -264,7 +264,7 @@ const openForm = (type: string, row?: any) => {
const formsSuccess = async (formType,data) => { const formsSuccess = async (formType,data) => {
if (formType === 'create') { if (formType === 'create') {
let ret=await OrderDayApi.createOrderDay(data) let ret= OrderDayApi.createOrderDay(data)
if(ret===undefined || ret===null){ if(ret===undefined || ret===null){
message.error(t('common.networkError')) message.error(t('common.networkError'))
}else{ }else{
@ -272,7 +272,7 @@ const formsSuccess = async (formType,data) => {
} }
} else { } else {
let ret=await OrderDayApi.updateOrderDay(data) let ret= OrderDayApi.updateOrderDay(data)
if(ret.code==0){ if(ret.code==0){
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
}else{ }else{

119
src/views/mes/workScheduling/workScheduling.data.ts

@ -1,5 +1,6 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import { ElTag } from 'element-plus'
// 表单校验 // 表单校验
export const WorkSchedulingRules = reactive({ export const WorkSchedulingRules = reactive({
@ -48,6 +49,13 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
isForm: true, isForm: true,
form:{
component: 'Input',
componentProps: {
placeholder: '请输入计划编号',
disabled:true
}
}
}, },
{ {
label: '工单编号', label: '工单编号',
@ -88,7 +96,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
label: '计划数量', label: '计划数量',
field: 'planCount', field: 'planCount',
sort: 'custom', sort: 'custom',
isForm: true, isForm: false,
}, },
{ {
label: '完工数量', label: '完工数量',
@ -143,7 +151,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
label: '工单模式', label: '工单模式',
field: 'formType', field: 'formType',
sort: 'custom', sort: 'custom',
isForm: true, isForm: false,
dictType: DICT_TYPE.MES_WORKBILL_MODEL, dictType: DICT_TYPE.MES_WORKBILL_MODEL,
dictClass: 'string', dictClass: 'string',
form: { form: {
@ -173,7 +181,7 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'id', field: 'id',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isTable: false, isTable: true,
isForm:false, isForm:false,
isDetail:false, isDetail:false,
}, },
@ -186,15 +194,7 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive<CrudSchema[]>([
isForm:false, isForm:false,
isDetail:false, isDetail:false,
}, },
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: false,
isTable: false,
isForm:false,
isDetail:false,
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -219,16 +219,16 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, },
{ // {
label: '任务ID', // label: '任务ID',
field: 'schedulingId', // field: 'schedulingId',
sort: 'custom', // sort: 'custom',
isSearch: true, // isSearch: true,
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
value: 0 // value: 0
}, // },
}, // },
{ {
label: '任务序号', label: '任务序号',
field: 'taskSort', field: 'taskSort',
@ -247,30 +247,55 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '允许工位', label: '允许工位',
field: 'workstationValidate', field: 'workstationValidate',
formatter: (_: Recordable, __: TableColumn, cellValue: String) => {
return h(
ElTag,
{
type:'primary'
},
() =>
JSON.parse(cellValue).map((item: any) => {
return '['+item.name+']'
}).join('\r\n')
)
},
sort: 'custom', sort: 'custom',
}, },
{ {
label: '允许设备', label: '允许设备',
field: 'deviceValidate', field: 'deviceValidate',
formatter: (_: Recordable, __: TableColumn, cellValue: String) => {
return h(
ElTag,
{
type:'primary'
},
() =>
JSON.parse(cellValue).map((item: any) => {
return '['+item.name+']'
}).join('\r\n')
)
},
sort: 'custom', sort: 'custom',
}, },
{ {
label: '允许人员', label: '允许人员',
field: 'personValidate', field: 'personValidate',
formatter: (_: Recordable, __: TableColumn, cellValue: String) => {
return h(
ElTag,
{
type:'primary'
},
() =>
JSON.parse(cellValue).map((item: any) => {
return '['+item.name+']'
}).join('\r\n')
)
},
sort: 'custom', sort: 'custom',
}, },
{
label: '报工人',
field: 'reportPerson',
sort: 'custom',
isSearch: true,
},
{
label: '生产人',
field: 'receivePerson',
sort: 'custom',
isSearch: true,
},
{ {
label: '计划数量', label: '计划数量',
field: 'planCount', field: 'planCount',
@ -280,6 +305,12 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive<CrudSchema[]>([
value: 0 value: 0
}, },
}, },
{
label: '报工人',
field: 'reportPerson',
sort: 'custom',
isSearch: true,
},
{ {
label: '报工数量', label: '报工数量',
field: 'reportCount', field: 'reportCount',
@ -328,10 +359,26 @@ export const WorkSchedulingDetail = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, },
{
label: '生产人',
field: 'receivePerson',
sort: 'custom',
isSearch: true,
},
// {
// label: '生产物料',
// field: 'materialValidate',
// sort: 'custom',
// },
{ {
label: '生产物料', label: '备注',
field: 'materialValidate', field: 'remark',
sort: 'custom', sort: 'custom',
isSearch: false,
isTable: false,
isForm:false,
isDetail:false,
}, },
{ {
label: '操作', label: '操作',

244
src/views/mes/workSchedulingQaform/index.vue

@ -0,0 +1,244 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="WorkSchedulingQaform.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="WorkSchedulingQaform.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #id="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.id)">
<span>{{ row.id }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="WorkSchedulingQaformRules"
:formAllSchemas="WorkSchedulingQaform.allSchemas"
:apiUpdate="WorkSchedulingQaformApi.updateWorkSchedulingQaform"
:apiCreate="WorkSchedulingQaformApi.createWorkSchedulingQaform"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="WorkSchedulingQaform.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/mes/work-scheduling-qaform/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { WorkSchedulingQaform,WorkSchedulingQaformRules } from './workSchedulingQaform.data'
import * as WorkSchedulingQaformApi from '@/api/mes/workSchedulingQaform'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'MesWorkSchedulingQaform' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(WorkSchedulingQaform.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: WorkSchedulingQaformApi.getWorkSchedulingQaformPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'mes:workSchedulingQaform:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'mes:workSchedulingQaform:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'mes:workSchedulingQaform:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'mes:workSchedulingQaform:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'mes:workSchedulingQaform:delete'}), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
// form
const formsSuccess = async (formType,data) => {
var isHave =WorkSchedulingQaform.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
message.error('失效时间要大于生效时间')
return;
}
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') {
await WorkSchedulingQaformApi.createWorkSchedulingQaform(data)
message.success(t('common.createSuccess'))
} else {
await WorkSchedulingQaformApi.updateWorkSchedulingQaform(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkSchedulingQaform')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await WorkSchedulingQaformApi.deleteWorkSchedulingQaform(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await WorkSchedulingQaformApi.exportWorkSchedulingQaform(tableObject.params)
download.excel(data, '任务质检单.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '任务质检单导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await WorkSchedulingQaformApi.importTemplate()
})
</script>

208
src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts

@ -0,0 +1,208 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const WorkSchedulingQaformRules = reactive({
concurrencyStamp: [required],
})
export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '删除时间',
field: 'deleteTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '主键',
field: 'id',
sort: 'custom',
isForm: false,
},
{
label: '状态',
field: 'status',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
form: {
component: 'Radio'
},
},
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
iisSearch: false,
isTable: false,
isForm: false,
isDetail:false,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
isForm: false,
},
{
label: '删除用户名',
field: 'deleter',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '位置ID',
field: 'siteId',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '主计划编号',
field: 'planMasterCode',
sort: 'custom',
isSearch: true,
},
{
label: '工单编号',
field: 'schedulingCode',
sort: 'custom',
isSearch: true,
},
{
label: '工序编号',
field: 'nodeCode',
sort: 'custom',
isSearch: true,
},
{
label: '检验单编号',
field: 'qaFormNo',
sort: 'custom',
isSearch: true,
},
{
label: '检验单名称',
field: 'qaFormName',
sort: 'custom',
isSearch: true,
},
{
label: '检验类型',
field: 'qaFormType',
sort: 'custom',
isSearch: true,
},
{
label: '检验时间',
field: 'qaTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: true,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '检测数量',
field: 'qaCount',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '检测合格数量',
field: 'qaCountPassed',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '检测不合格数量',
field: 'qaCountNotpassed',
sort: 'custom',
isSearch: true,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '合格率',
field: 'qaPassRate',
sort: 'custom',
isSearch: true,
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

1
src/views/qms/basicDataManage/inspectionScheme/addForm.vue

@ -845,6 +845,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
available: 'TRUE', available: 'TRUE',
dynamicUpdateCode:'', dynamicUpdateCode:'',
description:"", description:"",
samplePieceSize:"",
isWhole:"TRUE", isWhole:"TRUE",
process: [] process: []
} }

2
src/views/qms/basicDataManage/inspectionScheme/index.vue

@ -180,6 +180,8 @@ const submitForm = async (formType,data) => {
inspectionLevel: data.inspectionLevel, inspectionLevel: data.inspectionLevel,
effectiveDate: data.effectiveDate, effectiveDate: data.effectiveDate,
expirationDate: data.expirationDate, expirationDate: data.expirationDate,
samplePieceSize: data.samplePieceSize,
isWhole: data.isWhole,
available: data.available, available: data.available,
content:JSON.stringify(data.process) content:JSON.stringify(data.process)
} }

1
src/views/qms/basicDataManage/inspectionScheme/inspectionScheme.data.ts

@ -67,6 +67,7 @@ export const InspectionTemplateRules = reactive({
quantifyQuantifyCode: [ quantifyQuantifyCode: [
{ required: true, message: '请输入选择集编码', trigger: 'blur' } { required: true, message: '请输入选择集编码', trigger: 'blur' }
], ],
isWhole: [{ required: true}],
}) })
export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([ export const InspectionSchemeMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {

2
src/views/qms/inspection/inspectionRequest/index.vue

@ -61,7 +61,7 @@
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionMain.data' import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionRequestMain.data'
import * as InspectionMainApi from '@/api/qms/inspectionRequest' import * as InspectionMainApi from '@/api/qms/inspectionRequest'
import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage' import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'

22
src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts → src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts

@ -338,8 +338,26 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
} }
}, }, {
{ label: '检验水平',
field: 'inspectionLevel',
sort: 'custom',
dictType: DICT_TYPE.INSPECTION_LEVEL,
dictClass: 'string',
table: {
width: 150
},
isSearch: true,
}, {
label: 'aql',
field: 'aql',
sort: 'custom',
dictType: DICT_TYPE.BASIC_AQL,
dictClass: 'string',
table: {
width: 150
}
}, {
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isForm: false,

11
src/views/qms/sampleCode/sampleCode.data.ts

@ -7,9 +7,14 @@ import {validateNum} from "@/utils/validator";
export const SampleCodeRules = reactive({ export const SampleCodeRules = reactive({
code: [required], code: [required],
batchLowLimiting: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], batchLowLimiting: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
batchUpperLimiting: [ batchUpperLimiting: [{ required:true, message: '该项为必填', trigger: 'blur'}, { validator:validateNum, message: '请输入整数', trigger: 'blur'}],
{ required:true, message: '该项为必填', trigger: 'blur'}, s1: [{ required }],
{ validator:validateNum, message: '请输入整数', trigger: 'blur'}], s2: [{ required }],
s3: [{ required }],
s4: [{ required }],
g1: [{ required }],
g2: [{ required }],
g3: [{ required }]
}) })
const samplingSchemeList = await getSamplingScheme() const samplingSchemeList = await getSamplingScheme()
export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([

35
src/views/qms/samplingProcess/samplingProcess.data.ts

@ -29,10 +29,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
label: '描述', label: '描述',
field: 'description', field: 'description',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true
table: {
width: 175
}
}, },
{ {
label: '取样类型', label: '取样类型',
@ -43,31 +40,22 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true, isSearch: true,
form: { form: {
component: 'Select' component: 'Select'
},
table: {
width: 140
} }
}, },
{ {
label: '评估模式', label: '评估模式',
field: 'evaluationMode', field: 'evaluationMode',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.EVALUATION_MODE, dictType: DICT_TYPE.EVALUATION_MODE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑 dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: { form: {
component: 'Select' component: 'Select'
}, }
table: {
width: 140
}
}, },
{ {
label: '样品份数', label: '样品份数',
field: 'sampleQty', field: 'sampleQty',
sort: 'custom', sort: 'custom'
table: {
width: 140
}
}, },
{ {
label: '采样方案编码', label: '采样方案编码',
@ -82,9 +70,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
valueField: 'code' valueField: 'code'
}, },
} }
},
table: {
width: 175
} }
}, },
{ {
@ -104,9 +89,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
} }
},
table: {
width: 175
} }
}, },
{ {
@ -122,9 +104,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
inactiveValue: 'FALSE', inactiveValue: 'FALSE',
activeValue: 'TRUE' activeValue: 'TRUE'
} }
},
table: {
width: 110
} }
}, },
{ {

168
src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@ -15,6 +15,18 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isSearch: true, isSearch: true,
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '申请单号', label: '申请单号',
field: 'requestNumber', field: 'requestNumber',
@ -22,6 +34,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isSearch: true, isSearch: true,
}, },
// { // {
@ -39,6 +52,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '申请时间', label: '申请时间',
@ -51,6 +65,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -71,6 +86,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -99,6 +115,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -119,6 +136,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -135,19 +153,9 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '优先级', label: '优先级',
field: 'priority', field: 'priority',
@ -158,6 +166,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '优先级增量', label: '优先级增量',
@ -169,6 +178,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '部门', label: '部门',
@ -177,6 +187,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '承接人用户名', label: '承接人用户名',
@ -185,6 +196,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '承接时间', label: '承接时间',
@ -197,6 +209,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -213,6 +226,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '完成时间', label: '完成时间',
@ -225,6 +239,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -239,7 +254,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -251,7 +266,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -264,6 +279,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -272,6 +288,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -284,6 +301,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -300,6 +318,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到仓库代码', label: '到仓库代码',
@ -308,6 +327,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -316,6 +336,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到库区代码范围', label: '到库区代码范围',
@ -324,13 +345,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '自动完成', label: '自动完成',
field: 'autoComplete', field: 'autoComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -349,7 +371,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyLocation', field: 'allowModifyLocation',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -368,7 +390,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyQty', field: 'allowModifyQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -387,7 +409,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowBiggerQty', field: 'allowBiggerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -406,7 +428,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowSmallerQty', field: 'allowSmallerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -425,7 +447,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyInventoryStatus', field: 'allowModifyInventoryStatus',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -444,7 +466,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowContinuousScanning', field: 'allowContinuousScanning',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -463,7 +485,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowPartialComplete', field: 'allowPartialComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -482,7 +504,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyBatch', field: 'allowModifyBatch',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -501,7 +523,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyPackingNumber', field: 'allowModifyPackingNumber',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -587,16 +609,32 @@ export const ProductputawayJobMainRules = reactive({
*/ */
export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '包装号', label: '采购订单号',
field: 'packingNumber', field: 'poNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '器具号', label: '订单行',
field: 'containerNumber', field: 'poLine',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料名称',
field: 'itemName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -611,64 +649,80 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '库存状态', label: '包装号',
field: 'inventoryStatus', field: 'packingNumber',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '订单号', label: '包装规格',
field: 'poNumber', field: 'packUnit',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '订单行', label: '包装数量',
field: 'poLine', field: 'packQty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从库位代码', label: '计量单位',
field: 'fromLocationCode', field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '到库位代码', label: '器具号',
field: 'toLocationCode', field: 'containerNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTable: false
}, },
{ {
label: '物料代码', label: '库存状态',
field: 'itemCode', field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '物料名称', label: '从库位代码',
field: 'itemName', field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '物料描述1', label: '物料描述1',
field: 'itemDesc1', field: 'itemDesc1',
@ -676,6 +730,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '物料描述2', label: '物料描述2',
@ -684,6 +739,8 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '项目代码', label: '项目代码',
@ -692,6 +749,8 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '数量', label: '数量',
@ -700,21 +759,12 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -722,6 +772,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
hiddenInMain: true
}, },
{ {
label: '备注', label: '备注',
@ -730,6 +781,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '从货主代码', label: '从货主代码',
@ -738,6 +790,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -746,6 +799,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '创建时间', label: '创建时间',
@ -766,6 +820,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x', valueFormat: 'x',
} }
}, },
hiddenInMain: true
}, },
{ {
label: '创建者', label: '创建者',
@ -774,6 +829,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
])) ]))

183
src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@ -15,6 +15,19 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isSearch: true isSearch: true
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
sortTableDefault:1,
},
{ {
label: '申请单号', label: '申请单号',
field: 'requestNumber', field: 'requestNumber',
@ -22,6 +35,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isSearch: true isSearch: true
}, },
{ {
@ -31,6 +45,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isSearch: true isSearch: true
}, },
// { // {
@ -48,6 +63,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '入库事务类型', label: '入库事务类型',
@ -56,6 +72,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '执行时间', label: '执行时间',
@ -68,6 +85,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -88,6 +106,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -109,6 +128,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -129,6 +149,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -145,13 +166,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '接口类型', label: '接口类型',
field: 'interfaceType', field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE, dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -164,6 +186,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -172,6 +195,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建者', label: '创建者',
@ -180,6 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -192,6 +217,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -216,6 +242,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -224,13 +251,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从库区类型范围', label: '从库区类型范围',
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -243,13 +271,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到库区类型范围', label: '到库区类型范围',
field: 'toAreaTypes', field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -262,6 +291,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '是否可用', label: '是否可用',
@ -269,7 +299,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -283,6 +313,24 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '包装号', // 子表数据 只是为了展示
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:6,
},
{
label: '批次', // 子表数据 只是为了展示
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:5,
},
])) ]))
//表单校验 //表单校验
@ -342,41 +390,61 @@ export const ProductputawayRecordMainRules = reactive({
*/ */
export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '从包装号', label: '采购订单号',
field: 'fromPackingNumber', field: 'poNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:2,
}, },
{ {
label: '到包装号', label: '订单行',
field: 'toPackingNumber', field: 'poLine',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:2,
}, },
{ {
label: '从批次', label: '物料代码',
field: 'fromBatch', field: 'itemCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:3,
}, },
{ {
label: '到批次', label: '物料名称',
field: 'toBatch', field: 'itemName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:3,
}, },
{ {
label: '库存状态', label: '包装规格',
field: 'inventoryStatus', field: 'packUnit',
dictType: DICT_TYPE.INVENTORY_STATUS, sort: 'custom',
table: {
width: 150
},
},
{
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: true,
sort: 'custom', sort: 'custom',
@ -385,21 +453,53 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
}, },
}, },
{ {
label: '订单号', label: '从包装号',
field: 'poNumber', field: 'fromPackingNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '订单行', label: '到包装号',
field: 'poLine', field: 'toPackingNumber',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '从批次',
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '到批次',
field: 'toBatch',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从货主代码', label: '从货主代码',
field: 'fromOwnerCode', field: 'fromOwnerCode',
@ -407,6 +507,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '从库位代码', label: '从库位代码',
@ -423,6 +524,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '从库区代码', label: '从库区代码',
@ -431,6 +533,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -439,6 +542,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到库位代码', label: '到库位代码',
@ -455,6 +559,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到库区代码', label: '到库区代码',
@ -463,6 +568,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '单据号', label: '单据号',
@ -471,14 +577,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
}, hiddenInMain: true
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
}, },
{ {
label: '备注', label: '备注',
@ -487,6 +586,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '创建时间', label: '创建时间',
@ -507,6 +607,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
valueFormat: 'x', valueFormat: 'x',
} }
}, },
hiddenInMain: true
}, },
{ {
label: '创建者', label: '创建者',
@ -515,14 +616,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
}, hiddenInMain: true
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
}, },
{ {
label: '物料描述1', label: '物料描述1',
@ -531,6 +625,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '物料描述2', label: '物料描述2',
@ -539,6 +634,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '项目代码', label: '项目代码',
@ -547,6 +643,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '数量', label: '数量',
@ -555,21 +652,12 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
// { // {
// label: '代码', // label: '代码',
// field: 'code', // field: 'code',
@ -584,6 +672,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
dictType: DICT_TYPE.INTERFACE_TYPE, dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: true,
hiddenInMain: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -604,6 +693,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到器具号', label: '到器具号',
@ -612,6 +702,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
])) ]))

212
src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts

@ -41,6 +41,25 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false, isForm: false,
isSearch: true, isSearch: true,
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isForm:false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
// { // {
// label: '供应商代码', // label: '供应商代码',
// field: 'supplierCode', // field: 'supplierCode',
@ -58,6 +77,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -65,7 +85,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -79,6 +99,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -88,6 +109,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: { form: {
value: 'ProductPutaway', value: 'ProductPutaway',
componentProps: { componentProps: {
@ -116,6 +138,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -133,6 +156,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false isForm: false
}, },
{ {
@ -146,6 +170,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -167,6 +192,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -185,6 +211,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => { formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name return userDeptArray.find((account) => account.id == cellValue)?.name
}, },
@ -201,25 +228,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isForm:false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
{ {
label: '最后更新时间', label: '最后更新时间',
field: 'updateTime', field: 'updateTime',
@ -231,6 +240,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -248,6 +258,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -257,6 +268,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -265,7 +277,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -279,6 +291,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -286,7 +299,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoCommit', field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -307,7 +320,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoAgree', field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -328,7 +341,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoExecute', field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -406,6 +419,26 @@ export const ProductputawayRequestMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '采购订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{
label: '订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',
@ -435,8 +468,18 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
{ {
label: '包装号', label: '物料名称',
field: 'packingNumber', field: 'itemName',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false
},
{
label: '批次',
field: 'batch',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -451,8 +494,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
{ {
label: '器具号', label: '包装号',
field: 'containerNumber', field: 'packingNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -467,8 +510,27 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
{ {
label: '批次', label: '包装规格',
field: 'batch', field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
},
{
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -478,7 +540,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
disabled: true disabled: true
} }
}, },
tableForm: { tableForm:{
type: 'Select',
disabled: true disabled: true
} }
}, },
@ -502,26 +565,6 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
disabled: true disabled: true
} }
}, },
{
label: '订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{
label: '订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{ {
label: '从库位代码', label: '从库位代码',
field: 'fromLocationCode', field: 'fromLocationCode',
@ -545,6 +588,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 180 width: 180
}, },
hiddeInMain: true,
isTableForm: false, isTableForm: false,
form: { form: {
componentProps: { componentProps: {
@ -552,6 +596,15 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
} }
}, },
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
hiddeInMain: true,
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -563,6 +616,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 180 width: 180
}, },
hiddeInMain: true,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -581,19 +635,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddeInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false
},
{ {
label: '物料描述1', label: '物料描述1',
field: 'itemDesc1', field: 'itemDesc1',
@ -601,6 +647,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddeInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -611,6 +658,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddeInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -621,6 +669,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddeInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -631,6 +680,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddeInMain: true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
@ -644,26 +694,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
precision: 6 precision: 6
} }
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm:{
type: 'Select',
disabled: true
}
},
{ {
label: '从货主代码', label: '从货主代码',
field: 'fromOwnerCode', field: 'fromOwnerCode',
@ -671,6 +702,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddeInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -681,16 +713,27 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddeInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
{ {
label: '备注', label: '器具号',
field: 'remark', field: 'containerNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: {
componentProps: {
disabled: true
}
},
tableForm: {
disabled: true
}
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -703,6 +746,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -721,6 +765,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -734,6 +779,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
hiddenInMain:true,
isTableForm:false, isTableForm:false,
} }
])) ]))

166
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts

@ -15,6 +15,18 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isSearch: true, isSearch: true,
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '申请单号', label: '申请单号',
field: 'requestNumber', field: 'requestNumber',
@ -23,6 +35,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180 width: 180
}, },
isSearch: true, isSearch: true,
isTable: false,
}, },
// { // {
// label: '供应商代码', // label: '供应商代码',
@ -39,6 +52,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '申请时间', label: '申请时间',
@ -51,6 +66,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -71,6 +87,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -99,6 +116,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -119,6 +137,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -135,25 +154,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '优先级', label: '优先级',
field: 'priority', field: 'priority',
form: { form: {
component: 'InputNumber', component: 'InputNumber',
}, },
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -165,6 +175,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'InputNumber', component: 'InputNumber',
}, },
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -177,6 +188,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '承接人用户名', label: '承接人用户名',
@ -185,6 +197,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '承接时间', label: '承接时间',
@ -197,6 +210,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -213,6 +227,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '完成时间', label: '完成时间',
@ -225,6 +240,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -239,7 +255,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -251,7 +267,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -264,6 +280,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -272,6 +290,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -284,6 +303,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -300,6 +320,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到仓库代码', label: '到仓库代码',
@ -308,6 +329,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -316,6 +338,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到库区代码范围', label: '到库区代码范围',
@ -324,13 +347,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '自动完成', label: '自动完成',
field: 'autoComplete', field: 'autoComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -349,7 +373,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyLocation', field: 'allowModifyLocation',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -368,7 +392,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyQty', field: 'allowModifyQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -387,7 +411,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowBiggerQty', field: 'allowBiggerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -406,7 +430,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowSmallerQty', field: 'allowSmallerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -425,7 +449,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyInventoryStatus', field: 'allowModifyInventoryStatus',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -444,7 +468,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowContinuousScanning', field: 'allowContinuousScanning',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -463,7 +487,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowPartialComplete', field: 'allowPartialComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -482,7 +506,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyBatch', field: 'allowModifyBatch',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -501,7 +525,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyPackingNumber', field: 'allowModifyPackingNumber',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -587,16 +611,32 @@ export const ProductputawayJobMainRules = reactive({
*/ */
export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '包装号', label: '采购订单号',
field: 'packingNumber', field: 'poNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '器具号', label: '订单行',
field: 'containerNumber', field: 'poLine',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料名称',
field: 'itemName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -611,59 +651,62 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '库存状态', label: '包装号',
field: 'inventoryStatus', field: 'packingNumber',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '订单号', label: '包装规格',
field: 'poNumber', field: 'packUnit',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '订单行', label: '包装数量',
field: 'poLine', field: 'packQty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从库位代码', label: '计量单位',
field: 'fromLocationCode', field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '到库位代码', label: '库存状态',
field: 'toLocationCode', field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '物料代码', label: '从库位代码',
field: 'itemCode', field: 'fromLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '物料名称', label: '到库位代码',
field: 'itemName', field: 'toLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -676,6 +719,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true
}, },
{ {
label: '物料描述2', label: '物料描述2',
@ -684,6 +728,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true
}, },
{ {
label: '项目代码', label: '项目代码',
@ -692,6 +737,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true
}, },
{ {
label: '数量', label: '数量',
@ -700,21 +746,12 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -722,6 +759,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
hiddenInMain:true
}, },
{ {
label: '备注', label: '备注',
@ -730,6 +768,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true
}, },
{ {
label: '从货主代码', label: '从货主代码',
@ -738,6 +777,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -746,6 +786,8 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true
}, },
{ {
label: '创建时间', label: '创建时间',
@ -758,6 +800,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
hiddenInMain:true ,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -774,6 +817,17 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true
},
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false
}, },
])) ]))

191
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts

@ -15,6 +15,19 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isSearch: true isSearch: true
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
sortTableDefault:1,
},
{ {
label: '申请单号', label: '申请单号',
field: 'requestNumber', field: 'requestNumber',
@ -22,6 +35,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isSearch: true isSearch: true
}, },
{ {
@ -31,6 +45,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isSearch: true isSearch: true
}, },
// { // {
@ -48,6 +63,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '入库事务类型', label: '入库事务类型',
@ -56,6 +72,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '执行时间', label: '执行时间',
@ -68,6 +85,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -88,6 +106,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -109,6 +128,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -129,6 +149,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -145,13 +166,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '接口类型', label: '接口类型',
field: 'interfaceType', field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE, dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -164,6 +186,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -172,6 +195,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建者', label: '创建者',
@ -180,6 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -192,6 +217,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -216,6 +242,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从库区代码范围', label: '从库区代码范围',
@ -224,13 +251,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从库区类型范围', label: '从库区类型范围',
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -243,13 +271,14 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到库区类型范围', label: '到库区类型范围',
field: 'toAreaTypes', field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -262,6 +291,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '是否可用', label: '是否可用',
@ -269,7 +299,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -283,6 +313,24 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '包装号', // 子表数据 只是为了展示
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:6,
},
{
label: '批次', // 子表数据 只是为了展示
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:5,
},
])) ]))
//表单校验 //表单校验
@ -342,41 +390,61 @@ export const ProductputawayRecordMainRules = reactive({
*/ */
export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '从包装号', label: '采购订单号',
field: 'fromPackingNumber', field: 'poNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:2,
}, },
{ {
label: '到包装号', label: '订单行',
field: 'toPackingNumber', field: 'poLine',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:2,
}, },
{ {
label: '从批次', label: '物料代码',
field: 'fromBatch', field: 'itemCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:3,
}, },
{ {
label: '到批次', label: '物料名称',
field: 'toBatch', field: 'itemName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
sortTableDefault:3,
}, },
{ {
label: '库存状态', label: '包装规格',
field: 'inventoryStatus', field: 'packUnit',
dictType: DICT_TYPE.INVENTORY_STATUS, sort: 'custom',
table: {
width: 150
},
},
{
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: true,
sort: 'custom', sort: 'custom',
@ -385,21 +453,55 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
}, },
}, },
{ {
label: '订单号', label: '从包装号',
field: 'poNumber', field: 'fromPackingNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '订单行', label: '到包装号',
field: 'poLine', field: 'toPackingNumber',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '从批次',
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '到批次',
field: 'toBatch',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从货主代码', label: '从货主代码',
field: 'fromOwnerCode', field: 'fromOwnerCode',
@ -407,6 +509,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '从库位代码', label: '从库位代码',
@ -423,6 +526,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '从库区代码', label: '从库区代码',
@ -431,6 +535,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -439,6 +544,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到库位代码', label: '到库位代码',
@ -455,6 +561,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到库区代码', label: '到库区代码',
@ -463,6 +570,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '单据号', label: '单据号',
@ -471,15 +579,9 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
hiddenInMain: true
}, },
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -487,6 +589,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '创建时间', label: '创建时间',
@ -499,6 +602,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
hiddenInMain: true,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -515,15 +619,10 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '物料描述1', label: '物料描述1',
field: 'itemDesc1', field: 'itemDesc1',
@ -531,6 +630,8 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '物料描述2', label: '物料描述2',
@ -539,6 +640,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '项目代码', label: '项目代码',
@ -547,6 +649,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '数量', label: '数量',
@ -555,21 +658,12 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
// { // {
// label: '代码', // label: '代码',
// field: 'code', // field: 'code',
@ -588,6 +682,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
// { // {
// label: '任务明细ID', // label: '任务明细ID',
@ -604,6 +699,8 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '到器具号', label: '到器具号',
@ -612,6 +709,8 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
])) ]))

216
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts

@ -41,6 +41,25 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false, isForm: false,
isSearch: true, isSearch: true,
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isForm:false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
// { // {
// label: '供应商代码', // label: '供应商代码',
// field: 'supplierCode', // field: 'supplierCode',
@ -58,6 +77,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -65,7 +85,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -79,6 +99,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -88,6 +109,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: { form: {
value: 'ProductPutaway', value: 'ProductPutaway',
componentProps: { componentProps: {
@ -116,6 +138,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -133,6 +156,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false isForm: false
}, },
{ {
@ -154,6 +178,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -167,6 +192,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -185,6 +211,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => { formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name return userDeptArray.find((account) => account.id == cellValue)?.name
}, },
@ -201,25 +228,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isForm:false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
{ {
label: '最后更新时间', label: '最后更新时间',
field: 'updateTime', field: 'updateTime',
@ -231,6 +240,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -248,6 +258,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -257,6 +268,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -265,7 +277,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -279,6 +291,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -286,7 +299,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoCommit', field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -307,7 +320,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoAgree', field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -328,7 +341,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoExecute', field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -406,6 +419,26 @@ export const ProductputawayRequestMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '采购订单号',
field: 'poNumber',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{
label: '订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',
@ -435,8 +468,18 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
{ {
label: '包装号', label: '物料名称',
field: 'packingNumber', field: 'itemName',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false
},
{
label: '批次',
field: 'batch',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -451,8 +494,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
{ {
label: '器具号', label: '包装号',
field: 'containerNumber', field: 'packingNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -467,8 +510,27 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
}, },
{ {
label: '批次', label: '包装规格',
field: 'batch', field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
},
{
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -478,7 +540,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
disabled: true disabled: true
} }
}, },
tableForm: { tableForm:{
type: 'Select',
disabled: true disabled: true
} }
}, },
@ -502,33 +565,32 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
disabled: true disabled: true
} }
}, },
{ {
label: '订单号', label: '从库位代码',
field: 'poNumber', field: 'fromLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isForm: false, form: {
isTableForm: false, componentProps: {
}, disabled: true
{ }
label: '订单行',
field: 'poLine',
sort: 'custom',
table: {
width: 150
}, },
isForm: false, tableForm: {
isTableForm: false, disabled: true
}
}, },
{ {
label: '从库位代码', label: '器具号',
field: 'fromLocationCode', field: 'containerNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTable:false,
form: { form: {
componentProps: { componentProps: {
disabled: true disabled: true
@ -545,6 +607,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 180 width: 180
}, },
hiddenInMain: true,
isTableForm: false, isTableForm: false,
form: { form: {
componentProps: { componentProps: {
@ -552,6 +615,15 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
} }
} }
}, },
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -563,6 +635,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 180 width: 180
}, },
hiddenInMain: true,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -581,19 +654,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false
},
{ {
label: '物料描述1', label: '物料描述1',
field: 'itemDesc1', field: 'itemDesc1',
@ -601,6 +666,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -611,6 +677,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -622,6 +689,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 width: 150
}, },
isTableForm: false, isTableForm: false,
hiddenInMain: true,
isForm: false isForm: false
}, },
{ {
@ -631,6 +699,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
@ -644,26 +713,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
precision: 6 precision: 6
} }
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
componentProps: {
disabled: true
}
},
tableForm:{
type: 'Select',
disabled: true
}
},
{ {
label: '从货主代码', label: '从货主代码',
field: 'fromOwnerCode', field: 'fromOwnerCode',
@ -671,6 +721,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -681,17 +732,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '最后更新时间', label: '最后更新时间',
field: 'updateTime', field: 'updateTime',
@ -703,6 +748,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -721,6 +767,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -734,6 +781,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
isTable: false,
isTableForm:false, isTableForm:false,
} }
])) ]))

Loading…
Cancel
Save