Browse Source

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

intex_online20241228
ljlong_2630 2 months ago
parent
commit
b77b451bf0
  1. 9
      src/components/BasicForm/src/BasicForm.vue
  2. 1
      src/components/TableForm/src/TableForm.vue
  3. 2
      src/components/XButton/src/ButtonBaseMore.vue
  4. 16
      src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
  5. 24
      src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
  6. 59
      src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
  7. 42
      src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
  8. 11
      src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
  9. 5
      src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
  10. 1
      src/views/wms/inventoryManage/expectin/index.vue
  11. 1
      src/views/wms/inventoryManage/expectout/index.vue
  12. 51
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
  13. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
  14. 8
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

9
src/components/BasicForm/src/BasicForm.vue

@ -674,6 +674,15 @@ watch(
deep: true deep: true
} }
) )
watch(
() => props.formAllSchemas,
(val) => {
formSchema.value = val.formSchema
},
{
deep: true
}
)
let originFormModel = {} let originFormModel = {}
const updateOriginFormModel = (data) => { const updateOriginFormModel = (data) => {
originFormModel = JSON.parse(JSON.stringify(data)) originFormModel = JSON.parse(JSON.stringify(data))

1
src/components/TableForm/src/TableForm.vue

@ -627,7 +627,6 @@ const handleTableSelect = (row, column, event) => {
// item // item
const itemIsDisabled = (colum, row) => { const itemIsDisabled = (colum, row) => {
console.log(row['disabled_' + colum.field])
if (row['disabled_' + colum.field] === true || row['disabled_' + colum.field] === false) { if (row['disabled_' + colum.field] === true || row['disabled_' + colum.field] === false) {
return Boolean(row['disabled_' + colum.field]) return Boolean(row['disabled_' + colum.field])
} }

2
src/components/XButton/src/ButtonBaseMore.vue

@ -15,7 +15,7 @@
</el-button> </el-button>
</div> </div>
<el-dropdown placement="top-start" v-if="showList().length>3"> <el-dropdown placement="top-start" v-if="showList().length>3">
<el-button link class="more"> 更多 </el-button> <el-button link class="more" type="primary"> 更多 </el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item v-for="(item, index) in getMoreList" :key="index+3" class="btn-div"> <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+3" class="btn-div">

16
src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts

@ -184,14 +184,14 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{ // {
label: '部门', // label: '部门',
field: 'departmentCode', // field: 'departmentCode',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
}, // },
{ {
label: '明盘', label: '明盘',
field: 'isOpenCount', field: 'isOpenCount',

24
src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts

@ -183,30 +183,6 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '部门',
field: 'departmentCode',
sort: 'custom',
isForm: false,
table: {
width: 150
},
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name
},
form: {
value: userDept.id,
component: 'Select',
api: () => userDeptArray,
componentProps: {
disabled: true,
optionsAlias: {
labelField: 'name',
valueField: 'id'
}
}
}
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

59
src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts

@ -156,14 +156,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{ // {
label: '部门', // label: '部门',
field: 'departmentCode', // field: 'departmentCode',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
}, // },
// { // {
// label: '接口类型', // label: '接口类型',
// field: 'interfaceType', // field: 'interfaceType',
@ -456,49 +456,6 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '货主代码',
field: 'ownerCode',
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '任务明细ID',
// field: 'jobDetailId',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '代码',
// field: 'code',
// sort: 'custom',
// table: {
// width: 150
// },
// },
// {
// label: '接口类型',
// field: 'interfaceType',
// dictType: DICT_TYPE.INTERFACE_TYPE,
// dictClass: 'string',
// isTable: true,
// sort: 'custom',
// table: {
// width: 150
// },
// },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

42
src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@ -171,30 +171,6 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
}, },
isForm: false, isForm: false,
}, },
{
label: '部门',
field: 'departmentCode',
sort: 'custom',
isForm: false,
table: {
width: 150
},
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name
},
form: {
value: userDept.id,
component: 'Select',
api: () => userDeptArray,
componentProps: {
disabled: true,
optionsAlias: {
labelField: 'name',
valueField: 'id'
}
}
}
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -573,24 +549,6 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
type: 'Select' type: 'Select'
} }
}, },
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '货主代码',
field: 'ownerCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

11
src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts

@ -315,6 +315,17 @@ export const CustomerSaleInvoiceDetailRules = reactive({
}) })
export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '序号',
type:'index',
field: 'numberIndex',
sort: 'custom',
isSearch: false,
isForm: false,
tableForm: {
disabled: true
}
},
{ {
label: '品番', label: '品番',
field: 'itemCode', field: 'itemCode',

5
src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@ -117,7 +117,7 @@
<template #adjustmentAmount="{ row }" v-if="tabCurrent.prop == 'ShareReconciliation'"> <template #adjustmentAmount="{ row }" v-if="tabCurrent.prop == 'ShareReconciliation'">
<div style="position: relative"> <div style="position: relative">
<span>{{ row.adjustmentAmount }}</span> <span>{{ row.adjustmentAmount }}</span>
<Icon v-if="row.status==4" <Icon v-if="chooseRow.status==4"
icon="ep:edit" icon="ep:edit"
color="#409eff" color="#409eff"
@click="openDetailForm(row)" @click="openDetailForm(row)"
@ -655,6 +655,7 @@ const changeTabs = async (item) => {
] ]
apiPage.value = CustomerStatementDetailApi.getCustomerToolApportStatementPage apiPage.value = CustomerStatementDetailApi.getCustomerToolApportStatementPage
DetailAllSchemas.value = CustomerStatementShareReconciliation.allSchemas DetailAllSchemas.value = CustomerStatementShareReconciliation.allSchemas
console.log(555,DetailAllSchemas.value)
otherHeadButttonData.value = [ otherHeadButttonData.value = [
{ {
label: t(`ts.导出`).replace('ts.', ''), label: t(`ts.导出`).replace('ts.', ''),
@ -794,8 +795,6 @@ const openDetailForm = (row) => {
} }
// //
const handleDetailSubmitForm = async (formType, data) => { const handleDetailSubmitForm = async (formType, data) => {
console.log(detailRef.value.tableObjectRef.tableList)
await CustomerStatementDetailApi.updateAdjustmentAmount(data.id,data.masterId,data.adjustmentAmount) await CustomerStatementDetailApi.updateAdjustmentAmount(data.id,data.masterId,data.adjustmentAmount)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
detailRef.value.submitUpdateList() detailRef.value.submitUpdateList()

1
src/views/wms/inventoryManage/expectin/index.vue

@ -160,6 +160,7 @@ const handleSelectionDelete = async ()=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.id)] rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
}) })
if(rows.length==0){ if(rows.length==0){
message.warning("至少勾选一条数据!")
return return
} }
try { try {

1
src/views/wms/inventoryManage/expectout/index.vue

@ -160,6 +160,7 @@ const handleSelectionDelete = async ()=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.id)] rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
}) })
if(rows.length==0){ if(rows.length==0){
message.warning("至少勾选一条数据!")
return return
} }
try { try {

51
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts

@ -11,6 +11,14 @@ import * as QadProjectApi from '@/api/wms/qadProject'
import * as SubjectAccountApi from '@/api/wms/subjectAccount' import * as SubjectAccountApi from '@/api/wms/subjectAccount'
import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data' import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
// 获取当前操作人的部门
import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore()
const userDept = userStore.userSelfInfo.dept
// id 转str 否则form回显匹配不到
userDept.id = userDept.id.toString()
const userDeptArray: any = [userDept]
/** /**
* @returns {Array} * @returns {Array}
*/ */
@ -345,6 +353,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name
},
}, },
{ {
label: '接口类型', label: '接口类型',
@ -450,26 +461,26 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150 // width: 150
// }, // },
// }, // },
{ // {
label: '是否可用', // label: '是否可用',
field: 'available', // field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, // dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // dictClass: 'string',
isSearch: false, // isSearch: false,
isTable: true, // isTable: true,
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'Switch', // component: 'Switch',
value: 'TRUE', // value: 'TRUE',
componentProps: { // componentProps: {
inactiveValue: 'FALSE', // inactiveValue: 'FALSE',
activeValue: 'TRUE' // activeValue: 'TRUE'
} // }
} // }
}, // },
])) ]))
//表单校验 //表单校验

2
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts

@ -932,7 +932,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
//表单校验 //表单校验
export const UnplannedissueRequestDetailRules = reactive({ export const UnplannedissueRequestDetailRules = reactive({
batch: [ batch: [
{ required: true, message: '请输入批次', trigger: 'blur' }, // { required: true, message: '请输入批次', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
containerNumber: [ containerNumber: [

8
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -280,6 +280,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
tfk['itemCode'] = item['code'] tfk['itemCode'] = item['code']
tfk['uom'] = item['uom'] tfk['uom'] = item['uom']
tfk['validityDays'] = item['validityDays'] tfk['validityDays'] = item['validityDays']
tfk['isEnableBuy'] = val[0]['enableBuy']
tableData.value.push(tfk) tableData.value.push(tfk)
}) })
} else if (formField === 'costcentreCode') { } else if (formField === 'costcentreCode') {
@ -855,6 +856,13 @@ const submitForm = async (formType, submitData) => {
: '' : ''
}) })
try { try {
let newVal = data.subList.some((item) => item.isEnableBuy == 'TRUE')
let newVal1 = data.subList.some((item) => item.isEnableBuy == 'FALSE')
console.log(newVal,newVal1)
if (newVal && newVal1) {
message.warning('不能同时选择可制造和可采购的物料')
return
}
if (formType === 'create') { if (formType === 'create') {
console.log('【计划外入库子列表】', data.subList) console.log('【计划外入库子列表】', data.subList)
if (data.subList.length == 0) { if (data.subList.length == 0) {

Loading…
Cancel
Save