diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 88439dd30..af8cab620 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -406,7 +406,9 @@
routeName == 'DeliverPlanMain' ||
routeName == 'DeliverRequestMain' ||
routeName == 'ZZBJDeliverRequestMain' ||
- routeName == 'UnplannedreceiptRequestMain'
+ routeName == 'UnplannedreceiptRequestMain'||
+ routeName == 'RepleinshRequestMain'
+
"
>
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 4bf9a8d6e..471a5f41b 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -429,7 +429,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
table: {
width: 150
},
- isSearch: true,
+ isSearch: false,
hiddenInMain: true
},
{
@@ -439,7 +439,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
table: {
width: 150
},
- isSearch: true,
+ isSearch: false,
hiddenInMain: true
},
{
@@ -480,7 +480,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
width: 150
},
sortSearchDefault:3,
- isSearch: true,
+ isSearch: false,
hiddenInMain: true
},
{
@@ -491,7 +491,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
width: 150
},
sortSearchDefault:4,
- isSearch: true,
+ isSearch: false,
hiddenInMain: true
},
{
@@ -512,6 +512,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ isTable:false,
hiddenInMain:true,
sortTableDefault:2,
},
@@ -522,6 +523,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ isTable:false,
hiddenInMain:true,
sortTableDefault:3,
},
@@ -529,6 +531,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
+ isTable:false,
table: {
width: 150
},
@@ -690,6 +693,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ isTable:false,
hiddenInMain:true,
},
{
@@ -740,6 +744,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ isTable:false,
hiddenInMain:true,
},
@@ -750,6 +755,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ isTable:false,
hiddenInMain:true,
},
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index b71d95777..74040ff72 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
@@ -51,6 +51,8 @@
:apiUpdate="RepleinshRequestMainApi.updateRepleinshRequestMain"
:apiCreate="RepleinshRequestMainApi.createRepleinshRequestMain"
:isBusiness="true"
+ :isOpenSearchTable="true"
+ fieldTableColumn="itemCode"
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
:isShowReduceButtonSelection="true"
@@ -108,8 +110,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
// 明细查询页赋值
if (formField == 'itemCode') {
- row['itemCode'] = val[0]['code']
- row['uom'] = val[0]['uom']
+ // row['itemCode'] = val[0]['code']
+ // row['uom'] = val[0]['uom']
+ val.forEach(item=>{
+ if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
+ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+ newRow['itemCode'] = item['code']
+ newRow['uom'] = item['uom']
+ newRow['id'] = item['id']
+ tableData.value.push(newRow)
+ })
} else {
row[formField] = val[0][searchField]
}
@@ -366,6 +376,9 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){
data.id = data.masterId
}
+ tableData.value.forEach(item=>{
+ item.toLocationCode = data.toLocationCode
+ })
data.subList = tableData.value // 拼接子表数据参数
if(tableData.value.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0')
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 80e5d6536..006c658d2 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -208,44 +208,86 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([
isTable: false,
},
{
- label: '从仓库代码',
- field: 'fromWarehouseCode',
+ label: '到库位代码',
+ field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
- isTable: false,
+ hiddenInMain:true,
+ sortSearchDefault:1000,
+ isSearch: true,
+ sortTableDefault:1100,
+ // isTableForm: false,
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+ searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '仓库信息', // 查询弹窗标题
- searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
- searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
- searchCondition: [{
+ searchTitle: '库位信息', // 查询弹窗标题
+ searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+ searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
+ searchCondition:[{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
- }
- },
- {
- label: '到仓库代码',
- field: 'toWarehouseCode',
- sort: 'custom',
- table: {
- width: 150
},
- isTable: false,
- form: {
- componentProps: {
- disabled: true
- }
- }
+ tableForm:{
+ isInpuFocusShow: true,
+ searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '库位信息', // 查询弹窗标题
+ searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+ searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
+ searchCondition:[{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ },
},
+ // {
+ // label: '从仓库代码',
+ // field: 'fromWarehouseCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: 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
+ // },
+ // isTable: false,
+ // form: {
+ // componentProps: {
+ // disabled: true
+ // }
+ // }
+ // },
{
label: '自动提交',
field: 'autoCommit',
@@ -498,8 +540,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([
}
},
tableForm:{
- enterSearch:true,
isInpuFocusShow: true,
+ multiple:true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物料基础信息', // 查询弹窗标题
@@ -587,48 +629,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([
}
}
},
- {
- label: '到库位代码',
- field: 'toLocationCode',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain:true,
- sortSearchDefault:1000,
- isSearch: true,
- sortTableDefault:1100,
- // isTableForm: false,
- form: {
- // labelMessage: '信息提示说明!!!',
- componentProps: {
- isSearchList: true, // 开启查询弹窗
- searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '库位信息', // 查询弹窗标题
- searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
- searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }]
- }
- },
- tableForm:{
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择到库位代码', // 输入框占位文本
- searchField: 'code', // 查询弹窗赋值字段
- searchTitle: '库位信息', // 查询弹窗标题
- searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
- searchPage: LocationApi.getLocationPageRepleinsh, // 查询弹窗所需分页方法
- searchCondition:[{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }]
- },
- },
+
// {
// label: '包装号',
// field: 'packingNumber',
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index b8f15698c..83e25ee9b 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -129,7 +129,7 @@ const getSwitchStatus = async ()=>{
console.log('getSwitchStatus',res)
if(res&&res.list){
switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE'
-
+
}
}
// 列表头部按钮
@@ -255,6 +255,12 @@ const handleExport = async () => {
// 筛选提交
const searchFormClick = (searchData) => {
+ const cmd = {
+ 'column':'type',
+ 'action':'==',
+ 'value':'predict'
+ }
+ searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
filters: searchData.filters
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index bbe6e11a9..9778c239b 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -165,6 +165,12 @@ const handleExport = async () => {
// 筛选提交
const searchFormClick = (searchData) => {
+ const cmd = {
+ 'column':'type',
+ 'action':'==',
+ 'value':'predict'
+ }
+ searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
filters: searchData.filters
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index aa88d864f..9cfa44045 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -421,6 +421,12 @@ const importSuccess = () => {
// 筛选提交
const searchFormClick = (searchData) => {
+ const cmd = {
+ 'column':'type',
+ 'action':'==',
+ 'value':'predict'
+ }
+ searchData.filters.push(cmd)
tableObject.params = {
isSearch: true,
filters: searchData.filters
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index 02ea8131c..3a5bb522d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive([
{
- label: '上传质检报告',
+ label: '上传质量报告',
field: 'uploadFile',
sort: 'custom',
isTable:false,
@@ -16,7 +16,8 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive