Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/components/patientRegister/PatientRegisterList.vue

@@ -11,6 +11,7 @@
             <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
           </template>
         </el-table-column>
+        <el-table-column prop="guidePrintTimes" label="打印" />
         <el-table-column prop="isLock" label="锁住">
           <template slot-scope="scope">
             <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
@@ -166,7 +167,19 @@
         <el-button type="primary" class="btnClass">调整项目</el-button>
       </div>
       <div class="listBtn">
-        <el-button type="primary" class="btnClass" @click="guidePrint">打指引单</el-button>
+        <el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">指引单打印</el-button>
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="btnClass" @click="guidePrint('0001', true)">指引单预览</el-button>
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="btnClass" @click="lisPrint('0003', false)">检验申请</el-button>
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="btnClass" @click="lisPrint('0002', true)">检验条码</el-button>
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="btnClass" @click="">补打条码</el-button>
       </div>
     </div>
 
@@ -183,8 +196,8 @@
     </el-dialog>
 
     <!-- 指引单 -->
-    <el-dialog title="指引单" :visible.sync="dialogGuide" width="400" height="800" 
-      :append-to-body="true" :close-on-click-modal="false">
+    <el-dialog title="指引单" :visible.sync="dialogGuide" width="400" height="800" :append-to-body="true"
+      :close-on-click-modal="false">
       <div>{{ guideMsg }}</div>
     </el-dialog>
   </div>
@@ -194,7 +207,7 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+import { dddw, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
@@ -211,8 +224,8 @@ export default {
       multipleSelection: [], //选中的数据列表
       dialogVisible: false,
       dialogCamera: false,
-      dialogGuide:false,
-      guideMsg:'guideMsg',
+      dialogGuide: false,
+      guideMsg: 'guideMsg',
       tabChoosed: "1",
       formInitData: {},      //体检登记初始表单数据
       editTimes: 0,
@@ -227,54 +240,78 @@ export default {
     ...mapState(["window", "dict", "patientRegister", "customerOrg"]),
   },
   methods: {
-    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),     
-  
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+
     // 打印指引单(isPreview)
-    async guidePrint(isPreview){
+    async guidePrint(ReportCode, isPreview) {
       let token = localStorage.getItem('token');
       let user = localStorage.getItem('user');
-      let toOutShell = '';
+      let toOutShell = { ReportCode, token, 
+        Parameters: [
+          { Name: 'printer', Value: user },
+          { Name: 'hisLog', Value: 'pic/hisLog.jpg' },          
+        ], 
+      };
       let lfind = -1;
- 
 
-      if(this.multipleSelection.length < 1){
+
+      if (this.multipleSelection.length < 1) {
         this.$message.info("请勾选要打印指引单的人员记录！");
         return;
       }
 
-      this.multipleSelection.forEach((item,index) =>{
-        getapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${item.id}`)
-        .then((res) => {        
-          if (res.code != -1) {
-            res.data;
-            return this.$electronAPI.printPre('web 传入参数');
-          }
-        })
-        .then(res => {
-          if(res.toLowerCase() == 'success'){
-            //更新打印次数
-            return postapi('api/app/patientregister/updatepatientregisterguideprinttimesmany',[item.id])
-          }
-        })
-        .then(res =>{
-          if (res.code != -1) {
-            //
-          }
+      if (isPreview) {
+        //
+        //this.multipleSelection.forEach((item,index) =>{
+
+        getapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[0].id}`)
+          .then((res) => {
+            if (res.code != -1) {
+              toOutShell.ReportTable = res.data;
+              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
+            }
+          })
+          .catch(err => {
+            this.$message.warning(err);
+          });
+        // });
+      } else {
+        this.multipleSelection.forEach((item, index) => {
+          getapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${item.id}`)
+            .then((res) => {
+              if (res.code != -1) {
+                toOutShell.ReportTable = res.data;
+                console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+                return this.$peisAPI.print(JSON.stringify(toOutShell));
+              }
+            })
+            .then(res => {
+              if (res.toLowerCase() == 'success') {
+                //更新打印次数
+                return postapi('api/app/patientregister/updatepatientregisterguideprinttimesmany', [item.id])
+              }
+            })
+            .then(res => {
+              if (res.code != -1) {
+                lfind = arrayExistObj(this.patientRegister.prList, 'id', item.id)
+                if (lfind > -1) {
+                  if (this.patientRegister.prList[lfind].guidePrintTimes) {
+                    this.patientRegister.prList[lfind].guidePrintTimes = Number(this.patientRegister.prList[lfind].guidePrintTimes) + 1;
+                  } else {
+                    this.patientRegister.prList[lfind].guidePrintTimes = 1;
+                  }
+                }
+
+              }
+            })
+            .catch(err => {
+              this.$message.warning(err);
+            });
         });
-      });
-
-
-      
-
-      console.log(msg);
-
-      
-      
-
-        
-         
+      }
     },
-    
+
     handleSelectionChange(val) {
       this.multipleSelection = val;
       //console.log('this.multipleSelection',this.multipleSelection)

src/main.js

@@ -17,11 +17,11 @@ Vue.use(ElementUI);
 console.log('vue',Vue.prototype)
 Vue.prototype.$axios = axios;
 
-//全局注册 electronAPI 对象
+//全局注册外壳的 peisAPI 对象
 try {
-  Vue.prototype.$electronAPI = window.electronAPI;
+  Vue.prototype.$peisAPI = window.peisAPI;
 } catch (error) {
-  Vue.prototype.$electronAPI = null;
+  Vue.prototype.$peisAPI = null;
 }
 
 

src/views/basic-dictionary/SampleContainer.vue

@@ -28,6 +28,7 @@
           </el-table-column>
           <el-table-column prop="displayName" label="名称" width="">
           </el-table-column>
+          <el-table-column prop="containerRemark" label="备注" width="" />          
           <el-table-column prop="creatorName" label="创建者" width="">
           </el-table-column>
           <el-table-column prop="creationTime" label="创建时间" width="200">
@@ -107,7 +108,14 @@
                   <el-input v-model="form.containerColorName"></el-input>
                 </el-form-item>
               </el-col>
-              <div style="margin-top: 70px"><el-divider></el-divider></div>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="containerRemark">
+                  <el-input v-model="form.containerRemark"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-divider/>
+              </el-col>              
               <el-col :span="4" style="margin-left: 15px">
                 <el-form-item label="创建者">
                   <el-input
@@ -226,6 +234,7 @@ export default {
         displayName: "",
         containerColorName: "",
         containerColor: "",
+        containerRemark:'',
       },
       curRow: {},
     };
@@ -383,6 +392,7 @@ export default {
               displayName: this.form.displayName,
               containerColorName: this.form.containerColorName,
               containerColor: this.form.containerColor,
+              containerRemark: this.form.containerRemark,
             }).then((res) => {
               this.$message.success("新增成功");
               this.getlist();
@@ -393,6 +403,7 @@ export default {
               displayName: this.form.displayName,
               containerColorName: this.form.containerColorName,
               containerColor: this.form.containerColor,
+              containerRemark: this.form.containerRemark,
             }).then((res) => {
               this.$message.success("修改成功");
               this.getlist();

src/views/common-settings/SampleGroup.vue

@@ -4,7 +4,7 @@
       <el-card style="height: 800px">
         <el-table
           :data="tableData"
-          style="width: 100%; height: 200px"
+          width="100%" height="350px"
           v-loading="loading"
           row-key="id"
           class="el-table__body-wrapper tbody"

src/views/fee-settings/Item.vue

@@ -322,7 +322,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="项目结果模板" prop="resultTemplateTypeFlag">
-              <!-- <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input> -->
+              <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input>
+              <!-- 
               <el-select
                 v-model="form.resultTemplateTypeFlag"
                 placeholder="请选择"
@@ -336,6 +337,7 @@
                 >
                 </el-option>
               </el-select>
+               -->
             </el-form-item>
           </el-col>
           <el-col :span="8">