Browse Source

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

intex_online20241228
ljlong_2630 5 months ago
parent
commit
865d1e8ba2
  1. 4
      src/api/wms/package/index.ts
  2. 16
      src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue
  3. 16
      src/components/ImportForm/src/ImportCustomerStatementForm.vue
  4. 1
      src/components/ImportForm/src/ImportCustomerStatementShareForm.vue
  5. 14
      src/components/ImportForm/src/ImportSupplierMoldCostForm.vue
  6. 4
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
  7. 34
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
  8. 56
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
  9. 2
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  10. 24
      src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
  11. 56
      src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
  12. 2
      src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
  13. 2
      src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
  14. 34
      src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts
  15. 131
      src/views/wms/inventoryManage/balance/balance.data.ts
  16. 117
      src/views/wms/inventoryManage/balance/index.vue
  17. 3
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
  18. 6
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
  19. 8
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
  20. 9
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  21. 24
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

4
src/api/wms/package/index.ts

@ -107,8 +107,8 @@ export const batchPrintingLableGet = async (params: any) => {
} }
// 批量打印标签+创建新标签 // 批量打印标签+创建新标签
export const batchPrintingBalanceLableForCreate = async (params: any) => { export const batchPrintingBalanceLableForCreate = async (data: any) => {
return await request.get({ url: `/wms/package/batchPrintingBalanceLableForCreate`, params }) return await request.post({ url: `/wms/package/batchPrintingBalanceLableForCreate`, data })
} }
// 批量打印标签多选 // 批量打印标签多选
export const batchPrintingLables = async (data: any) => { export const batchPrintingLables = async (data: any) => {

16
src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue

@ -6,11 +6,12 @@
:model="queryParams" :model="queryParams"
class="demo-form-inline" class="demo-form-inline"
style="margin-bottom: 10px" style="margin-bottom: 10px"
label-width="70px" label-width="80px"
:rules="rules"
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户代码"> <el-form-item label="客户代码" prop="customerCode">
<el-select <el-select
v-model="queryParams.customerCode" v-model="queryParams.customerCode"
placeholder="请选择客户代码" placeholder="请选择客户代码"
@ -21,7 +22,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年月"> <el-form-item label="年月" prop="yearsMonthStr">
<el-date-picker <el-date-picker
v-model="queryParams.yearsMonthStr" v-model="queryParams.yearsMonthStr"
type="month" type="month"
@ -436,7 +437,14 @@ const queryParams = reactive({
customerCode: '', customerCode: '',
yearsMonthStr: '', yearsMonthStr: '',
}) })
const rules = ref({
customerCode: [
{ required: true, message: '请选择客户代码', trigger: 'change' },
],
yearsMonthStr: [
{ required: true, message: '请选择年月', trigger: 'change' },
],
})
const getCustomerList = async () => {// const getCustomerList = async () => {//
var param ={} var param ={}
const list = await CustomerApi.getCustomerListPc(param); const list = await CustomerApi.getCustomerListPc(param);

16
src/components/ImportForm/src/ImportCustomerStatementForm.vue

@ -6,11 +6,12 @@
:model="queryParams" :model="queryParams"
class="demo-form-inline" class="demo-form-inline"
style="margin-bottom: 10px" style="margin-bottom: 10px"
label-width="70px" label-width="80px"
:rules="rules"
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户代码"> <el-form-item label="客户代码" prop="customerCode">
<el-select <el-select
v-model="queryParams.customerCode" v-model="queryParams.customerCode"
placeholder="请选择客户代码" placeholder="请选择客户代码"
@ -21,7 +22,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年月"> <el-form-item label="年月" prop="yearsMonthStr">
<el-date-picker <el-date-picker
v-model="queryParams.yearsMonthStr" v-model="queryParams.yearsMonthStr"
type="month" type="month"
@ -437,6 +438,15 @@ const queryParams = reactive({
yearsMonthStr: '', yearsMonthStr: '',
}) })
const rules = ref({
customerCode: [
{ required: true, message: '请选择客户代码', trigger: 'change' },
],
yearsMonthStr: [
{ required: true, message: '请选择年月', trigger: 'change' },
],
})
const getCustomerList = async () => {// const getCustomerList = async () => {//
var param ={} var param ={}
const list = await CustomerApi.getCustomerListPc(param); const list = await CustomerApi.getCustomerListPc(param);

1
src/components/ImportForm/src/ImportCustomerStatementShareForm.vue

@ -275,7 +275,6 @@ const verifyData = async () => {
// buttonBaseClick('refresh',null) // buttonBaseClick('refresh',null)
} catch { } catch {
// //
alert(123);
} }
}else if(data.status==3){ }else if(data.status==3){
await message.alertWarning('已存在相同客户代码及年月的客户对账单,且已确认分摊金额,无法导入') await message.alertWarning('已存在相同客户代码及年月的客户对账单,且已确认分摊金额,无法导入')

14
src/components/ImportForm/src/ImportSupplierMoldCostForm.vue

@ -7,10 +7,11 @@
class="demo-form-inline" class="demo-form-inline"
style="margin-bottom: 10px" style="margin-bottom: 10px"
label-width="70px" label-width="70px"
:rules="rules"
> >
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商代码" label-width="85px"> <el-form-item label="供应商代码" label-width="95px" prop="supplierCode">
<el-select <el-select
v-model="queryParams.supplierCode" v-model="queryParams.supplierCode"
placeholder="请选择供应商代码" placeholder="请选择供应商代码"
@ -21,7 +22,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年月"> <el-form-item label="年月" prop="yearsMonthStr">
<el-date-picker <el-date-picker
v-model="queryParams.yearsMonthStr" v-model="queryParams.yearsMonthStr"
type="month" type="month"
@ -435,7 +436,14 @@ const queryParams = reactive({
supplierCode: '', supplierCode: '',
yearsMonthStr: '', yearsMonthStr: '',
}) })
const rules = ref({
supplierCode: [
{ required: true, message: '请选择供应商代码', trigger: 'change' },
],
yearsMonthStr: [
{ required: true, message: '请选择年月', trigger: 'change' },
],
})
const getCustomerList = async () => {// const getCustomerList = async () => {//
const list = await SuppliperMoldCostMainApi.getCustomerList(); const list = await SuppliperMoldCostMainApi.getCustomerList();

4
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts

@ -415,7 +415,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isTable: false,
isForm: false isForm: false
}, },
{ {
@ -425,7 +424,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false isForm: false
}, },
{ {
@ -734,7 +732,6 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -753,7 +750,6 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },

34
src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@ -585,6 +585,7 @@ export const DeliverJobMain = useCrudSchemas(
}, },
isTable: false isTable: false
}, },
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -635,7 +636,6 @@ export const DeliverJobMain = useCrudSchemas(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -652,7 +652,6 @@ export const DeliverJobMain = useCrudSchemas(
table: { table: {
width: 150 width: 150
}, },
isTable: false
}, },
{ {
label: '操作', label: '操作',
@ -906,6 +905,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -945,6 +945,36 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: true, isTable: true,
}, },
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
},
])) ]))
//表单校验 //表单校验

56
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@ -402,6 +402,34 @@ export const DeliverRecordMain = useCrudSchemas(
}, },
isTable: false isTable: false
}, },
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
},
// { // {
// label: '代码', // label: '代码',
// field: 'code', // field: 'code',
@ -816,6 +844,34 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: true, isTable: true,
}, },
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
},
// { // {
// label: '任务明细ID', // label: '任务明细ID',
// field: 'jobDetailId', // field: 'jobDetailId',

2
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@ -1115,7 +1115,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -1135,7 +1134,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },

24
src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@ -176,15 +176,6 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: false, isTable: false,
}, },
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
isForm: false,
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -216,14 +207,13 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '最后更新者', label: '创建者',
field: 'updater', field: 'creator',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isForm: false, isForm: false,
isTable: false
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -245,7 +235,15 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
isForm: false, isForm: false,
isTable: false },
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
isForm: false,
}, },
{ {
label: '当前阶段', label: '当前阶段',

56
src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@ -410,6 +410,34 @@ export const DeliverRecordMain = useCrudSchemas(
}, },
isTable: false isTable: false
}, },
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
},
// { // {
// label: '代码', // label: '代码',
// field: 'code', // field: 'code',
@ -828,6 +856,34 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isTable: true, isTable: true,
}, },
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
}
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
},
// { // {
// label: '任务明细ID', // label: '任务明细ID',
// field: 'jobDetailId', // field: 'jobDetailId',

2
src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts

@ -116,7 +116,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
type: 'datetime', type: 'datetime',
valueFormat: 'YYYY-MM' valueFormat: 'YYYY-MM',
} }
}, },
}, },

2
src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@ -117,7 +117,7 @@
<template #adjustmentAmount="{ row }" v-if="tabCurrent.prop == 'ShareReconciliation'"> <template #adjustmentAmount="{ row }" v-if="tabCurrent.prop == 'ShareReconciliation'">
<div style="position: relative"> <div style="position: relative">
<span>{{ row.adjustmentAmount }}</span> <span>{{ row.adjustmentAmount }}</span>
<Icon <Icon v-if="row.status==4"
icon="ep:edit" icon="ep:edit"
color="#409eff" color="#409eff"
@click="openDetailForm(row)" @click="openDetailForm(row)"

34
src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/supplierMoldCostMain.data.ts

@ -9,10 +9,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
fixed: 'left', fixed: 'left',
isSearch: true, isSearch: true
table:{
width: 200
}
}, },
{ {
label: '状态', label: '状态',
@ -31,9 +28,6 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
multiple:true, multiple:true,
} }
}, },
table:{
width: 100
}
}, },
{ {
label: '版本号', label: '版本号',
@ -45,18 +39,12 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '供应商代码', label: '供应商代码',
field: 'supplierCode', field: 'supplierCode',
sort: 'custom', sort: 'custom',
table: {
width: 150
},
isSearch: true isSearch: true
}, },
{ {
label: '供应商名称', label: '供应商名称',
field: 'supplierName', field: 'supplierName',
sort: 'custom', sort: 'custom',
table: {
width: 150
},
isSearch: true isSearch: true
}, },
{ {
@ -69,7 +57,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
valueFormat: 'YYYY-MM', valueFormat: 'YYYY-MM',
type: 'daterange', type: 'monthrange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, },
@ -82,9 +70,6 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
type: 'datetime', type: 'datetime',
valueFormat: 'YYYY-MM' valueFormat: 'YYYY-MM'
} }
},
table:{
width: 100
} }
}, },
{ {
@ -93,10 +78,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isDetail:true, isDetail:true,
isForm: false, isForm: false,
isTable:true, isTable:true
table:{
width: 150
}
}, },
{ {
label: '创建时间', label: '创建时间',
@ -115,10 +97,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat : 'YYYY-MM-DD HH:mm:ss' dateFormat : 'YYYY-MM-DD HH:mm:ss'
}, },
isTable:true, isTable:true,
isForm: false, isForm: false
table:{
width:180
}
}, },
{ {
label: '更新者', label: '更新者',
@ -145,10 +124,7 @@ export const SupplierMoldCostMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat : 'YYYY-MM-DD HH:mm:ss' dateFormat : 'YYYY-MM-DD HH:mm:ss'
}, },
isTable:false, isTable:false,
isForm: false, isForm: false
table:{
width:180
}
}, },
{ {
label: '操作', label: '操作',

131
src/views/wms/inventoryManage/balance/balance.data.ts

@ -1,6 +1,12 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import * as SupplieritemApi from '@/api/wms/supplieritem'
import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
import { validatePositiveNumber } from "@/utils/validator";
/** /**
* @returns {Array} * @returns {Array}
*/ */
@ -821,3 +827,128 @@ export const BalanceRules = reactive({
{ required: true, message: '请选择生产日期', trigger: 'change' } { required: true, message: '请选择生产日期', trigger: 'change' }
], ],
}) })
// 表单校验
export const BalancePackageRules = reactive({
batch: [
{ required: true, message: '请输入批次', trigger: 'blur' }
],
printQty: [
{ required: true, message: '请输入打印数量', trigger: 'blur' },
{ validator: validatePositiveNumber, message: '必须是一个正数', trigger: 'change' }
],
})
export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
isSearch: true,
table: {
},
tableForm: {
disabled: true
}
},
{
label: '批次',
field: 'batch',
sort: 'custom',
isSearch: true,
tableForm: {
type: 'FormDate',
format: 'YYYYMMDD',
valueFormat: 'YYYYMMDD',
}
},
{
label: '打印数量',
field: 'printQty',
sort: 'custom',
table: {
},
tableForm: {
type: 'InputNumber',
precision: 6,
min: 0
}
},
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
tableForm: {
disabled: true
}
},
{
label: '标包数量',
field: 'packQty',
sort: 'custom',
tableForm: {
disabled: true
}
},
{
label: '计量单位',
field: 'uom',
sort: 'custom',
dictType: DICT_TYPE.UOM,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Select'
},
table: {
},
tableForm: {
type: 'Select',
disabled: true
}
},
{
label: '标签生产线代码',
field: 'productionLineCodePackage',
sort: 'custom',
table: {
width: 150
},
tableForm: {
enterSearch: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'productionLineCode', // 查询弹窗赋值字段
searchTitle: '生产线物料关系信息', // 查询弹窗标题
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'itemCode',
value: 'itemCode',
isMainValue: true
}]
}
},
{
label: '标签供应商代码',
field: 'supplierItemCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
enterSearch: true,
isInpuFocusShow: true,
searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
searchField: 'supplierCode', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'itemCode',
value: 'itemCode',
message: '请填写物料代码!',
isMainValue: true
}]
}
},
]))

117
src/views/wms/inventoryManage/balance/index.vue

@ -82,8 +82,8 @@
<BasicForm <BasicForm
ref="labelPointFormRef" ref="labelPointFormRef"
@success="getList" @success="getList"
:tableAllSchemas="SupplierdeliverRequestPackage.allSchemas" :tableAllSchemas="detailListTableColumns"
:tableFormRules="SupplierdeliverRequestPackageRules" :tableFormRules="detailListTableColumnsRules"
:tableData="detatableData1" :tableData="detatableData1"
:isBusiness="true" :isBusiness="true"
:isShowButton="false" :isShowButton="false"
@ -106,10 +106,11 @@
<script setup lang="ts"> <script setup lang="ts">
import dayjs from 'dayjs' import dayjs from 'dayjs'
import download from '@/utils/download' import download from '@/utils/download'
import { cloneDeep } from 'lodash-es'
import * as BalanceApi from '@/api/wms/balance' import * as BalanceApi from '@/api/wms/balance'
import * as PackageApi from '@/api/wms/package' import * as PackageApi from '@/api/wms/package'
import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
import { Balance, TransactionTab, BalanceRules } from './balance.data' import { Balance, TransactionTab, BalanceRules,BalancePackage,BalancePackageRules } from './balance.data'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@ -118,10 +119,14 @@ import { getAccessToken } from '@/utils/auth'
import { getJmreportBaseUrl } from '@/utils/systemParam' import { getJmreportBaseUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading' import { usePageLoading } from '@/hooks/web/usePageLoading'
import * as ItembasicApi from '@/api/wms/itembasic'
import * as SupplieritemApi from '@/api/wms/supplieritem'
import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
import { import {
SupplierdeliverRequestPackage, SupplierdeliverRequestPackage,
SupplierdeliverRequestPackageRules SupplierdeliverRequestPackageRules
} from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' } from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
console.log(222,SupplierdeliverRequestPackage) console.log(222,SupplierdeliverRequestPackage)
const { loadStart, loadDone } = usePageLoading() const { loadStart, loadDone } = usePageLoading()
// //
@ -137,6 +142,8 @@ const tableColumns = ref(Balance.allSchemas.tableColumns)
const tabsExtend = ref(false) const tabsExtend = ref(false)
const apiPage = ref() const apiPage = ref()
const tableObjectExtend = ref() const tableObjectExtend = ref()
const detailListTableColumns =cloneDeep(BalancePackage.allSchemas)
const detailListTableColumnsRules =cloneDeep(BalancePackageRules)
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -348,28 +355,86 @@ const handlePoint = async (row) => {
} }
const searchTableRef = ref() const searchTableRef = ref()
const enableBuyOrenableMake = ref()//
const getLabelDetailPage = async (row, useToPackingNumber) => { const getLabelDetailPage = async (row, useToPackingNumber) => {
//// ////
let defaultParams = { // let defaultParams = {
moduleName: 'move', // moduleName: 'move',
recordNumber: '', // recordNumber: '',
// itemCode: row.itemCode,
// packQty: row.packQty,
// batch: row.batch
// }
// const { tableObject: tableObjectPrint, tableMethods } = useTable({
// defaultParams,
// getListApi: PackageApi.getLabelDetailPage //
// })
// //
// const { getList: getListPrint } = tableMethods
// await getListPrint()
// tableObject.loading = false
// const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
// tableColumns.forEach((item) => {
// item.width = item.table?.width || 150
// })
// detatableData1.value = tableObjectPrint.tableList
await ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,
code: row.itemCode,
sort: '',
by: 'ASC',
}).then(res => {
if (res.list.length > 0) {
//
detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules)
enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' :''
if (res.list[0].enableBuy == "TRUE") {
detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage')
delete detailListTableColumnsRules.value.productionLineCodePackage
// tableform
detailListTableColumns.tableFormColumns.map(itemColumns => {
if(itemColumns.field == 'supplierItemCode') {
SupplieritemApi.getSupplieritemPage({
pageSize: 10,
pageNo: 1,
itemCode: row.itemCode, itemCode: row.itemCode,
packQty: row.packQty, sort: '',
batch: row.batch by: 'ASC',
}).then(response => {
row.supplierItemCode = response.list[0].supplierCode
})
} }
const { tableObject: tableObjectPrint, tableMethods } = useTable({
defaultParams,
getListApi: PackageApi.getLabelDetailPage //
}) })
// }
const { getList: getListPrint } = tableMethods //
await getListPrint() if (res.list[0].enableMake == "TRUE") {
tableObject.loading = false // tableform
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierItemCode')
tableColumns.forEach((item) => { delete detailListTableColumnsRules.value.supplierItemCode
item.width = item.table?.width || 150 detailListTableColumns.tableFormColumns.map(itemColumns => {
if(itemColumns.field == 'productionLineCodePackage') {
ProductionlineitemApi.getProductionlineitemPage({
pageNo: 1,
itemCode: row.itemCode,
sort: '',
by: 'ASC',
}).then(response => {
row.supplierItemCode = response.list[0].supplierCode
}) })
detatableData1.value = tableObjectPrint.tableList }
})
}
} else {
message.warning('没有查询到物料代码:【' + row.itemCode + '】')
return
}
})
detatableData1.value=[]//,
detatableData1.value.push(row)
detatableData1.value.forEach(item => { detatableData1.value.forEach(item => {
item.printQty =row.qty item.printQty =row.qty
if (!item.batch) { if (!item.batch) {
@ -504,10 +569,13 @@ const pointLabel = async () => {
// }) // })
const obj = { const obj = {
itemCode:detatableData1.value[0].itemCode, itemCode:detatableData1.value[0].itemCode,
packingNumber:detatableData1.value[0].number,
batch:detatableData1.value[0].batch, batch:detatableData1.value[0].batch,
printQty:detatableData1.value[0].printQty, printQty:detatableData1.value[0].printQty,
packUnit:detatableData1.value[0].packUnit,
packQty:detatableData1.value[0].packQty, packQty:detatableData1.value[0].packQty,
uom:detatableData1.value[0].uom,
productionLineCodePackage:detatableData1.value[0].productionLineCodePackage,
supplierItemCode:detatableData1.value[0].supplierItemCode,
} }
// const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0) // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0)
if(!parseFloat(obj.printQty) ){ if(!parseFloat(obj.printQty) ){
@ -515,8 +583,13 @@ const pointLabel = async () => {
return; return;
} }
await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => { await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) let src =ref('')
window.open(src.value+'&asn_number='+res) if (enableBuyOrenableMake.value == 'enableBuy') {
src.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id='+res//
} else if(enableBuyOrenableMake.value == 'enableMake') {
src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//
}
window.open(src.value)
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
message.error('创建标签失败') message.error('创建标签失败')

3
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@ -77,6 +77,9 @@
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
:detailValidate="detailValidate" :detailValidate="detailValidate"
@onBlur="onBlur" @onBlur="onBlur"
:detailButtonIsShowAdd="false"
:detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="false"
/> />
<!-- 导入 --> <!-- 导入 -->

6
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts

@ -568,9 +568,9 @@ export const UnplannedissueRequestMainRules = reactive({
costCenterCode: [ costCenterCode: [
{ required: true, message: '请输入成本中心代码', trigger: 'blur' } { required: true, message: '请输入成本中心代码', trigger: 'blur' }
], ],
costCenterType: [ // costCenterType: [
{ required: true, message: '请输入成本中心类型', trigger: 'blur' } // { required: true, message: '请输入成本中心类型', trigger: 'blur' }
], // ],
reasonCodeRequisition: [ reasonCodeRequisition: [
{ required: true, message: '请输入领用原因代码', trigger: 'blur' } { required: true, message: '请输入领用原因代码', trigger: 'blur' }
], ],

8
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts

@ -236,7 +236,8 @@ export const InventorymoveRequestMainRules = reactive({
], ],
toLocationCode: [ toLocationCode: [
{ required: true, message: '请选择到库位代码', trigger: 'change' } { required: true, message: '请选择到库位代码', trigger: 'change' }
] ],
}) })
/** /**
@ -514,5 +515,8 @@ export const InventorymoveRequestDetailRules = reactive({
], ],
toInventoryStatus: [ toInventoryStatus: [
{ required: true, message: '请选择到库存状态', trigger: 'change' } { required: true, message: '请选择到库存状态', trigger: 'change' }
] ],
fromBatch: [
{ required: true, message: '请选择批次', trigger: 'change' }
],
}) })

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

@ -696,7 +696,7 @@ const buttonTableClick = async (val, row) => {
labelPrint(row) labelPrint(row)
} else if (val == 'documentPrint') { } else if (val == 'documentPrint') {
// //
handleDocumentPrint(row.masterId) handleDocumentPrint(row.masterId,row.masterId)
} }
} }
const footButttondata = ref([ const footButttondata = ref([
@ -1080,13 +1080,14 @@ const genRecords = async (id: number) => {
// //
SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id) SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
.then((res) => { .then((res) => {
console.log('res',res)
message.success(t('ts.处理成功!')) message.success(t('ts.处理成功!'))
// //
getList() getList()
getLoading?.close() getLoading?.close()
// //
handleDocumentPrint(id) handleDocumentPrint(res,id)
}) })
.catch((err) => { .catch((err) => {
getLoading?.close() getLoading?.close()
@ -1242,8 +1243,8 @@ const print = async () => {
const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken()) const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
// //
const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
const handleDocumentPrint = async (id) => { const handleDocumentPrint = async (id,stausId) => {
await SupplierdeliverRequestMainApi.getItemStatus(id).then(async (res) => { await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => {
if (res) { if (res) {
// //
window.open(documentSrc2.value + '&id=' + id) window.open(documentSrc2.value + '&id=' + id)

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

@ -1824,18 +1824,18 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
valueFormat: 'YYYYMMDD', valueFormat: 'YYYYMMDD',
} }
}, },
// { {
// label: '打印数量', label: '打印数量',
// field: 'printQty', field: 'printQty',
// sort: 'custom', sort: 'custom',
// table: { table: {
// }, },
// tableForm: { tableForm: {
// type: 'InputNumber', type: 'InputNumber',
// precision: 6, precision: 6,
// min:0 min:0
// } }
// }, },
{ {
label: '包装规格', label: '包装规格',
field: 'packUnit', field: 'packUnit',

Loading…
Cancel
Save