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

Merge branch 'master_hella' into master_hella_20240701

master_hella_20240701
陈薪名 4 months ago
parent
44da37b8c7 fb5c6e4140
commit
e68c2663c0
5 changed files with 97 additions and 74 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. 4
      src/components/TableForm/src/TableForm.vue
  2. 14
      src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
  3. 17
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
  4. 131
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
  5. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts

4
src/components/TableForm/src/TableForm.vue
View File

@ -406,7 +406,9 @@
routeName == 'DeliverPlanMain' ||
routeName == 'DeliverRequestMain' ||
routeName == 'ZZBJDeliverRequestMain' ||
routeName == 'UnplannedreceiptRequestMain'
routeName == 'UnplannedreceiptRequestMain'||
routeName == 'RepleinshRequestMain'
"
>
<el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加" />

14
src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
View File

@ -429,7 +429,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true,
isSearch: false,
hiddenInMain: true
},
{
@ -439,7 +439,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isSearch: true,
isSearch: false,
hiddenInMain: true
},
{
@ -480,7 +480,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
sortSearchDefault:3,
isSearch: true,
isSearch: false,
hiddenInMain: true
},
{
@ -491,7 +491,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
sortSearchDefault:4,
isSearch: true,
isSearch: false,
hiddenInMain: true
},
{
@ -512,6 +512,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
hiddenInMain:true,
sortTableDefault:2,
},
@ -522,6 +523,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
hiddenInMain:true,
sortTableDefault:3,
},
@ -529,6 +531,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '从货主代码',
field: 'fromOwnerCode',
sort: 'custom',
isTable:false,
table: {
width: 150
},
@ -690,6 +693,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
hiddenInMain:true,
},
{
@ -740,6 +744,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
hiddenInMain:true,
},
@ -750,6 +755,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable:false,
hiddenInMain:true,
},

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

@ -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')

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

@ -208,44 +208,86 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
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<CrudSchema[]>([
}
},
tableForm:{
enterSearch:true,
isInpuFocusShow: true,
multiple:true,
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物料基础信息', // 查询弹窗标题
@ -587,48 +629,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
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',

5
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
View File

@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '上传质检报告',
label: '上传质量报告',
field: 'uploadFile',
sort: 'custom',
isTable:false,
@ -16,7 +16,8 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
tableName: 'SupplierdeliverInspectionDetail',
},
fileType:['pdf','png','jpg','jpeg'],
fileSize:100
fileSize:100,
limit:20000
}
},
},

Write Preview
Loading…
Cancel
Save