dj

src/assets/css/global_menu.css

@@ -0,0 +1,4 @@
+/* 菜单高度 */
+.menu_item{
+  line-height: 20px !important;
+}

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)
@@ -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: "预览检验条码",

src/views/customerOrg/patientRegisterImport.vue

@@ -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>