Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -1142,8 +1142,8 @@ export default {
           this.advices = tableAdvice;
         }
 
-        // var arr = [] 
-        // arr = this.unique(this.advices)
+        var arr = [] 
+        arr = this.unique(this.advices)
         // console.log("arriooowo",arr)
         // if(arr!=null && arr.length >0){
   

src/xt_pages/management/components/PlanForm.vue

@@ -41,7 +41,7 @@
                 default-first-option
                 placeholder="请选择时间"
                 style="width: 135px;"
-               
+
               >
                 <el-option
                   v-for="item in this.timeType"
@@ -251,7 +251,7 @@ export default {
         { id: 1, name: "床单" },
         { id: 2, name: "被套" },
         { id: 3, name: "枕套" },
-      
+
       ],
       DeviceType: [],
       planid: 0,
@@ -272,7 +272,7 @@ export default {
       });
     },
     savePlan(formName) {
-      
+
       var equimentid = this.equimentid;
       // console.log('equimentid', equimentid);
       var devicetype = this.form.device_type;
@@ -300,7 +300,7 @@ export default {
           var msg = response.data.data.msg;
           // console.log('msg', msg);
           this.$message.success("保存成功");
-          
+
           this.dialogVisible = false;
           this.$refs['form'].resetFields()
           this.$emit("getAllPlan");
@@ -308,12 +308,12 @@ export default {
           // 如果保存成功通过状态值改变父组键表格的值
           this.plandata = 1;
           this.$emit("func", this.plandata);
-          
+
         } else {
           this.$message.error("该消毒计划已存在");
         }
       });
-      
+
     },
     getAllEquitType() {
       getAllEquitType().then(response => {

src/xt_pages/outpatientDoctorStation/checkTemplate/printThree.vue

@@ -1,165 +1,135 @@
 <template>
   <div>
-    <div id="prescription-print3" class="prescription-print">
-      <img
-        style="width: 100%; height: 80px"
-        v-if="org_id == 10138"
-        src="https://kuyi.shengws.com/bailin/bltotle.jpg"
-        alt=""
-      />
-      <img
-        style="width: 100%; height: 80px"
-        v-if="org_id == 10278 || org_id == 0"
-        src="https://kuyi.shengws.com/beierlog.png"
-        alt=""
-      />
-      <div class="printTitle">检验申请单</div>
-
-      <div style="border: 1px solid #000;margin-bottom: 10px;">
-        <div
-          style="
-            display: flex;
-            justify-content: space-between;
-            border-bottom: 1px solid #000;
-            line-height: 40px;
-            padding: 0 10px;
-          "
-        >
-          <div>是否急诊：否</div>
-          <div>
-            结算方式：{{
-              faber && faber.transBody
-                ? getName(faber.transBody.outputlist1)
-                : ""
-            }}
+    <div v-for="(item, index) in advicePrint" :key="index">
+      <div id="prescription-print3" class="prescription-print">
+        
+        <div class="printTitle">检验申请单</div>
+
+        <div style="border: 1px solid #000;margin-bottom: 10px;">
+          <div
+            style="
+              display: flex;
+              justify-content: space-between;
+              border-bottom: 1px solid #000;
+              line-height: 40px;
+              padding: 0 10px;
+            "
+          >
+            <div>是否急诊：否</div>
+            <div>
+              结算方式：{{
+                faber && faber.transBody
+                  ? getName(faber.transBody.outputlist1)
+                  : ""
+              }}
+            </div>
+            <div>金额：{{ total }}</div>
           </div>
-          <div>金额：{{ total }}</div>
-        </div>
-        <div
-          style="
-            display: flex;
-            justify-content: space-between;
-            border-bottom: 1px solid #000;
-            line-height: 40px;
-            padding: 0 10px;
-          "
-        >
-          <div>
-            姓名：{{
-              advicePrint[0].patient.name
-                ? advicePrint[0].patient.name.indexOf("（") > -1
-                  ? advicePrint[0].patient.name.substring(
-                      0,
-                      advicePrint[0].patient.name.indexOf("（")
-                    )
-                  : advicePrint[0].patient.name
+          <div
+            style="
+              display: flex;
+              justify-content: space-between;
+              border-bottom: 1px solid #000;
+              line-height: 40px;
+              padding: 0 10px;
+            "
+          >
+            <div>
+              姓名：{{ item.patient.name }}
+              <!-- {{
+                advicePrint[0].patient.name
+                  ? advicePrint[0].patient.name.indexOf("（") > -1
+                    ? advicePrint[0].patient.name.substring(
+                        0,
+                        advicePrint[0].patient.name.indexOf("（")
+                      )
+                    : advicePrint[0].patient.name
+                  : ""
+              }} -->
+            </div>
+            <div>
+              性别：
+              <span v-if="item.patient.gender == 1">男</span>
+              <span v-if="item.patient.gender == 2">女</span>
+            </div>
+            <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
+
+          </div>
+          <div style="margin-bottom: 20px; padding: 10px 10px 0" >
+            病史摘要：{{
+              history.history_of_present_illness
+                ? history.history_of_present_illness
                 : ""
             }}
           </div>
-          <div>
-            性别：
-            <span v-if="advicePrint[0].patient.gender == 1">男</span>
-            <span v-if="advicePrint[0].patient.gender == 2">女</span>
+          <!-- <div style="margin-bottom:20px;padding:0 10px;"   >体格检查：
+                      <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+                      <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
+                      <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
+                      <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+                  </div> -->
+          <div style="margin-bottom: 20px; padding: 0 10px">
+            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
           </div>
-<!--          <div>-->
-<!--            年龄：{{-->
-<!--              advicePrint[0].patient.age ? advicePrint[0].patient.age : ""-->
-<!--            }}岁-->
-<!--          </div>-->
-          <div>年龄：{{getAge(advicePrint[0].patient)?getAge(advicePrint[0].patient):""}}岁</div>
-
-        </div>
-        <div style="margin-bottom: 20px; padding: 10px 10px 0" >
-          病史摘要：{{
-            history.history_of_present_illness
-              ? history.history_of_present_illness
-              : ""
-          }}
-        </div>
-        <!-- <div style="margin-bottom:20px;padding:0 10px;"   >体格检查：
-                    <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
-                    <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
-                    <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
-                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
-                </div> -->
-        <div style="margin-bottom: 20px; padding: 0 10px">
-          临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}
-        </div>
-        <div style="display: flex; margin-bottom: 20px; padding: 0 10px">
-          <div>检验项目：</div>
-          <div style="position: relative;">
-            <div v-for="item in projectPrint" style="margin-bottom: 10px">
-              {{ item.team.project_team }}
-            </div>
-            <div v-for="item in singleProjectPrint">
-              <div v-if="item.remark == '血透前抽血'" style="border-right: 1px solid red;padding-bottom: 5px;">
-                {{ item.project.project_name }}
+          <div style="display: flex; margin-bottom: 20px; padding: 0 10px">
+            <div>检验项目：</div>
+            <div style="position: relative;">
+              <div v-for="item in projectPrint" style="margin-bottom: 10px">
+                {{ item.team.project_team }}
               </div>
-              <!-- <div v-else style="border-right: 1px solid rgb(0, 47, 255);">
-                {{ item.project.project_name }}
-              </div> -->
-            </div>
-            <div style="height: 10px;"></div>
-            <div v-for="item in singleProjectPrint" >
-              <!-- <div v-if="item.remark == '血透前抽血'" style="border-right: 1px solid red;">
-                {{ item.project.project_name }}
-              </div> -->
-              <div v-if="item.remark == '血透后抽血'" style="border-right: 1px solid rgb(0, 47, 255);padding-bottom: 5px;">
-                {{ item.project.project_name }}
+              <div v-for="item in singleProjectPrint">
+                <!-- <div v-if="item.remark == '血透前抽血'" style="border-right: 1px solid red;padding-bottom: 5px;"> -->
+                  {{ item.project.project_name }}
+                <!-- </div> -->
               </div>
+              <!-- <div style="height: 10px;"></div>
+              <div v-for="item in singleProjectPrint" >
+                <div v-if="item.remark == '血透后抽血'" style="border-right: 1px solid rgb(0, 47, 255);padding-bottom: 5px;">
+                  {{ item.project.project_name }}
+                </div>
+              </div> -->
+              <!-- <span style="position: absolute;top: 65px;right: -77px;" v-if=" singleProjectPrint.length>0">血透前抽血</span>
+              <span style="position: absolute;bottom: 96px;right: -77px;" v-if=" singleProjectPrint.length>0">血透后抽血</span> -->
             </div>
-            <span style="position: absolute;top: 65px;right: -77px;" v-if=" singleProjectPrint.length>0">血透前抽血</span>
-            <span style="position: absolute;bottom: 96px;right: -77px;" v-if=" singleProjectPrint.length>0">血透后抽血</span>
-          </div>
-        </div>
-        <div
-          style="
-            display: flex;
-            justify-content: space-between;
-            border-top: 1px solid #000;
-            line-height: 40px;
-            padding: 0 10px;
-          "
-        >
-          <div>开单医生：{{ doctor ? doctor : "" }}</div>
-          <div>
-            开单日期：
-            {{ getTime(pre_time) ? getTime(pre_time).split(" ")[0] : "" }}
           </div>
-          <div>
-            医生签字：
-
-            <img
-              v-if="setAdminUserES(advicePrint[0].creator)"
-              style="height: 80px; width: 80px;"
-              :src="setAdminUserES(advicePrint[0].creator)"
-              alt=""
-              srcset=""
-            />
-            <span
-              style="width: 100px; display: inline-block"
-              v-else-if="advicePrint[0].doctor != ''"
-            >
-              {{ advicePrint[0].doctor ? advicePrint[0].doctor : "" }}
-            </span>
-            <span v-else>
-
-            </span>
+          <div
+            style="
+              display: flex;
+              justify-content: space-between;
+              border-top: 1px solid #000;
+              line-height: 40px;
+              padding: 0 10px;
+            "
+          >
+            <div>开单医生：{{ doctor ? doctor : "" }}</div>
+            <div>
+              开单日期：
+              {{ getTime(pre_time) ? getTime(pre_time).split(" ")[0] : "" }}
+            </div>
+            <div>
+              医生签字：
+
+              <img
+                v-if="setAdminUserES(advicePrint[0].creator)"
+                style="height: 80px; width: 80px;"
+                :src="setAdminUserES(advicePrint[0].creator)"
+                alt=""
+                srcset=""
+              />
+              <span
+                style="width: 100px; display: inline-block"
+                v-else-if="advicePrint[0].doctor != ''"
+              >
+                {{ advicePrint[0].doctor ? advicePrint[0].doctor : "" }}
+              </span>
+              <span v-else>
+
+              </span>
+            </div>
           </div>
         </div>
+      
       </div>
-      <img
-      style="width: 100%"
-      v-if="org_id == 10138 "
-      src="https://kuyi.shengws.com/bailin/blend.jpg"
-      alt=""
-    />
-      <img
-        style="width: 100%"
-        v-if="org_id == 10278 || org_id == 0"
-        src="https://kuyi.shengws.com/bailinbeier.png"
-        alt=""
-      />
     </div>
   </div>
 </template>
@@ -272,10 +242,10 @@ export default {
       getPrescriptionPrint(params).then((response) => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint;
-          // console.log("adviceprint9999", advicePrint);
+          console.log("adviceprint9999", advicePrint);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
-          // console.log("处方222222", this.prescriptions);
+          console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
           // console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;

src/xt_pages/role/admin.vue

@@ -187,12 +187,12 @@
           @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
-        <!-- <el-button
+          <!--<el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSavePDFInformation">生成PDF</el-button> -->
+          @click="toSavePDFInformation">生成PDF</el-button>-->
 
 
         <!-- <el-button
@@ -1071,11 +1071,11 @@ export default {
            
            var orderId = response.data.data.orderId
            
-           var base64Img = 'data:image/png;base64'+","+orderId
-           console.log("base64Img",base64Img)
-           var imgFile = this.base64ImgtoFile(base64Img)
-           this.downloadBlob(imgFile, 'test.png')
-           console.log("imgFilewoowow",imgFile)
+          //  var base64Img = 'data:image/png;base64'+","+orderId
+          //  console.log("base64Img",base64Img)
+          //  var imgFile = this.base64ImgtoFile(base64Img)
+          //  this.downloadBlob(imgFile, 'test.png')
+          //  console.log("imgFilewoowow",imgFile)
 
            const blob = this.base64ToBlob(orderId, 'application/pdf');
            this.openPdf(blob);