diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index e1bc40d1f..ffa85fa80 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -4,29 +4,17 @@
-
-
+
+
-
+ }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+ v-model:sort="tableObject.sort">
{{ row.number }}
@@ -39,347 +27,329 @@
-
+ :apiCreate="InspectRequestMainApi.createInspectRequestMain" :isBusiness="true" @handleAddTable="handleAddTable"
+ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
-
+ @searchTableSuccessDetail="searchTableSuccessDetail" />
-
+
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index 4f7c196ca..1b7b778a7 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -1,18 +1,26 @@
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 BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'InspectRequest'
+ pageSize: 10,
+ pageNo: 1,
+ code: 'InspectRequest'
}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
- // 获取当前操作人的部门
+// 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore()
const userDept = userStore.userSelfInfo.dept
@@ -31,64 +39,121 @@ import * as LocationApi from '@/api/wms/location'
* @returns {Array} 检验申请主表
*/
export const InspectRequestMain = useCrudSchemas(reactive([
+
{
- label: '采购收货记录单号',
- field: 'purchaseReceiptRecordNumber',
+ label: '发货单号',
+ field: 'asnNumber',
sort: 'custom',
table: {
width: 150
},
+ isForm: false,
+ },
+ {
+ label: '要货计划单号',
+ field: 'ppNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ },
+ {
+ label: '供应商代码',
+ field: 'supplierCode',
+ sort: 'custom',
isSearch: true,
+ table: {
+ width: 150
+ },
form: {
- // labelMessage: '信息提示说明!!!',
+ labelMessage: '影响明细中物品代码,需在供应商物品中维护',
componentProps: {
isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
- searchField: 'number', // 查询弹窗赋值字段
- searchTitle: '采购收货记录', // 查询弹窗标题
- searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
- searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 查询弹窗所需分页方法
+ searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '供应商信息', // 查询弹窗标题
+ searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+ searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
}
}
},
+
{
- label: '供应商代码',
- field: 'supplierCode',
+ label: '收货数量',
+ field: 'receiveQty',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ min: 1,
+ precision: 6
+ }
+ },
+ isTableForm: true,
+ isForm: true,
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
sort: 'custom',
table: {
width: 150
},
- isSearch: true,
- form:{
- componentProps:{
- disabled:true
+ tableForm: {
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码',
+ searchField: 'code',
+ searchTitle: '仓库信息',
+ searchAllSchemas: Warehouse.allSchemas,
+ searchPage: WarehouseApi.getWarehousePage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ },
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '仓库信息', // 查询弹窗标题
+ searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+ searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
}
}
},
{
- label: '单据号',
- field: 'number',
+ label: '运输方式',
+ field: 'transferMode',
sort: 'custom',
+ dictType: DICT_TYPE.TRANSFER_MODE,
+ dictClass: 'string',
table: {
- width: 150,
- fixed: 'left'
+ width: 150
},
- isForm: false,
- isSearch: true,
},
{
- label: '业务类型',
- field: 'businessType',
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
sort: 'custom',
table: {
width: 150
},
- form: {
- value: 'Inspect',
- componentProps: {
- disabled: true
- }
- }
},
{
label: '从仓库代码',
@@ -100,19 +165,20 @@ export const InspectRequestMain = useCrudSchemas(reactive([
isForm: false,
},
{
- label: '从库区代码范围',
- field: 'fromAreaCodes',
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
sort: 'custom',
table: {
width: 150
},
+ isTableForm: false,
isForm: false,
},
{
label: '从库位类型范围',
field: 'fromLocationTypes',
- dictType: DICT_TYPE.LOCATION_TYPE,
- dictClass: 'string',
+ // dictType: DICT_TYPE.LOCATION_TYPE,
+ // dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
@@ -121,17 +187,21 @@ export const InspectRequestMain = useCrudSchemas(reactive([
isForm: false,
},
{
- label: '备注',
- field: 'remark',
+ label: '到库位类型范围',
+ field: 'toLocationTypes',
+ // dictType: DICT_TYPE.LOCATION_TYPE,
+ // dictClass: 'string',
+ isTable: true,
sort: 'custom',
table: {
width: 150
},
- isTable: false,
+ isTableForm: false,
+ isForm: false,
},
{
- label: '创建者',
- field: 'creator',
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
sort: 'custom',
table: {
width: 150
@@ -139,23 +209,46 @@ export const InspectRequestMain = useCrudSchemas(reactive([
isForm: false,
},
{
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
},
+ isForm: false,
+ isTableForm: false,
+ },
+ {
+ label: '从月台代码',
+ field: 'fromDockCode',
sort: 'custom',
table: {
- width: 180
+ width: 150
+ },
+ isForm: false,
+ },
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isForm: false,
+ isSearch: true,
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
},
form: {
- component: 'DatePicker',
+ value: 'PurchaseReturn',
componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ disabled: true
}
},
isForm: false,
@@ -174,7 +267,7 @@ export const InspectRequestMain = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- style: {width:'100%'},
+ style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@@ -196,7 +289,7 @@ export const InspectRequestMain = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- style: {width:'100%'},
+ style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@@ -236,181 +329,44 @@ export const InspectRequestMain = useCrudSchemas(reactive([
}
},
{
- label: '订单号',
- field: 'poNumber',
+ label: '备注',
+ field: 'remark',
sort: 'custom',
table: {
width: 150
},
- tableForm:{
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择订单号',
- searchField: 'number',
- searchTitle: '采购订单信息',
- searchAllSchemas: PurchaseMain.allSchemas,
- searchPage: PurchaseMainApi.getPurchaseMainPage
- },
- form: {
- // labelMessage: '信息提示说明!!!',
- componentProps: {
- isSearchList: true,
- searchListPlaceholder: '请选择订单号',
- searchField: 'number',
- searchTitle: '采购订单信息',
- searchAllSchemas: PurchaseMain.allSchemas,
- searchPage: PurchaseMainApi.getPurchaseMainPage
- }
- }
+ isTable: false,
},
{
- label: '订单行',
- field: 'poLine',
+ label: '创建者',
+ field: 'creator',
sort: 'custom',
table: {
width: 150
},
- tableForm:{
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择订单行',
- searchField: 'lineNumber',
- searchTitle: '采购订单信息',
- searchAllSchemas: PurchaseDetail.allSchemas,
- searchPage: PurchaseDetailApi.getPurchaseDetailPage
- },
- form: {
- // labelMessage: '信息提示说明!!!',
- componentProps: {
- isSearchList: true,
- searchListPlaceholder: '请选择订单行',
- searchField: 'lineNumber',
- searchTitle: '采购订单信息',
- searchAllSchemas: PurchaseDetail.allSchemas,
- searchPage: PurchaseDetailApi.getPurchaseDetailPage
- }
- }
+ isForm: false,
},
{
- label: '批次',
- field: 'batch',
- sort: 'custom',
- table: {
- width: 150
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
- },
- {
- label: '物品代码',
- field: 'itemCode',
sort: 'custom',
table: {
- width: 150
- },
- tableForm:{
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择物品代码',
- searchField: 'code',
- searchTitle: '物品基础信息',
- searchAllSchemas: Itembasic.allSchemas,
- searchPage: ItembasicApi.getItembasicPage
+ width: 180
},
form: {
- // labelMessage: '信息提示说明!!!',
+ component: 'DatePicker',
componentProps: {
- isSearchList: true,
- searchListPlaceholder: '请选择物品代码',
- searchField: 'code',
- searchTitle: '物品基础信息',
- searchAllSchemas: Itembasic.allSchemas,
- searchPage: ItembasicApi.getItembasicPage
+ style: { width: '100%' },
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
}
- }
- },
- {
- label: '检验类型',
- field: 'inspectType',
- dictType: DICT_TYPE.INSPECT_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false
- },
- {
- label: '下一步检验动作',
- field: 'nextAction',
- dictType: DICT_TYPE.NEXT_ACTION,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false
- },
- {
- label: '抽检方式',
- field: 'sampleMethod',
- dictType: DICT_TYPE.SAMPLE_METHOD,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false
- },
- {
- label: '计量单位',
- field: 'uom',
- dictType: DICT_TYPE.UOM,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '收货数量',
- field: 'receiveQty',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- componentProps: {
- min: 1,
- precision: 6
- },
},
- isForm: false
- },
- {
- label: '样品数量',
- field: 'sampleQty',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- componentProps: {
- min: 1,
- precision: 6
- },
- },
- isForm: false
- },
- {
- label: '货主代码',
- field: 'ownerCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false
+ isForm: false,
},
{
label: '自动提交',
@@ -604,7 +560,7 @@ export const InspectRequestDetail = useCrudSchemas(reactive([
table: {
width: 150
},
- tableForm:{
+ tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
@@ -631,25 +587,24 @@ export const InspectRequestDetail = useCrudSchemas(reactive([
table: {
width: 150
},
- tableForm:{
+ tableForm: {
+ disabled: true,
isInpuFocusShow: true,
- searchListPlaceholder: '请选择物品代码',
- searchField: 'code',
- searchTitle: '物品基础信息',
- searchAllSchemas: Itembasic.allSchemas,
- searchPage: ItembasicApi.getItembasicPage
+ earchListPlaceholder: '请选择包装号',
+ searchField: 'packingNumber',
+ searchTitle: '库存余额信息',
+ searchAllSchemas: Balance.allSchemas,
+ searchPage: BalanceApi.getBalancePagePutaway,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }, {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ isMainValue: true
+ }]
},
- form: {
- // labelMessage: '信息提示说明!!!',
- componentProps: {
- isSearchList: true,
- searchListPlaceholder: '请选择物品代码',
- searchField: 'code',
- searchTitle: '物品基础信息',
- searchAllSchemas: Itembasic.allSchemas,
- searchPage: ItembasicApi.getItembasicPage
- }
- }
},
{
label: '物品名称',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 7a2bc2b64..5d445ab43 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -106,9 +106,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
// 明细查询页赋值
row[formField] = val[0][searchField]
- row['itemCode'] = val[0]['code']
- row['poNumber'] = val[0]['number']
- row['poLine'] = val[0]['lineNumber']
+ if (formField == 'itemCode') {
+ row['poNumber'] = val[0]['poNumber']
+ row['poLine'] = val[0]['poLine']
+ row['itemCode'] = val[0]['itemCode']
+ row['uom'] = val[0]['uom']
+ }
} else {
const setV = {}
setV[formField] = val[0][searchField]
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index af8a54c14..eebbc29f3 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -1,10 +1,10 @@
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 getRequestsettingApi from '@/api/wms/requestsetting/index'
-// import * as SupplierApi from '@/api/wms/supplier'
-// import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
import { InspectRequestMain } from '@/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data'
@@ -17,17 +17,23 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l
import * as PurchaseMainApi from '@/api/wms/purchaseMain'
import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
const queryParams = {
- pageSize:10,
- pageNo:1,
- code:'MaterialPutawayRequest'
+ pageSize: 10,
+ pageNo: 1,
+ code: 'MaterialPutawayRequest'
}
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
- // 获取当前操作人的部门
+// 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user'
import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
const userStore = useUserStore()
@@ -37,15 +43,15 @@ const userDept = userStore.userSelfInfo.dept
* @returns {Array} 上架申请主表
*/
export const PutawayRequestMain = useCrudSchemas(reactive([
- {
- label: '从仓库代码',
- field: 'fromWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
+ // {
+ // label: '从仓库代码',
+ // field: 'fromWarehouseCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // },
{
label: '从库位类型范围',
field: 'fromLocationTypes',
@@ -72,26 +78,108 @@ export const PutawayRequestMain = useCrudSchemas(reactive([
field: 'number',
sort: 'custom',
table: {
- width: 150,
+ width: 180,
fixed: 'left'
},
isForm: false,
isSearch: true,
},
{
- label: '业务类型',
- field: 'businessType',
+ label: '供应商代码',
+ field: 'supplierCode',
sort: 'custom',
table: {
width: 150
},
+ isSearch: true,
form: {
- value: 'PurchasePutaway',
+ // labelMessage: '信息提示说明!!!',
componentProps: {
- disabled: true
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '供应商信息', // 查询弹窗标题
+ searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+ searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+ }
+ }
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码',
+ searchField: 'code',
+ searchTitle: '仓库信息',
+ searchAllSchemas: Warehouse.allSchemas,
+ searchPage: WarehouseApi.getWarehousePage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ },
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '仓库信息', // 查询弹窗标题
+ searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+ searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ }
+ }
+ },
+
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码',
+ searchField: 'code',
+ searchTitle: '仓库信息',
+ searchAllSchemas: Warehouse.allSchemas,
+ searchPage: WarehouseApi.getWarehousePage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ },
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '仓库信息', // 查询弹窗标题
+ searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+ searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
}
}
},
+
{
label: '备注',
field: 'remark',
@@ -115,7 +203,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- style: {width:'100%'},
+ style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@@ -146,7 +234,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- style: {width:'100%'},
+ style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@@ -169,7 +257,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- style: {width:'100%'},
+ style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@@ -410,6 +498,46 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([
type: 'Select'
}
},
+ {
+ label: '物品代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ disabled: true,
+ isInpuFocusShow: true,
+ earchListPlaceholder: '请选择包装号',
+ searchField: 'packingNumber',
+ searchTitle: '库存余额信息',
+ searchAllSchemas: Balance.allSchemas,
+ searchPage: BalanceApi.getBalancePagePutaway,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }, {
+ key: 'workshopCode',
+ value: 'workshopCode',
+ isMainValue: true
+ }]
+ },
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ type: 'Select'
+ }
+ },
{
label: '订单号',
field: 'poNumber',
@@ -471,7 +599,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([
table: {
width: 150
},
- tableForm:{
+ tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
@@ -500,38 +628,12 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([
},
isTableForm: false,
form: {
- componentProps:{
- disabled: true
- }
- }
- },
- {
- label: '物品代码',
- field: 'itemCode',
- sort: 'custom',
- 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
+ disabled: true
}
}
},
+
{
label: '备注',
field: 'remark',
@@ -554,7 +656,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([
form: {
component: 'DatePicker',
componentProps: {
- style: {width:'100%'},
+ style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
@@ -633,20 +735,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([
precision: 6
}
},
- {
- label: '计量单位',
- field: 'uom',
- dictType: DICT_TYPE.UOM,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm: {
- type: 'Select'
- }
- },
+
{
label: '从货主代码',
field: 'fromOwnerCode',
@@ -671,13 +760,13 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([
label: '操作',
field: 'action',
isDetail: false,
- isForm: false ,
- isTable: false ,
+ isForm: false,
+ isTable: false,
table: {
width: 150,
fixed: 'right'
},
- isTableForm:false,
+ isTableForm: false,
}
]))