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

src/xt_pages/data/printTemplate.vue

@@ -223,7 +223,7 @@ export default {
               this.tempRadio = template_id.toString();
               // 同步
               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/dialog/monitor_dialog.vue

@@ -236,15 +236,15 @@
           <el-table-column
             prop="displacement_quantity"
             align="center"
-            label="SpO₂(%)"
+            label="置换量(L)"
             width="100"
-            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11"
+            v-if="isShow('置换量') && template_id != 6 && template_id != 10 && template_id != 11"
           >
             <template slot-scope="scope">
               {{
-                scope.row.blood_oxygen_saturation
-                  ? scope.row.blood_oxygen_saturation
-                  : ""
+              scope.row.displacement_quantity
+              ? scope.row.displacement_quantity
+              : ""
               }}
             </template>
           </el-table-column>
@@ -252,18 +252,20 @@
           <el-table-column
             prop="displacement_quantity"
             align="center"
-            label="置换量(L)"
+            label="SpO₂(%)"
             width="100"
-            v-if="isShow('置换量') && template_id != 6 && template_id != 10 || template_id != 11"
+            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11"
           >
             <template slot-scope="scope">
               {{
-                scope.row.displacement_quantity
-                  ? scope.row.displacement_quantity
+                scope.row.blood_oxygen_saturation
+                  ? scope.row.blood_oxygen_saturation
                   : ""
               }}
             </template>
           </el-table-column>
+
+
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
@@ -290,6 +292,14 @@
               }}
             </template>
           </el-table-column>
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="肝素用量余量(ml)"
+            width="140"
+            v-if="isShow('肝素用量余量')"
+          >
+          </el-table-column>
           <el-table-column
             prop="symptom"
             align="center"
@@ -471,7 +481,7 @@
 
 
           <el-col :span="8" v-if="isShow('肝素用量余量')">
-            <el-form-item label="肝素用量余量(ml)：">
+            <el-form-item label="肝素用量余量(ml):">
               <el-input v-model="form.heparin"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -498,12 +498,12 @@
                   <td> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
                   <td> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
                   <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} </td>
-                  <td v-if=" monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
-                  <td v-if=" monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
+                  <td v-if="dialysisOrder && (monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time )" > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
+                  <td v-if="dialysisOrder && (monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }} </td>
                   <!--<td> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>-->
                   <!--<td> {{ monitor.sodium_concentration ? monitor.sodium_concentration : ""  }} </td>-->
-                  <td v-if=" monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{  monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </td>
-                  <td v-if=" monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.ultrafiltration_volume  ? monitor.ultrafiltration_volume : 0 }} </td>
+                  <td v-if="dialysisOrder && monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " > {{  monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </td>
+                  <td v-if="dialysisOrder && monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " > {{ monitor.ultrafiltration_volume  ? monitor.ultrafiltration_volume : 0 }} </td>
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time > dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
                   <td v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time <= dialysisOrder.end_time " width="50" > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
                   <td> {{ monitor.heparin ? monitor.heparin : "" }} </td>

src/xt_pages/role/components/PermissionSettings.vue

@@ -172,13 +172,22 @@
           })
         }
         var idsStr = ''
-        if (ids.length > 0) {
-          idsStr = ids.join(',')
-        }
 
         var funcIdsStr = ''
         if (func_ids.length > 0) {
           funcIdsStr = func_ids.join(',')
+          ids.push(49)
+        }
+
+        //去重复
+        const obj5 = {}
+        ids = ids.reduce((cur, next) => {
+          obj5[next] ? '' : obj5[next] = true && cur.push(next)
+          return cur
+        }, [])
+
+        if (ids.length > 0) {
+          idsStr = ids.join(',')
         }
         this.submitLoading = true
         editPurview(this.role_id, idsStr, funcIdsStr).then(rs => {