doct

src/components/doctorCheck/ButtonList.vue

@@ -45,7 +45,7 @@
             <el-button type="primary" class="commonbutton" @click="btnCheckHistory">历次结果</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '体检报告')" class="divBtnClass">
-            <el-button type="primary" class="commonbutton" @click="report">体检报告</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnReport">体检报告</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '总检')" class="divBtnClass">
             <el-button type="primary" class="commonbutton" @click="toSumDoctorCheck">总检</el-button>
@@ -83,30 +83,18 @@
 
 
         <!-- 体检人员登记 -->
-        <el-dialog 
-            :title="doctorCheck.prBase.id ? '体检人员--编辑' : '体检人员--新增'"
-            :visible.sync="dialogWin.PatientRegisterEdit"
-            :close-on-click-modal="false"
-            fullscreen @close="closeDialogWinPatientRegisterEdit"
-            >
+        <el-dialog :title="doctorCheck.prBase.id ? '体检人员--编辑' : '体检人员--新增'" :visible.sync="dialogWin.PatientRegisterEdit"
+            :close-on-click-modal="false" fullscreen @close="closeDialogWinPatientRegisterEdit">
             <!-- :formInitData="formData" -->
-            <PatientRegisterEdit  style="z-index:30001;"
-                :isDoctor="'1'" 
-                :patientRegisterId = "doctorCheck.prBase.id"                
-                :editTimes="editTimes"
-                :refreshRegister="refreshRegister"
-            />
+            <PatientRegisterEdit style="z-index:30001;" :isDoctor="'1'" :patientRegisterId="doctorCheck.prBase.id"
+                :editTimes="editTimes" :refreshRegister="refreshRegister" />
         </el-dialog>
-        <el-dialog
-            title="设置体检日期" style="z-index:30002;"
-            :visible.sync="dialogVisibleSetStartDate"
-            :close-on-click-modal="false" :show-close="false"
-            width="300px" 
-            >
+        <el-dialog title="设置体检日期" style="z-index:30002;" :visible.sync="dialogVisibleSetStartDate"
+            :close-on-click-modal="false" :show-close="false" width="300px">
             <div style="padding: 0 20px;">
                 <span style="margin-right:5px ;">体检日期</span>
-                <el-date-picker v-model="medicalStartDateTemp" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="出生日期"                    
-                    prefix-icon="" size="small" style="width:150px;"/>
+                <el-date-picker v-model="medicalStartDateTemp" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    placeholder="出生日期" prefix-icon="" size="small" style="width:150px;" />
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button class="commonbutton" @click="dialogVisibleSetStartDate = false">取 消</el-button>
@@ -114,12 +102,7 @@
             </span>
         </el-dialog>
 
-        <el-dialog
-            title="历次结果" 
-            :visible.sync="dialogVisibleCheckHistory"
-            :close-on-click-modal="false" 
-            width="800px" 
-            >
+        <el-dialog title="历次结果" :visible.sync="dialogVisibleCheckHistory" :close-on-click-modal="false" width="800px">
             <div style="padding: 0 20px;">
                 <el-tabs v-model="tabChoosed">
                     <el-tab-pane label="明细结果" name="2">
@@ -520,7 +503,7 @@ export default {
         },
 
         //体检报告
-        report() {
+        btnReport() {
 
             if (!this.$peisAPI) {
                 this.$message.info("此功能，需要在壳客户端才可运行！")
@@ -543,15 +526,20 @@ export default {
                 ],
             };
 
-
             postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.doctorCheck.prBase.id}`)
                 .then((res) => {
-                    if (res.code != -1) {
+                    if (res.code > -1) {
                         toOutShell.ReportTable = res.data;
                         console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
                         return this.$peisAPI.printPre(JSON.stringify(toOutShell));
                     }
                 })
+                .then(res => {
+                    if (res) {
+                        let lres = JSON.parse(res)
+                        if (lres.code < 0) this.$message.error({ showClose: true, message: lres.message })
+                    }
+                })
                 .catch(err => {
                     this.$message.warning(err);
                 });