occ r

src/components/occDisease/OccDisease.vue

@@ -169,22 +169,59 @@ export default {
         if (res && res.code > -1) {
           this.dialogWin.OccDisease = false
         }
-      }).catch((err) => {
-        if (err != 'cancel') {
-          this.$message.info({ showClose: true, message: err });
-        }
-      });
+      })
     },
 
-    // 点击确定
-    btnOk() {
-      let message = ''
-      // console.log('this.dataTransOpts.tableM.patient_poison', this.dataTransOpts.tableM.patient_poison)
+    // 数据验证
+    validiteData(){
+      let err = ''
+      let disease = this.dataTransOpts.tableS.patient_occupational_disease
+      if(!disease.ocCheckTypeId){
+        err = '请填写 检查类别'
+        return err
+      }
+      if(!disease.jobType){
+        err = '请填写 工种'
+        return err
+      }
+      if(!disease.riskFactors){
+        err = '请填写 基本信息-接害因素'
+        return err
+      }
+
+      if(disease.smokeFlag && disease.smokeFlag != '0'){
+        if(!disease.smokeNum){
+          err = '请填写 吸烟频次'
+          return err
+        }
+        if(!disease.smokeYears){
+          err = '请填写 烟龄'
+          return err
+        }
+      }
+
+      if(disease.drinkFlag && disease.drinkFlag != '0'){
+        if(!disease.drinkNum){
+          err = '请填写 饮酒频次'
+          return err
+        }
+        if(!disease.drinkYears){
+          err = '请填写 酒龄'
+          return err
+        }
+      }
 
       this.dataTransOpts.tableM.patient_poison.forEach((e, i) => {
-        if (!e.poisonId) message = `接害因素，第 ${i + 1} 行，不能为空`
+        if (!e.poisonId) err = `接害因素，第 ${i + 1} 行，不能为空`
         if (!e.occupationalAbnormalId) e.occupationalAbnormalId = null
       });
+
+      return err
+    },
+    // 点击确定
+    btnOk() {
+      let message = this.validiteData()
+      // console.log('this.dataTransOpts.tableM.patient_poison', this.dataTransOpts.tableM.patient_poison)
       if (message) {
         this.$message.warning({ showClose: true, message })
         return

src/components/patientRegister/PatientLisRequest.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex;">
-    <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'">
+    <div :style="`width:${isDialog ? 660:(window.pageWidth - 200 - 145)}px;`">
       <el-table :data="dataTransOpts.tableM.lis_request" border @row-click="rowClick"
         :height="window.pageHeight < 600 ? 140 : Math.floor((window.pageHeight - 250) * 2 / 5)" size="small"
         highlight-current-row ref="lis_request" :row-class-name="handleRowClassName">
@@ -68,6 +68,7 @@ import { getapi, postapi, putapi, deletapi } from "../../api/api";
 
 export default {
   components: {},
+  props:["isDialog"],
   data() {
     return {
       pagePriv: {

src/components/patientRegister/PatientPacsRequest.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex;">
-    <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'">
+    <div :style="`width:${isDialog ? 660:(window.pageWidth - 200 - 145)}px;`">
       <el-table :data="pacsRequest" border @row-click="rowClick"
         :height="window.pageHeight < 600 ? 140 : Math.floor((window.pageHeight - 250) * 2 / 5)" size="small"
         highlight-current-row ref="pacs_request" :row-class-name="handleRowClassName">
@@ -42,6 +42,7 @@ import { getapi, postapi, putapi, deletapi } from "../../api/api";
 
 export default {
   components: {},
+  props:["isDialog"],
   data() {
     return {
       pagePriv: {

src/components/patientRegister/PatientRegisterEdit.vue

@@ -438,7 +438,7 @@
           <el-button type="primary" class="commonbutton" @click="labelPrint(false)" :disabled="printing">条码打印</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '条码补打')" class="btn">
-          <el-button type="danger" class="commonbutton" @click="reLisRequest">条码补打</el-button>
+          <el-button type="danger" class="commonbutton" @click="btnLabel">条码补打</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="btn">
           <el-button type="primary" class="commonbutton" @click="guidePrint('0001', false)"
@@ -449,6 +449,9 @@
           <el-button type="primary" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
         </div>
         -->
+        <div v-show="checkPagePriv(pagePriv.privs, '条码合并')" class="btn">
+          <el-button type="danger" class="commonbutton" @click="reLisRequest">条码合并</el-button>
+        </div>
         <div v-show="checkPagePriv(pagePriv.privs, '手动合并项目')" class="btn">
           <el-button type="danger" class="commonbutton" @click="reMergeAsbitem">手动合并项目</el-button>
         </div>
@@ -559,12 +562,26 @@
       <Camera :id="form.id" />    
     </el-dialog>
     -->
-      <!-- 检验条码补打 -->
-      <el-dialog title="检验条码补打" :visible.sync="patientRegister.lisRequestVisble" width="600px" height="400"
+      <!-- 合并条码 -->
+      <el-dialog title="合并条码" :visible.sync="patientRegister.lisRequestVisble" width="600px" height="400"
         :show-close="false" :close-on-click-modal="false" :append-to-body="true">
         <LisRequest :id="form.id" :brushTimes="brushTimes" />
       </el-dialog>
 
+      <!-- 条码补打 -->
+      <el-dialog title="条码补打" :visible.sync="dialogWin.Label" width="800px" height="400" 
+        :close-on-click-modal="false" :append-to-body="true">
+        <el-tabs v-model="tabChoosed" style="height:320px;margin-top: -22px;">
+          <!-- 组合项目 -->
+          <el-tab-pane label="检验条码" name="1">
+            <PatientLisRequest :isDialog="true"/>
+          </el-tab-pane>
+          <el-tab-pane label="检查条码" name="2">
+            <PatientPacsRequest :isDialog="true"/>
+          </el-tab-pane>
+        </el-tabs>
+      </el-dialog>
+
       <!-- 手动合并项目 -->
       <el-dialog title="手动合并项目" :visible.sync="patientRegister.mergeAsbitemVisble" width="600px" height="400"
         :show-close="false" :close-on-click-modal="false" :append-to-body="true">
@@ -609,6 +626,10 @@ import Charge from "../../views/charge/charge.vue";
 import PatientRegisterEditQuery from "../../components/patientRegister/PatientRegisterEditQuery.vue";
 import OccDisease from "../../components/occDisease/OccDisease.vue"
 
+
+import PatientLisRequest from "../../components/patientRegister/PatientLisRequest.vue";
+import PatientPacsRequest from "../../components/patientRegister/PatientPacsRequest.vue";
+
 export default {
   components: {
     Camera,
@@ -618,7 +639,9 @@ export default {
     Charge,
     AsbChargeRequest,
     PatientRegisterEditQuery,
-    OccDisease
+    OccDisease,
+    PatientLisRequest,
+    PatientPacsRequest,
   },
   // isDoctor: '0:标准人员登记/1:医生诊台登记(可修改单位)' 
   props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'],
@@ -776,6 +799,8 @@ export default {
 
       printing: false, // 是否打印中，控制一次只能有一个任务
       completeFlag: '0', // 默认预登记，首次正式登记或者预登记转正式登记，提示打印条码与指引单
+
+      tabChoosed:"1",
     };
   },
 
@@ -2099,6 +2124,16 @@ export default {
       this.dialogWin.OccDisease = true
     },
 
+    btnLabel() {
+      if (!this.form.id) {
+        this.$message.warning({ showClose: true, message: '人员信息尚未保存！' })
+        return
+      }
+      this.dataTransOpts.refresh.lis_request.M++ //触发检验条码刷新      
+      this.dataTransOpts.refresh.register_check.M++ //触发检查条码刷新
+      this.dialogWin.Label = true
+    },
+
     //回车替代tab键
     enterToTab() {
       this.$nextTick(() => {

src/store/index.js

@@ -420,6 +420,7 @@ export default new Vuex.Store({
             LocalConfig: false, // 设置窗口
             AsbChargeRequest: false, // 收费申请
             OccDisease: false, // 职业病
+            Label:false, // 补打条码
         }
 
     },