From e3321fe969bde06c7057c9e6b4acbe7a7e219229 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Tue, 7 May 2024 17:32:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/orderDay/components/schedule.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 1373e120d..0795b866d 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 () => {
@@ -714,14 +714,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

From 924dc6d7d85e8a55928116acd98171439df80672 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 8 May 2024 09:27:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue              | 11 +++++++++++
 1 file changed, 11 insertions(+)

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)
     }
   }
 

From 6cf78af238dc907ea7285fef22d5cfee0011a21d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 8 May 2024 09:52:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain.data.ts                         | 3 ---
 1 file changed, 3 deletions(-)

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' }
   ],