From 371316faea2182d1980fcb4379d43f850c0cd54b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Oct 2024 09:04:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/Scan.vue   |  8 ++++++++
 src/assets/icons/index.js   |  3 ++-
 src/views/template/scan.vue | 16 ++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/icons/Scan.vue

diff --git a/src/assets/icons/Scan.vue b/src/assets/icons/Scan.vue
new file mode 100644
index 00000000..73e49f66
--- /dev/null
+++ b/src/assets/icons/Scan.vue
@@ -0,0 +1,8 @@
+<template>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
+		<g fill="none">
+			<path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z" />
+			<path fill="currentColor" d="M4 14.5A1.5 1.5 0 0 1 5.5 16v2.5H9a1.5 1.5 0 0 1 0 3H5A2.5 2.5 0 0 1 2.5 19v-3A1.5 1.5 0 0 1 4 14.5m16 0a1.5 1.5 0 0 1 1.493 1.356L21.5 16v3a2.5 2.5 0 0 1-2.336 2.495L19 21.5h-4a1.5 1.5 0 0 1-.144-2.993L15 18.5h3.5V16a1.5 1.5 0 0 1 1.5-1.5m0-4a1.5 1.5 0 0 1 .144 2.993L20 13.5H4a1.5 1.5 0 0 1-.144-2.993L4 10.5zm-11-8a1.5 1.5 0 0 1 .144 2.993L9 5.5H5.5V8a1.5 1.5 0 0 1-2.993.144L2.5 8V5a2.5 2.5 0 0 1 2.336-2.495L5 2.5zm10 0a2.5 2.5 0 0 1 2.495 2.336L21.5 5v3a1.5 1.5 0 0 1-2.993.144L18.5 8V5.5H15a1.5 1.5 0 0 1-.144-2.993L15 2.5z" />
+		</g>
+	</svg>
+</template>
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index f51c6b06..10417c56 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -24,4 +24,5 @@ export { default as Zhixing } from './Zhixing.vue'
 export { default as Zhizao } from './Zhizao.vue'
 export { default as Env } from './Env.vue'
 export { default as Elec } from './Elec.vue'
-export { default as Jcpz } from './Jcpz.vue'
\ No newline at end of file
+export { default as Jcpz } from './Jcpz.vue'
+export { default as Scan } from './Scan.vue'
\ No newline at end of file
diff --git a/src/views/template/scan.vue b/src/views/template/scan.vue
index 11df1868..7f396806 100644
--- a/src/views/template/scan.vue
+++ b/src/views/template/scan.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-icon v-if="type=='info'" size="18"  @click="open"><el-icon-files /></el-icon>
+        <el-icon class="printIcon" v-if="type=='info'" size="18" @click="open"><component :is="'sc-icon-scan'" /></el-icon>
         <el-button v-else type="primary" @click="open" style="margin-left: 10px;">扫码添加</el-button>
         <el-dialog
             title="扫描二维码"
@@ -49,4 +49,16 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.printIcon{
+    width: 38px;
+    height: 58px;
+    padding: 0 10px;
+    font-size: 19px;
+    color: rgb(145,149,162);
+    &:hover{
+        background-color: rgba(255, 255, 255, 0.1) !important;
+    }
+}
+</style>
\ No newline at end of file

From f4fcc315bb525eb134ff36b15a893d4d227f51aa Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Oct 2024 09:05:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=B0=8F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=88=E8=BF=87=E7=A8=8B=E6=8A=BD=E6=A3=80=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/process2.vue      |  2 +-
 src/views/setting/print/A4.vue | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/qm/process2.vue b/src/views/qm/process2.vue
index 407e80f9..38426b8d 100644
--- a/src/views/qm/process2.vue
+++ b/src/views/qm/process2.vue
@@ -122,7 +122,7 @@
 			></materials>
 		</el-dialog>
 		<el-dialog v-model="printVisible" width="1200px">
-			<print :baseData="rowItem" type="ptest_gx" @closePrint="printVisible=false"/>
+			<print :baseData="rowItem" type="ptest_cj" @closePrint="printVisible=false"/>
 		</el-dialog>
 	</el-container>
 </template>
diff --git a/src/views/setting/print/A4.vue b/src/views/setting/print/A4.vue
index 7b32e4a8..5c80749b 100644
--- a/src/views/setting/print/A4.vue
+++ b/src/views/setting/print/A4.vue
@@ -163,7 +163,8 @@
                         <li class="export_ulli export_ulli_h"></li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">{{ baseData.count_ok }}</li>
+                        <li class="export_ulli" v-if="type=='ptest_gx'">{{ baseData.count_ok }}</li>
+                        <li class="export_ulli" v-else>{{ baseData.count_sampling_ok }}</li>
                         <li class="export_ulli">{{baseData.count_notok}}</li>
                         <li class="export_ulli">{{ baseData.rate }}</li>
                         <li class="export_ulli"></li>
@@ -197,16 +198,16 @@
                         <li class="export_ulli">{{baseData.count_n_txd}}</li>
                     </ul>
                     <ul class="export_ul" v-else>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hd}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_qp}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_swen}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_bb}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hs}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_md}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_xbb}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_wj}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_yd}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_txd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_qp}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_swen}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_bb}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hs}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_md}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_xbb}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_wj}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_yd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_txd}}</li>
                     </ul>
                 </div>
                 <!-- 尺寸检验/外观检验 -->
@@ -551,6 +552,7 @@
 			};
 		},
 		mounted() {
+            console.log('this.baseData',this.baseData)
             let that = this;
             that.printId = that.baseData.id;
             that.value = that.type+":"+that.printId;

From 9734d461cfdd59d16880f5c0ec7af3cea353a54e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Oct 2024 10:03:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index cc59cead..0f2b01ec 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -153,7 +153,7 @@
 						<el-button
 							link
 							size="small"
-							v-if="scope.row.send_mgroup == mgroupId"
+							v-if="scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept"
 							@click="table_print(scope.row)"
 							type="success"
 							>打印</el-button
@@ -178,7 +178,7 @@
 							v-auth="'handover.update'"
 							type="primary"
 							v-if="
-								scope.row.send_mgroup == mgroupId &&
+								(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
 								scope.row.submit_time == null
 							"
 							>编辑</el-button
@@ -186,7 +186,7 @@
 						<el-popconfirm
 							title="确定删除吗？"
 							v-if="
-								scope.row.send_mgroup == mgroupId &&
+							(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
 								scope.row.submit_time == null
 							"
 							@confirm="table_del(scope.row, scope.$index)"