Browse Source

采购收货记录发送到货检验申请功能去掉 YT-349

syhx
YEJIAXING-PC\lenovo 2 months ago
parent
commit
6a7df5a967
  1. 136
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
  2. 12
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  3. 12
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue
  4. 24
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  5. 9
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue
  6. 9
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

136
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@ -625,74 +625,74 @@ export const ProductreceiptRequestMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ // {
label: '生产线代码', // label: '生产线代码',
field: 'productionLineCode', // field: 'productionLineCode',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isTableForm: false, // isTableForm: false,
tableForm:{ // tableForm:{
disabled:true, // disabled:true,
multiple: true, // multiple: true,
// isInpuFocusShow: true, // // isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // searchListPlaceholder: '请选择生产线代码',
searchField: 'code', // searchField: 'code',
searchTitle: '生产线信息', // searchTitle: '生产线信息',
searchAllSchemas: Productionline.allSchemas, // searchAllSchemas: Productionline.allSchemas,
searchPage: ProductionlineApi.getProductionlinePage, // searchPage: ProductionlineApi.getProductionlinePage,
searchCondition: [{ // searchCondition: [{
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
},{ // },{
key: 'workshopCode', // key: 'workshopCode',
value: 'workshopCode', // value: 'workshopCode',
message: '请填写车间代码!', // message: '请填写车间代码!',
isMainValue: true // isMainValue: true
}], // }],
verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法 // verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法
isShowTableFormSearch: true, // isShowTableFormSearch: true,
verificationParams: [{ // verificationParams: [{
key: 'code', // key: 'code',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true, // isFormModel: true,
}], // 失去焦点校验参数 // }], // 失去焦点校验参数
}, // },
form: { // form: {
// labelMessage: '信息提示说明!!!', // // labelMessage: '信息提示说明!!!',
componentProps: { // componentProps: {
isSearchList: true, // isSearchList: true,
searchListPlaceholder: '请选择生产线代码', // searchListPlaceholder: '请选择生产线代码',
searchField: 'code', // searchField: 'code',
searchTitle: '生产线信息', // searchTitle: '生产线信息',
searchAllSchemas: Productionline.allSchemas, // searchAllSchemas: Productionline.allSchemas,
searchPage: ProductionlineApi.getProductionlinePage, // searchPage: ProductionlineApi.getProductionlinePage,
searchCondition: [{ // searchCondition: [{
key: 'available', // key: 'available',
value: 'TRUE', // value: 'TRUE',
isMainValue: false // isMainValue: false
},{ // },{
key: 'workshopCode', // key: 'workshopCode',
value: 'workshopCode', // value: 'workshopCode',
message: '请填写车间代码!', // message: '请填写车间代码!',
isMainValue: true // isMainValue: true
}], // }],
verificationParams: [{ // verificationParams: [{
key: 'code', // key: 'code',
action: '==', // action: '==',
value: '', // value: '',
isMainValue: false, // isMainValue: false,
isSearch: true, // isSearch: true,
isFormModel: true, // isFormModel: true,
}], // 失去焦点校验参数 // }], // 失去焦点校验参数
} // }
} // }
}, // },
{ {
label: '工位代码', label: '工位代码',
field: 'workStationCode', field: 'workStationCode',

12
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@ -239,7 +239,7 @@ const butttondata = (row,$index) => {
hasPermi: 'wms:purchasereceipt-job-main:refusal', hasPermi: 'wms:purchasereceipt-job-main:refusal',
link: true // link: true //
}, },
defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), //
] ]
} }
@ -258,10 +258,12 @@ const buttonTableClick = async (val, row) => {
console.log('列表-操作按钮事件-承接') console.log('列表-操作按钮事件-承接')
await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId) await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId)
buttonBaseClick('refresh',null) buttonBaseClick('refresh',null)
} else if(val == 'mainPlanCheckQualityReport'){ }
// // else if(val == 'mainPlanCheckQualityReport'){
checkQualityReport(row) // //
} else if(val == 'mainJobRefusal'){ // checkQualityReport(row)
// }
else if(val == 'mainJobRefusal'){
// handleRefusal(row.masterId) // handleRefusal(row.masterId)
resonSubmit(row) resonSubmit(row)
} }

12
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue

@ -181,16 +181,16 @@ const isShowSourceTypeButton = (row) => {
// - // -
const butttondata = (row,$index) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>-1&&findIndex<$index){ // if(findIndex>-1&&findIndex<$index){
return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] // return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})]
} // }
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({hide:row.orderTypeM == "2"}), // //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), //
defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), //
defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) // defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})
] ]
} }

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

@ -181,17 +181,17 @@ const isShowSourceTypeButton = (row) => {
// - // -
const butttondata = (row,$index) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 // const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>-1&&findIndex<$index){ // if(findIndex>-1&&findIndex<$index){
return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] // return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})]
} // }
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.mainPurchasereturnRecordBtn({hasPermi:'wms:purchasereceipt-record-main:createPurchasereturnRecord',hide:row.purchasereturnRecordFlag == "FALSE" }),// 退 defaultButtons.mainPurchasereturnRecordBtn({hasPermi:'wms:purchasereceipt-record-main:createPurchasereturnRecord',hide:row.purchasereturnRecordFlag == "FALSE" }),// 退
//defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), //
defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), //
defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) // defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})
] ]
} }
@ -203,10 +203,12 @@ const buttonTableClick = async (val, row) => {
handleCreateInspectRequest(row.number) handleCreateInspectRequest(row.number)
}else if(val == 'purchasereturnRecord'){//退 }else if(val == 'purchasereturnRecord'){//退
handleCreatePurchasereturnRecord(row.number) handleCreatePurchasereturnRecord(row.number)
}else if(val == 'mainPlanCheckQualityReport'){ }
// // else if(val == 'mainPlanCheckQualityReport'){
checkQualityReport(row) // //
}else if (val == 'printInspection'){ // checkQualityReport(row)
// }
else if (val == 'printInspection'){
handlePrint(row) handlePrint(row)
} }
} }

9
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue

@ -176,7 +176,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({}), //
] ]
} }
@ -186,10 +186,11 @@ const buttonTableClick = async (val, row) => {
handleCreatePutawayRequest(row.number) handleCreatePutawayRequest(row.number)
}else if(val == 'inspectRequest'){// }else if(val == 'inspectRequest'){//
handleCreateInspectRequest(row.number) handleCreateInspectRequest(row.number)
}else if(val == 'mainPlanCheckQualityReport'){
//
checkQualityReport(row)
} }
// else if(val == 'mainPlanCheckQualityReport'){
// //
// checkQualityReport(row)
// }
} }
// //
const showQualityReport = ref(false) const showQualityReport = ref(false)

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

@ -415,7 +415,7 @@ const butttondata = (row,$index) => {
defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','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({hide:isShowSourceTypeButton(row)}), // // defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), //
] ]
} }
@ -460,10 +460,11 @@ const buttonTableClick = async (val, row) => {
}else if (val == 'point') { }else if (val == 'point') {
// //
labelPrint(row) labelPrint(row)
}else if(val == 'mainPlanCheckQualityReport'){
//
checkQualityReport(row)
} }
// else if(val == 'mainPlanCheckQualityReport'){
// //
// checkQualityReport(row)
// }
} }
// //
const onChangeLabel =(field,e,row, index) => { const onChangeLabel =(field,e,row, index) => {

Loading…
Cancel
Save