Browse Source

BUG修改

master
yejiaxing 12 months ago
parent
commit
4a5371bcad
  1. 17
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  2. 60
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

17
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@ -204,12 +204,10 @@ const butttondata = (row) => {
defaultButtons.mainListPurchasePlanCloBtn({hide:isShowMainButton(row,['1'])}), // defaultButtons.mainListPurchasePlanCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListPurchasePlanOpeBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListPurchasePlanOpeBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:update'}), // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:update'}), //
defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), //
] ]
} }
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPurPlanOpe') { // if (val == 'mainPurPlanOpe') { //
@ -299,13 +297,14 @@ const submitForm = async (formType, data) => {
for(let item of tableData.value) { for(let item of tableData.value) {
await PurchaseDetailApi.getPurchaseDetailPage({ await PurchaseDetailApi.getPurchaseDetailPage({
number: item.poNumber, number: item.poNumber,
lineNumber: item.poLine lineNumber: item.poLine,
}).then(res => { }).then(res => {
if(item.planQty > res.list[0].orderQty-res.list[0].plannedQty){ data.subList.push(item) //
message.error('要货计划数量不得大于订单数量-已计划数量') // if(item.planQty > res.list[0].orderQty-res.list[0].plannedQty){
} else { // message.error('-')
data.subList.push(item) // // } else {
} // data.subList.push(item) //
// }
}) })
} }
if(data.subList.length == tableData.value.length){ if(data.subList.length == tableData.value.length){

60
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@ -15,7 +15,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '单据号', label: '单据号',
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
isForm: false , isForm: false,
table: { table: {
width: 150, width: 150,
fixed: 'left' fixed: 'left'
@ -122,7 +122,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -145,7 +145,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -166,7 +166,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
isTable: true, isTable: true,
isForm: false , isForm: false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -178,7 +178,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -189,7 +189,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '创建者', label: '创建者',
field: 'creator', field: 'creator',
sort: 'custom', sort: 'custom',
isForm: false , isForm: false,
table: { table: {
width: 150 width: 150
}, },
@ -198,7 +198,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '最后更新时间', label: '最后更新时间',
field: 'updateTime', field: 'updateTime',
isTable: true, isTable: true,
isForm: false , isForm: false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -210,7 +210,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -221,7 +221,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '最后更新者', label: '最后更新者',
field: 'updater', field: 'updater',
sort: 'custom', sort: 'custom',
isForm: false , isForm: false,
table: { table: {
width: 150 width: 150
}, },
@ -250,7 +250,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '操作', label: '操作',
field: 'action', field: 'action',
isDetail: false, isDetail: false,
isForm: false , isForm: false,
table: { table: {
width: 200, width: 200,
fixed: 'right' fixed: 'right'
@ -285,7 +285,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
tableForm:{ tableForm: {
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择订单号', searchListPlaceholder: '请选择订单号',
searchField: 'number', searchField: 'number',
@ -322,7 +322,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
tableForm:{ tableForm: {
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择订单行', searchListPlaceholder: '请选择订单行',
searchField: 'lineNumber', searchField: 'lineNumber',
@ -330,10 +330,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchAllSchemas: PurchaseDetail.allSchemas, searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchPage: PurchaseDetailApi.getPurchaseDetailPage,
searchCondition: [{ searchCondition: [{
key:'number', key: 'number',
value:'poNumber', value: 'poNumber',
isMainValue: true isMainValue: true
},{ },
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
@ -349,10 +350,11 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchAllSchemas: PurchaseDetail.allSchemas, searchAllSchemas: PurchaseDetail.allSchemas,
searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchPage: PurchaseDetailApi.getPurchaseDetailPage,
searchCondition: [{ searchCondition: [{
key:'number', key: 'number',
value:'poNumber', value: 'number',
isMainValue: true isMainValue: true
},{ },
{
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
@ -364,7 +366,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '单据号', label: '单据号',
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
isTableForm:false, isTableForm: false,
table: { table: {
width: 150 width: 150
}, },
@ -398,7 +400,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
sort: 'custom', sort: 'custom',
isTableForm:false, isTableForm: false,
table: { table: {
width: 180 width: 180
}, },
@ -406,7 +408,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -417,7 +419,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '创建者', label: '创建者',
field: 'creator', field: 'creator',
sort: 'custom', sort: 'custom',
isTableForm:false, isTableForm: false,
table: { table: {
width: 150 width: 150
}, },
@ -472,7 +474,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '最后更新者', label: '最后更新者',
field: 'updater', field: 'updater',
sort: 'custom', sort: 'custom',
isTableForm:false, isTableForm: false,
table: { table: {
width: 150 width: 150
}, },
@ -482,7 +484,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '最后更新时间', label: '最后更新时间',
field: 'updateTime', field: 'updateTime',
sort: 'custom', sort: 'custom',
isTableForm:false, isTableForm: false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -494,7 +496,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
style: {width:'100%'}, style: { width: '100%' },
type: 'datetime', type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
@ -520,8 +522,8 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
tableForm:{ tableForm: {
type:'Select', type: 'Select',
default: 'TRUE', default: 'TRUE',
inactiveValue: 'FALSE', inactiveValue: 'FALSE',
activeValue: 'TRUE' activeValue: 'TRUE'
@ -539,12 +541,12 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '操作', label: '操作',
field: 'action', field: 'action',
isDetail: false, isDetail: false,
isForm: false , isForm: false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
isTableForm:false, isTableForm: false,
} }
])) ]))

Loading…
Cancel
Save