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

package-lock.json

@@ -2114,15 +2114,15 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001718",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001718.tgz",
-      "integrity": "sha512-XJRbbI1T9yUmA3mqXSmN2Zn7LAoUSvQd//XymssqZcsBI+sR1j87ZPbPQcJsAsR/MKhpa4ZSOs0wf1DDjbUcfQ==",
+      "version": "1.0.30001720",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001720.tgz",
+      "integrity": "sha512-mLSrTF00L/GGGpaNlm1SM/TjhI9ZMKyjDQkA7i1hNsRS6s5bvDrjwub/eVymxoO0FBazwEGsBJTiOA4LX5nZmQ==",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001718",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
-      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
+      "version": "1.0.30001720",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz",
+      "integrity": "sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==",
       "dev": true
     },
     "canvg": {
@@ -3875,9 +3875,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.5.159",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.159.tgz",
-      "integrity": "sha512-CEvHptWAMV5p6GJ0Lq8aheyvVbfzVrv5mmidu1D3pidoVNkB3tTBsTMVtPJ+rzRK5oV229mCLz9Zj/hNvU8GBA==",
+      "version": "1.5.161",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz",
+      "integrity": "sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==",
       "dev": true
     },
     "elegant-spinner": {
@@ -3993,9 +3993,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.23.10",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
-      "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "dev": true,
       "requires": {
         "array-buffer-byte-length": "^1.0.2",
@@ -4025,7 +4025,9 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
@@ -4040,6 +4042,7 @@
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -6674,6 +6677,12 @@
       "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true
     },
+    "is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true
+    },
     "is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -13672,6 +13681,16 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "requires": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      }
+    },
     "stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",

src/api/dialysis.js

@@ -590,4 +590,14 @@ export function getPatientDialysisSolutionByPatientId(params){
     method:"Get",
     params:params,
   })
+}
+
+
+export function getBedNumberList(params){
+  console.log("099999999999999990",params)
+  return request({
+    url:"/api/schedule/getbednumberlist",
+    method:"Get",
+    params:params,
+  })
 }

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -965,33 +965,37 @@ export default {
           return;
         }
         if (index === 7) {
-          // 单位裁切
-          data.forEach((el, index) => {
-            dose_unit.push(this.getDose_unit(el.total));
-          });
 
-          dose_unit = this.unique_unit(dose_unit);
-          console.log(dose_unit,'dose_unit')
-          // // 数据合计
-          data.forEach((el, index) => {
-            if (this.getDose_unit(el.total) === dose_unit[0]) {
-              unit_1.push(parseInt(el.total));
-            }
-            if (this.getDose_unit(el.total) === dose_unit[1]) {
-              unit_2.push(parseInt(el.total));
+          if(data!=unll && data.length>0){
+            // 单位裁切
+            data.forEach((el, index) => {
+                    dose_unit.push(this.getDose_unit(el.total));
+                  });
+
+                  dose_unit = this.unique_unit(dose_unit);
+                  console.log(dose_unit,'dose_unit')
+                  // // 数据合计
+                  data.forEach((el, index) => {
+                    if (this.getDose_unit(el.total) === dose_unit[0]) {
+                      unit_1.push(parseInt(el.total));
+                    }
+                    if (this.getDose_unit(el.total) === dose_unit[1]) {
+                      unit_2.push(parseInt(el.total));
+                    }
+                  });
+                  unit_1 = eval(unit_1.join("+"));
+                  unit_2 = eval(unit_2.join("+"));
+
+                  if (dose_unit[0] == undefined) {
+                    sums[index] = "";
+                  } else if (dose_unit[1] == undefined || unit_2 == undefined) {
+                    sums[index] = `${unit_1}${dose_unit[0]}`;
+                  } else {
+                    sums[index] = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+                  }
+                  return;
             }
-          });
-          unit_1 = eval(unit_1.join("+"));
-          unit_2 = eval(unit_2.join("+"));
-
-          if (dose_unit[0] == undefined) {
-            sums[index] = "";
-          } else if (dose_unit[1] == undefined || unit_2 == undefined) {
-            sums[index] = `${unit_1}${dose_unit[0]}`;
-          } else {
-            sums[index] = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
-          }
-          return;
+            
         }
       });
 

src/xt_pages/dialysis/PatientBox.vue

@@ -120,6 +120,14 @@
             </span>
           </span>
         </p>
+        <p>
+          <span v-if="$store.getters.xt_user.org.id==10777 || $store.getters.xt_user.org.id==0">
+              处方脱水量:
+            <span v-if=" schedule.prescription && schedule.prescription.prescription_water > 0">
+               <span> {{schedule.prescription? schedule.prescription.prescription_water: ""}}L</span>
+            </span>
+          </span>
+        </p>
         <p>
            <span  v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
              抗凝剂:

src/xt_pages/dialysis/batch_print/batch_print_order_eightysix.vue

@@ -638,12 +638,13 @@
                         <div class="inline_block" style=" flex: 2">
                           血管通路：
                           <div class="under_line" style="width: 70%; text-align: center" >
+
                             {{
-                              record.assessment_before_dislysis &&
-                              record.assessment_before_dislysis.blood_access_part_id
-                                ? record.assessment_before_dislysis.blood_access_part_id : ''
+                              record.prescription &&
+                              record.prescription.blood_access_part_id
+                                ? record.prescription.blood_access_part_id : ''
                             }}
-                            {{QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
+                            {{QueryPartById(record.prescription.blood_access) }}
                           </div>
                         </div>             
                         <div class="inline_block" style=" flex: 1">

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

@@ -87,7 +87,7 @@
 
           <el-col :span="8">
             <el-form-item label="透析机型号" :prop="isName('透析机型号')"
-              :rules="isCheckmust('透析机型号')" v-if="isShow('透析机型号')">
+              :rules="isCheckmust('透析机型号')">
               <el-select v-model="assessmentBeforeDislysis.machine_type">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -861,7 +861,7 @@
   import axios from 'axios'
   import multiSelectBox from './MultiSelectBox'
   import { getDataConfig } from '@/utils/data'
-  import { postAssessmentBeforeDislysis, CreateDryWeight,saveInformation } from '@/api/dialysis'
+  import { postAssessmentBeforeDislysis, CreateDryWeight,saveInformation,getBedNumberList } from '@/api/dialysis'
   import store from '@/store'
   import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
@@ -1137,8 +1137,46 @@
         }
         return false
       },
+      getBedNumberList(){
+          var patient_id = ""
+         if(this.patient.id != undefined && this.patient.id >0){
+            patient_id =  parseInt(this.$route.query.patient_id) 
+          }
+          if(this.patient.id == 'undefined' || this.patient.id ==0){
+          
+             patient_id = parseInt(this.$route.query.patient_id) 
+          }
+          if(this.$route.query.patient_id == undefined || this.$route.query.patient_id == 0 ){
+             
+              patient_id = this.patient.id
+          }
+
+          var params = {
+            patient_id:patient_id,
+            record_date:this.record_date,
+          }
+          console.log("params----",params)
+          getBedNumberList(params).then(response=>{
+             if(response.data.state == 1){
+               var number = response.data.data.number
+               if(number!=undefined){
+                if(this.assessmentBeforeDislysis.machine_type == ""){
+                  this.assessmentBeforeDislysis.machine_type = number.number_type
+                }
+                 
+               }
+             }
+          })
+       
+      },
 
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation,lastAssessment,record_date) {
+          
+       
+
+        if(this.$store.getters.xt_user.template_info.org_id == 10777 || this.$store.getters.xt_user.template_info.org_id == 0){
+           this.getBedNumberList()
+        }
 
         let filedList = store.getters.xt_user.fileds;
 

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

@@ -3017,6 +3017,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10777){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:30'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 10440){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
@@ -5311,6 +5319,10 @@ mu
          if(response.data.state == 1){
           var patientBefor = response.data.data.patientBefor
           var prescription = response.data.data.prescription
+          var access  = response.data.data.access
+          console.log("accesss====",access)
+
+
           if(patientBefor!=undefined){
 
             if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745||this.$store.getters.xt_user.template_info.org_id == 10751||this.$store.getters.xt_user.template_info.org_id == 10697||this.$store.getters.xt_user.template_info.org_id == 10757||this.$store.getters.xt_user.template_info.org_id == 10768){
@@ -5354,9 +5366,38 @@ mu
             this.dialysisPrescription.prescription_water = prescription.prescription_water
           }
 
+
+         
+          if(this.$store.getters.xt_user.template_info.org_id == 10777 || this.$store.getters.xt_user.template_info.org_id == 10164){
+             
+            if (access!=undefined) {
+             var blood_access =  this.getBloodAceess(access.blood_access_part_opera_id)
+             if(this.dialysisPrescription.blood_access == ""){
+              this.dialysisPrescription.blood_access = blood_access
+             }
+             if(this.dialysisPrescription.blood_access_part_id == "" ){
+               this.dialysisPrescription.blood_access_part_id = access.blood_access_part_id
+             }
+            
+  
+            }
+          }
+
+        
+          
          }
       })
     },
+    getBloodAceess(name){
+      console.log("blood_access_option",this.blood_access_option)
+      var id =0 
+      for(let i=0;i<this.blood_access_option.length;i++){
+         if(name === this.blood_access_option[i].name){
+            id = this.blood_access_option[i].id
+         }
+      }
+      return id
+    },
     getPatientDialysisSolution(){
         var params = {
           patient_id:patient_id,

src/xt_pages/dialysis/template/DialysisPrintOrdereightsix.vue

@@ -592,8 +592,11 @@
                       <div class="inline_block" style="flex: 2">
                         血管通路：
                         <div class="under_line" style="width: 60%; text-align: center">
-                          {{ predialysis.blood_access_part_id }}
-                          {{ predialysis.blood_access_part_opera_name }}
+                          <!-- {{ predialysis.blood_access_part_id }}
+                          {{ predialysis.blood_access_part_opera_name }} -->
+                           {{ prescription.blood_access_part_id }}
+                           {{getBloodAceess(prescription.blood_access)}}
+                          
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -1932,6 +1935,7 @@
         },
         org_id: 0,
         projectsOne: [],
+        blood_access_option:[],
       };
     },
     methods: {
@@ -3102,7 +3106,17 @@
         }else{
           this.$message.success('核对完成')
         }
-      }
+      },
+      getBloodAceess(id){
+        console.log("blood_access_option",this.blood_access_option)
+        var name = ""
+        for(let i=0;i<this.blood_access_option.length;i++){
+          if(id === this.blood_access_option[i].id){
+              name = this.blood_access_option[i].name
+          }
+        }
+        return  name
+     },
     },
     watch: {
       "patientInfo.gender": function () {
@@ -3135,6 +3149,10 @@
   
     },
     created() {
+      this.blood_access_option = getDataConfig(
+          'hemodialysis',
+          'vascular_access_desc'
+      )
       console.log('dddddd',this.$parent.childResponse);
       this.way_arr = getDataConfig("hemodialysis", "way");
       this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");

src/xt_pages/management/components/ManageForm.vue

@@ -657,6 +657,10 @@ export default {
         this.form.revers_mode = 0;
       }
 
+      if(this.form.zone_id == ""){
+         this.form.zone_id = 0
+      }
+
       this.$refs[formName].validate(valid => {
         if (valid) {
           SaveManageInfo(this.form).then(response => {

src/xt_pages/user/vascularAccess.vue

@@ -32,6 +32,13 @@
             <span>{{scope.row.other_vascular}}</span>
          </template>
       </el-table-column>
+      
+      <el-table-column prop="date" label="启用状态" width="120" align="center">
+          <template slot-scope="scope">
+             {{ getUserStatus(scope.row.user_status)}}
+          </template>
+      </el-table-column>
+      
       <el-table-column prop="date" label="首次启用日期" width="120" align="center">
           <template slot-scope="scope">
             <span>{{ getTime(scope.row.first_start_time)}}</span>
@@ -570,6 +577,19 @@
       }
     },
     methods: {
+      getUserStatus(val){
+        var name = ""
+        if(val == 1){
+           name ="启用"
+        }
+        if(val == 2){
+           name ="停用"
+        }
+        if(val == 3){
+           name ="备用"
+        }
+        return name
+      },
       clickuseradvicecell(row, column, cell, event) {
       },
       onTranPatient: function(tranPatient) {

src/xt_pages/workforce/appointment.vue

@@ -842,6 +842,7 @@ export default {
       // }
 
       if(this.schedule_type!=0 || this.partition_id != 0 || this.week_date !=''){
+
         this.export_file_step_twos()
       }else{
         this.export_file_step_two()
@@ -851,7 +852,7 @@ export default {
       // this.export_file_step_twos()
     },
     export_file_step_two: function(){
-
+    
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
         const filterVal = [
@@ -970,6 +971,8 @@ export default {
 
     },
     export_file_step_twos: function(){
+
+      console.log("this.export_type00000000000000",this.tableList)
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
         const filterVal = [
@@ -1017,6 +1020,9 @@ export default {
             }
             i++
           }
+          console.log("lsit--------------------",list)
+          console.log("表格-------------------",this.tableList)
+
           if(this.week_date!= '' || this.schedule_type!=0){
             if(this.week_date=='周一' &&this.schedule_type==0 ){
               multiHeader=[['区号', '机号', '周一' + "(" + this.days[0] + ")", '', '']]
@@ -1156,22 +1162,25 @@ export default {
               header = ['', '', '晚上']
               merges = ['A1:A2', 'B1:B2', 'C1']
             }
-          }
-          else{
+          }else{
             multiHeader = [['区号', '机号', '周一' + "(" + this.days[0] + ")", '', '', '周二' + "(" + this.days[1] + ")", '', '', '周三' + "(" + this.days[2] + ")", '', '', '周四' + "(" + this.days[3] + ")", '', '', '周五' + "(" + this.days[4] + ")", '', '', '周六' + "(" + this.days[5] + ")", '', '', '周日' + "(" + this.days[6] + ")", '', '' ]]
             header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
             merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1']
           }
 
-          var data = []
+          
 
+          var data = []
+          console.log("this.tableList=--------------------",this.tableList)
           this.tableList.map(item => {
             data.push(Object.values(item))
           })
 
           const filename = '排班模版'
 
-          console.log('333333333',data),
+          console.log('333333333',data)
+
+          // return false
           excel.export_json_to_excel3({
 
             multiHeader,
@@ -3933,7 +3942,7 @@ export default {
         partition_id: this.partition_id,
         schedule_type: this.schedule_type
       }
-      // console.log("params32323232323223", params)
+      console.log("日本params32323232323223", params)
       getThreeWeekList(params).then(response => {
         if (response.data.state == 1) {
           var partitions = response.data.data.partitions
@@ -4239,11 +4248,16 @@ export default {
 
           var lastend = this.getTimestamp(last_end) - 28800
           console.log("week",this.export_type)
+          console.log("activeName",this.activeName)
           if (this.export_type == 0) {
             for (let i = 0; i < scheduleList.length; i++) {
+              
               if(this.activeName=='thisWeek'){
                 if (scheduleList[i].schedule_date >= start && scheduleList[i].schedule_date <= end) {
                  var weekday= this.changeWeekType(scheduleList[i].schedule_week)
+                 console.log("---------------",this.schedule_type)
+                 console.log("partition_id------",this.partition_id)
+                 console.log("week_date----",this.week_date)
                  if(this.schedule_type!=0 || this.partition_id != 0 || this.week_date !=''){
                     if(this.schedule_type==scheduleList[i].schedule_type &&
                       this.partition_id==scheduleList[i].partition_id &&weekday==this.week_date){
@@ -4288,6 +4302,7 @@ export default {
                       week.push(scheduleList[i])
                     }
                   }else{
+                    console.log("999999999999999999999999",week)
                     week.push(scheduleList[i])
                   }
                 }
@@ -4305,17 +4320,20 @@ export default {
                 }
               }
             }
+
+            // week.push(scheduleList[i])
           }
 
           if (this.export_type == 1) {
             week = scheduleList
           }
-          console.log("list")
-          console.log(list)
-          console.log("week")
-          console.log(week)
-          console.log(week2)
-
+          // console.log("list")
+          // console.log(list)
+          // console.log("week")
+          // console.log(week)
+          // console.log(week2)
+           
+          console.log("weiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",week)
           if (week.length > 0) {
             // console.log('qqqqqqqqq',list);
             // console.log('wwwwwwwww',week);
@@ -4808,7 +4826,7 @@ export default {
               }
             }
           }
-          console.log('xxxxxx',list);
+          console.log('德国=================================xxxxxx',list);
           this.tableList = list
           this.start_time = ""
           this.end_time = ""
@@ -4817,10 +4835,10 @@ export default {
     },
 
     changePartition(val) {
-      console.log('666666',val);
+      console.log('中国----------------------------666666',val ==0);
       this.partition_id = val
       if(val==0){
-        // console.log('llllll');
+         console.log('llllll');
           this.getThreeWeekList()
       }else{
         // console.log('oooooo');

src/xt_pages/workforce/components/tableData.vue

@@ -3212,6 +3212,8 @@ export default {
 
           });
 
+          console.log("source_scheduleZone---------------",this.source_scheduleZone)
+
           this.source_scheduleZone = this.scheduleZone
 
         } else {