From e969c1f0523c69fe854fdcad7d8d8e2da6dcf30d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 28 十一月 2023 17:44:53 +0800
Subject: [PATCH] 	modified:   src/views/product/workbench/feed-form.vue 	modified:   src/views/product/workbench/feed-pane.vue 	modified:   src/views/warehouse/pallettransports/index.vue 	modified:   vue.config.js

---
 src/views/quality/rawMaterial/index.vue |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index a547dd5..51299fe 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -38,11 +38,11 @@
             @refreshDataList="getData"
         ></RawMaterialForm>
         <el-dialog
-        top="10vh"
+        top="7vh"
         title="鎵撳嵃棰勮"
         :visible.sync="printDialogVisible"
-        width="60%">
-        <div style="width:100%;height: 60vh;overflow-y: scroll;">
+        width="70%">
+        <div style="width:90%;margin-left:5%;height: 60vh;overflow-y: scroll;">
             <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
         </div>
         <span slot="footer" class="dialog-footer">
@@ -95,12 +95,20 @@
                 column: [
                     {
                         minWidth: '120',
-                        prop: 'code',
-                        label: '鍘熸潗鏂欑紪鐮�',
+                        prop: 'rawInsNo',
+                        label: '鍘熸潗鏂欐楠岀紪鍙�',
                         isTrue: true,
                         isSearch: true,
                         searchInfoType: 'text',
                         render: { fun: this.addOrUpdateHandle }
+                    },
+                    {
+                        minWidth: '120',
+                        prop: 'code',
+                        label: '鍘熸潗鏂欑紪鐮�',
+                        isTrue: true,
+                        isSearch: true,
+                        searchInfoType: 'text'
                     },
                     {
                         minWidth: '120',
@@ -297,13 +305,12 @@
                 type: "html",
                 // header: "鍘熸潗鏂欐娴嬫姤鍛�",
                 targetStyles: ["*"],
-                style: `@page {margin: 0mm 5mm;size: A4;};
-                    html {zoom:100%;};
+                style: `@page {margin: 0mm 5mm;size: A4;}
+                    html {zoom:100%;}
                     @media print {
 					  html,body{
-					    width:880pt;
-					    height:900pt;
-					    margin:0;
+					    width:200mm;
+					    height:297mm;
 					  }
 					}`,
                 ignoreElements: ["no-ignore"],

--
Gitblit v1.9.3