Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/utils/data.js

@@ -3,6 +3,9 @@ import store from '@/store'
 export function getDataConfig(module, field) {
   var storeConfigList = store.getters.configlist
   var moduleConfig = storeConfigList[module]
+  if (moduleConfig == undefined) {
+    return false
+  }
   if (module === 'summary' || module === 'education' || module === 'nursing_record' || module === 'special_record') {
     var Aresult = []
     for (var j = 0; j < moduleConfig.length; j++) {

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

@@ -125,230 +125,230 @@
 </template>
 
 <script>
-import { getDataConfig } from "@/utils/data";
-import { postTreatmentsummary } from "@/api/dialysis";
-import { uParseTime } from "@/utils/tools";
-import store from "@/store";
-import request from "@/utils/request";
+import { getDataConfig } from '@/utils/data'
+import { postTreatmentsummary } from '@/api/dialysis'
+import { uParseTime } from '@/utils/tools'
+import store from '@/store'
+import request from '@/utils/request'
 
 export default {
-  name: "treatmentSummaryDialog",
+  name: 'treatmentSummaryDialog',
 
   props: {
     treatment_summary: {
       // 治疗小结
       type: Object,
       default: () => {
-        return { id: 0 };
+        return { id: 0 }
       }
     },
     patient: {
       // 患者信息
       type: Object,
       default: () => {
-        return { id: 0 };
+        return { id: 0 }
       }
     }
   },
   data() {
     return {
-      showTxt: "",
+      showTxt: '',
       hasPermission: true,
-      value: "",
-      value2: "",
-      value3: "",
-      value4: "",
+      value: '',
+      value2: '',
+      value3: '',
+      value4: '',
       isVisibility: false,
-      record_date: "",
+      record_date: '',
       education: [],
       summary: [],
       nursingRecord: [],
       specialRecord: [],
       treatmentSummary: {
-        mission: "",
-        dialysis_summary: "",
-        sj_nurse: "",
-        zl_nurse: "",
-        hd_nurse: "",
-        xj_nurse: "",
-        zl_doctor: "",
-        nursing_record: "",
-        special_record: ""
+        mission: '',
+        dialysis_summary: '',
+        sj_nurse: '',
+        zl_nurse: '',
+        hd_nurse: '',
+        xj_nurse: '',
+        zl_doctor: '',
+        nursing_record: '',
+        special_record: ''
       }
-    };
+    }
   },
   methods: {
     show(record) {
-      this.isVisibility = true;
-      this.record = record;
-      console.log("治疗小结", record);
-      this.getPermission();
+      this.isVisibility = true
+      this.record = record
+      console.log('治疗小结', record)
+      this.getPermission()
     },
     hide() {
-      this.isVisibility = false;
+      this.isVisibility = false
     },
     dialysisAfterTeachSelectChange: function(values) {
-      if (this.treatmentSummary.mission == "") {
-        this.treatmentSummary.mission = values;
+      if (this.treatmentSummary.mission == '') {
+        this.treatmentSummary.mission = values
       } else {
         if (this.treatmentSummary.mission.indexOf(values) == -1) {
           if (
             this.treatmentSummary.mission
               .charAt(this.treatmentSummary.mission.length - 1)
-              .indexOf("。") == -1
+              .indexOf('。') == -1
           ) {
             this.treatmentSummary.mission =
-              this.treatmentSummary.mission + "," + values;
+              this.treatmentSummary.mission + ',' + values
           } else {
             this.treatmentSummary.mission =
-              this.treatmentSummary.mission + values;
+              this.treatmentSummary.mission + values
           }
         }
       }
     },
     dialysisSummarySelectChange: function(values) {
-      if (this.treatmentSummary.dialysis_summary == "") {
-        this.treatmentSummary.dialysis_summary = values;
+      if (this.treatmentSummary.dialysis_summary == '') {
+        this.treatmentSummary.dialysis_summary = values
       } else {
         if (this.treatmentSummary.dialysis_summary.indexOf(values) == -1) {
           if (
             this.treatmentSummary.dialysis_summary
               .charAt(this.treatmentSummary.dialysis_summary.length - 1)
-              .indexOf("。") == -1
+              .indexOf('。') == -1
           ) {
             this.treatmentSummary.dialysis_summary =
-              this.treatmentSummary.dialysis_summary + "," + values;
+              this.treatmentSummary.dialysis_summary + ',' + values
           } else {
             this.treatmentSummary.dialysis_summary =
-              this.treatmentSummary.dialysis_summary + "," + values;
+              this.treatmentSummary.dialysis_summary + ',' + values
             this.treatmentSummary.dialysis_summary =
-              this.treatmentSummary.dialysis_summary + values;
+              this.treatmentSummary.dialysis_summary + values
           }
         }
       }
     },
     dialysisNusingRecordSelectChange: function(values) {
-      if (this.treatmentSummary.nursing_record == "") {
-        this.treatmentSummary.nursing_record = values;
+      if (this.treatmentSummary.nursing_record == '') {
+        this.treatmentSummary.nursing_record = values
       } else {
         if (this.treatmentSummary.nursing_record.indexOf(values) == -1) {
           if (
             this.treatmentSummary.nursing_record
               .charAt(this.treatmentSummary.nursing_record.length - 1)
-              .indexOf("。") == -1
+              .indexOf('。') == -1
           ) {
             this.treatmentSummary.nursing_record =
-              this.treatmentSummary.nursing_record + "," + values;
+              this.treatmentSummary.nursing_record + ',' + values
           } else {
             this.treatmentSummary.nursing_record =
-              this.treatmentSummary.nursing_record + "," + values;
+              this.treatmentSummary.nursing_record + ',' + values
             this.treatmentSummary.nursing_record =
-              this.treatmentSummary.nursing_record + values;
+              this.treatmentSummary.nursing_record + values
           }
         }
       }
     },
     dialysisSpecialRecordSelectChange(values) {
-      if (this.treatmentSummary.special_record == "") {
-        this.treatmentSummary.special_record = values;
+      if (this.treatmentSummary.special_record == '') {
+        this.treatmentSummary.special_record = values
       } else {
         if (this.treatmentSummary.special_record.indexOf(values) == -1) {
           if (
             this.treatmentSummary.special_record
               .charAt(this.treatmentSummary.special_record.length - 1)
-              .indexOf("。") == -1
+              .indexOf('。') == -1
           ) {
             this.treatmentSummary.special_record =
-              this.treatmentSummary.special_record + "," + values;
+              this.treatmentSummary.special_record + ',' + values
           } else {
             this.treatmentSummary.special_record =
-              this.treatmentSummary.special_record + "," + values;
+              this.treatmentSummary.special_record + ',' + values
             this.treatmentSummary.special_record =
-              this.treatmentSummary.special_record + values;
+              this.treatmentSummary.special_record + values
           }
         }
       }
     },
     handleCancle: function() {
-      this.isVisibility = false;
+      this.isVisibility = false
     },
     handleComfirm: function() {
-      const ParamsQuery = this.treatmentSummary;
-      ParamsQuery["patient"] = this.patient.id;
-      ParamsQuery["record_date"] = this.record_date;
-      ParamsQuery["mode"] = "1";
+      const ParamsQuery = this.treatmentSummary
+      ParamsQuery['patient'] = this.patient.id
+      ParamsQuery['record_date'] = this.record_date
+      ParamsQuery['mode'] = '1'
       if (this.treatment_summary.id > 0) {
-        ParamsQuery["mode"] = "2";
+        ParamsQuery['mode'] = '2'
         if (
           this.treatment_summary.creater != this.$store.getters.xt_user.user.id
         ) {
-          ParamsQuery["mode"] = "3";
+          ParamsQuery['mode'] = '3'
         }
       }
       postTreatmentsummary(ParamsQuery).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
           this.$notify({
-            title: "成功",
-            message: "提交成功",
-            type: "success",
+            title: '成功',
+            message: '提交成功',
+            type: 'success',
             duration: 2000
-          });
+          })
 
-          const summary_resp = response.data.data.summary;
+          const summary_resp = response.data.data.summary
           // prop
-          var treatment_summary = this.treatment_summary;
+          var treatment_summary = this.treatment_summary
           for (var index in summary_resp) {
             // treatment_summary[index] = summary_resp[index];
-            this.$set(treatment_summary, index, summary_resp[index]);
+            this.$set(treatment_summary, index, summary_resp[index])
           }
 
-          this.hide();
+          this.hide()
         }
-      });
+      })
     },
     getPermission() {
       request
-        .get("/api/func_per/get", {
+        .get('/api/func_per/get', {
           params: {
-            create_url: "/api/dialysis/treatmentsummary?mode=1",
-            modify_url: "/api/dialysis/treatmentsummary?mode=2",
-            modify_other_url: "/api/dialysis/treatmentsummary?mode=3",
+            create_url: '/api/dialysis/treatmentsummary?mode=1',
+            modify_url: '/api/dialysis/treatmentsummary?mode=2',
+            modify_other_url: '/api/dialysis/treatmentsummary?mode=3',
             module: 9
           }
         })
         .then(res => {
           if (res.data.state == 0) {
-            this.hasPermission = false;
+            this.hasPermission = false
           } else if (res.data.state == 1) {
-            if (this.record.id != "" && this.record.creater != 0) {
-              //有数据
+            if (this.record.id != '' && this.record.creater != 0) {
+              // 有数据
               if (this.record.creater == this.$store.getters.user.admin.id) {
-                //创建人是自己
+                // 创建人是自己
                 if (res.data.data.is_has_modify == false) {
-                  this.hasPermission = false;
-                  this.showTxt = "你没有修改治疗小结权限";
+                  this.hasPermission = false
+                  this.showTxt = '你没有修改治疗小结权限'
                 }
               } else {
-                //创建人不是自己
+                // 创建人不是自己
                 if (res.data.data.is_has_modify_other == false) {
-                  this.hasPermission = false;
-                  this.showTxt = "你没有修改他人治疗小结权限";
+                  this.hasPermission = false
+                  this.showTxt = '你没有修改他人治疗小结权限'
                 }
               }
-            } else if (this.record.id == "" || this.record.creater == 0) {
+            } else if (this.record.id == '' || this.record.creater == 0) {
               if (res.data.data.is_has_create == false) {
-                this.hasPermission = false;
-                this.showTxt = "你没有新增治疗小结权限";
+                this.hasPermission = false
+                this.showTxt = '你没有新增治疗小结权限'
               }
             }
           }
-        });
+        })
     },
     isShow(name) {
-      var filedList = store.getters.xt_user.fileds;
+      var filedList = store.getters.xt_user.fileds
 
       for (let i = 0; i < filedList.length; i++) {
         if (
@@ -356,34 +356,34 @@ export default {
           filedList[i].filed_name_cn == name &&
           filedList[i].is_show == 1
         ) {
-          return true;
+          return true
         }
       }
-      return false;
+      return false
     }
   },
   watch: {
     isVisibility(val) {},
-    "treatment_summary.id": function() {
+    'treatment_summary.id': function() {
       if (this.treatment_summary.id > 0) {
         for (var index in this.treatmentSummary) {
-          this.treatmentSummary[index] = this.treatment_summary[index];
+          this.treatmentSummary[index] = this.treatment_summary[index]
         }
       }
     }
   },
   created() {
-    this.education = getDataConfig("education", "education");
-    this.summary = getDataConfig("summary", "summary");
+    this.education = getDataConfig('education', 'education')
+    this.summary = getDataConfig('summary', 'summary')
 
-    this.nursingRecord = getDataConfig("nursing_record", "nursing_record");
+    this.nursingRecord = getDataConfig('nursing_record', 'nursing_record')
 
-    this.specialRecord = getDataConfig("special_record", "special_record");
+    this.specialRecord = getDataConfig('special_record', 'special_record')
 
-    var date = this.$route.query && this.$route.query.date;
-    this.record_date = uParseTime(date, "{y}-{m}-{d}");
+    var date = this.$route.query && this.$route.query.date
+    this.record_date = uParseTime(date, '{y}-{m}-{d}')
   }
-};
+}
 </script>
 
 <style scoped>

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -340,7 +340,7 @@
             <td width="50" style="text-align:left;border:none;">
               <div>
                 <span class="under_line" style="width:50px;display:inline-block">
-                  {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+                  {{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }}
                 </span>次/分
               </div>
             </td>
@@ -375,18 +375,18 @@
             校对护士
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
-                {{ getAdminUser(check == null ? 0 : check.modifier) }}
-              </span>
+              <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''"> {{ getAdminUser(check == null ? 0 : check.modifier) }} </span>
               <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
             </span>
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
+              <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
+              <img style="height:20px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater))" alt="" srcset="" v-else />
+              <!-- <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
                 <img class="es-img" style="height:30px;" :src="doctorForm.url" />
-              </span>
+              </span> -->
             </span>
             
             
@@ -670,7 +670,7 @@ export default {
         ? this.modeOptions[mode_id].name
         : ''
     },
-    getDialysisRecord() {
+    getDialysisRecords() {
       this.loading = true
 
       getDialysisRecord(this.queryParams).then(response => {
@@ -679,14 +679,12 @@ export default {
           this.adminUser = response.data.data.users
           this.users = response.data.data.users
           var patientInfo = response.data.data.patientInfo
-          console.log('烧腊店就拉萨讲道理看', patientInfo)
           if (patientInfo.gender === 1) {
             patientInfo.gender = '男'
           }
           if (patientInfo.gender === 2) {
             patientInfo.gender = '女'
           }
-          console.log('patientInfo', patientInfo)
           this.patientInfo = patientInfo
           this.patientInfo.birth = uParseTime(
             this.patientInfo.birthday,
@@ -1301,10 +1299,6 @@ export default {
     var vascularAccess = getDataConfig('hemodialysis', 'vascular_access')
     this.vascularAccess = vascularAccess
     // console.log("hhe", vascularAccess);
-    console.log(
-      '血管通路部位',
-      getDataConfig('hemodialysis', 'vascular_access')
-    )
 
     var bloodAccessParOpera = getDataConfig(
       'hemodialysis',
@@ -1334,7 +1328,7 @@ export default {
     ) {
       this.queryParams.xtdate = xtdate
       this.queryParams.xtno = xtno
-      this.getDialysisRecord()
+      this.getDialysisRecords()
     } else {
       this.$message.error('参数不齐')
       return false