Browse Source

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

master_hella_20240701
liuchen864 7 months ago
parent
commit
6de82dfa0a
  1. 6
      src/api/mes/processroute/index.ts
  2. 56
      src/api/mes/reportpStore/index.ts
  3. 23
      src/views/mes/orderDay/components/schedule.vue
  4. 35
      src/views/mes/processroute/components/configDialog.vue
  5. 244
      src/views/mes/reportpStore/index.vue
  6. 111
      src/views/mes/reportpStore/reportpStore.data.ts
  7. 12
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  8. 194
      src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
  9. 415
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  10. 306
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
  11. 44
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  12. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
  13. 44
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

6
src/api/mes/processroute/index.ts

@ -82,9 +82,9 @@ export const getPatternPage = async (code:String) => {
return await request.get({ url: `/mes/mes-process-pattern/pagePatternByProcessCode?pageSize=25&processCode=`+code })
}
// 查询物料列表
export const getItembasicPage = async (code:String) => {
return await request.get({ url: `/mes/mes-process-itembasic/pageByProcessCode?pageSize=25&processCode=`+code})
// 查询产品物料列表
export const getProcessBomList = async (params) => {
return await request.get({ url: `/mes/common/getBomListByProductAndProcess`,params})
}
export const getWorkstationPage = async (code:String) => {

56
src/api/mes/reportpStore/index.ts

@ -0,0 +1,56 @@
import request from '@/config/axios'
export interface ReportpStoreVO {
status: string
remark: string
planDayCode: string
workBillNo: string
batchCode: string
reportUuid: string
itemBasicCode: string
itemCounts: number
itemUom: string
workstationCode: string
productCode: string
}
// 查询工序报工物料明细列表
export const getReportpStorePage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/mes/reportp-store/senior', data })
} else {
return await request.get({ url: `/mes/reportp-store/page`, params })
}
}
// 查询工序报工物料明细详情
export const getReportpStore = async (id: number) => {
return await request.get({ url: `/mes/reportp-store/get?id=` + id })
}
// 新增工序报工物料明细
export const createReportpStore = async (data: ReportpStoreVO) => {
return await request.post({ url: `/mes/reportp-store/create`, data })
}
// 修改工序报工物料明细
export const updateReportpStore = async (data: ReportpStoreVO) => {
return await request.put({ url: `/mes/reportp-store/update`, data })
}
// 删除工序报工物料明细
export const deleteReportpStore = async (id: number) => {
return await request.delete({ url: `/mes/reportp-store/delete?id=` + id })
}
// 导出工序报工物料明细 Excel
export const exportReportpStore = async (params) => {
return await request.download({ url: `/mes/reportp-store/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/mes/reportp-store/get-import-template' })
}

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

@ -25,12 +25,12 @@
<template #header>
<div class="card-header">
<span>工艺路线</span>
<el-button
<!-- <el-button
type="text"
icon="el-icon-plus"
@click="opensearchTable"
style="float: right; padding: 3px 0"
>添加工序</el-button>
>添加工序</el-button> -->
</div>
</template>
<el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%" @cell-dblclick="userAddNode">
@ -40,11 +40,11 @@
<template #header>
<span>操作</span>
</template>
<template #default="scope">
<!-- <template #default="scope">
<el-button type="danger" size="mini" text @click="deleteNode(scope.row)"
>移除</el-button
>
</template>
</template> -->
</el-table-column>
</el-table>
</el-card>
@ -395,13 +395,13 @@ const opensearchTable = (
) => {
//console.log("opensearchTable")
const _searchCondition = {}
const _searchTableTitle = "工序查询"
const _searchTableAllSchemas = ProcessSearch.allSchemas
const _searchTablePage = ProcessApi.getProcessPage
// const _searchTableTitle = ""
// const _searchTableAllSchemas = ProcessSearch.allSchemas
// const _searchTablePage = ProcessApi.getProcessPage
searchTableRef.value.open(
_searchTableTitle,
_searchTableAllSchemas,
_searchTablePage,
'工序查询',
ProcessSearch.allSchemas,
ProcessApi.getProcessPage,
'process',
'process',
true,
@ -409,8 +409,9 @@ const opensearchTable = (
undefined,
_searchCondition,
false,
true
//true
)
}
const publishPlan=()=>{
message.confirm("确认发布当前计划?","question").then(async () => {

35
src/views/mes/processroute/components/configDialog.vue

@ -96,10 +96,11 @@
</div>
</template>
<el-table :data="materialData" ref="tableMaterial" style="width: 100%; height: 80%;overflow-y: auto;">
<el-table-column prop="name" label="物料名称"/>
=
<el-table-column prop="code" label="物料编码"/>
<el-table-column prop="desc1" label="是否替代"/>
<!-- <el-table-column prop="name" label="物料名称"/> -->
<el-table-column prop="componentItemCode" label="物料编码"/>
<el-table-column prop="version" label="版本号"/>
<el-table-column prop="componentQty" label="物料数量"/>
</el-table>
</el-card></el-col
>
@ -194,7 +195,7 @@ const opensearchTable = (
undefined,
_searchCondition,
false,
true
//true
)
}
//
@ -210,6 +211,7 @@ const deleteNode=(row)=>{
processData.value.splice(processData.value.indexOf(row),1)
graph.value.removeNode(row.code)
}
const productCode=ref()
//
const graph = ref<Graph>()
const rowData = ref()
@ -219,6 +221,7 @@ const openDetail = (row: any) => {
titleNameRef.value = rowData.value.processrouteCode
titleValueRef.value = rowData.value.processName
processRouteId.value = rowData.value.id
productCode.value=rowData.value.productCode
routeVersion.value=rowData.value.routeVersion
remarksData.data = {
tableId: rowData.value.id,
@ -261,11 +264,17 @@ const getProcessInfo = async (id: any) => {
/** 获取产品信息 */
const getItembasicInfo = async (code: String) => {
const res = await ProcessrouteApi.getProductInfo(code)
console.log('productData',res)
productData.value = res
}
/** 获取物料列表 */
const getItembasicPage = async (code) => {
return await ProcessrouteApi.getItembasicPage(code);
const getProcessBomList = async (pcode,processCode) => {
let params={
code:pcode ,//""
//version:version,//bom"
processCode:processCode
}
return await ProcessrouteApi.getProcessBomList(params);
}
/** 查询模具基本信息列表 */
const getPatternPage = async (code) => {
@ -290,7 +299,7 @@ const getWorkstationPage = async (code) => {
// }
/**获取工艺路线定义的工序列表 */
const getProcessList = async (code) => {
console.log('code',code)
//console.log('code',code)
const res = await ProcessrouteApi.getProcessrouteNodeList(code)
processData.value = res
//return res
@ -299,15 +308,15 @@ const getProcessList = async (code) => {
const nodeClick = (e, x, y, node, view) => {
Promise.all([
getProcessInfo(node.id),
getItembasicPage(node.id),
getProcessBomList(productCode.value,node.id),
getPatternPage(node.id),
getWorkstationPage(node.id)
]).then(([processIndoList,itembasicPage, patternPage,workstationInfoList]) => {
]).then(([processIndoList,basicBom, patternPage,workstationInfoList]) => {
//
message.info(JSON.stringify(processIndoList))
console.log(processIndoList)
//message.info(JSON.stringify(processIndoList))
console.log('basicBom',basicBom)
//
materialData.value = itembasicPage.list
materialData.value = basicBom
//
mouldData.value = patternPage.list
//

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

@ -0,0 +1,244 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ReportpStore.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ReportpStore.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 #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</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="ReportpStoreRules"
:formAllSchemas="ReportpStore.allSchemas"
:apiUpdate="ReportpStoreApi.updateReportpStore"
:apiCreate="ReportpStoreApi.createReportpStore"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="ReportpStore.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/mes/reportp-store/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { ReportpStore,ReportpStoreRules } from './reportpStore.data'
import * as ReportpStoreApi from '@/api/mes/reportpStore'
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: 'MesReportpStore' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ReportpStore.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: ReportpStoreApi.getReportpStorePage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:reportpStore:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:reportpStore:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:reportpStore: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:'wms:reportpStore:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:reportpStore: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 =ReportpStore.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 ReportpStoreApi.createReportpStore(data)
message.success(t('common.createSuccess'))
} else {
await ReportpStoreApi.updateReportpStore(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, 'basicReportpStore')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ReportpStoreApi.deleteReportpStore(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 ReportpStoreApi.exportReportpStore(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 ReportpStoreApi.importTemplate()
})
</script>

111
src/views/mes/reportpStore/reportpStore.data.ts

@ -0,0 +1,111 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const ReportpStoreRules = reactive({
})
export const ReportpStore = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '状态',
field: 'status',
sort: 'custom',
isSearch: true,
form: {
component: 'Radio'
},
},
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
isTable: false,
isSearch: true,
isForm: false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isTable: false,
},
{
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: 'planDayCode',
sort: 'custom',
isSearch: true,
},
{
label: '工单编码',
field: 'workBillNo',
sort: 'custom',
isSearch: true,
},
{
label: '批次编码',
field: 'batchCode',
sort: 'custom',
isSearch: true,
},
{
label: '报工流水号',
field: 'reportUuid',
sort: 'custom',
isSearch: true,
},
{
label: '物料编码',
field: 'itemBasicCode',
sort: 'custom',
isSearch: true,
},
{
label: '物料数量',
field: 'itemCounts',
sort: 'custom',
isSearch: true,
},
{
label: '物料单位',
field: 'itemUom',
sort: 'custom',
isSearch: true,
},
{
label: '工位',
field: 'workstationCode',
sort: 'custom',
isSearch: true,
},
{
label: '产品编码',
field: 'productCode',
sort: 'custom',
isSearch: true,
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

12
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@ -42,6 +42,8 @@
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="itemCode"
:rules="DeliverPlanMainRules"
:formAllSchemas="DeliverPlanMain.allSchemas"
:tableAllSchemas="DeliverPlanDetail.allSchemas"
@ -124,8 +126,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
})
if (type == 'tableForm') {
if(formField == 'itemCode') {
row['uom'] = val[0]['customerUom']
val.forEach(item=>{
if(tableData.value.find(item1=>item1['id'] == item['id'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['customerUom']
tableData.value.push(newRow)
})
}
// if(formField == 'itemCode') {
// row['uom'] = val[0]['customerUom']
// }
//
row[formField] = val[0][searchField]
} else {

194
src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts

@ -16,13 +16,16 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
},
{
label: '申请单号',
field: 'requestNumber',
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 180
width: 150
},
isSearch: true,
},
{
label: '车间代码',
@ -32,6 +35,16 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
isTable: false,
},
{
label: '从仓库代码',
field: 'fromWarehouseCode',
@ -39,6 +52,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '到仓库代码',
@ -47,6 +61,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '申请时间',
@ -59,6 +74,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -79,6 +95,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -88,18 +105,6 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}
},
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '过期时间',
field: 'expiredTime',
@ -111,6 +116,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -131,6 +137,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -147,6 +154,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
// {
// label: '状态',
@ -163,6 +171,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
form: {
component: 'InputNumber',
}
@ -174,6 +183,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
form: {
component: 'InputNumber',
}
@ -185,6 +195,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '承接人',
@ -193,6 +204,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '承接时间',
@ -205,6 +217,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -221,6 +234,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '完成时间',
@ -233,6 +247,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -247,7 +262,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -258,7 +273,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -271,6 +286,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '备注',
@ -279,6 +295,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '创建时间',
@ -291,6 +308,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -307,6 +325,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '从库区代码范围',
@ -315,6 +334,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '到库区代码范围',
@ -323,13 +343,14 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '自动完成',
field: 'autoComplete',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -348,7 +369,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyLocation',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -367,7 +388,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyQty',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -386,7 +407,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowBiggerQty',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -405,7 +426,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowSmallerQty',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -424,7 +445,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyInventoryStatus',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -443,7 +464,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowContinuousScanning',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -462,7 +483,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowPartialComplete',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -481,7 +502,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyBatch',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -500,7 +521,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyPackingNumber',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -602,20 +623,38 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '包装号',
field: 'packingNumber',
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '器具号',
field: 'containerNumber',
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料描述1',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '物料描述2',
field: 'itemDesc2',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '批次',
@ -626,93 +665,105 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '从库位代码',
field: 'fromLocationCode',
label: '包装规格',
field: 'packUnit',
sort: 'custom',
table: {
width: 120
},
},
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '到库位代码',
field: 'toLocationCode',
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料代码',
field: 'itemCode',
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '物料名称',
field: 'itemName',
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料描述1',
field: 'itemDesc1',
label: '来源库位',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '物料描述2',
field: 'itemDesc2',
label: '目标库位',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '项目代码',
field: 'projectCode',
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '数量',
field: 'qty',
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
hiddenInMain: true
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true
},
{
label: '单据号',
@ -721,6 +772,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain: true
},
{
label: '备注',
@ -729,6 +781,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '创建者',
@ -737,6 +790,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '创建时间',
@ -749,6 +803,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
hiddenInMain: true,
form: {
component: 'DatePicker',
componentProps: {
@ -758,22 +813,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
},
},
{
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到货主代码',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
},
]))
//表单校验

415
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -61,7 +61,26 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
isSearch: true,
},
{
label: '车间代码',
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
isForm:false,
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
{
label: '车间',
field: 'workshopCode',
sort: 'custom',
table: {
@ -86,23 +105,51 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
},
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
isForm:false,
label: '生产线代码',
field: 'productionLineCode',
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
// labelMessage: '信息提示说明!!!',
componentProps: {
disabled: true
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请选择车间信息!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
},
},
{
label: '申请时间',
@ -115,6 +162,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -137,6 +185,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -152,7 +201,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -165,7 +214,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isSearch: true,
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -179,6 +228,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
isForm: false,
},
{
@ -188,6 +238,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
isForm: false,
},
{
@ -197,6 +248,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
isForm: false,
},
{
@ -206,6 +258,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
isForm: false,
},
{
@ -224,6 +277,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
isForm: false,
},
{
@ -234,6 +288,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name
},
@ -255,7 +310,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm:false,
sort: 'custom',
table: {
@ -276,7 +331,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm:false,
sort: 'custom',
table: {
@ -297,7 +352,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm:false,
sort: 'custom',
table: {
@ -345,6 +400,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -363,6 +419,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
isForm: false
},
{
@ -376,6 +433,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -394,6 +452,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
isForm: false
},
{
@ -405,6 +464,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
width: 300,
fixed: 'right'
},
isTable: false,
}
]))
@ -444,6 +504,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -558,12 +620,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'locationCode',
value: 'fromLocationCode',
message: '请填写从库位代码!',
isMainValue: true
},{
searchCondition:[
// {
// key: 'locationCode',
// value: 'fromLocationCode',
// message: '请填写从库位代码!',
// isMainValue: true
// },
{
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
@ -577,12 +641,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'locationCode',
value: 'fromLocationCode',
message: '请填写从库位代码!',
isMainValue: true
},{
searchCondition:[
// {
// key: 'locationCode',
// value: 'fromLocationCode',
// message: '请填写从库位代码!',
// isMainValue: true
// },
{
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
@ -632,88 +698,61 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
isForm: false,
},
{
label: '数量',
field: 'qty',
label: '物料描述1',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 6
}
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '物料描述2',
field: 'itemDesc2',
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 6
}
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '包装规格',
field: 'packUnit',
label: '批次',
field: 'batch',
sort: 'custom',
isSearch: true,
table: {
width: 120
width: 150
},
tableForm:{
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!',
isMainValue: true
}]
tableForm: {
disabled: true
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
disabled: true
}
}
},
{
label: '标包数量',
field: 'packQty',
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 120
},
tableForm:{
disabled: true
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
disabled: true
min: 0,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 6
}
},
{
@ -737,44 +776,18 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '物料描述1',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '物料描述2',
field: 'itemDesc2',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
isTableForm: false,
isForm: false,
},
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
disabled: true
},
form: {
@ -783,14 +796,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
}
},
{
label: '从库位代码',
label: '来源库位',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
tableForm: {
disabled: true
},
@ -801,49 +814,47 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
label: '从货主',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '单据号',
field: 'number',
label: '到货主',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 180
width: 150
},
hiddenInMain: true,
isTableForm: false,
form: {
componentProps: {
disabled: true
}
}
isForm: false,
},
{
label: '包装号',
field: 'packingNumber',
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 180
},
hiddenInMain: true,
isTableForm: false,
form: {
componentProps: {
disabled: true
@ -851,32 +862,24 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '从货主代码',
field: 'fromOwnerCode',
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
hiddenInMain: true,
},
{
label: '到货主代码',
field: 'toOwnerCode',
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
isForm: false
},
{
label: '创建时间',
@ -889,6 +892,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 180
},
hiddenInMain: true,
form: {
component: 'DatePicker',
componentProps: {
@ -901,15 +905,94 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
isTableForm: false,
isForm: false
},
{
label: '创建者',
field: 'creator',
label: '包装规格',
field: 'packUnit',
sort: 'custom',
isSearch: true,
table: {
width: 120
},
isTable:false,
isTableForm: false,
tableForm:{
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
}
},
{
label: '标包数量',
field: 'packQty',
sort: 'custom',
table: {
width: 120
},
isTable:false,
isTableForm: false,
tableForm:{
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
isTable:false,
isTableForm: false,
isForm: false
tableForm: {
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '最后更新时间',
@ -922,6 +1005,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 180
},
isTable:false,
form: {
component: 'DatePicker',
componentProps: {
@ -941,6 +1025,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTable:false,
isTableForm: false,
isForm: false
},

306
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@ -29,6 +29,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
hiddenInMain: true,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
@ -162,12 +164,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'locationCode',
value: 'fromLocationCode',
message: '请填写从库位代码!',
isMainValue: true
},{
searchCondition:[
// {
// key: 'locationCode',
// value: 'fromLocationCode',
// message: '请填写从库位代码!',
// isMainValue: true
// },
{
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
@ -216,111 +220,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
isTableForm: false,
isForm: false,
},
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 6
}
},
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
isSearch: true,
table: {
width: 120
},
tableForm:{
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
}
},
{
label: '标包数量',
field: 'packQty',
sort: 'custom',
table: {
width: 120
},
tableForm:{
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '物料描述1',
field: 'itemDesc1',
@ -328,6 +227,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
@ -338,20 +238,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '批次',
field: 'batch',
@ -369,25 +259,29 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '从库位代码',
field: 'fromLocationCode',
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
},
form: {
component: 'InputNumber',
componentProps: {
disabled: true
min: 0,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 6
}
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
@ -405,13 +299,20 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '单据号',
field: 'number',
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
isTableForm: false,
sort: 'custom',
table: {
width: 180
width: 150
},
tableForm: {
type: 'Select',
disabled: true
},
isTableForm: false,
form: {
componentProps: {
disabled: true
@ -419,12 +320,13 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '包装号',
field: 'packingNumber',
label: '来源库位',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
isTableForm:false,
tableForm: {
disabled: true
},
@ -435,25 +337,53 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '从货主代码',
label: '从货主',
field: 'fromOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '到货主代码',
label: '到货主',
field: 'toOwnerCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
isForm: false,
},
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 180
},
hiddenInMain: true,
isTableForm: false,
form: {
componentProps: {
disabled: true
}
}
},
{
label: '备注',
field: 'remark',
@ -461,6 +391,18 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
hiddenInMain: true,
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
isForm: false
},
{
label: '创建时间',
@ -473,6 +415,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 180
},
hiddenInMain: true,
form: {
component: 'DatePicker',
componentProps: {
@ -486,14 +429,91 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
isForm: false
},
{
label: '创建者',
field: 'creator',
label: '包装规格',
field: 'packUnit',
sort: 'custom',
isSearch: true,
table: {
width: 120
},
isTable: false,
isTableForm: false,
tableForm:{
isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题
searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'itemCode',
value: 'itemCode',
message: '请先选择物料代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true
}]
}
}
},
{
label: '标包数量',
field: 'packQty',
sort: 'custom',
table: {
width: 120
},
isTable: false,
isTableForm: false,
tableForm:{
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isTableForm: false,
isForm: false
tableForm: {
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '最后更新时间',
@ -506,6 +526,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -525,6 +546,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTable: false,
isTableForm: false,
isForm: false
},

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

@ -680,42 +680,24 @@ const handlePoint = async (row) => {
const searchTableRef = ref()
//
const labelPrint = async (row) => {
console.log("------------",row);
tableObject.loading = true
const subTableDFata = await PackageApi.getLabel(row.masterId)
tableObject.loading = false
const tableObject1 = {
//
currentPage: 1,
//
exportLoading: false,
//
loading: false,
//
pageSize: subTableDFata.length,
params:null,
//
sort: {
order: '', //
prop: '' //
},
//
total: subTableDFata.length,
//
tableList: subTableDFata,
currentRow:null
}
console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number}
const {tableObject:tableObjectPrint ,tableMethods} = useTable({
defaultParams,
getListApi: PackageApi.getLabelDetailPage //
})
//
const { getList:getListPrint } = tableMethods
getListPrint()
tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width || 150
})
searchTableRef.value.openData("标签信息",tableObject1,{tableColumns},true)
// window.open(src.value + '&asn_number=' + row.asnNumber)
searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
}
// --
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val)
@ -733,10 +715,10 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
console.log(res)
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&request_number='+res)
window.open(src.value+'&asn_number='+res)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&request_number='+res)
window.open(src.value+'&asn_number='+res)
}
}).catch(err => {
console.log(err)

2
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue

@ -62,7 +62,7 @@
:detailAllSchemas="ProductreceiptJobDetail.allSchemas"
:detailAllSchemasRules="ProductreceiptJobDetailRules"
:searchTableParams="searchTableParams"
:apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
:apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPageAssemble"
/>
</template>

44
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@ -674,42 +674,24 @@ const handlePoint = async (row) => {
}
}
const searchTableRef = ref()
//
const labelPrint = async (row) => {
console.log("------------",row);
tableObject.loading = true
const subTableDFata = await PackageApi.getLabel(row.masterId)
tableObject.loading = false
const tableObject1 = {
//
currentPage: 1,
//
exportLoading: false,
//
loading: false,
//
pageSize: subTableDFata.length,
params:null,
//
sort: {
order: '', //
prop: '' //
},
//
total: subTableDFata.length,
//
tableList: subTableDFata,
currentRow:null
}
console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
const defaultParams = {'moduleName':'productreceipt_assemble','recordNumber':row.number}
const {tableObject:tableObjectPrint ,tableMethods} = useTable({
defaultParams,
getListApi: PackageApi.getLabelDetailPage //
})
//
const { getList:getListPrint } = tableMethods
getListPrint()
tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width || 150
})
searchTableRef.value.openData("采购收货记录单号",tableObject1,{tableColumns},true)
// window.open(src.value + '&asn_number=' + row.asnNumber)
searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
}
@ -733,10 +715,10 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
console.log(res)
if (labelType.value == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&request_number='+res)
window.open(src.value+'&asn_number='+res)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&request_number='+res)
window.open(src.value+'&asn_number='+res)
}
}).catch(err => {
console.log(err)

Loading…
Cancel
Save