dj seo

src/components/doctorCheck/PatientRegisterList.vue

@@ -60,25 +60,25 @@
       :height="winAbsolute ? (window.pageHeight - 44 - 120 - 30 - 24) : (window.pageHeight - 44 - 120 - 24)" row-key="id"
       size="small" highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info"
       style="border-radius:10px;">
-      <el-table-column prop="customerOrgParentName" label="单位" width="120">
+      <el-table-column prop="customerOrgParentName" label="单位" width="120" sortable>
         <template slot-scope="scope">
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="customerOrgName" label="部门" width="100">
+      <el-table-column prop="customerOrgName" label="部门" width="100" sortable>
         <template slot-scope="scope">
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="patientName" label="姓名" width="80" />
-      <el-table-column prop="sexId" label="性别">
+      <el-table-column prop="patientName" label="姓名" width="80" sortable/>
+      <el-table-column prop="sexId" label="性别" sortable>
         <template slot-scope="scope">
           <div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="age" label="年龄" />
-      <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
-      <el-table-column prop="patientNo" label="档案号" />
+      <el-table-column prop="patientRegisterNo" label="条码号" width="150" sortable/>
+      <el-table-column prop="patientNo" label="档案号" sortable/>
       <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
       <el-table-column label="分组/套餐" width="150">
         <template slot-scope="scope">
@@ -90,14 +90,14 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="nationId" label="民族">
+      <el-table-column prop="nationId" label="民族" sortable>
         <template slot-scope="scope">
           <div>
             {{ dddw(dict.nation, "id", scope.row.nationId, "displayName") }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="idNo" label="身份证" width="150" />
+      <el-table-column prop="idNo" label="身份证" width="150" sortable/>
       <el-table-column prop="birthDate" label="出生日期" width="100">
         <template slot-scope="scope">
           <div v-if="scope.row.birthDate">
@@ -118,14 +118,14 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="medicalTypeId" label="体检类别">
+      <el-table-column prop="medicalTypeId" label="体检类别" sortable>
         <template slot-scope="scope">
           <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
             {{ dddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="personnelTypeId" label="人员类别">
+      <el-table-column prop="personnelTypeId" label="人员类别" sortable>
         <template slot-scope="scope">
           <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
             {{ dddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}

src/components/patientRegister/PatientRegisterEdit.vue

@@ -432,13 +432,13 @@
         </div>
 
         <div v-show="checkPagePriv(pagePriv.privs, '条码打印')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="labelPrint(false)">条码打印</el-button>
+          <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>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
+          <el-button type="primary" class="commonbutton" @click="guidePrint('0001', false)" :disabled="printing">指引单打印</el-button>
         </div>
         <!-- 
         <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="btn">
@@ -747,6 +747,8 @@ export default {
       },
       nation: [], //
       dialogOrg: false,
+
+      printing: false, // 是否打印中，控制一次只能有一个任务
     };
   },
 
@@ -1651,10 +1653,11 @@ export default {
         Parameters: [
           { Name: 'printer', Value: user },
           { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
+          { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
         ],
       };
 
-
+      this.printing = true
       if (isPreview) {
         /*
         postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.form.id}`)
@@ -1682,6 +1685,7 @@ export default {
           let lres = await this.$peisAPI.print(JSON.stringify(toOutShell))
           if (JSON.parse(lres).code < 0) {
             this.$message.warning({ showClose: true, message: JSON.parse(lres).message });
+            this.printing = false
             return
           }
           postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.form.id]).then(res => {
@@ -1700,6 +1704,7 @@ export default {
           this.$message.warning({ showClose: true, message: `${error}` });
         }
       }
+      this.printing = false
     },
 
     //检验申请
@@ -1772,6 +1777,7 @@ export default {
         ],
       };
 
+      this.printing = true
       try {
         // lis条码打印 
         await this.lisPrint('0002', isPreview, toOutShell)
@@ -1783,13 +1789,14 @@ export default {
         console.log(error)
       }
 
+      this.printing = false
 
     },
 
     // lis条码打印 
     async lisPrint(ReportCode, isPreview, toOutShell) {
       toOutShell.ReportCode = ReportCode
-      // console.log('this.$peisAPI.print', toOutShell)
+      console.log('this.$peisAPI.print', toOutShell)
       if (isPreview) {
         try {
           let lres = await this.$peisAPI.printPre(JSON.stringify(toOutShell))
@@ -1821,6 +1828,7 @@ export default {
     //pacs条码打印
     pacsPrint(ReportCode, isPreview, toOutShell) {
       toOutShell.ReportCode = ReportCode
+      console.log('this.$peisAPI.print', toOutShell)
       if (isPreview) {
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {

src/components/patientRegister/PatientRegisterList.vue

@@ -440,6 +440,7 @@ export default {
         Parameters: [
           { Name: "printer", Value: user },
           { Name: "hisLog", Value: "pic/hisLog.jpg" },
+          { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
         ],
       };
       let lfind = -1;