config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    // host: 'xt.test.sgjyun.com',
+    host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
    // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+  //  host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package.json

@@ -56,7 +56,7 @@
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "^8.0.0",
+    "node-sass": "4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",

src/api/his/his_hospital.js

@@ -19,15 +19,5 @@ export function refundDetail(params) {
   });
 }
 
-export function exportData(params) {
-  return request({
-    url: "/api/exportuncharge/get",
-    method: "get",
-    params:params
-  });
-}
-
-
-
 
 

src/api/schedule.js

@@ -269,12 +269,3 @@ export function getSolutionSchedule(params) {
     params: params
   })
 }
-
-
-export function CancelScheduleTwo(id) {
-  return request({
-    url: '/api/schedule/delete_two?id=' + id,
-    method: 'Delete'
-  })
-}
-

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -328,7 +328,7 @@
                         <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
-                        <!-- <td width="60" style="height:20px;line-height:20px">温度<br />°C</td> -->
+                        <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
 <!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
@@ -352,7 +352,7 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
 
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
-                        <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td> -->
+                        <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
@@ -716,7 +716,6 @@ export default {
       .then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
-          this.loading = false
           this.org_template_info = resp.data.templateInfo
 
           this.records = this.records.concat(resp.data.schedules)
@@ -888,7 +887,7 @@ export default {
           this.adminSign = name
           console.log('name是', name)
           console.log('记录', this.records)
-          
+          this.loading = false
         } else {
           this.loading = false
           this.$message.error(resp.msg)

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,7 +17,7 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && ((this.$store.getters.xt_user.template_info.template_id == 6 &&this.$store.getters.xt_user.template_info.org_id != 10447) || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
           <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445"  >L</span>
         </li>
         <li v-if="isShow('导管')">

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" (this.template_id == 6 && this.$store.getters.xt_user.template_info.org_id != 10447) || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1560,7 +1560,7 @@ export default {
         }
       }
       
-      if( this.$store.getters.xt_user.org.id == 0 || this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10447){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -594,7 +594,7 @@
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
-            label="电导度(mS/cm)"
+            label="电导度(mS/m)"
             width="100"
             v-if="isShow('电导度')"
           >
@@ -1322,7 +1322,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('电导度')">
-            <el-form-item label="电导度(mS/cm)：">
+            <el-form-item label="电导度(mS/m)：">
               <el-input v-model="form.conductivity"></el-input>
             </el-form-item>
           </el-col>
@@ -1917,8 +1917,6 @@ export default {
           this.form.breathing_rated = "20"
         }else if(this.org_id == 10340){
          this.form.breathing_rated = "20"
-        }else if(this.org_id == 10447){
-          this.form.breathing_rated = "20"
         } else {
           this.form.breathing_rated = "";
         }
@@ -1964,13 +1962,7 @@ export default {
         this.form.symptom = resp.monitor.symptom ? resp.monitor.symptom : ""; // this.last_monitor_record.symptom;
        // this.form.dispose = resp.monitor.dispose ? resp.monitor.dispose : ""; // this.last_monitor_record.dispose;
         this.form.result = resp.monitor.result ? resp.monitor.result : ""; // this.last_monitor_record.result;
-        //电导度
-        if(this.org_id == 9671 || this.org_id == 10447){
-           this.form.blood_oxygen_saturation = "99"
-        }else{
-           this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation? resp.monitor.blood_oxygen_saturation: "";
-        }
-       
+        this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation? resp.monitor.blood_oxygen_saturation: "";
        //针对长沙南雅医院
        if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 9675){
           this.form.blood_oxygen_saturation = "/"
@@ -1982,7 +1974,7 @@ export default {
         this.form.sodium_concentration = resp.monitor.sodium_concentration
           ? resp.monitor.sodium_concentration
           : "";
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10447){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
           this.form.conductivity = 14
         }else{
            this.form.conductivity = resp.monitor.conductivity? resp.monitor.conductivity: "";
@@ -2017,7 +2009,7 @@ export default {
         this.form.heparin_amount = resp.monitor.heparin_amount
           ? resp.monitor.heparin_amount
           : "";
-         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10447){
+         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
             this.form.dialysate_temperature = 36.5
             
          }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -26,7 +26,7 @@
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
-          <th v-if="isShow('电导度')" width="92px">电导度(mS/cm)</th>
+          <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>

src/xt_pages/dialysis/schedualPatient.vue

@@ -184,7 +184,6 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           {value: 1,label: '待开处方'},
           {value: 2,label: '待开小结'},
           {value: 3,label: '待医嘱核对'},
-          {value:4,label:'待消毒'},
         ],
         treatStateVal: 0,
         allPatient:[],
@@ -826,18 +825,6 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             }
           }
           arr2 = arr
-        }else if(this.treatStateVal == 4){
-         let arr = []
-          arr = JSON.parse(JSON.stringify(arr1))
-          for (let i = 0; i < arr.length; i++) {
-            for (let j = 0; j < arr[i].schedules.length; j++) {
-              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].device_information != null)) {
-                // 删除元素后改变i的值
-                arr[i].schedules.splice(j--, 1);
-              }
-            }
-          }
-          arr2 = arr
         }
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -3,21 +3,7 @@
     <div class="dialysis-print-order">
       <div class="order-yy-name">{{ orgname }}</div>
       <div class="order-title">血液透析（滤过）记录表单</div>
-      <div style="display:flex;justify-content: space-between;">
-        <div class="order-name" style="margin: 0;">姓 名:&nbsp;{{ patientInfo.name }}</div>
-            <div class="order-name" style="margin: 0;">门诊/住院号:&nbsp;
-            <span v-if="receiverTreatmentAccess.admission_number">
-              {{ receiverTreatmentAccess.admission_number }}
-            </span>
-            <span v-else-if="patientInfo.admission_number">
-              {{ patientInfo.admission_number }}
-            </span>
-            <span v-else>
-              {{ "/" }}
-            </span>
-            </div>
-          </div>
-      
+      <div class="order-name">姓 名:&nbsp;{{ patientInfo.name }}</div>
       <table class="print-table" border="1">
         <tbody>
           <tr>
@@ -851,25 +837,13 @@
             <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
             <td v-if="advice_index === 3">较干体重增加量:</td>
             <td v-if="advice_index === 3">
-              <span v-if="org_id==10345">
-                {{
-                predialysis.weight_before == 0
-                  ? 0
-                  : (
-                      predialysis.weight_before - predialysis.dry_weight
-                    ).toFixed(2)
-              }}kg
-              </span>
-              <span v-else>
-                {{
+              {{
                 afterdialysis.weight_after == 0
                   ? 0
                   : (
                       afterdialysis.weight_after - predialysis.dry_weight
                     ).toFixed(2)
               }}kg
-              </span>
-              
             </td>
             <td v-if="advice_index === 4">净脱水量:</td>
             <td v-if="advice_index === 4">

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -100,6 +100,19 @@
                       class="under_line"
                       style="width: 50px; text-align: center"
                     >
+                      <!-- <span>{{
+                        (dialysisOrder &&
+                          dialysisOrder != null &&
+                          dialysisOrder.DeviceNumber &&
+                          dialysisOrder.DeviceNumber.number.length > 0) ||
+                        (dialysisOrder &&
+                          dialysisOrder != null &&
+                          receiverTreatmentAccess.condition &&
+                          receiverTreatmentAccess.condition != 1)
+                          ? patientInfo.DialysisSchedule.device_number.number
+                          : dialysisOrder.DeviceNumber.number
+                      }}</span> -->
+
                       <span
                         v-if="
                           dialysisOrder == null ||
@@ -1143,15 +1156,6 @@
                                     : "/"
                                 }}
                               </div>
-                               <span v-if="prescription.anticoagulant == 7"
-                                >iu</span
-                              >
-                               <span v-if="prescription.anticoagulant == 6"
-                                >iu</span
-                              >
-                               <span v-if="prescription.anticoagulant == 5"
-                                >ml</span
-                              >
                               <span v-if="prescription.anticoagulant == 4"
                                 >mg</span
                               >
@@ -1189,12 +1193,6 @@
                                     : "0"
                                 }}
                               </div>
-                              <span v-if="prescription.anticoagulant == 7"
-                                >iu/h</span
-                              >
-                              <span v-if="prescription.anticoagulant == 6"
-                                >iu/h</span
-                              >
                               <span v-if="prescription.anticoagulant == 5"
                                 >ml/h</span
                               >
@@ -1262,15 +1260,6 @@
                                     : "/"
                                 }}
                               </div>
-                              <span v-if="prescription.anticoagulant == 7"
-                                >iu</span
-                              >
-                              <span v-if="prescription.anticoagulant == 6"
-                                >iu</span
-                              >
-                              <span v-if="prescription.anticoagulant == 5"
-                                >ml</span
-                              >
                               <span v-if="prescription.anticoagulant == 4"
                                 >mg</span
                               >
@@ -1435,6 +1424,17 @@
                                 </td>
                                 <td width="200">病情变化及处理</td>
 
+                                <!-- <td width="100">时间</td>
+                    <td width="30">T<br>C°</td>
+                    <td width="30">P<br/>次/分</td>
+                    <td width="30">R<br/>次/分</td>
+                    <td width="100">BP<br/>mmHg</td>
+                    <td width="60">静脉压/动脉压<br/>mmHg</td>
+                    <td width="80">血流量<br/>ml/min</td>
+                    <td width="90">超滤量累计L</td>
+                    <td width="80">钠浓度<br/>mmol/L</td>
+                    <td width="240">病情特殊情况处理<br/>及专科护理措施记录</td>
+                    <td  width="100">护士签名</td> -->
                               </tr>
 
                               <tr
@@ -3379,7 +3379,7 @@ export default {
         var leftAdvice = [];
         var rightAdvice = [];
         var adlen = advices.length;
-        console.log("adlen----------------------",adlen)
+
         var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2;
         for (var i = 0; i < halfLen; i++) {
           leftAdvice.push(advices[i]);
@@ -3404,8 +3404,8 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
-        this.doctor_advices =response.data.data.advices == null ? [] : response.data.data.advices;
-        console.log("zhonguog---------------------------------",this.doctor_advices)
+        this.doctor_advices =
+          response.data.data.advices == null ? [] : response.data.data.advices;
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
@@ -3505,15 +3505,12 @@ export default {
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        console.log("totalpath-------------------------------",this.totollength)
-        if (this.totollength > 58) {
+        if (this.totollength > 18) {
           var temp_advice_length = 17 - this.monitors.length;
-          console.log("temp_advice_length-----------",temp_advice_length)
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
           for (let index = 0; index < this.doctor_advices.length; index++) {
             const element = this.doctor_advices[index];
-
             if (temp_advice_length > index) {
               doctor_advices_1.push(element);
             } else {
@@ -3523,7 +3520,6 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        console.log("doctor_advice----------",this.doctor_advices)
 
         this.patientInfo.name = this.nameSplit(this.patientInfo.name);
       } else {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -586,13 +586,10 @@
                         </td>
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
                           <span v-if="advice.parent_id > 0">---></span>
-                          
-                          <span v-if="advice.project&&advice.project.project_name">{{ advice.project.project_name }}</span>
-                          <span v-else>{{ advice.advice_name }}</span>
-                          <span v-if="advice.project&&advice.count">{{ advice.count }}{{ advice.unit }}</span>
+                          <span>{{ advice.advice_name }}</span>
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
-                          <span v-if="advice.single_dose != 0&&!advice.project">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                          <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
@@ -1401,27 +1398,12 @@ export default {
           ].name
           this.AlPanel = this.anticoagulantsConfit[thisALID]
         }
-        // this.advices = response.data.data.projects
+
         this.advices = response.data.data.advices
         console.log("医嘱数据2222222222",this.advices)
-        let doctorAdevieInfo = []
-        let ad_arr = JSON.parse(JSON.stringify(response.data.data.projects))
-        ad_arr.forEach(el => {
-          if(el.project&&el.project.project_name!=""){
-            doctorAdevieInfo.push(el)
-          }
-        });
-        let ad_arr2= JSON.parse(JSON.stringify(response.data.data.advices))
-        ad_arr2.forEach(el => {
-          doctorAdevieInfo.push(el)
-        });
-        console.log(doctorAdevieInfo,'doctorAdevieInfo')
-        // doctorAdevieInfo.push(JSON.parse(JSON.stringify(response.data.data.advices)))
+
+        var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
         this.tableAdvice = doctorAdevieInfo;
-        // console.log(this.tableAdvice,'this.tableAdvice')
-        // if(!this.tableAdvice[0].advice_name){
-        //   console.log("不存在")
-        // }
         if (this.tableAdvice.length < 7) {
           var nl = 6 - this.tableAdvice.length;
           for (let index = 0; index < nl; index++) {
@@ -1542,7 +1524,6 @@ export default {
           this.doctor_advices[index]['isShow'] = 2
         }
 
-
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -872,7 +872,7 @@
             </td>
           </tr>
 
-          <!-- <tr>
+          <tr>
             <td style="text-align: left" colspan="8">
               <span style="display: inline-block; margin-left: 15px"
                 >出血影响因素:</span
@@ -925,7 +925,7 @@
               >其他:
               <span>{{ predialysis.hemorrhage_other }}</span>
             </td>
-          </tr> -->
+          </tr>
         </table>
 
         <table class="print-table" border="1" style="line-height: 30px">
@@ -959,10 +959,10 @@
               超滤率
               <br />ml/h
             </td>
-            <!-- <td style="min-width: 60px">
+            <td style="min-width: 60px">
               超滤量
               <br />ml
-            </td> -->
+            </td>
             <td style="min-width: 60px">
               电导度
               <br />
@@ -990,10 +990,12 @@
             <td>{{ monitor.pulse_frequency }}</td>
             <td>{{ monitor.blood_flow_volume }}</td>
             <td>{{ monitor.venous_pressure }}</td>
-            <td>{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
+            <td>
+              {{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
+            </td>
             <td>{{ monitor.transmembrane_pressure }}</td>
             <td>{{ monitor.ultrafiltration_rate }}</td>
-            <!-- <td>{{ monitor.ultrafiltration_volume }}</td> -->
+            <td>{{ monitor.ultrafiltration_volume }}</td>
             <td>{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
             <td>
               <span style="line-height: 18px; display: block">
@@ -1084,15 +1086,7 @@
                   :isChecked="afterdialysis.cruor.indexOf('透析器-3级') > -1"
                 ></label-box
                 >&nbsp;&nbsp;
-                <label-box
-                  showValue="无"
-                  :isChecked="afterdialysis.cruor.indexOf('透析器-0度') <= 0&&
-                  afterdialysis.cruor.indexOf('透析器-Ⅲ度') <= 0&&
-                  afterdialysis.cruor.indexOf('透析器-Ⅰ度') <= 0&&
-                  afterdialysis.cruor.indexOf('透析器-Ⅱ度') <= 0"
-                ></label-box
-                >
-                <!-- {{ getCruor(afterdialysis.cruor) }} -->
+                {{ getCruor(afterdialysis.cruor) }}
               </span>
             </td>
           </tr>

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -46,6 +46,7 @@ import printThree from "./invoiceTemplate/printThree";
 export default {
   name: "invoicePrint",
   components: {
+    PrintNight,
     printOne,
     printTwo,
     printThree,

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -92,16 +92,10 @@
 
           <div>
             <div>入院时间：{{this.hisPatientInfo&&this.hisPatientInfo.in_hosptial_time?this.hisPatientInfo.in_hosptial_time:""}}</div>
-            <el-button
-              size="small"
-              @click="exportUnchargeData"
-              type="primary">导出未收费数据</el-button>
-
-<!--            -->
-<!--            <el-button  size="small"-->
-<!--                       @click="open(1)"-->
-<!--                       type="primary">入院登记-->
-<!--            </el-button>-->
+            <el-button  size="small"
+                       @click="open(1)"
+                       type="primary">入院登记
+            </el-button>
 
             <el-button v-loading="loadingone" size="small"
                        v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
@@ -280,28 +274,6 @@
                 <el-button type="primary" @click="comfirmTime">确 定</el-button>
              </span>
     </el-dialog>
-
-    <el-dialog
-      title="导出时间"
-      :visible.sync="dialogExportVisible"
-      width="30%"
-    >
-      <el-date-picker v-model="export_start_time" type="datetime" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd"
-                      placeholder="请选择导出开始时间">
-      </el-date-picker>
-
-      <el-date-picker v-model="export_end_time" type="datetime" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd"
-                      placeholder="请选择导出结束时间">
-      </el-date-picker>
-
-      <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogExportVisible = false">取 消</el-button>
-                <el-button type="primary" @click="comfirmExportTime">确 定</el-button>
-             </span>
-    </el-dialog>
-
   </div>
 
 </template>
@@ -327,12 +299,6 @@ import {
   Outhopitaluncheck,
   Settle
 } from '@/api/his/his'
-
-import {
-  exportData
-} from '@/api/his/his_hospital'
-
-
 import { uParseTime } from '@/utils/tools'
 
 import RegisterDialog from './components/registerDialog'
@@ -468,10 +434,7 @@ export default {
       department: [],
       invoiceVisible: false,
       invoiceParams: {},
-      out_hospital_time: moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss"),
-      dialogExportVisible:false,
-      export_start_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
-      export_end_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      out_hospital_time: moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss")
 
     }
   },
@@ -494,68 +457,6 @@ export default {
     this.getPatientList()
   },
   methods: {
-    comfirmExportTime(){
-      let params = {
-        'patient_id': this.patientInfo.id,
-        'start_time': this.export_start_time,
-        'end_time': this.export_end_time,
-      }
-      exportData(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          this.dialogExportVisible = false
-          return false
-        } else {
-          this.dialogExportVisible = false
-          var prescriptions = response.data.data.month_prescriptions
-          var patient_ids = this.unique_patient(prescriptions)
-          let list=  []
-          for(var i = 0;i < patient_ids.length; i++){
-            let obj = {}
-            let total = 0
-            obj["患者姓名"] = patient_ids[i].patient.name
-            for(let b = 0; b < prescriptions.length; b++){
-              if(patient_ids[i].patient_id == prescriptions[b].patient_id){
-                if (prescriptions[b].type == 1) {
-                  if (prescriptions[b].advices != null) {
-                    console.log("~~~~~~~~~~~~~~~~~1111")
-
-                    for (let a = 0; a < prescriptions[b].advices.length; a++) {
-                      total = total + parseFloat(prescriptions[b].advices[a].price * prescriptions[b].advices[a].prescribing_number)
-                    }
-                  }
-                } else {
-                  if (prescriptions[b].project != null) {
-                    console.log("~~~~~~~~~~~~~~~~~22222")
-                    for (let c = 0; c < prescriptions[b].project.length; c++) {
-                      total = total + parseFloat(prescriptions[b].project[c].price  * prescriptions[b].project[c].count)
-                    }
-                  }
-                }
-              }
-            }
-            obj["总金额"] = total.toFixed(2)
-            list.push(obj)
-          }
-          import("@/vendor/Export2Excel").then((excel) => {
-            const tHeader = [
-              "患者姓名",
-              "总金额"
-            ];
-            const filterVal = [
-              "患者姓名",
-              "总金额"
-            ];
-            const data = this.formatJson(filterVal, list);
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: "消费明细",
-            });
-          });
-        }
-      })
-    },
     comfirmTime() {
       var that = this
       let params = {
@@ -1387,10 +1288,6 @@ export default {
     },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
-    },exportUnchargeData(){
-
-      this.dialogExportVisible = true
-
     },
     open(index) {
       if (index == 1){
@@ -2974,22 +2871,6 @@ export default {
       this.curSettlePrescriptions = this.settle_prescriptions[0]
 
     },
-    unique_patient(array) {
-      // res用来存储结果
-      var res = []
-      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
-        for (var j = 0, resLen = res.length; j < resLen; j++) {
-          if (array[i].patient_id === res[j].patient_id) {
-            break
-          }
-        }
-        // 如果array[i]是唯一的，那么执行完循环，j等于resLen
-        if (j === resLen) {
-          res.push(array[i])
-        }
-      }
-      return res
-    },
     unique_two(array) {
       // res用来存储结果
       var res = []

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -83,15 +83,15 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-<!--          <div v-if="org_id == 10340 || org_id == 0">-->
-<!--                        <el-button  size="small"-->
-<!--                                   @click="openZb(4)"-->
-<!--                                   v-if=" this.order.id == 0"-->
-<!--                          type="primary">记账-->
-<!--                        </el-button>-->
-<!--          </div>-->
-
-          <div  v-if="org_id != 10340">
+          <div v-if="org_id == 10340 || org_id == 0">
+                        <el-button  size="small"
+                                   @click="openZb(4)"
+                                   v-if=" this.order.id == 0"
+                          type="primary">记账
+                        </el-button>
+          </div>
+
+          <div  v-if="org_id != 10340 && org_id != 0">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -42,7 +42,7 @@
       <!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
       <!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
       <printFive
-          v-if="org_id == 0"
+          v-if="org_id == 0  || org_id == 10191"
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
@@ -55,7 +55,7 @@
          :balanceAccounts="balanceAccounts"
      >
      </printSeven>
-   <printOne :info="info" :paramsObj="paramsObj" v-else></printOne>
+   <printOne :info="info" v-else></printOne>
 <!--      <printOne :info="info" v-if="org_id != 9990 &&-->
 <!--          org_id != 10138 &&-->
 <!--          org_id != 9504 &&-->
@@ -271,8 +271,8 @@ export default {
             scanStyles: false,
           });
         } else if (
-            this.$store.getters.xt_user.org_id == 0
-
+            this.$store.getters.xt_user.org_id == 0 ||
+            this.$store.getters.xt_user.org_id == 10191
         ) {
           const style =
               "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
@@ -386,7 +386,7 @@ export default {
       // console.log(json, "json");
       // this.info = json.data.info
       //
-      if (obj.balance_accounts_type == 2) {
+      if (obj.balance_accounts_type == 2 ) {
         let params = {
           his_patient_id: obj.his_patient_id,
           id: obj.order_id,
@@ -828,7 +828,7 @@ export default {
         }
 
       } else {
-        if (this.$store.getters.xt_user.org_id == 10191) {
+        if (this.org_id == 10191 || this.org_id == 0) {
           let params = {
             his_patient_id: obj.his_patient_id,
             id: obj.order_id,

src/xt_pages/outpatientCharges/summary.vue

@@ -109,6 +109,7 @@
           </el-button
           >
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
+          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
           <!--          >报表下载2-->
@@ -118,7 +119,7 @@
           <!--                    <el-button size="small" type="primary" @click="export_detail_three">报表下载2</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-          <!--          <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+<!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
 
@@ -355,7 +356,7 @@ import {jsGetAge, uParseTime} from "@/utils/tools";
 
 import {getHisDataFive, getHisDataSix, getHisDataThree, getHisDataTwo,getAllOrders} from "../../api/his/his";
 
-import {handleData10106} from "../../api/his/his_export";
+import {handleData10106,handleData10318} from "../../api/his/his_export";
 
 export default {
   name: "OutpatientChargesSummary",
@@ -1220,7 +1221,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "周期": "2022年第三季度",
+              "周期": "2022年第四季度",
               "类别": "门诊",
               "医保目录编码": list[i].code,
               "医保目录名称": list[i].name,
@@ -1631,7 +1632,107 @@ export default {
       });
 
     },
+    export_detail_ten_two(){
+      let params = {
+        start_time:this.start_time,
+        end_time:this.end_time
+      };
+      handleData10318(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          for (let i = 0; i < response.data.data.order.length; i++) {
+            let order = response.data.data.order[i];
+
+
+            let obj = {
+              姓名: order.patient.name,
+              身份证: order.patient.id_card_no,
+              西药费:0,
+              化验费:0,
+              检查费:0,
+              治疗费:0,
+              材料费:0,
+              中成药费:0,
+              备注: "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay,
+            }
+            let xiyaoPrice = 0
+            let huaYanPrice = 0
+            let jianChaPrice = 0
+            let zhiLiaoPrice = 0
+            let cailiaoPrice = 0
+            let zhongchengyaoPrice = 0
+
+              for (let b = 0; b < order.info.length; b++) {
+                if(order.info[b].med_chrgitm_type ==  '09'){
+                  xiyaoPrice = xiyaoPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '04'){
+                  huaYanPrice = huaYanPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '03'){
+                  jianChaPrice = jianChaPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '05'){
+                  zhiLiaoPrice = zhiLiaoPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '08'){
+                  cailiaoPrice = cailiaoPrice + order.info[b].det_item_fee_sumamt
+                }
+                if(order.info[b].med_chrgitm_type ==  '11'){
+                  zhongchengyaoPrice = zhongchengyaoPrice + order.info[b].det_item_fee_sumamt
+                }
+              }
+            obj.西药费 = xiyaoPrice
+            obj.化验费 = huaYanPrice
+            obj.检查费 = jianChaPrice
+            obj.治疗费 = zhiLiaoPrice
+            obj.材料费 = cailiaoPrice
+            obj.中成药费 = zhongchengyaoPrice
 
+
+            list.push(obj)
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "姓名",
+              "身份证",
+              "西药费",
+              "化验费",
+              "检查费",
+              "治疗费",
+              "材料费",
+              "中成药费",
+              "备注",
+            ];
+            const filterVal = [
+              "姓名",
+              "身份证",
+              "西药费",
+              "化验费",
+              "检查费",
+              "治疗费",
+              "材料费",
+              "中成药费",
+              "备注",
+            ];
+            const data = this.formatJson(filterVal, list);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+
+
+        }
+      });
+
+
+    },
     GetGoodName(id) {
       switch (id) {
         case 254:
@@ -1824,39 +1925,47 @@ export default {
 
             } else if (order.his_patient.insuplc_admdvs == "440704"){
 
-              insuplc_admdvs_name = "江海区"
+              insuplc_admdvs_name = "蓬江区"
 
 
             } else if (order.his_patient.insuplc_admdvs == "440705"){
 
-              insuplc_admdvs_name = "新会区"
+              insuplc_admdvs_name = "蓬江区"
 
 
             }else if (order.his_patient.insuplc_admdvs == "440781"){
 
-              insuplc_admdvs_name = "台山市"
+              insuplc_admdvs_name = "蓬江区"
+
 
             }else if (order.his_patient.insuplc_admdvs == "440783"){
-              insuplc_admdvs_name = "开平市"
+
+              insuplc_admdvs_name = "蓬江区"
+
 
             }else if (order.his_patient.insuplc_admdvs == "440784"){
-              insuplc_admdvs_name = "鹤山市"
+
+
 
             }else if (order.his_patient.insuplc_admdvs == "440785"){
-              insuplc_admdvs_name = "恩平市"
+
+
 
             }else if (order.his_patient.insuplc_admdvs == "440799"){
-              insuplc_admdvs_name = "市直"
+
+
+
             }
 
+
+
             let obj = {
               就诊号: order.mdtrt_id,
               患者姓名: name,
               开处时间: time,
               险种类型: insutypeName,
               参保所属医保区划: order.his_patient.insuplc_admdvs,
-              参保号:order.his_patient.id_card_no,
-              属地名称: insuplc_admdvs_name,
+              属地名称: order.his_patient.insuplc_admdvs,
               应收金额: order.medfee_sumamt,
               实收金额: order.medfee_sumamt,
               医保统筹金额: order.hifp_pay,
@@ -1890,9 +1999,6 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
-              "参保所属医保区划",
-              "参保号",
-             "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",
@@ -1922,9 +2028,6 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
-              "参保所属医保区划",
-              "参保号",
-              "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -13,8 +13,7 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="$store.getters.xt_user.org_id != 0 && $store.getters.xt_user.org_id != 10402" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
-        <check-print-two v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></check-print-two>
+        <printOne :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
       </div>
   </div>
 </template>
@@ -26,11 +25,9 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 import printOne from "./checkTemplate/printOne"
 import { getAllDoctorList,getAllHisPatientList } from "@/api/project/project"
-import CheckPrintTwo from "./checkTemplate/checkPrintTwo";
 export default {
   name: "dialysisPrintOrder",
   components: {
-    CheckPrintTwo,
     BreadCrumb,
     printOne,
   },

src/xt_pages/outpatientDoctorStation/checkTemplate/checkPrintTwo.vue

@@ -1,616 +0,0 @@
-<template>
-  <div>
-    <div id="prescription-print3" class="prescription-print">
-
-      <div class="printTitle">检验申请单</div>
-
-      <div style="border: 1px solid #000">
-        <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
-          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>
-          <div>
-            性别：
-            <span v-if="advicePrint[0].patient.gender == 1">男</span>
-            <span v-if="advicePrint[0].patient.gender == 2">女</span>
-          </div>
-          <div>
-            年龄：{{
-              advicePrint[0].patient.age ? advicePrint[0].patient.age : ""
-            }}岁
-          </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>
-            <div v-for="item in projectPrint" style="margin-bottom: 10px">
-              {{ item.project.project_name }}
-            </div>
-            <!--            <div v-for="item in singleProjectPrint" style="margin-bottom: 10px">-->
-            <!--              {{ item.project.project_name }}-->
-            <!--            </div>-->
-          </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: 30px"
-              :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>
-
-  </div>
-</template>
-<script>
-import { jsGetAge, uParseTime } from "@/utils/tools";
-import {
-  getAllDoctorList,
-  getPrescriptionPrint,
-  getHisPatientDetail,
-  getPatientCaseHistory,
-} from "@/api/project/project";
-import { getInitData } from "@/api/his/his";
-export default {
-  props: {
-    patient_id: Number,
-    record_date: String,
-    prescription_id: Number,
-    ids: String,
-  },
-  data() {
-    return {
-      doctorList_1: [],
-      doctorList: [],
-      advicePrint: {},
-      patient: {},
-      tableData: [],
-      prescriptionInfo: [],
-      hisPatient: {},
-      department: [],
-      prescriptions: [],
-      projectList: [],
-      doc_name: "",
-      orgname: "",
-      diagnoses: [],
-      pageArr: [],
-      faber: {},
-      total: 0,
-      projectPrint: [],
-      time: "",
-      doctor: "",
-      org_id: "",
-      singleProjectPrint: [],
-      operatorMaps: {},
-    };
-  },
-  methods: {
-    getPatientCaseHistory() {
-      const params = {
-        patient_id: this.patient_id,
-      };
-      getPatientCaseHistory(params).then((response) => {
-        if (response.data.state == 1) {
-          var history = response.data.data.history;
-          // console.log("中国history222222", history);
-          this.history = history;
-        }
-      });
-    },
-    getAllDoctorList() {
-      getAllDoctorList().then((response) => {
-        if (response.data.state == 1) {
-          var doctor = response.data.data.doctor;
-
-          this.doctorList = doctor;
-        }
-      });
-    },
-
-    getDoctor(id) {
-      var name = "";
-      for (let i = 0; i < this.doctorList.length; i++) {
-        if (id == this.doctorList[i].admin_user_id) {
-          name = this.doctorList[i].user_name;
-        }
-      }
-      return name;
-    },
-    getTime(value, temp) {
-      if (value != undefined) {
-        return uParseTime(value, temp);
-      }
-      return "";
-    },
-
-    getPrescriptionPrint() {
-      var params = {
-        // patient_id:this.patient_id,
-        // record_date:this.record_date,
-        // prescription_id:this.prescription_id,
-        patient_id: this.patient_id,
-        record_date: this.record_date,
-        prescription_id: this.prescription_id,
-        ids: this.ids,
-        p_type: 2,
-      };
-      // console.log("params", params);
-      getPrescriptionPrint(params).then((response) => {
-        if (response.data.state == 1) {
-          var advicePrint = response.data.data.advicePrint;
-          // console.log("adviceprint9999", advicePrint);
-          this.advicePrint = advicePrint;
-          this.prescriptions = advicePrint;
-          // console.log("处方222222", this.prescriptions);
-          var hisPatient = response.data.data.hisPatient;
-          // console.log("hisPatient", hisPatient);
-          this.hisPatient = hisPatient;
-          let projectPrint = [];
-          let total = 0;
-          this.advicePrint.map((item) => {
-            // console.log("imte233232323232323223", item.project);
-            if (item.project.length > 0) {
-              item.project.map((it) => {
-                if (it.type == 2) {
-                  if (it.project.cost_classify == 3) {
-                    projectPrint.push(it);
-                    total += it.project.price * parseInt(it.count);
-                  }
-                }
-              });
-            }
-          });
-          this.doctorList_1 = response.data.data.eles;
-          // console.log(this.doctorList_1, "医生列表");
-          if (this.doctorList_1.length > 0) {
-            var operatorsLen = this.doctorList_1.length;
-            for (var index = 0; index < operatorsLen; index++) {
-              this.$set(
-                this.operatorMaps,
-                this.doctorList_1[index].creator,
-                this.doctorList_1[index]
-              );
-            }
-          }
-          let data2 = [];
-          projectPrint.map((item) => {
-            data2.push(item);
-          });
-          this.projectPrint = data2;
-          console.log("列表", this.projectPrint);
-          this.total = total.toFixed(2);
-          this.pre_time = this.advicePrint[0].pre_time;
-          this.doctor = this.advicePrint[0].doctor;
-
-          var projectlist = response.data.data.projectlist;
-
-          var projectlist = response.data.data.projectlist;
-          // console.log("所有项目列表", projectlist);
-          this.projectList = projectlist;
-          this.getPage();
-          let outputlist1Name = response.data.data.his.patient_info
-            ? JSON.parse(response.data.data.his.patient_info)
-            : {};
-          this.faber = outputlist1Name;
-        }
-      });
-    },
-    // 电子签名
-    setAdminUserES(id) {
-      // console.log(id, "id");
-      if (id == 0) {
-        return "";
-      }
-      if (id in this.operatorMaps) {
-        // console.log(this.operatorMaps, "this.operatorMaps");
-        return this.operatorMaps[id].url;
-      } else {
-        // console.log("po");
-        return "";
-      }
-    },
-    getHisPatientDetail() {
-      const params = {
-        patient_id: this.patient_id,
-      };
-      getHisPatientDetail(params).then((response) => {
-        if (response.data.state == 1) {
-          var hisPatient = response.data.data.hisPatient;
-          // console.log("挂号病人", hisPatient);
-          this.hisPatient = hisPatient;
-        }
-      });
-    },
-    getInitData() {
-      getInitData().then((response) => {
-        if (response.data.state == 1) {
-          this.department = response.data.data.department;
-          this.diagnoses = response.data.data.diagnose.sort(this.compare("id"));
-          // console.log("争端", this.diagnoses);
-        }
-      });
-    },
-    getDepart(id) {
-      var name = "";
-      for (let i = 0; i < this.department.length; i++) {
-        if (id == this.department[i].id) {
-          name = this.department[i].name;
-        }
-      }
-      return name;
-    },
-    getTotalOne(id) {
-      var total = 0;
-      var addtotal = 0;
-      for (let i = 0; i < this.prescriptions.length; i++) {
-        if (id == this.prescriptions[i].id) {
-          if (this.prescriptions[i].project != null) {
-            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
-              total =
-                total +
-                this.prescriptions[i].project[a].price *
-                this.prescriptions[i].project[a].count;
-            }
-          }
-
-          if (this.prescriptions[i].additionalcharge != null) {
-            for (
-              let a = 0;
-              a < this.prescriptions[i].additionalcharge.length;
-              a++
-            ) {
-              addtotal =
-                addtotal +
-                this.prescriptions[i].additionalcharge[a].price *
-                this.prescriptions[i].additionalcharge[a].count;
-            }
-          }
-          addtotal = Math.floor(addtotal * 100) / 100;
-        }
-      }
-
-      for (let i = 0; i < this.prescriptions.length; i++) {
-        if (id == this.prescriptions[i].id) {
-          if (this.prescriptions[i].advices != null) {
-            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-              total =
-                total +
-                this.prescriptions[i].advices[a].price *
-                this.prescriptions[i].advices[a].prescribing_number;
-            }
-          }
-
-          if (this.prescriptions[i].additionalcharge != null) {
-            for (
-              let a = 0;
-              a < this.prescriptions[i].additionalcharge.length;
-              a++
-            ) {
-              addtotal =
-                addtotal +
-                this.prescriptions[i].additionalcharge[a].price *
-                this.prescriptions[i].additionalcharge[a].count;
-            }
-          }
-          addtotal = Math.floor(addtotal * 100) / 100;
-        }
-      }
-
-      return total + addtotal;
-    },
-
-    getProjectName(id) {
-      var project_name = "";
-      for (let i = 0; i < this.projectList.length; i++) {
-        if (id == this.projectList[i].id) {
-          project_name = this.projectList[i].project_name;
-        }
-      }
-      return project_name;
-    },
-
-    getDiagnosis(ids) {
-      let newIds = ids.split(",").sort(function (a, b) {
-        return a - b;
-      });
-
-      var name = "";
-      let nameArr = [];
-      for (let i = 0; i < this.diagnoses.length; i++) {
-        // if(id == this.diagnoses[i].id){
-        //    name = this.diagnoses[i].class_name
-        // }
-
-        if (newIds.indexOf(this.diagnoses[i].id.toString()) > -1) {
-          // name += diagnoses[i].class_name + ' '
-          nameArr.push(this.diagnoses[i].class_name);
-        }
-      }
-      let newNameArr = [];
-      nameArr.map((item, index) => {
-        if (item == "尿毒症") {
-          newNameArr.push(item);
-          nameArr.splice(index, 1, "");
-        }
-      });
-      newNameArr.push(...nameArr);
-      return newNameArr.join(" ");
-    },
-    compare(property) {
-      return function (a, b) {
-        var value1 = a[property];
-        var value2 = b[property];
-        return value1 - value2; //升序排序
-      };
-    },
-    getPage() {
-      this.page = 1;
-      this.pageArr = [];
-
-      this.advicePrint.map((item) => {
-        let arr = [];
-        item.pageArr = [];
-        if (item.advices.length <= 5) {
-          this.page = 1;
-          arr.push(item.advices.length);
-          item.pageArr.push(arr);
-        } else if (item.advices.length > 5) {
-          this.page = parseInt(item.advices.length / 5);
-          let num = item.advices.length % 5;
-          for (var i = 0; i < this.page; i++) {
-            item.pageArr.push([5]);
-          }
-          if (num != 0) {
-            item.pageArr.push([num]);
-          }
-        }
-      });
-      // console.log('this.pageArr',this.pageArr)
-    },
-    getName(list) {
-      console.log("list", list);
-      let new_list = [];
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].aac031 == "1") {
-          new_list.push(list[i]);
-        }
-      }
-
-      switch (new_list[0].bcc334) {
-        case "A31001":
-          return "深圳医保1档";
-          break;
-        case "A31002":
-          return "深圳医保2档";
-
-          break;
-        case "A31003":
-          return "深圳医保3档";
-
-          break;
-        case "A31004":
-          return "二档（少儿）";
-
-          break;
-        case "A31005":
-          return "学生二档";
-
-          break;
-        case "A31006":
-          return "大学生二档";
-
-          break;
-        case "A32001":
-          return "在职公务员";
-          break;
-        case "A32002":
-          return "在职驻深公务员";
-
-          break;
-        case "A39301":
-          return "家属统筹医疗";
-
-          break;
-        case "A41001":
-          return "工伤在职";
-
-          break;
-        case "A51001":
-          return "生育在职";
-
-          break;
-        case "A52001":
-          return "生育医疗一档";
-
-          break;
-        case "A52002":
-          return "生育医疗一档";
-
-          break;
-        case "C31001":
-          return "一档医疗退休";
-
-          break;
-        case "C31002":
-          return "二档医疗退休";
-          break;
-      }
-    },
-  },
-  created() {
-    this.getAllDoctorList();
-    this.getInitData();
-    this.getPrescriptionPrint();
-    this.getHisPatientDetail();
-    this.getPatientCaseHistory();
-    var xtuser = this.$store.getters.xt_user;
-    this.orgname = xtuser.org.org_name;
-    this.org_id = this.$store.getters.xt_user.org_id;
-  },
-  watch: {
-    ids: function (val) {
-      this.ids = val;
-      this.getPrescriptionPrint();
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-.prescription-print {
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-  0 0 60px rgba(0, 0, 0, 0.06) inset;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-  0 0 40px rgba(0, 0, 0, 0.06) inset;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  margin-bottom: 20px;
-  padding: 20px 10px;
-}
-.printTitle {
-  font-size: 22px;
-  text-align: center;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
-.infoTitle {
-  display: flex;
-  margin-top: 10px;
-  line-height: 24px;
-}
-.infoTitle div {
-  width: 200px;
-}
-.infoMain {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-}
-.infoMain div {
-  width: 50%;
-  line-height: 24px;
-}
-.prescriptionBox {
-  padding: 0 10px;
-  min-height: 400px;
-}
-.Rp {
-  font-size: 22px;
-  font-weight: bold;
-}
-.drugsBox {
-  padding-left: 40px;
-  margin-bottom: 10px;
-}
-.drugsBox div {
-  line-height: 20px;
-}
-.drugsOne {
-  line-height: 24px;
-}
-.drugsOne span {
-  margin-right: 20px;
-}
-.doctorBox {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 10px;
-  line-height: 24px;
-  border-bottom: 2px solid #000;
-}
-.actionBar {
-  display: flex;
-  justify-content: space-between;
-  line-height: 24px;
-  padding: 0 10px;
-}
-.actionBar p {
-  width: 150px;
-}
-.under_line {
-  display: inline-block;
-  border-bottom: 1px solid #000;
-  flex: 1;
-}
-</style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -508,7 +508,6 @@
       additions: Array,
       patientInfo: Object,
       hisPatientInfo: Object,
-      goodOutOpen:Object,
       prescriptions: Array,
       record_date: String,
       search_keyword: '',
@@ -2548,7 +2547,7 @@
                           }
                         }
                       }
-                     // console.log("new233223322323",newArr)
+                      console.log("new233223322323",newArr)
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
                           if(newArr[i].is_user!=1){
@@ -2566,9 +2565,8 @@
                     }
                   }
                 }
-               
-              //  console.log("good_isopen--------------------",this.goodOutOpen)
-               if(this.goodOutOpen.is_open == 1){
+
+               if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
                   var project_arr = []
                   //耗材
                   for(let i=0;i<this.prescriptions.length;i++){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -165,7 +165,7 @@
                            :org_id="org_id"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            v-on:getSunziValue = "getSunziValue"
-                           :hisPatientInfo="hisPatientInfo" :goodOutOpen="goodOutOpen" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
+                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
                            v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
@@ -607,7 +607,6 @@ export default {
       printList:[],
       printDate:'',
       anticoagulants_confit:null,
-      goodOutOpen:{}
     }
   },
 
@@ -1434,10 +1433,6 @@ export default {
           this.sick = response.data.data.sick
           this.diagnoses = response.data.data.diagnose
           this.additions = response.data.data.additions
-          
-          var goodOutOpen = response.data.data.goodOutOpen
-          console.log("goodOutOpen----------------------",goodOutOpen)
-          this.goodOutOpen = goodOutOpen
 
         }
       })

src/xt_pages/outpatientDoctorStation/print.vue

@@ -18,7 +18,7 @@
 9675:测试
  -->
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 0">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
 
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -127,9 +127,8 @@
           <div style="text-align: center">(以下空白)</div>
         </div>
         <div class="doctorBox" v-if="org_id != 10188">
-          <p>
+          <p v-if="org_id == 10217 || org_id == 0">
             医师：
-            <!-- {{ item.doctor ? item.doctor : "" }} -->
             <span
               style="width: 100px; display: inline-block"
               v-if="item.creator == ''"
@@ -143,13 +142,16 @@
               {{ doc_name }}
             </span>
             <img
-              style="height: 50px"
+              style="height: 50px;"
               :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""
-              v-else
+
             />
           </p>
+          <p v-else>
+            医师： {{ item.doctor ? item.doctor : "" }}
+          </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
         <div class="doctorBox" v-else>
@@ -234,6 +236,11 @@ export default {
   methods: {
     // 电子签名
     setAdminUserES(id,name) {
+      console.log(id)
+      console.log(name)
+      console.log(this.operatorMaps)
+
+
       if (id == 0) {
         return "";
       }

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -71,7 +71,9 @@
             <div style="width: 13%;"></div>
             <div style="width: 33%; display: flex">
               处方编号：<span class="under_line">{{
-              item.id
+                item.prescription_number.substring(
+                  item.prescription_number.length - 6
+                )
               }}</span>
             </div>
           </div>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -460,12 +460,10 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
-      this.getGoodDetailPrintList()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
-      this.getGoodDetailPrintList()
     },
     startTimeChange(val) {
 
@@ -476,7 +474,6 @@ export default {
       } else {
 
         this.GetCancelStock();
-        this.getPrintStockGood()
 
       }
     },
@@ -488,7 +485,6 @@ export default {
       } else {
 
         this.GetCancelStock();
-        this.getPrintStockGood()
       }
     },
     getTimestamp(time) {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -791,8 +791,8 @@ export default {
       },
 
     exportList(){
-      
-       console.log("到处数据------------------------",this.tableOut)
+      console.log("shij232333",this.tableOut)
+     
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -820,8 +820,6 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10188){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
-        }else if(this.orgId == 10402){
-          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
@@ -830,13 +828,11 @@ export default {
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        //手动自动出库
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 10402){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        //自动出库
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919  && this.orgId!=10402){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 10387">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

src/xt_pages/stock/query/goodNewQuery.vue

@@ -681,10 +681,11 @@ export default {
        if(response.data.state == 1){
          this.dialogVisible = true
          var list = response.data.data.list
-         console.log("list2332323232wo",list)
          this.tableData = list
          this.totalone = response.data.data.total
       
+        //  this.flushList =  response.data.data.flushList
+        
        }
      })
    

src/xt_pages/stock/stockFlow.vue

@@ -131,8 +131,6 @@
              <span > {{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
-
-     
        </el-table>
        
       <el-pagination

src/xt_pages/user/courseOfDisease.vue

@@ -57,7 +57,6 @@
                 <el-table-column label="记录时间" align="center">
                   <template slot-scope="scope">
                     {{ recordTime(scope.row.record_time) }}
-                   
                   </template>
                 </el-table-column>
                 <el-table-column label="记录医生" align="center">
@@ -87,8 +86,8 @@
               <label class="title"><span class="name">病程日期</span> : </label>
               <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 200px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
+                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
@@ -133,8 +132,8 @@
               <el-date-picker v-model="edit_course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 200px;"
                               type="datetime"
-                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
+                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
@@ -186,9 +185,7 @@
     modifyCourseOfDiseaseRecord,
     GetCoursePrintData
   } from '@/api/patient'
-  import { parseTime, } from '@/utils'
-  import { uParseTime } from '@/utils/tools'
-
+  import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
   export default {
@@ -288,15 +285,8 @@
         this.current_select_record = record
       },
       recordTime: function(timestamp) {
-       
-        if(timestamp < 0){
-           return ""
-         }
-         if(timestamp == ""){
-          return ""
-         }else {
-          return uParseTime(timestamp, '{y}-{m}-{d} {h}:{i}:{s}')
-         }
+        var time = new Date(timestamp * 1000)
+        return parseTime(time, '{y}-{m}-{d} {h}:{m}')
       },
       doctorName: function(doctor_id) {
         for (let index = 0; index < this.doctors.length; index++) {

src/xt_pages/user/dialysisSolution.vue

@@ -312,7 +312,6 @@
           </el-col>
 
           <el-col :span="8" v-if="isShows('抗凝剂')">
-            
             <el-form-item label="抗凝剂:" prop="anticoagulant">
               <el-select
                 v-model="addPlan.anticoagulant"
@@ -2536,7 +2535,7 @@
       this.anticoagulantsSet = this.$store.getters.anticoagulants_set
       this.replacementWays = this.$store.getters.replacement_ways
       this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
-      console.log("抗凝剂22333223wo",this.anticoagulantsConfit)
+
       this.blood_filters = this.$store.getters.blood_filters
       this.perfusion_apparatus = this.$store.getters.perfusion_apparatus
       this.hemodialysis_machines = this.$store.getters.hemodialysis_machines

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,11 +1,20 @@
 <template>
     <div >
+        <el-tooltip placement="right" :disabled="scheduleDetail.patient.length>0?false:true" >
+            <div slot="content">
+                {{scheduleDetail.patient}}
+                <br/>
+                <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
+              <span >{{scheduleDetail.dialysis_machine_name}}</span>
+
+            </div>
             <div>
                 <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
                 <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
               <span >{{scheduleDetail.dialysis_machine_name}}</span>
 
             </div>
+        </el-tooltip>
     </div>
 </template>
 

src/xt_pages/workforce/components/editTableData.vue

@@ -1827,53 +1827,17 @@
       </div>
       <span slot="footer" class="dialog-footer">
          <el-button
-           type="danger"
-           @click="tipDialogVisibleTwo = true"
+           type="primary"
+           @click="coverSch()"
          >替换</el-button>
             <el-button
               type="primary"
-              @click="tipDialogVisibleThree = true"
+              @click="changeSchTwo()"
             >交换</el-button>
         <el-button @click="tipDialogVisible = false">取 消</el-button>
       </span>
     </el-dialog>
 
-    <el-dialog
-      title="提示"
-      :visible.sync="tipDialogVisibleTwo"
-      width="300px"
-    >
-      <div>
-        是否将此位置排班替换
-      </div>
-      <span slot="footer" class="dialog-footer">
-         <el-button
-           type="primary"
-           @click="coverSch()"
-         >确定</el-button>
-
-        <el-button @click="tipDialogVisibleTwo = false">取 消</el-button>
-      </span>
-    </el-dialog>
-
-
-    <el-dialog
-      title="提示"
-      :visible.sync="tipDialogVisibleThree"
-      width="300px"
-    >
-      <div>
-        是否将此位置排班互换
-      </div>
-      <span slot="footer" class="dialog-footer">
-         <el-button
-           type="primary"
-           @click="changeSchTwo()"
-         >确定</el-button>
-        <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
-      </span>
-    </el-dialog>
-
 
   </div>
 </template>
@@ -1893,7 +1857,6 @@ import {
   BatchSmartSch,
 } from "@/api/schedule_template/sch_template";
 import {
-  CancelScheduleTwo,
   CancelSchedule,
   ChangeSchedule,
   CreateSchedule,
@@ -1967,8 +1930,6 @@ export default {
 
   data() {
     return {
-      tipDialogVisibleTwo:false,
-      tipDialogVisibleThree:false,
       cur_date:"",
       dataloading:false,
       current_patient_data:[],
@@ -1977,7 +1938,6 @@ export default {
       saveloading: false,
       zones: [],
       weeks: weekOptions,
-      first_weeks:[],
       smart_keyword: "",
       cur_smart_patient_id: 0,
       cur_smart_patient_name: "",
@@ -2392,11 +2352,6 @@ export default {
     },
     handleClick() {
       if (this.editableTabsValue == "1") {
-
-        console.log(this.first_weeks)
-        console.log(this.weeks)
-
-
         for (let i = 0; i < this.weeks.length; i++) {
           var tempDate = new Date();
           var day = tempDate.getDay();
@@ -2409,22 +2364,6 @@ export default {
             this.weeks[i].is_edit = false;
           }
         }
-
-        for(let i = 0; i < this.weeks.length; i++){
-          for(let b = 0; b < this.first_weeks.length; b++){
-            if(this.weeks[i].week_type == this.first_weeks[b].week_type && this.first_weeks[b].order_id > 0){
-              console.log(this.weeks[i].week_type)
-              console.log(this.first_weeks[b].week_type)
-              console.log(this.first_weeks[b].order_id)
-
-              this.weeks[i].is_edit = false
-            }
-
-          }
-        }
-
-
-
       } else {
         for (let i = 0; i < this.weeks.length; i++) {
           this.weeks[i].is_edit = true;
@@ -2592,16 +2531,16 @@ export default {
       console.log(delTempData)
 
 
-      if(saveOrEditTempData.length > 0 ){
-        for (let i = 0; i < delTempData.length; i++) {
-          for (let  b = 0; b < saveOrEditTempData.length; b++) {
-            if(saveOrEditTempData[b].sch_id&&delTempData[i].sch_id&&delTempData[i].sch_id == saveOrEditTempData[b].sch_id){
-              delTempData.splice(i,1)
-            }
+
+      for (let i = 0; i < delTempData.length; i++) {
+        for (let  b = 0; b < saveOrEditTempData.length; b++) {
+          if(delTempData[i].sch_id == saveOrEditTempData[b].sch_id){
+            delTempData.splice(i,1)
           }
         }
-
       }
+      console.log(delTempData)
+
       for (let i = 0; i < saveOrEditTempData.length; i++) {
         if (saveOrEditTempData[i].bed_id == "" || saveOrEditTempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
@@ -2610,7 +2549,8 @@ export default {
       }
 
 
-      if (saveOrEditTempData.length > 0 || delTempData.length > 0) {
+      if (saveOrEditTempData.length > 0 ) {
+
 
         let obj = {
           smart_schs: saveOrEditTempData,
@@ -2684,8 +2624,7 @@ export default {
       return "";
     },
     handleSelect(val) {
-      this.first_weeks = []
-        this.dataloading = true
+      this.dataloading = true
       getSmartSchByPatient(val.id).then((response) => {
         this.dataloading = false
         var sch = response.data.data.sch
@@ -2746,11 +2685,6 @@ export default {
                   ) {
                     this.weeks[b].is_edit = true;
                   } else {
-                    let obj = {
-                      week_type:this.weeks[b].week_type,
-                      order_id:schedules[i].order.id,
-                    }
-                    this.first_weeks.push(obj)
                     this.weeks[b].is_edit = false;
                   }
                   this.editableTabs[0].checkedWeek.push(this.weeks[b]);
@@ -3012,7 +2946,7 @@ export default {
           tableWeekArrage: [],
         },
       ];
-      this.first_weeks = []
+
       getPatientSmartSch(params).then((response) => {
         if (response.data.state == 0) {
           return false;
@@ -3064,9 +2998,7 @@ export default {
                 is_edit = true;
               }
               obj.is_edit = is_edit;
-              console.log("schedules[i].order.id")
 
-              console.log(schedules[i].order.id)
 
               for (let b = 0; b < this.weeks.length; b++) {
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
@@ -3074,13 +3006,9 @@ export default {
                       this.weeks[b].week_type >= day &&
                       schedules[i].order.id == 0
                   ) {
+
                     this.weeks[b].is_edit = true;
                   } else {
-                    let obj = {
-                      week_type:this.weeks[b].week_type,
-                      order_id:schedules[i].order.id,
-                    }
-                    this.first_weeks.push(obj)
                     this.weeks[b].is_edit = false;
                   }
 
@@ -3345,6 +3273,9 @@ export default {
     dragendTwo(event) {},
     isEditForDate(day){
       var week = this.weekDay(day);
+      console.log(this.weekDays[week[0] - 1].valueOf())
+      console.log( new Date(this.weekDays[week[0] - 1]).valueOf() /1000 )
+      console.log(this.weekDays[week[0] - 1] >= this.cur_date)
       if( new Date(this.weekDays[week[0] - 1]).valueOf() /1000 >= this.cur_date){
         return true
       }else{
@@ -3354,12 +3285,15 @@ export default {
     },
     drag(e, day, index, name, row) {
       e.preventDefault();
+      console.log("拖动前")
+      console.log(row)
       for (var key in row) {
         if (key == day) {
           console.log(row[key].patient_id)
 
           if(row[key].patient_id > 0 ) {
             this.cur_drag_obj = 2
+            console.log(row)
             var week = this.weekDay(day);
             this.cur_drag_info.schedule_date = this.weekDays[week[0] - 1];
             this.cur_drag_info.schedule_type = week[1];
@@ -3382,24 +3316,37 @@ export default {
     allowDrop(e) {
       e.preventDefault();
     },coverSch(){
-      let params={
-        id_one:this.cur_drag_info.id,
-        id_two:this.currentData.id
-
-      }
-      CoverSch(params).then((response) => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          this.tipDialogVisibleTwo = false
+      this.$confirm('是否将此位置排班替换?', '替换', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取 消',
+        type: 'warning'
+      }).then(() => {
+        let params={
+          id_one:this.cur_drag_info.id,
+          id_two:this.currentData.id
 
-        } else {
-          this.$message.success("替换成功");
-          this.tipDialogVisible = false
-          this.tipDialogVisibleTwo = false
-          this.getSchedules();
         }
-      });
+        CoverSch(params).then((response) => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+          } else {
+            this.$message.success("替换成功");
+            this.tipDialogVisible = false
+            this.getSchedules();
+
+          }
+        });
+
+      })
+        .catch(() => {
+        })
+
     },changeSchTwo(){
+      this.$confirm('是否将此位置排班互换?', '交换', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取 消',
+        type: 'warning'
+      }).then(() => {
         let params={
           id_one:this.cur_drag_info.id,
           id_two:this.currentData.id
@@ -3408,15 +3355,17 @@ export default {
         ExchangeSch(params).then((response) => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
-            this.tipDialogVisibleThree = false
           } else {
             this.$message.success("交换成功");
             this.tipDialogVisible = false
-            this.tipDialogVisibleThree = false
             this.getSchedules();
 
           }
         });
+      })
+        .catch(() => {
+        })
+
     },
     //        ----------------------------------
     //        | !在html里面的chedule-item里绑定的|
@@ -3458,7 +3407,7 @@ export default {
             if(this.cur_drag_obj == 2 ){
               if(this.cur_drag_info.schedule_date == this.currentData.schedule_date){ //同一天
                 if(row[key].patient_id == 0) { //空床位
-                  CancelScheduleTwo(this.cur_drag_info.id).then((response) => {
+                  CancelSchedule(this.cur_drag_info.id).then((response) => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg);
                     } else {
@@ -3488,16 +3437,15 @@ export default {
                           }
                         }
                       });
-                      //接口提交排班数据
-                      that.currentData.mode_id = that.cur_drag_info.mode_id;
-                      that.currentData.id = 0;
-                      that.currentData.contagions = [];
-                      that.currentData.patient_id = that.cur_drag_info.patient_id;
-                      that.currentData.patient = that.cur_drag_info.patient_name;
-                      that.setSchedule();
                     }
                   });
-
+                  //接口提交排班数据
+                  this.currentData.mode_id = this.cur_drag_info.mode_id;
+                  this.currentData.id = 0;
+                  this.currentData.contagions = [];
+                  this.currentData.patient_id = this.cur_drag_info.patient_id;
+                  this.currentData.patient = this.cur_drag_info.patient_name;
+                  this.setSchedule();
                 }else{  //非空，替換或者交換位置
                   this.tipDialogVisible = true
                 }
@@ -4395,7 +4343,7 @@ export default {
 
     // 删除某一单元格内的患者透析排班
     deletePatientMode(row) {
-      console.log(row)
+
       if (row.schedule_id > 0) {
         this.CancelSchedule(row.schedule_id);
       }

src/xt_pages/workforce/components/tableWeeks.vue

@@ -221,16 +221,24 @@
             </el-table-column>
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
                 <template slot-scope="scope">
+                    <!-- <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215 &&org_id!=10233 && org_id!=10290">
+                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
+                        <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
+                      </span>
+
+                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 && scope.row.prescription.dialysis_dialyszers == ''">{{scope.row.dialysissolution.dialysis_dialyszers}}</span>
+                    </span> -->
+
+                    <!-- <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
                     
+                      <!-- {{scope.row.prescription.dialysis_dialyszers}} -->
                     <span v-if="scope.row.prescription.dialysis_dialyszers =='' ">
                        {{scope.row.dialysissolution.dialysis_dialyszers}}
                     </span>
                     <span v-if="scope.row.prescription.dialysis_dialyszers !=''">{{scope.row.prescription.dialysis_dialyszers}}</span>
-
                     <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' ">
                        {{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}
                     </span>
-
                     <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus !=''">{{scope.row.prescription.dialyzer_perfusion_apparatus}}</span>
   
                     <span v-if="scope.row.prescription.dialysis_irrigation==''">/{{scope.row.dialysissolution.dialysis_irrigation}}</span>

src/xt_pages/workforce/components/template_table.vue

@@ -1594,8 +1594,8 @@ export default {
 
       this.smartVisible = true;
     },
-    SetSmartSch(tempData) {
-        this.saveActionThree(tempData);
+    SetSmartSch(tempData,delData) {
+        this.saveActionThree(tempData,delData);
     },
     check(tempData) {
       let isJiXu = true;
@@ -1647,7 +1647,7 @@ export default {
     batchSetSch() {
       this.smartSaveLoading = true;
       var tempData = [];
-      // var delData = [];
+      var delData = [];
       for (let b = 0; b < this.editableTabs.length; b++) {
         for (let c = 0; c < this.editableTabs[b].tableWeekArrage.length; c++) {
           let obj = {
@@ -1667,35 +1667,36 @@ export default {
         }
       }
 
-      // for (let b = 0; b < this.current_patient_data.length; b++) {
-      //   for (let c = 0; c < this.current_patient_data[b].tableWeekArrage.length; c++) {
-      //     let obj = {
-      //       time_type: this.current_patient_data[b].tableWeekArrage[c].time_type,
-      //       jihao_id: this.current_patient_data[b].tableWeekArrage[c].device_number_id,
-      //       schedule_week: this.getWeekByzhongwen(
-      //         this.current_patient_data[b].tableWeekArrage[c].week
-      //       ),
-      //       mode_id: this.current_patient_data[b].tableWeekArrage[c].treat_mode,
-      //       sch_id: this.current_patient_data[b].tableWeekArrage[c].id,
-      //       zone_id: this.current_patient_data[b].tableWeekArrage[c].zone_id,
-      //       t_id: this.current_patient_data[b].name,
-      //       title:this.current_patient_data[b].title,
-      //       patient_id: this.cur_smart_patient_id,
-      //     };
-      //     delData.push(obj);
-      //   }
-      // }
-      // console.log(tempData)
-      // console.log(delData)
+      for (let b = 0; b < this.current_patient_data.length; b++) {
+        for (let c = 0; c < this.current_patient_data[b].tableWeekArrage.length; c++) {
+          let obj = {
+            time_type: this.current_patient_data[b].tableWeekArrage[c].time_type,
+            jihao_id: this.current_patient_data[b].tableWeekArrage[c].device_number_id,
+            schedule_week: this.getWeekByzhongwen(
+              this.current_patient_data[b].tableWeekArrage[c].week
+            ),
+            mode_id: this.current_patient_data[b].tableWeekArrage[c].treat_mode,
+            sch_id: this.current_patient_data[b].tableWeekArrage[c].id,
+            zone_id: this.current_patient_data[b].tableWeekArrage[c].zone_id,
+            t_id: this.current_patient_data[b].name,
+            title:this.current_patient_data[b].title,
+            patient_id: this.cur_smart_patient_id,
+          };
+          delData.push(obj);
+        }
+      }
+      console.log(tempData)
+      console.log(delData)
 
-      // for (let i = 0; i < delData.length; i++) {
-      //   for (let  b = 0; b < tempData.length; b++) {
-      //     if(delData[i].sch_id == tempData[b].sch_id){
-      //       delData.splice(i,1)
-      //     }
-      //   }
-      // }
+      for (let i = 0; i < delData.length; i++) {
+        for (let  b = 0; b < tempData.length; b++) {
+          if(delData[i].sch_id == tempData[b].sch_id){
+            delData.splice(i,1)
+          }
+        }
+      }
 
+      console.log(delData)
       for (let i = 0; i < tempData.length; i++) {
         if (tempData[i].jihao_id == "" || tempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
@@ -1705,11 +1706,11 @@ export default {
         }
       }
       this.isEdit = true
-      console.log("saveData")
-      console.log(tempData)
-      this.$emit("saveData", tempData);
+      this.$emit("saveData", tempData,delData);
     },changeJihao(){
+
       this.$forceUpdate()
+
     },
     changeSch(row) {
 
@@ -2939,10 +2940,10 @@ export default {
         });
       }
     },
-    saveActionThree: function (val) {
+    saveActionThree: function (val,delData) {
       updateEditSchedules(
         JSON.stringify(val),
-        JSON.stringify([]),
+        JSON.stringify(delData),
       ).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -17,9 +17,10 @@
     <div class="app-container" style="background-color: white;">
       <div id="print_content">
         <div class="print_main_content">
-          <div class="table_panel">
+          <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
             <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''">
              
+
               <div class="signPrint" style="font-size:16px;">
                 <div style="font-size:24px;font-weight: 400;">姓名:
                   <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
@@ -153,7 +154,7 @@
                     <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
                 </div>
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
-                    <span>上次透析时长：<span v-if="main_collection.lastafterweight!=null">{{ main_collection.lastafterweight.actual_treatment_hour?main_collection.lastafterweight.actual_treatment_hour:"" }}小时{{ main_collection.lastafterweight.actual_treatment_minute?main_collection.lastafterweight.actual_treatment_minute:"" }}分钟</span></span>
+                    <span>上次透析时长：{{ main_collection.lastafterweight.actual_treatment_hour }}小时{{ main_collection.lastafterweight.actual_treatment_minute }}分钟</span>
                 </div>
                 <div class="printCell">身份证:
                     <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
@@ -236,7 +237,7 @@
         printObj: {},
         type: 1,
         printDate: '',
-        loading: false
+        loading:false,
       }
     },
     components: {
@@ -263,20 +264,12 @@
           week_time: this.week_time,
           zone: this.zone
         }
-
-      const loading = this.$loading({
-        lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-  
-       
+      
+        this.loading = true
         getScheduleList(params).then(response => {
           if (response.data.state == 1) {
             var list = response.data.data.list
-            loading.close();
-          
+            this.loading = false
             for (let i = 0; i < list.length; i++) {
               list[i].sort = list[i].number.sort
             }
@@ -316,7 +309,6 @@
             }
             var str = year + '年' + month + '月' + day + '日  ' + days
             this.currentDate = str
-            
           }
         })
 
@@ -491,12 +483,6 @@
         })
       },
       getNextScheduleWeekDay() {
-       const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
         const start = moment().weekday(1).format('YYYY-MM-DD') // 本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
         var zone = this.zone
@@ -538,7 +524,6 @@
         getNextScheduleWeekDayOne(params).then(response => {
           this.scheduleData = []
           if (response.data.state == 1) {
-            loading.close()
             var scheduleData = response.data.data.schedule
 
             for (let i = 0; i < scheduleData.length; i++) {

src/xt_pages/workforce/template.vue

@@ -3188,12 +3188,14 @@ export default {
       })
 
 
-    },saveData(val){
+    },saveData(val,del_data){
       var tempDataOne = []
       for(let i = 0; i < val.length; i++){
           tempDataOne.push(val[i])
       }
-      this.$refs.table.SetSmartSch(tempDataOne)
+      if(tempDataOne.length > 0){
+        this.$refs.table.SetSmartSch(tempDataOne,del_data)
+      }
     },
     getWeekPanels(val) {
       getWeekPanels(1,val).then(response => {
@@ -4231,12 +4233,6 @@ export default {
 
     },
     submitAction() {
-     const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
       var template
       if (this.form.firstWeek == 1) {
         template = this.first_template
@@ -4266,7 +4262,6 @@ export default {
       }
       synchroSchedule(params).then(response => {
         if (response.data.state == 1) {
-          loading.close()
           var msg = response.data.data.msg
           this.$message.success("同步成功!")
           this.newVisible = false

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))