From 82ca80780261829b181d868a4a0e38088f16249c Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 15 Jul 2024 16:03:33 +0800
Subject: [PATCH] dj

---
 .../单位体检人员名单导入模板.xlsx | Bin 25088 -> 25088 bytes
 ...�业病体检人员名单导入模板.xlsx | Bin 27136 -> 27136 bytes
 src/assets/css/global_menu.css                |   4 +
 .../patientRegister/PatientRegisterList.vue   |  86 +++++++++++++++++-
 .../customerOrg/patientRegisterImport.vue     |   9 +-
 5 files changed, 91 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/css/global_menu.css

diff --git a/public/files/单位体检人员名单导入模板.xlsx b/public/files/单位体检人员名单导入模板.xlsx
index f2e9c4e8de4d99e4070ef0cd73c0123a395c98fe..10a7370a07dffabef088bdcc076cc1114efc7cca 100644
GIT binary patch
delta 3436
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
LQ>0}njc@!H^v_@W

delta 3121
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

diff --git a/public/files/职业病体检人员名单导入模板.xlsx b/public/files/职业病体检人员名单导入模板.xlsx
index a1688520dce34a2fc49e79c0eb789d17b8b58790..314cbdb1b284b13354e7a3fa6702d401c42300de 100644
GIT binary patch
delta 1651
zcmZuxU1%It6h8OvWM($I*`1k9W@hu#-KZPWO>NSUX0av7is(b2W$T*Owsu_%)ljxS
z5fyyeD5y_H+Ec8EU>^iuL}EvZ53K}$(1$#zELHPR3W5|t$csoTQqR3JJ7(9NVQ235
zednC}&As>RN`tL5*ji0di*HrGsocO9ls8xc?<jS)>AlkR3-?ax?`tfH8N)%<aB<pj
znTc}=2M-z#YYiv?Kn7Pyy>3L)HlaW782}B)(l80Ip1lRVV2g~j(^M~-=B3!B7%1aX
zbuno=>Gc0pTdMsyN9sURZ9tWV{msgQc-C}MLrwKF8i-5D<Ey5FYo?mY5R{%mZ45sp
z?Ut#cZCNaXrsbevsd&}2*bb=`36Uo9@ny>u3ZC;L@UpM5JpNz}N#%QAxsX!vV9LUY
zluJKZPEaDZO7Bln78}?;mt=*yPO5M+F4e6dNAJDKhP`{e`x)kYU2mVA=cu?A>%q5O
z2UlGcKX$X~GHld7DtkYY;2Hh(e!ek*=cnwnen2dP%F3_=C+U6>CgFA3iPvy_>ZtZN
z+fV8^X7_%jabVif+co@k?@Bb{kM{sBPQRoFXcB*#&g<jw?QVcL;8=MOa|J8<<qW|5
z;{elMv2cggfo<p&P(cCU2{AW3A)hWibxucuE*F-Vc(1b)k`us%dC3)7QgU2!AGUB2
z$?cLH1aUME<%V2cCU>=xl2bcyS_e*-+)&FT(GFa92QCI>;ife?-XXB311DCiJ(oHM
zT<^VoZ}LJFL|6R-VqOPM&<}ud6&T&mN}d6SMJnM(F^CXK<NQpnPHhrIXz(0}9ujpJ
z=!6DC6ou0uI>^_$3GE0`49<Y)pf6-zoGPD$o**(oC@Zx%)l9-!d7FW1L&bpMu#f{4
zxDU5xoaFrh#{;AGY_9%5$O)sl5DB9rA=++~lcCe_V5kYBqlAP}PUrMLqa3yy<!wee
zEiW0}85Z)5UYpJIoRLKq{qMrtvzfjY227f46uNM0)@h3^&b4RP+8OWNxg$z!jdr!h
zOKcN1y}OS-7H8+YVyVnnH{LullIVs$vc>3&Xw>I@cj!Fh@e)2#xa%!EX|O}$FVo*N
z4#%LmhT;Gmm)q+f6NQk7qDH5veE6Xvr+GlcUL1!Jyt*))919{MlG}y9E#%lk7(YC~
zc6+0Te~w`3shwAj*<4$V{Qkk^>&xEI)5{Tj=b2MDq3Bnt7b7}M{_%C?#wNS){Gj*w
S;=H02U=K_|!HX{a#r_2#hb004

delta 1621
zcmZ{lU2GIp6vzK}W_M<GTXuG4%ii67u(VKUwFxY?TWe@*G(dt8C{0DFv}&a^5xcf(
zj0vRcgY^lc9^}b{#29_>frcT*7h4j2Y(g+40UxaN!55<S#TXv2o_qHrY+3haXXpI>
z=bU@yoVnS;iYTmzg|i`R;np`tjhi$ZnisuvKQt%Sg7?FB46^}0(`9>WaNPOACM%v2
z9<95Qw#8F)B;H3d=F+9OOBdpibP~Yd8*yL-$N07mxW4^2G(ggoxD=Aym=q~mjmvbp
z?0M1imNH8jgp%5`kz7xvn=0z$WKr$aYBLRbGSO02SMVw@kl|hE15Z-HvqXmW_>#W!
zd|L1<`rY&G0Ug;!H#oAb9C?jz)F;$McR4cd7k#58U(O-gXq+=0^iw)ZUrEV(N?Bs%
z>!Lz?6Bd(o9kK3rDx3cFefmW6qly3Dl|AT4!nb=$xv$jpeL`3GSK?RE7Tjn!Z&G*4
zPsfmjKomGve2#LXW0aRtxb$AC-I_(V^N(EcWy%+{H|>jQ%BR!8we(zL*3GIgOAKQQ
zr+K}@=|1E+WuM>7_i6quz25zjy(XSyxr=`4{*gZJDUi&)OP}XDoi6Oy1Jr}gz0gc+
zIX`l*A9(v9FdjU}-4}EJV%Zskg%HlO*9I>{#yC?5Fk)&$9M@OLSI6MDhd&ZiLj7JB
zr!-TB#9_^z7OrN7W?xk?Q?oA3Q1qKq8*y+IM7RdCYB0M7b2MvtcoRfwFrE+ZJ5lY(
zhk{`>tFOVf)L^Pxn`2$Yf<sSzWSFOrq}Bb>RgHYWZ-;=138X08-+o9PxFWMLiN=cM
zu%(V$QH$VBG*_%BrlAg7QL959+i0f0=>VTNEb=G?T)d^1SMo_>4BJ^1h6RK5*EBcy
z{tQ}6nT%3Zt6Y^jkSe<YRn?A)rK;Llu^z6<VDD+PS2R`CE_!aDX?M9QV^dWI%2h3*
z114n#<(546<ureF^|UmQ*+lL=LgZj(YgH6H?m-9aNAm^w!4sjnd7l1R;~BAx<>2PC
z2kOO4Add|T0eWL-SIkj|mmB2pibjLWL!S!K6J&?$jG<KN*#vjxB+4C9vmDivQoR-Y
zPLGy4C)jIur5`G$JZshIQS77(Bdu;n$-~sFlYSU!Z+VQ_A{P?od@u4cbjGmucs$q`
zxouuOnKbN6rgN)x|7_6m@{CFI<Fi*^xoA2CznA|lei5IYX%4=hI2^Kb=)*qr1(B(L
F#DAJQ9M=E<

diff --git a/src/assets/css/global_menu.css b/src/assets/css/global_menu.css
new file mode 100644
index 0000000..87296c7
--- /dev/null
+++ b/src/assets/css/global_menu.css
@@ -0,0 +1,4 @@
+/* 菜单高度 */
+.menu_item{
+  line-height: 20px !important;
+}
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index a356004..5479475 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -175,6 +175,10 @@
         <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="listBtn">
           <el-button type="" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
         </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="guidePrint('0001', false)"
+            style="font-size: 12px;">人员检验检查条码</el-button>
+        </div>
         <div v-show="checkPagePriv(pagePriv.privs, '人员信息导出')" class="listBtn">
           <el-button type="" class="commonbutton" @click="btnExport('info')">人员信息导出</el-button>
         </div>
@@ -588,6 +592,71 @@ export default {
       }
     },
 
+    // 指引单新打印方式，promise 
+    guidePrintPromise(ReportCode, isPreview, row) {
+      return new Promise((resolve, reject) => {
+        if (!this.$peisAPI) reject("此功能，需要在壳客户端才可运行！")
+
+
+        let token = window.sessionStorage.getItem("token");
+        let user = window.sessionStorage.getItem("user");
+        let toOutShell = {
+          ReportCode,
+          token,
+          isBuildImage: 'N',
+          IsUploadPdf: 'N',
+          preViewCanPrint: "N",
+          Parameters: [
+            { Name: "printer", Value: user },
+            { Name: "hisLog", Value: "pic/hisLog.jpg" },
+            { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+          ],
+        };
+
+        if (!row.completeFlag || row.completeFlag == '0') reject('预登记人员，不可执行此操作！')
+        toOutShell.BusinessCode = row.id
+
+        if (isPreview) {
+          this.$peisAPI.printPre(JSON.stringify(toOutShell))
+            .then(res => {
+              if (JSON.parse(res).code < 0) {
+                resolve(JSON.parse(res))
+              } else {
+                reject(JSON.parse(res).message)
+              }
+            })
+            .catch((err) => {
+              reject(err)
+            });
+        } else {
+          this.$peisAPI.printPre(JSON.stringify(toOutShell))
+            .then(res => {
+              if (JSON.parse(res).code < 0) {
+                return postapi("/api/app/patientregister/updatepatientregisterguideprinttimesmany", [row.id]);
+              } else {
+                reject(JSON.parse(res).message)
+              }
+            })
+            .then(res => {
+              if (res && res.code > -1) {
+                let lfind = arrayExistObj(this.tableData, "id", row.id);
+                if (lfind > -1) {
+                  if (this.tableData[lfind].guidePrintTimes) {
+                    this.tableData[lfind].guidePrintTimes = Number(this.tableData[lfind].guidePrintTimes) + 1;
+                  } else {
+                    this.tableData[lfind].guidePrintTimes = 1;
+                  }
+                }
+              }
+              resolve(res)
+            })
+            .catch((err) => {
+              reject(err)
+            });
+        }
+      })
+    },
+
     handleSelectionChange(rows) {
       //this.multipleSelection = rows;
       //// console.log('this.multipleSelection',this.multipleSelection)
@@ -1004,9 +1073,9 @@ export default {
         }
       })
     },
-    
 
-    close_dialogWin_upBaseInfo(){
+
+    close_dialogWin_upBaseInfo() {
       this.upBaseInfo.visble = false
       this.close_dialogWin_PatientRegisterEdit()
     },
@@ -1019,11 +1088,11 @@ export default {
       }
       body[this.upBaseInfo.colName] = this.upBaseInfo.value
 
-      postapi('/api/app/PatientRegister/UpdatePatientRegisterBaseInfoByPatientRegisterId',body).then(res => {
-        if(res.code > -1){          
+      postapi('/api/app/PatientRegister/UpdatePatientRegisterBaseInfoByPatientRegisterId', body).then(res => {
+        if (res.code > -1) {
           this.close_dialogWin_upBaseInfo()
         }
-      })      
+      })
     },
     // 修改基本信息
     fnUpBaseInfo(row, baseInfoType) {
@@ -1086,6 +1155,13 @@ export default {
             this.lisRequest(row);
           },
         })
+      if (checkPagePriv(this.pagePriv.privs, '预览人员条码') && row.completeFlag != '0')
+        items.push({
+          label: "预览人员条码",
+          onClick: () => {
+            this.guidePrintPromise("0008", true, row);
+          },
+        })
       if (checkPagePriv(this.pagePriv.privs, '预览检验条码') && row.completeFlag != '0')
         items.push({
           label: "预览检验条码",
diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue
index 6d3471e..6ef9e74 100644
--- a/src/views/customerOrg/patientRegisterImport.vue
+++ b/src/views/customerOrg/patientRegisterImport.vue
@@ -150,7 +150,7 @@
             <el-table-column prop="choosed" align="center" label="选中" min-width="40"/>
             -->
               <el-table-column v-for="(item, index) in excelCols" :key="`col_${index}`" :prop="item.dispLabel"
-                align="center" :label="(item.val ? '√' : '') + (item.dataLabel || item.dispLabel)"
+                align="center" :label="(item.val ? '√ ' : '') + (item.dataLabel || item.dispLabel)"
                 :min-width="100 + index" />
 
             </el-table>
@@ -581,6 +581,7 @@ export default {
         { dispLabel: '工种', val: 'jobType' },
         { dispLabel: '检查类别', val: 'ocCheckTypeName' },
         { dispLabel: '接害因素', val: 'poisons' },
+        { dispLabel: '备注', val: 'remark' },
         { dispLabel: '支付方式', val: 'payTypeFlag' },
       ],
       /* 
@@ -1751,6 +1752,7 @@ export default {
 @import '../../assets/css/global_form.css';
 @import '../../assets/css/global_input.css';
 @import '../../assets/css/global_table.css';
+@import '../../assets/css/global_menu.css';
 @import '../../assets/css/global.css';
 
 
@@ -1771,7 +1773,8 @@ input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: button !important;
   margin: 0 -12px 0 0 !important;
 }
-::v-deep .menu_item{
-    line-height: 24px;
+
+::v-deep .el-table__header th {
+    font-family: "Microsoft YaHei";
 }
 </style>