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

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

master
陈薪名 1 year ago
parent
9fab4b9cf1 fc569c17f1
commit
d275fd2107
8 changed files with 551 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
  2. 36
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  3. 36
      src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
  4. 140
      src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
  5. 52
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  6. 188
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  7. 24
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
  8. 89
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

103
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
View File

@ -1,7 +1,17 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
import * as CustomerApi from '@/api/wms/customer'
import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
import * as SaleMainApi from '@/api/wms/saleMain'
import * as SaleDetailApi from '@/api/wms/saleDetail'
import { SaleDetail, SaleMain } from '../saleMain/saleMain.data'
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
const { t } = useI18n() // 国际化
/**
* @returns {Array} 发货计划主表
@ -14,7 +24,18 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true
isSearch: true,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择客户代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '客户信息', // 查询弹窗标题
searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
searchPage: CustomerApi.getCustomerPage // 查询弹窗所需分页方法
}
}
},
{
label: '计划日期',
@ -51,7 +72,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '业务类型',
field: 'businessType',
sort: 'custom',
isForm:false,
isForm: false,
table: {
width: 150
},
@ -241,6 +262,25 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择销售订单号',
searchField: 'number',
searchTitle: '销售订单信息',
searchAllSchemas: SaleMain.allSchemas,
searchPage: SaleMainApi.getSaleMainPage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择销售订单号',
searchField: 'number',
searchTitle: '销售订单信息',
searchAllSchemas: SaleMain.allSchemas,
searchPage: SaleMainApi.getSaleMainPage
}
}
},
{
label: '销售订单行',
@ -249,6 +289,25 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择销售订单行',
searchField: 'lineNumber',
searchTitle: '销售订单信息',
searchAllSchemas: SaleDetail.allSchemas,
searchPage: SaleDetailApi.getSaleDetailPage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择销售订单行',
searchField: 'lineNumber',
searchTitle: '销售订单信息',
searchAllSchemas: SaleDetail.allSchemas,
searchPage: SaleDetailApi.getSaleDetailPage
}
}
},
{
label: '客户月台',
@ -257,6 +316,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '项目',
@ -265,6 +326,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '单据号',
@ -287,6 +350,25 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage
}
}
},
{
label: '备注',
@ -337,6 +419,15 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -349,6 +440,9 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '最后更新时间',
@ -399,7 +493,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
isTableForm: false
},
{
label: '操作',

36
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
View File

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

36
src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
View File

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

140
src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
View File

@ -1,5 +1,12 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import * as CustomerApi from '@/api/wms/customer'
import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
const { t } = useI18n() // 国际化
/**
@ -14,6 +21,17 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isSearch: true,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择客户代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '客户信息', // 查询弹窗标题
searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
searchPage: CustomerApi.getCustomerPage // 查询弹窗所需分页方法
}
}
},
{
label: '订单类型',
@ -84,6 +102,9 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 0
}
}
},
{
@ -133,7 +154,8 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
disabled: true
}
}
},
isForm: false
},
{
label: '备注',
@ -288,6 +310,8 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{
label: '标包数量',
@ -298,6 +322,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -310,6 +343,9 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '客户计量数量',
@ -320,6 +356,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -332,6 +377,9 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '转换率',
@ -342,6 +390,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -353,6 +410,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -364,6 +430,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -375,6 +450,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -386,6 +470,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -397,6 +490,15 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -420,6 +522,25 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
}
}
},
{
label: '备注',
@ -470,7 +591,16 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
}
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
label: '计量单位',
@ -482,6 +612,9 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '最后更新时间',
@ -532,7 +665,8 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
isTableForm: false
},
{
label: '操作',

52
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
View File

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

188
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
View File

@ -1,8 +1,21 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as WorkshopApi from '@/api/wms/workshop'
import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
import * as ProductionlineApi from '@/api/wms/productionline'
import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
import * as WorkstationApi from '@/api/wms/workstation'
import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = {
pageSize:10,
@ -29,6 +42,17 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
width: 150
},
isSearch: true,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择车间代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '车间信息', // 查询弹窗标题
searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
}
},
},
{
label: '从仓库代码',
@ -37,6 +61,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isForm: false,
},
{
label: '从库位类型范围',
@ -48,6 +73,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isForm: false,
},
{
label: '从库区代码范围',
@ -56,6 +82,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isForm: false,
},
{
label: '单据号',
@ -75,6 +102,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isForm: false,
},
{
label: '备注',
@ -99,6 +127,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -129,11 +158,13 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
isForm: false,
},
{
label: '截止时间',
@ -149,6 +180,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -201,6 +233,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -224,6 +257,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isForm: false,
},
{
label: '到库位类型范围',
@ -236,6 +270,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isForm: false,
},
{
label: '到库区代码范围',
@ -244,6 +279,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isForm: false,
},
{
label: '自动提交',
@ -339,18 +375,18 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
//表单校验
export const ProductionreturnRequestMainRules = reactive({
fromWarehouseCode: [
{ required: true, message: '请输入从仓库代码', trigger: 'blur' }
],
fromLocationTypes: [
{ required: true, message: '请选择从库位类型范围', trigger: 'change' }
],
toWarehouseCode: [
{ required: true, message: '请输入到仓库代码', trigger: 'blur' }
],
toLocationTypes: [
{ required: true, message: '请选择到库位类型范围', trigger: 'change' }
],
// fromWarehouseCode: [
// { required: true, message: '请输入从仓库代码', trigger: 'blur' }
// ],
// fromLocationTypes: [
// { required: true, message: '请选择从库位类型范围', trigger: 'change' }
// ],
// toWarehouseCode: [
// { required: true, message: '请输入到仓库代码', trigger: 'blur' }
// ],
// toLocationTypes: [
// { required: true, message: '请选择到库位类型范围', trigger: 'change' }
// ],
departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' }
],
@ -366,9 +402,9 @@ export const ProductionreturnRequestMainRules = reactive({
directCreateRecord: [
{ required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
],
businessType: [
{ required: true, message: '请输入业务类型', trigger: 'blur' }
],
// businessType: [
// { required: true, message: '请输入业务类型', trigger: 'blur' }
// ],
})
/**
@ -382,6 +418,25 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
},
},
{
label: '工位代码',
@ -390,6 +445,25 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择工位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage // 查询弹窗所需分页方法
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择工位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '工位信息', // 查询弹窗标题
searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
searchPage: WorkstationApi.getWorkstationPage // 查询弹窗所需分页方法
},
},
{
label: '库存状态',
@ -401,6 +475,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '从货主代码',
@ -409,6 +486,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '到货主代码',
@ -417,6 +496,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '包装号',
@ -425,6 +506,25 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装号', // 输入框占位文本
searchField: 'packingNumber', // 查询弹窗赋值字段
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择包装号', // 输入框占位文本
searchField: 'packingNumber', // 查询弹窗赋值字段
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
},
},
{
label: '器具号',
@ -433,6 +533,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
tableForm: {
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '批次',
@ -441,6 +549,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
tableForm: {
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '从库位代码',
@ -449,6 +565,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '单据号',
@ -471,6 +589,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
tableForm: {
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '备注',
@ -494,6 +620,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -519,6 +646,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '物品描述1',
@ -527,6 +656,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '物品描述2',
@ -535,6 +666,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '项目代码',
@ -543,6 +676,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '数量',
@ -553,6 +688,15 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -565,6 +709,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '最后更新时间',
@ -580,6 +727,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -614,7 +762,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
//表单校验
export const ProductionreturnRequestDetailRules = reactive({
packingNumber: [
{ required: true, message: '请输入包装号', trigger: 'blur' }
{ required: true, message: '请选择包装号', trigger: 'change' }
],
batch: [
{ required: true, message: '请输入批次', trigger: 'blur' }
@ -622,9 +770,9 @@ export const ProductionreturnRequestDetailRules = reactive({
inventoryStatus: [
{ required: true, message: '请选择库存状态', trigger: 'change' }
],
fromLocationCode: [
{ required: true, message: '请输入从库位代码', trigger: 'blur' }
],
// fromLocationCode: [
// { required: true, message: '请输入从库位代码', trigger: 'blur' }
// ],
itemCode: [
{ required: true, message: '请输入物品代码', trigger: 'blur' }
],

24
src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
View File

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

89
src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
View File

@ -1,8 +1,15 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
const queryParams = {
pageSize:10,
@ -28,6 +35,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
},
{
label: '从库位类型范围',
@ -40,6 +48,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isSearch: true,
isForm: false,
},
{
label: '从库区代码范围',
@ -48,6 +57,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
},
{
label: '到仓库代码',
@ -56,6 +66,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false
},
{
label: '到库位类型范围',
@ -67,6 +78,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
},
{
label: '到库区代码范围',
@ -75,6 +87,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isForm: false,
},
{
label: '单据号',
@ -99,7 +112,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
disabled: true
}
}
},
isForm: false,
},
{
label: '备注',
@ -154,11 +168,13 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: { width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
isForm: false,
},
{
label: '截止时间',
@ -174,6 +190,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: { width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -226,6 +243,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: { width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -382,6 +400,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '到库位代码',
@ -390,6 +411,25 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
},
},
{
label: '单据号',
@ -412,6 +452,25 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
}
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择物品代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物品基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
},
},
{
label: '备注',
@ -435,6 +494,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: { width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@ -460,6 +520,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '物品描述1',
@ -468,6 +530,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '物品描述2',
@ -476,6 +540,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '项目代码',
@ -484,6 +550,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '数量',
@ -494,6 +562,15 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
form: {
component: 'InputNumber',
componentProps: {
min: 1,
precision: 6
}
},
tableForm: {
type: 'InputNumber',
min: 1,
precision: 6
}
},
{
@ -506,6 +583,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '从货主代码',
@ -514,6 +594,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '到货主代码',
@ -522,6 +604,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '最后更新时间',
@ -537,6 +621,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
component: 'DatePicker',
componentProps: {
style: { width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',

Write Preview
Loading…
Cancel
Save