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

src/api/dialysis.js

@@ -145,6 +145,7 @@ export function getDialysisRecord(params) {
 }
 
 export function postPrescription(params) {
+  console.log('params是----', params)
   return request({
     url: '/api/dialysis/prescription',
     method: 'Post',

src/xt_pages/data/printTemplate.vue

@@ -47,7 +47,7 @@
             style="margin-left: 100px;margin-right: 100px;text-align: center"
           >
             <div
-              @click="imgClick('https://images.shengws.com/fangji.jpg')"
+              @click="imgClick('https://images.shengws.com/template_two.jpg')"
 
             >
               <el-tooltip
@@ -74,7 +74,7 @@
             >
           </el-col>
           <el-col :span="6" style="text-align: center">
-            <div class="demo-image__preview">
+            <div class="demo-image__preview"  @click="imgClick('https://images.shengws.com/template_five.jpg')">
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -100,7 +100,7 @@
             >
           </el-col>
           <el-col :span="6" style="text-align: center">
-            <div class="demo-image__preview">
+            <div class="demo-image__preview"  @click="imgClick('https://images.shengws.com/serven.png')">
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -127,7 +127,7 @@
         </el-row>
         <el-row :gutter="20" type="flex">
           <el-col :span="6" style="text-align: center">
-            <div class="demo-image__preview">
+            <div class="demo-image__preview" @click="imgClick('https://images.shengws.com/eight.png')">
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -156,7 +156,7 @@
             >
           </el-col>
           <el-col :span="6" style="text-align: center">
-            <div class="demo-image__preview">
+            <div class="demo-image__preview" @click="imgClick('https://images.shengws.com/template_six.png')">
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -285,7 +285,7 @@ export default {
               // 同步
               // console.log(response.data.data.fileds)
               this.loading = false;
-               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+              // store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -146,7 +146,7 @@
           '1': '正常',
           '2': '异常'
         },
-        precautions:[]
+        precautions:[],
       }
     },
     props: {
@@ -263,16 +263,41 @@
         } else {
           return this.psychological_assessment[this.record.psychological_assessment] == undefined ? '' : this.psychological_assessment[this.record.psychological_assessment] + ''
         }
-      }, precaution: function() {
-        if (this.record.id == 0) {
+      }, 
+      precaution: function() {
+        if (this.record.id == 0 || this.record == null ) {
+          console.log("id--------")
           return ''
         } else {
-          for (let i = 0; i < this.precautions.length; i++){
-            if (this.record.precaution == this.precautions[i].id){
-              return this.precautions[i].name
-
+          //console.log("-----",this.record.precaution)
+          var obj = this.record.precaution
+            console.log("obj--",obj)
+          if(obj == null){
+            return ""
+          }
+          if(obj !=null){
+             var arr = obj.split(",")
+          // console.log("arr----",arr)
+            var arrtwo = []
+            for(let i=0;i<arr.length;i++){
+              for(let j=0;j<this.precautions.length;j++){
+                if(parseInt(arr[i]) == this.precautions[j].id){
+                  arrtwo.push(this.precautions[j].name)
+                }
+              }
             }
+               // console.log("arrtwo",arrtwo)
+              var objtwo = arrtwo.join(",")
+            // console.log("objtwo",objtwo)
+              return objtwo
           }
+         // for (let i = 0; i < this.precautions.length; i++){
+
+           // if (this.record.precaution == this.precautions[i].id){
+           //   return this.precautions[i].name
+           //
+           // }
+          // }
           // return this.precautions[this.record.precaution] == undefined ? '' : this.precautions[this.record.precaution] + ''
         }
       }
@@ -289,12 +314,14 @@
       }
     },
     created(){
+      console.log("records",this.record)
       this.ways = getDataConfig('hemodialysis', 'way')
       this.consciousnesses = getDataConfig('hemodialysis', 'consciousness')
       this.appetites = getDataConfig('hemodialysis', 'appetite')
       this.postures = getDataConfig('hemodialysis', 'posture')
       this.sick_condition = getDataConfig('hemodialysis', 'sick_condition')
       this.precautions = getDataConfig('hemodialysis', 'precaution')
+      console.log("跌倒预防措施",this.precautions)
       this.intake = getDataConfig('hemodialysis', 'intake')
       this.nutrition = getDataConfig('hemodialysis', 'nutrition')
       console.log(this.ways)

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -391,6 +391,7 @@ export default {
         return "-";
       }
       return this.record.internal_fistula;
+     
     },
 
     internal_fistula_skin: function() {

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

@@ -1360,7 +1360,22 @@ export default {
             return;
           }
 
-          const ParamsQuery = this.dialysisPrescription;
+           var arr = this.dialysisPrescription;
+            console.log("arr", arr);
+            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+              if (
+                parseInt(arr.dialyzer_perfusion_apparatus) ==
+                this.dialyzerPerfusionApparatus[i].id
+              ) {
+                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+                  i
+                ].name;
+              }
+            }
+
+            const ParamsQuery = arr;
+            console.log("医嘱推送2", ParamsQuery);
+
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
 
@@ -1435,7 +1450,22 @@ export default {
             this.loading = false;
             return;
           }
-          const ParamsQuery = this.dialysisPrescription;
+           var arr = this.dialysisPrescription;
+            console.log("arr", arr);
+            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+              if (
+                parseInt(arr.dialyzer_perfusion_apparatus) ==
+                this.dialyzerPerfusionApparatus[i].id
+              ) {
+                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+                  i
+                ].name;
+              }
+            }
+
+            const ParamsQuery = arr;
+            console.log("医嘱推送3", ParamsQuery);
+
 
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
@@ -1511,7 +1541,23 @@ export default {
             return;
           }
 
-          const ParamsQuery = this.dialysisPrescription;
+            var arr = this.dialysisPrescription;
+            console.log("arr", arr);
+            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+              if (
+                parseInt(arr.dialyzer_perfusion_apparatus) ==
+                this.dialyzerPerfusionApparatus[i].id
+              ) {
+                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+                  i
+                ].name;
+              }
+            }
+
+            const ParamsQuery = arr;
+            console.log("医嘱推送4", ParamsQuery);
+
+
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           console.log(this.prescription);
@@ -1550,7 +1596,22 @@ export default {
             this.loading = false;
             return;
           }
-          const ParamsQuery = this.dialysisPrescription;
+           var arr = this.dialysisPrescription;
+            console.log("arr", arr);
+            for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
+              if (
+                parseInt(arr.dialyzer_perfusion_apparatus) ==
+                this.dialyzerPerfusionApparatus[i].id
+              ) {
+                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
+                  i
+                ].name;
+              }
+            }
+
+            const ParamsQuery = arr;
+            console.log("医嘱推送5", ParamsQuery);
+
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           ParamsQuery["mode"] = 1;
@@ -1721,12 +1782,8 @@ export default {
           console.log("arr", arr);
           for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
             if (
-              parseInt(arr.dialyzer_perfusion_apparatus) ==
-              this.dialyzerPerfusionApparatus[i].id
-            ) {
-              arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                i
-              ].name;
+              parseInt(arr.dialyzer_perfusion_apparatus) == this.dialyzerPerfusionApparatus[i].id) {
+              arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[i].name;
             }
           }
 
@@ -1735,7 +1792,7 @@ export default {
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           ParamsQuery["mode"] = "1";
-
+          
           postPrescription(ParamsQuery).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -1907,23 +1964,18 @@ export default {
             var arr = this.dialysisPrescription;
             console.log("arr", arr);
             for (let i = 0; i < this.dialyzerPerfusionApparatus.length; i++) {
-              if (
-                parseInt(arr.dialyzer_perfusion_apparatus) ==
-                this.dialyzerPerfusionApparatus[i].id
-              ) {
-                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[
-                  i
-                ].name;
+              if ( parseInt(arr.dialyzer_perfusion_apparatus) == this.dialyzerPerfusionApparatus[i].id) {
+                arr.dialyzer_perfusion_apparatus = this.dialyzerPerfusionApparatus[i].name;
               }
             }
-
             const ParamsQuery = arr;
             console.log("paramsqueryfour", ParamsQuery);
-            if (this.prescription.creater <= 0) {
-              mode = 1;
-            } else {
-              mode = 2;
-            }
+            console.log("创建者",this.prescription.creater)
+            //if (this.prescription.creater <= 0) {
+            //  mode = 1;
+            //} else {
+            //  mode = 2;
+            //}
             ParamsQuery["patient"] = this.patient.id;
             ParamsQuery["record_date"] = this.record_date;
             // console.log(this.prescription);

src/xt_pages/dialysis/details/index.vue

@@ -548,6 +548,7 @@ export default {
           console.log("透析处方",prescription)
           var solution = resp.data.solution; // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
+          console.log("receiver_treatment_access",receiver_treatment_access)
           var predialysis_evaluation = resp.data.predialysis_evaluation; // 透前评估
           console.log("透前评估",predialysis_evaluation)
            if(predialysis_evaluation !=null){

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -218,15 +218,14 @@
           <td style="text-align:left;" colspan="2">
             <span style="display:inline-block;margin-left:15px;">
               透析时间:
-              {{
-              afterdialysis.actual_treatment_hour
-              ? afterdialysis.actual_treatment_hour
-              : "0"
-              }}小时{{
-              afterdialysis.actual_treatment_minute
-              ? afterdialysis.actual_treatment_minute
-              : "0"
-              }}分钟
+              {{ prescription.dialysis_duration_hour
+                 ? prescription.dialysis_duration_hour
+                 : "0"
+                 }}小时{{
+                 prescription.dialysis_duration_minute
+                        ? prescription.dialysis_duration_minute
+                        : "0"
+                    }}分钟
             </span>
           </td>
           <td style="text-align:left;" colspan="1">
@@ -945,11 +944,11 @@
               透析中进食:
               <label-box
                 showValue="无"
-                :isChecked="afterdialysis.dialysis_intakes == 0 ? true : false"
+                :isChecked="afterdialysis.is_eat == 2 ? true : false"
               ></label-box>
               <label-box
                 showValue="有"
-                :isChecked="afterdialysis.dialysis_intakes > 0 ? true : false"
+                :isChecked="afterdialysis.is_eat == 1 ? true : false"
               ></label-box>
             </span>&nbsp;&nbsp;
             <span>

src/xt_pages/workforce/template.vue

@@ -70,17 +70,7 @@
                  size="small" icon="el-icon-setting" type="primary" @click="import_file()">导出模版
       </el-button>
 
-      <el-button
-        @click="generateLog()"
-        class="filter-item"
-        type="primary"
-        size="small"
-      >下载错误日志
-      </el-button>
 
-      <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
-      <schedule-template-upload-excel style="float:right;" :on-success='handleSuccess'
-                                      :before-upload="beforeUpload"></schedule-template-upload-excel>
 
       <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
       <!-- </el-col> -->