Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/store/modules/xt_user.js

         commit('SET_FILEDS_LIST', infoJSON)
         resolve()
       })
-    },
+    },updateAllFiledConfigList({ commit }, object) {
+      var oldFiledList = getFiledConfigList()
+      var infoJSON = JSON.parse(oldFiledList)
+
+      return new Promise((resolve, reject) =>{
+        infoJSON = object
+        setFiledConfigList(JSON.stringify(infoJSON))
+        commit('SET_FILEDS_LIST', infoJSON)
+        resolve()
+      })
+    }
   }
 }
 

src/xt_pages/data/printTemplate.vue

     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
+    <div v-loading="loading"
+         element-loading-text="服务器处理数据中，请稍候......."
+         element-loading-spinner="el-icon-loading"
+         element-loading-background="rgba(0, 0, 0, 0.8)">
+
     <div class="app-container" style="text-align: center">
       <p style="margin-top: 10px;margin-bottom: 30px">请选择你需要打印的血液透析护理记录单样式</p>
       <el-row :gutter="20" type="flex" justify="center">
         </el-col>
       </el-row>
     </div>
+    </div>
   </div>
 </template>
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getPrintTemplate, postPrintTemplate } from '@/api/data'
+  import store from "@/store";
 
   export default {
     name: 'printTemplate',
         ],
         delay:500,
         radio: 0,
-        tempRadio: 0
+        tempRadio: 0,
+        loading:false,
+
       }
     }, methods: {
       change: function(val) {
           cancelButtonText: '取消',
           type: 'info'
         }).then(() => {
+          this.loading = true
           postPrintTemplate(val).then(response => {
             if (response.data.state == 1) {
               var template_id = response.data.data.template_id
               this.radio = template_id.toString()
               this.tempRadio = template_id.toString()
               //同步
+              this.loading = false
+
+              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: 'success',
                 message: '切换成功'

src/xt_pages/dialysis/batch_print/batch_print_order.vue

         ],
         loading: false,
         orgname: '',
+        org_template_info: {},
+
         bloodAccessParOpera: {},
         anticoagulantsConfit: {},
         dialysateFormulationOptions: {},
         var resp = rs.data
         if (resp.state == 1) {
 
+          this.org_template_info = resp.data.templateInfo
+
           this.records = this.records.concat(resp.data.schedules)
           for (const recordIndex in this.records) {
             var dlegh = 0
       })
     },
     methods: {
+      getAge: function(val) {
+        val.birth = uParseTime(val.birthday, '{y}-{m}-{d}')
+        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
+          if (val.age == 0) {
+            return jsGetAge(val.birth, '-')
+          } else {
+            return val.age
+          }
+        } else {
+          return jsGetAge(val.birth, '-')
+        }
+      },
       printAction: function() {
         const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}'
 
           }
         }
       },
-      jsGetAge: function(agetime) {
-        if (agetime == 0) {
-          return ''
-        }
-        return jsGetAge(uParseTime(agetime, '{y}-{m}-{d}'), '-')
-      },
       getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                                     </div>
                                     <div class="inline_block" style="margin-left:20px;">
                                     维持：
-                                    <div v-if="record.prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
+                                    <div v-if="record.prescription&&record.prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:'/'}}
                                     </div>
-                                    <div v-if="record.prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
+                                    <div v-if="record.prescription&&record.prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:0}}
                                     </div>
                                     lu

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

           this.form.blood_flow_volume = monitor.blood_flow_volume ? monitor.blood_flow_volume : ''
           this.form.venous_pressure = monitor.venous_pressure ? monitor.venous_pressure : ''
           this.form.transmembrane_pressure = monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ''
-          this.form.ultrafiltration_volume = monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ''
+          this.form.ultrafiltration_volume = monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : ''
           this.form.ultrafiltration_rate = monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : ''
           this.form.arterial_pressure = monitor.arterial_pressure ? monitor.arterial_pressure : ''
           this.form.sodium_concentration = monitor.sodium_concentration ? monitor.sodium_concentration : ''

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                 <div class="inline_block" style="flex:1; display:inline-block;">
                   治疗小结：
-                  <div class="under_line" style="width: 90%;line-height: 25px;text-align: left;margin-left: 2px; display:inline-block;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
+                  <div class="under_line" style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
                 </div>
               </div>
 

src/xt_pages/user/components/PatientDetail.vue

 
             var contagionsArr = response.data.data.contagions
             var diseasesArr = response.data.data.diseases
+
             this.patientPrint = patietInfo
 
+
             var sourceLen = this.sourceOptions.length
             for (let index = 0; index < sourceLen; index++) {
               if (this.sourceOptions[index].value === patietInfo.source) {
               this.patientPrint.gender = ''
             }
             var maritalLen = this.maritalOptions.length
-            this.patientPrint.marital_status = ''
+            console.log(maritalLen)
             for (let index = 0; index < maritalLen; index++) {
-              if (this.maritalOptions[index].id === patietInfo.marital_status) {
+              if (this.maritalOptions[index].id ==  response.data.data.patient.marital_status) {
                 this.patientPrint.marital_status = this.maritalOptions[index].name
-                break
+
               }
             }
+
             this.patientPrint.birthday = uParseTime(patietInfo.birthday, '{y}-{m}-{d}')
             this.patientPrint.age = jsGetAge(this.patientPrint.birthday, '-')