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

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

intex_online20250427
songguoqiang 5 days ago
parent
8a37143dc9 b221f79316
commit
6dae17755d
15 changed files with 1079 additions and 974 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. 2
      src/components/Search/src/Search.vue
  2. 2
      src/views/wms/basicDataManage/itemPull/index.vue
  3. 1823
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
  4. 12
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
  5. 56
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
  6. 16
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
  7. 44
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
  8. 16
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  9. 25
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  10. 3
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  11. 29
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  12. 3
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
  13. 19
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  14. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  15. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

2
src/components/Search/src/Search.vue
View File

@ -377,7 +377,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
.dateSearch ::v-deep(.el-form-item) {
margin-right: 1%;
min-width: 320px;
width:30%;
width:32%;
}
.search ::v-deep(.el-form-item:nth-last-child(1)) {
margin-right: 0px;

2
src/views/wms/basicDataManage/itemPull/index.vue
View File

@ -225,7 +225,7 @@ const handleImport = () => {
// 导入附件弹窗所需的参数
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '物料拉动配置导入模版.xlsx'
templateTitle: '品番拉动配置导入模版.xlsx'
})
// 导入成功之后
const importSuccess = () => {

1823
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
View File

File diff suppressed because it is too large

12
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
View File

@ -154,7 +154,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '领用原因代码',
label: '预算科目',
field: 'reasonCodeRequisition',
sort: 'custom',
table: {
@ -162,9 +162,9 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码',
searchListPlaceholder: '请选择成预算科目',
searchField: 'code',
searchTitle: '领用原因代码',
searchTitle: '预算科目',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
@ -184,7 +184,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{
@ -211,7 +211,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode',
searchTitle: '领用原因代码',
searchTitle: '预算科目',
searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage
},
@ -221,7 +221,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{

56
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
View File

@ -197,7 +197,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '领用原因代码',
label: '预算科目',
field: 'reasonCodeRequisition',
sort: 'custom',
table: {
@ -205,9 +205,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
tableForm: {
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码',
searchListPlaceholder: '请选择成预算科目',
searchField: 'code',
searchTitle: '领用原因代码',
searchTitle: '预算科目',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
@ -227,7 +227,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{
@ -254,7 +254,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode',
searchTitle: '领用原因代码',
searchTitle: '预算科目',
searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage
},
@ -264,7 +264,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{
@ -681,28 +681,28 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
},
{
label: '单价',
field: 'singlePrice',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '金额',
field: 'amount',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
// {
// label: '单价',
// field: 'singlePrice',
// sort: 'custom',
// table: {
// width: 150
// },
// form: {
// component: 'InputNumber',
// }
// },
// {
// label: '金额',
// field: 'amount',
// sort: 'custom',
// table: {
// width: 150
// },
// form: {
// component: 'InputNumber',
// }
// },
{
label: '库存状态',
field: 'inventoryStatus',

16
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
View File

@ -189,7 +189,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '领用原因代码',
label: '预算科目',
field: 'reasonCodeRequisition',
sort: 'custom',
table: {
@ -198,9 +198,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
tableForm: {
enterSearch: true,
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择成领用原因代码',
searchListPlaceholder: '请选择成预算科目',
searchField: 'code',
searchTitle: '领用原因代码',
searchTitle: '预算科目',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
@ -230,9 +230,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择领用原因代码', // 输入框占位文本
searchListPlaceholder: '请选择预算科目', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
searchCondition: [{
@ -270,7 +270,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息',
searchField: 'projectCode',
searchTitle: '领用原因代码',
searchTitle: '预算科目',
searchAllSchemas: QadProject.allSchemas,
searchPage: QadProjectApi.getQadProjectPage,
verificationParams: [{
@ -289,7 +289,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
searchField: 'projectCode', // 查询弹窗赋值字段
searchTitle: '领用原因代码', // 查询弹窗标题
searchTitle: '预算科目', // 查询弹窗标题
searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
searchCondition: [{
@ -677,7 +677,7 @@ export const UnplannedissueRequestMainRules = reactive({
{ required: false, message: '请输入成本中心类型', trigger: 'blur' }
],
reasonCodeRequisition: [
{ required: true, message: '请输入领用原因代码', trigger: 'blur' }
{ required: true, message: '请输入预算科目', trigger: 'blur' }
],
projectCode: [
{ required: false, message: '请输入项目代码', trigger: 'blur' }

44
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
View File

@ -661,28 +661,28 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150
},
},
{
label: '单价',
field: 'singlePrice',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '金额',
field: 'amount',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
// {
// label: '单价',
// field: 'singlePrice',
// sort: 'custom',
// table: {
// width: 150
// },
// form: {
// component: 'InputNumber',
// }
// },
// {
// label: '金额',
// field: 'amount',
// sort: 'custom',
// table: {
// width: 150
// },
// form: {
// component: 'InputNumber',
// }
// },
{
label: '到库位代码',
field: 'toLocationCode',

16
src/views/wms/issueManage/issue/issueRequestMain/index.vue
View File

@ -240,14 +240,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}
if (formField == 'productionLineCode') {
//生产线
let res = await WorkstationApi.getWorkstationPage({
productionLineCode: val[0][searchField],
pageSize: 20,
pageNo: 1
})
if(res&&res.list&&res.list.length>0){
setV['workStationCode'] = res.list[0].code
}
// let res = await WorkstationApi.getWorkstationPage({
// productionLineCode: val[0][searchField],
// pageSize: 20,
// pageNo: 1
// })
// if(res&&res.list&&res.list.length>0){
// setV['workStationCode'] = res.list[0].code
// }
tableData.value =[]
}
if (formField == 'workStationCode') {

25
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
View File

@ -265,7 +265,7 @@ function addDay(date: Date | number, addDay: number) {
}
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => {
nextTick(async() => {
if (type == 'tableForm') {
if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit']
@ -282,6 +282,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
}
const index1 = 0
setTableFormsValues(val, index1)
} else if (formField == 'workStationCode') {
// 获取管理精度
const res = await ruleApi.getManagementPrecision({
itemCodes: [row['itemCode']],
locationCode:val[0]['fgLocationCode']
})
if (res[0].ManagementPrecision == 'BY_BATCH') {
row['batch'] = formatTime(new Date(), 'yyyyMMdd')
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = false
})
ProductreceiptRequestDetailRules.batch[0].required = true
// 按数量管理批次清空不可输入
} else if (res[0].ManagementPrecision == 'BY_QUANTITY') {
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = true
})
row['batch'] = ''
ProductreceiptRequestDetailRules.batch[0].required = false
}
row[formField] = val[0][searchField]
} else {
row[formField] = val[0][searchField]
}

3
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
View File

@ -1113,6 +1113,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
tableForm: {
disabled: false
}
},
{
label: '品名',

29
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
View File

@ -159,6 +159,8 @@ import * as WorkshopApi from '@/api/wms/workshop'
import * as ConfigApi from '@/api/infra/config'
import { usePageLoading } from '@/hooks/web/usePageLoading'
import * as ruleApi from '@/api/wms/rule/index'
import * as AreaApi from '@/api/wms/areabasic'
import * as LocationApi from '@/api/wms/location'
const { loadStart, loadDone } = usePageLoading()
// 装配收货申请
// 号口品收货申请
@ -226,7 +228,7 @@ const onChange = (field, cur) => {
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
nextTick(() => {
nextTick(async() => {
if (type == 'tableForm') {
if (formField == 'secondPackUnit') {
row['secondPackUnit'] = val[0]['packUnit']
@ -243,7 +245,30 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}
const index1 = 0
setTableFormsValues(val, index1)
} else{
} else if (formField == 'workStationCode') {
// 获取管理精度
const res = await ruleApi.getManagementPrecision({
itemCodes: [row['itemCode']],
locationCode:val[0]['fgLocationCode']
})
if (res[0].ManagementPrecision == 'BY_BATCH') {
row['batch'] = formatTime(new Date(), 'yyyyMMdd')
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = false
})
ProductreceiptRequestDetailRules.batch[0].required = true
// 按数量管理批次清空不可输入
} else if (res[0].ManagementPrecision == 'BY_QUANTITY') {
ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
if(item.field == 'batch')
item.tableForm.disabled = true
})
row['batch'] = ''
ProductreceiptRequestDetailRules.batch[0].required = false
}
row[formField] = val[0][searchField]
} else{
row[formField] = val[0][searchField]
}
} else {

3
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
View File

@ -1170,6 +1170,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
sortTableDefault: 1006,
table: {
width: 150
},
tableForm: {
disabled:false
}
},
{

19
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
View File

@ -2645,13 +2645,14 @@ export const PurchasereceiptRequestPackage = useCrudSchemas(reactive<CrudSchema[
disabled: true
}
},
{
label: '品番类型',
field: 'itemType',
sort: 'custom',
isTableForm: false,
tableForm: {
disabled: true
}
},
// {
// label: '品番类型',
// field: 'itemType',
// sort: 'custom',
// isTableForm: false,
// isForm: false,
// tableForm: {
// disabled: true
// }
// },
]))

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
View File

@ -1067,7 +1067,7 @@ const handleSelectionPublish = async ()=>{
getList()
importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
nextTick(()=>{
tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty')
// tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty')
})
})
</script>

1
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
View File

@ -8,6 +8,7 @@
]"
@search="setSearchParams"
@reset="setSearchParams"
:formClassNames="['dateSearch']"
/>
</ContentWrap>

Write Preview
Loading…
Cancel
Save