Browse Source

M类型采购收货

master_hella_20240701
赵雪冰 8 months ago
parent
commit
662d1fc8e1
  1. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  2. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  3. 26
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
  4. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
  5. 2
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@ -173,7 +173,7 @@ const butttondata = (row,$index) => {
return [ return [
defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),//
defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),//
defaultButtons.mainListPlanCheckQualityReportBtn({}), // defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), //
] ]
} }

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@ -729,9 +729,11 @@ const submitForm = async (formType, submitData) => {
data.subList = tableData.value // data.subList = tableData.value //
try { try {
if (formType === 'create') { if (formType === 'create') {
data.orderTypeM='1';
await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data) await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
data.orderTypeM='1';
await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data) await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }

26
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue

@ -353,20 +353,20 @@ const butttondata = (row,$index) => {
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), //
// defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), //
{ // {
label: '生成标签', // label: '',
name: 'ssbq', // name: 'ssbq',
hide: isASNShowMainButton(row, ['3']), // hide: isASNShowMainButton(row, ['3']),
type: 'primary', // type: 'primary',
icon: '', // icon: '',
color: '', // color: '',
hasPermi: '', // hasPermi: '',
link: true // // link: true //
}, // },
defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // // defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), //
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), //
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), //
defaultButtons.mainListPlanCheckQualityReportBtn({}), // // defaultButtons.mainListPlanCheckQualityReportBtn({}), //
] ]
} }
@ -729,9 +729,11 @@ const submitForm = async (formType, submitData) => {
data.subList = tableData.value // data.subList = tableData.value //
try { try {
if (formType === 'create') { if (formType === 'create') {
data.orderTypeM='2';
await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data) await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
data.orderTypeM='2';
await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data) await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts

@ -535,6 +535,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
componentProps: { componentProps: {
inactiveValue: 'FALSE', inactiveValue: 'FALSE',
activeValue: 'TRUE', activeValue: 'TRUE',
disabled:true
} }
} }
}, },
@ -589,9 +590,6 @@ export const PurchasereceiptRequestMainRules = reactive({
autoExecute: [ autoExecute: [
{ required: true, message: '请选择是否自动执行', trigger: 'change' } { required: true, message: '请选择是否自动执行', trigger: 'change' }
], ],
directCreateRecord: [
{ required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
],
businessType: [ businessType: [
{ required: true, message: '请输入业务类型', trigger: 'blur' } { required: true, message: '请输入业务类型', trigger: 'blur' }
], ],

2
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@ -590,9 +590,11 @@ const submitForm = async (formType, submitData) => {
data.subList = tableData.value // data.subList = tableData.value //
try { try {
if (formType === 'create') { if (formType === 'create') {
data.orderTypeM='1';
await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMainSpare(data) await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMainSpare(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
data.orderTypeM='1';
await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data) await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data)
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }

Loading…
Cancel
Save