diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 3dd728f6e..c369aad9e 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -280,7 +280,7 @@ const showMaterialsData=ref() //物料信息分页展示 const page=ref({ total:0, current:1, - size:5 + size:7 }) /*班组数据*/ const teamData = ref([]) @@ -412,8 +412,8 @@ const getProcessroute = async () => { currentNode.value = graphJson.value.cells[0] // 手动触发点击事件 nodeClick('','','',currentNode.value,'') - - + + } //获取配置的工序信息 const getConfigProcessRouteNode= async () => { @@ -715,14 +715,14 @@ const handleCurrentChangeM=(value: number)=>{ let index=(value-1)*page.value.size page.value.current=value showMaterialsData.value=materialsData.value.slice(index,index+page.value.size) - + } const handlePrevClickM=(value: number)=>{ page.value.current=value-1 if(page.value.current==0) { page.value.current=1 } - + } const handleNextClickM=(value: number)=>{ page.value.current=value+1 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 49653cb14..d7e0c75b0 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -345,6 +345,15 @@ defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑 defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','8','6']) }), // 关闭 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除 + { + label: '打印', + name: 'mian_print', + hide: null, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + } ] } @@ -378,6 +387,8 @@ const handleImport = () => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) + } else if( val == 'mian_print'){ // 打印 + handleDocumentPrint(row.masterId) } } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index c78a98cee..09dfa85af 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -724,9 +724,6 @@ export const SupplierinvoiceRequestMainRules = reactive({ required, { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'} ], - invoiceTime: [ - { required: true, message: '请选择发票日期', trigger: 'change' } - ], supplierCode: [ { required: true, message: '请选择供应商代码', trigger: 'change' } ],