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

src/api/schedule.js

@@ -1,66 +1,68 @@
 import request from '@/utils/request'
 
-export function getWeekPanels(t){
-    return request({
-        url:'/api/schedule/weekpanel?data='+t,
-        method:'get',
-    })
+export function getWeekPanels(t) {
+  return request({
+    url: '/api/schedule/weekpanel?data=' + t,
+    method: 'get'
+  })
 }
 
-export function getSchedules(week){
-    return request({
-        url:'/api/schedule/schedules?weekTime=' + week,
-        method:'get',
-    })
+export function getSchedules(week) {
+  return request({
+    url: '/api/schedule/schedules?weekTime=' + week,
+    method: 'get'
+  })
 }
 
-export function getSchedulePatients(params){
-    return request({
-        url:'/api/schedule/patients',
-        method:'get',
-        params:params,
-    })
+export function getSchedulePatients(params) {
+  return request({
+    url: '/api/schedule/patients',
+    method: 'get',
+    params: params
+  })
 }
 
-export function CreateSchedule(id, schedule){
-    return request({
-        url:'/api/schedule/create?patient_id='+id,
-        method:'Post',
-        data:schedule,
-    })
+export function CreateSchedule(id, schedule) {
+  return request({
+    url: '/api/schedule/create?patient_id=' + id,
+    method: 'Post',
+    data: schedule
+  })
 }
 
 export function CancelSchedule(id) {
-    return request({
-        url:'/api/schedule/delete?id='+id,
-        method:"Delete",
-    });
+  return request({
+    url: '/api/schedule/delete?id=' + id,
+    method: 'Delete'
+  })
 }
 
-export function ChangeSchedule(id, schedule){
-    return request({
-        url:'/api/schedule/change?id='+id,
-        method:'Put',
-        data:schedule,
-    })
+export function ChangeSchedule(id, schedule) {
+  console.log('schedule', schedule)
+  return request({
+    url: '/api/schedule/change?id=' + id,
+    method: 'Put',
+    data: schedule
+  })
 }
 
 export function GetPatientSchedules(id) {
-    return request({
-        url:'/api/patients/schedules?id='+id,
-        method:'Get',
-    })
+  return request({
+    url: '/api/patients/schedules?id=' + id,
+    method: 'Get'
+  })
 }
 
 export function GetWeekSchedulePrintInitData(date) {
-    return request({
-        url: '/api/schedule/print/initdata',
-        method: 'get',
-        params: { date: date },
-    })
+  return request({
+    url: '/api/schedule/print/initdata',
+    method: 'get',
+    params: {
+      date: date
+    }
+  })
 }
 
-
 export function getUrgentScheduleInitData(params) {
   return request({
     url: '/api/schedule/urgentinit',
@@ -69,8 +71,6 @@ export function getUrgentScheduleInitData(params) {
   })
 }
 
-
-
 export function getSearchResult(params) {
   return request({
     url: '/api/schedule/search',
@@ -79,9 +79,6 @@ export function getSearchResult(params) {
   })
 }
 
-
-
-
 export function getScheduleWeekDay(params) {
   return request({
     url: '/api/schedule/week',

src/store/modules/globalConfig.js

@@ -475,6 +475,21 @@ const global_config = {
         sodium: 2,
         calcium: 2,
         bicarbonate: 2
+      },
+      19: {
+        id: 19,
+        name: 'IUF+HD',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
       // 15: { id: 15, name: 'HD前置换', dialysis_duration: 1, replacement_way: 2, hemodialysis_machine: 1, blood_filter: 2, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 16: { id: 16, name: 'HD后置换', dialysis_duration: 1, replacement_way: 2, hemodialysis_machine: 1, blood_filter: 2, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },

src/xt_pages/data/components/tableson.vue

@@ -355,22 +355,22 @@ export default {
       };
     },
     handleCreate() {
-      for (let i = 0; i < this.list.length; i++) {
-        if (
-          this.list[i].name == "无肝素" ||
-          this.list[i].name == "普通肝素" ||
-          this.list[i].name == "低分子肝素钠" ||
-          this.list[i].name == "低分子肝素钙" ||
-          this.list[i].name == "阿加曲班" ||
-          this.list[i].name == "枸橼酸钠"
-        ) {
-          this.$message.error("该项暂不支持新增");
-          return false;
-        }
-      }
-
       this.resetTemp();
       this.dialogStatus = "create";
+      // for (let i = 0; i < this.list.length; i++) {
+      //  if (
+      //    this.list[i].name == "无肝素" ||
+      //   this.list[i].name == "普通肝素" ||
+      //   this.list[i].name == "低分子肝素钠" ||
+      //    this.list[i].name == "低分子肝素钙" ||
+      //   this.list[i].name == "阿加曲班" ||
+      //    this.list[i].name == "枸橼酸钠"
+      //  ) {
+      //    this.$message.error("该项暂不支持新增");
+      //    return false;
+      //  }
+      // }
+
       this.dialogFormVisible = true;
       this.$nextTick(() => {
         this.$refs["dataForm"].clearValidate();

src/xt_pages/data/prescription.vue

@@ -640,9 +640,69 @@ export default {
           calcium: 2,
           bicarbonate: 2
         },
+        // {
+        //   id: 15,
+        //   name: "HD前置换",
+        //   dialysis_duration: 1,
+        //   replacement_way: 2,
+        //   hemodialysis_machine: 1,
+        //   blood_filter: 2,
+        //   perfusion_apparatus: 2,
+        //   blood_flow_volume: 1,
+        //   dialysate_flow: 1,
+        //   kalium: 1,
+        //   sodium: 1,
+        //   calcium: 1,
+        //   bicarbonate: 1
+        // },
+        // {
+        //   id: 16,
+        //   name: "HD后置换",
+        //   dialysis_duration: 1,
+        //   replacement_way: 2,
+        //   hemodialysis_machine: 1,
+        //   blood_filter: 2,
+        //   perfusion_apparatus: 2,
+        //   blood_flow_volume: 1,
+        //   dialysate_flow: 1,
+        //   kalium: 1,
+        //   sodium: 1,
+        //   calcium: 1,
+        //   bicarbonate: 1
+        // },
+        // {
+        //   id: 17,
+        //   name: "HDF前置换",
+        //   dialysis_duration: 1,
+        //   replacement_way: 1,
+        //   hemodialysis_machine: 2,
+        //   blood_filter: 1,
+        //   perfusion_apparatus: 2,
+        //   blood_flow_volume: 1,
+        //   dialysate_flow: 1,
+        //   kalium: 1,
+        //   sodium: 1,
+        //   calcium: 1,
+        //   bicarbonate: 1
+        // },
+        // {
+        //   id: 18,
+        //   name: "HDF后置换",
+        //   dialysis_duration: 1,
+        //   replacement_way: 1,
+        //   hemodialysis_machine: 2,
+        //   blood_filter: 1,
+        //   perfusion_apparatus: 2,
+        //   blood_flow_volume: 1,
+        //   dialysate_flow: 1,
+        //   kalium: 1,
+        //   sodium: 1,
+        //   calcium: 1,
+        //   bicarbonate: 1
+        // },
         {
-          id: 15,
-          name: "HD前置换",
+          id: 19,
+          name: "IUF+HD",
           dialysis_duration: 1,
           replacement_way: 2,
           hemodialysis_machine: 1,
@@ -654,51 +714,6 @@ export default {
           sodium: 1,
           calcium: 1,
           bicarbonate: 1
-        },
-        {
-          id: 16,
-          name: "HD后置换",
-          dialysis_duration: 1,
-          replacement_way: 2,
-          hemodialysis_machine: 1,
-          blood_filter: 2,
-          perfusion_apparatus: 2,
-          blood_flow_volume: 1,
-          dialysate_flow: 1,
-          kalium: 1,
-          sodium: 1,
-          calcium: 1,
-          bicarbonate: 1
-        },
-        {
-          id: 17,
-          name: "HDF前置换",
-          dialysis_duration: 1,
-          replacement_way: 1,
-          hemodialysis_machine: 2,
-          blood_filter: 1,
-          perfusion_apparatus: 2,
-          blood_flow_volume: 1,
-          dialysate_flow: 1,
-          kalium: 1,
-          sodium: 1,
-          calcium: 1,
-          bicarbonate: 1
-        },
-        {
-          id: 18,
-          name: "HDF后置换",
-          dialysis_duration: 1,
-          replacement_way: 1,
-          hemodialysis_machine: 2,
-          blood_filter: 1,
-          perfusion_apparatus: 2,
-          blood_flow_volume: 1,
-          dialysate_flow: 1,
-          kalium: 1,
-          sodium: 1,
-          calcium: 1,
-          bicarbonate: 1
         }
       ],
       addPlan: {

src/xt_pages/data/showConfig.vue

@@ -1,27 +1,47 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
       <div class="service-box">
         <el-tabs v-model="activeName">
           <el-tab-pane label="透析处方" name="first">
-            <dialysis-prescription :dialysis_prescription_data="dialysis_prescription_data" @change="changePrescriptionData"></dialysis-prescription>
+            <dialysis-prescription
+              :dialysis_prescription_data="dialysis_prescription_data"
+              @change="changePrescriptionData"
+            ></dialysis-prescription>
           </el-tab-pane>
           <el-tab-pane label="接诊评估">
-            <receive-treatment-asses :receive_treatment_asses_data="receive_treatment_asses_data" @change="changeAssesData"></receive-treatment-asses>
+            <receive-treatment-asses
+              :receive_treatment_asses_data="receive_treatment_asses_data"
+              @change="changeAssesData"
+            ></receive-treatment-asses>
           </el-tab-pane>
           <el-tab-pane label="透前评估">
-            <dialysis-before :dialysis_before_data="dialysis_before_data" @change="changeBeforeData"></dialysis-before>
+            <dialysis-before
+              :dialysis_before_data="dialysis_before_data"
+              @change="changeBeforeData"
+            ></dialysis-before>
           </el-tab-pane>
           <el-tab-pane label="透析监测">
-            <dialysis-monitor :dialysis_monitor_data="dialysis_monitor_data" @change="changeMonitorData"></dialysis-monitor>
+            <dialysis-monitor
+              :dialysis_monitor_data="dialysis_monitor_data"
+              @change="changeMonitorData"
+            ></dialysis-monitor>
           </el-tab-pane>
           <el-tab-pane label="透后评估">
-            <dialysis-after :dialysis_after_data="dialysis_after_data" @change="changeAfterData"></dialysis-after>
+            <dialysis-after
+              :dialysis_after_data="dialysis_after_data"
+              @change="changeAfterData"
+            ></dialysis-after>
+          </el-tab-pane>
+          <el-tab-pane label="透析小结">
+            <dialysis-summary
+              :dialysis_summary_data="dialysis_summary_data"
+              @change="changeSummaryData"
+            ></dialysis-summary>
           </el-tab-pane>
-
         </el-tabs>
       </div>
     </div>
@@ -29,114 +49,121 @@
 </template>
 
 <script>
-
-  import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import DialysisAfter from './components/dialysisAfter'
-  import DialysisPrescription from './components/dialysisPrescription'
-  import DialysisBefore from './components/dialysisBefore'
-  import DialysisMonitor from './components/dialysisMonitor'
-  import ReceiveTreatmentAsses from './components/receiveTreatmentAsses'
-  import { getFiledConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
-  import store from '@/store'
-
-  export default {
-    name: 'showConfig',
-    components: {
-      ReceiveTreatmentAsses,
-      DialysisMonitor,
-      DialysisBefore,
-      DialysisPrescription,
-      DialysisAfter,
-      BreadCrumb
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import DialysisAfter from "./components/dialysisAfter";
+import DialysisPrescription from "./components/dialysisPrescription";
+import DialysisBefore from "./components/dialysisBefore";
+import DialysisMonitor from "./components/dialysisMonitor";
+import ReceiveTreatmentAsses from "./components/receiveTreatmentAsses";
+import DialysisSummary from "./components/dialysisSummary";
+import { getFiledConfigList } from "@/utils/data_config"; // getConfigList from sessionStorage
+import store from "@/store";
+
+export default {
+  name: "showConfig",
+  components: {
+    ReceiveTreatmentAsses,
+    DialysisMonitor,
+    DialysisBefore,
+    DialysisPrescription,
+    DialysisAfter,
+    BreadCrumb,
+    DialysisSummary
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "管理中心" },
+        { path: "/data/showconfig", name: "显示配置" }
+      ],
+      activeName: "first",
+      dialysis_prescription_data: [],
+      receive_treatment_asses_data: [],
+      dialysis_before_data: [],
+      dialysis_monitor_data: [],
+      dialysis_after_data: [],
+      dialysis_summary_data: []
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event, this.activeName);
     },
-    data() {
-      return {
-        crumbs: [
-          { path: false, name: '管理中心' },
-          { path: '/data/showconfig', name: '显示配置' }
-        ],
-        activeName: 'first',
-        dialysis_prescription_data:[],
-        receive_treatment_asses_data:[],
-        dialysis_before_data:[],
-        dialysis_monitor_data:[],
-        dialysis_after_data:[],
+    changePrescriptionData: function(object) {
+      for (let i = 0; i < this.dialysis_prescription_data.length; i++) {
+        if (this.dialysis_prescription_data[i].id == object.id) {
+          this.dialysis_prescription_data[i].is_show = object.is_show;
+        }
       }
     },
-    methods: {
-      handleClick(tab, event) {
-        console.log(tab, event, this.activeName)
-      },changePrescriptionData:function(object) {
-        for (let i = 0; i< this.dialysis_prescription_data.length; i++){
-          if( this.dialysis_prescription_data[i].id ==object.id){
-            this.dialysis_prescription_data[i].is_show = object.is_show
-          }
-
-        }
-
-      },changeAssesData:function(object) {
-        for (let i = 0; i< this.receive_treatment_asses_data.length; i++){
-          if( this.receive_treatment_asses_data[i].id ==object.id){
-            this.receive_treatment_asses_data[i].is_show = object.is_show
-          }
-
+    changeAssesData: function(object) {
+      for (let i = 0; i < this.receive_treatment_asses_data.length; i++) {
+        if (this.receive_treatment_asses_data[i].id == object.id) {
+          this.receive_treatment_asses_data[i].is_show = object.is_show;
         }
-
-
-      },changeBeforeData:function(object) {
-        for (let i = 0; i< this.dialysis_before_data.length; i++){
-          if( this.dialysis_before_data[i].id ==object.id){
-            this.dialysis_before_data[i].is_show = object.is_show
-          }
-
+      }
+    },
+    changeBeforeData: function(object) {
+      for (let i = 0; i < this.dialysis_before_data.length; i++) {
+        if (this.dialysis_before_data[i].id == object.id) {
+          this.dialysis_before_data[i].is_show = object.is_show;
         }
-
-
-      },changeMonitorData:function(object) {
-        for (let i = 0; i< this.dialysis_monitor_data.length; i++){
-          if( this.dialysis_monitor_data[i].id ==object.id){
-            this.dialysis_monitor_data[i].is_show = object.is_show
-          }
-
+      }
+    },
+    changeMonitorData: function(object) {
+      for (let i = 0; i < this.dialysis_monitor_data.length; i++) {
+        if (this.dialysis_monitor_data[i].id == object.id) {
+          this.dialysis_monitor_data[i].is_show = object.is_show;
         }
-
-
-      },changeAfterData:function(object) {
-        for (let i = 0; i< this.dialysis_after_data.length; i++){
-          if( this.dialysis_after_data[i].id ==object.id){
-            this.dialysis_after_data[i].is_show = object.is_show
-          }
-
+      }
+    },
+    changeAfterData: function(object) {
+      for (let i = 0; i < this.dialysis_after_data.length; i++) {
+        if (this.dialysis_after_data[i].id == object.id) {
+          this.dialysis_after_data[i].is_show = object.is_show;
         }
-
-
       }
     },
-    created(){
-      var filedList = store.getters.xt_user.fileds
-      for (let i = 0; i < filedList.length;i++){
-        switch (filedList[i].module) {
-          case 1:
-            this.dialysis_prescription_data.push(filedList[i])
-            break
-          case 2:
-            this.receive_treatment_asses_data.push(filedList[i])
-            break
-          case 3:
-            this.dialysis_before_data.push(filedList[i])
-            break
-          case 4:
-            this.dialysis_monitor_data.push(filedList[i])
-            break
-          case 5:
-            this.dialysis_after_data.push(filedList[i])
-            break
+    changeSummaryData: function(object) {
+      for (let i = 0; i < this.dialysis_summary_data.length; i++) {
+        if (this.dialysis_summary_data[i].id == object.id) {
+          this.dialysis_summary_data[i].is_show = object.is_show;
         }
       }
-
-
+    }
+  },
+  created() {
+    var filedList = store.getters.xt_user.fileds;
+    console.log("filedList", filedList);
+    var arr = [];
+    for (let i = 0; i < filedList.length; i++) {
+      if (filedList[i].module == 6) {
+        arr.push(filedList[i]);
+      }
+    }
+    console.log("arr", arr);
+    for (let i = 0; i < filedList.length; i++) {
+      switch (filedList[i].module) {
+        case 1:
+          this.dialysis_prescription_data.push(filedList[i]);
+          break;
+        case 2:
+          this.receive_treatment_asses_data.push(filedList[i]);
+          break;
+        case 3:
+          this.dialysis_before_data.push(filedList[i]);
+          break;
+        case 4:
+          this.dialysis_monitor_data.push(filedList[i]);
+          break;
+        case 5:
+          this.dialysis_after_data.push(filedList[i]);
+          break;
+        case 6:
+          this.dialysis_summary_data.push(filedList[i]);
+          break;
+      }
     }
   }
+};
 </script>
-
-

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -896,7 +896,7 @@
         </tr>
          <tr>
           <td style="text-align:left;" colspan="12">
-            <span style="display:inline-block;margin-left:15px;">透析护理记录:</span>
+            <span style="display:inline-block;margin-left:15px;">透析护理记录:{{record.summer && record.summer.nursing_record? record.summer.nursing_record: '/'}}</span>
           </td>
         </tr>
         <tr>
@@ -1164,7 +1164,7 @@
         </tr>
         <tr>
           <td style="text-align:left;"  colspan="6">
-            <span style="margin-left:15px">特殊记录:{{record.summer && record.summer.dialysis_summary? record.summer.dialysis_summary: '/'}}</span>
+            <span style="margin-left:15px">特殊记录:{{record.summer && record.summer.special_record? record.summer.special_record: '/'}}</span>
           </td>
         </tr>
         <tr>

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -187,11 +187,13 @@
                           透析次数:
                           <span class="under-line"
                           >&nbsp;
-                            {{
-                              record.patient.total_dialysis
-                                ? record.patient.total_dialysis + + record.patient.user_sys_before_count
-                                : '/'
-                            }}</span
+                           {{
+                            record.patient.total_dialysis +
+                            record.patient.user_sys_before_count
+                              ? record.patient.total_dialysis +
+                                record.patient.user_sys_before_count
+                              : "/"
+                          }}</span
                           >
                         </td>
                       </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -450,6 +450,76 @@
                           >
                             HF
                           </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 6"
+                          >
+                            SCUF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 7"
+                          >
+                            IUF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 8"
+                          >
+                            HFHD
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 9"
+                          >
+                            HFHD+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 10"
+                          >
+                            PHF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 11"
+                          >
+                            HFR
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 12"
+                          >
+                            HDF+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 13"
+                          >
+                            CRRT
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 14"
+                          >
+                            腹水回输
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 19"
+                          >
+                            IUF+HD
+                          </div>
                         </div>
                       </div>
 
@@ -707,12 +777,30 @@
                           class="under_line"
                           style="width: 150px;text-align: center"
                         >
-                          {{
-                            record.prescription &&
-                            record.prescription.anticoagulant_name
-                              ? record.prescription.anticoagulant_name
-                              : "/"
-                          }}
+                          <span v-if="record.prescription.anticoagulant == 0"
+                            >&nbsp;/</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 1"
+                            >&nbsp;无肝素</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 2"
+                            >&nbsp;普通肝素</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 3"
+                            >&nbsp;低分子肝素</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 4"
+                            >&nbsp;阿加曲班</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 5"
+                            >&nbsp;枸橼酸钠</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 6"
+                            >&nbsp;低分子肝素钙</span
+                          >
+                          <span v-if="record.prescription.anticoagulant == 7"
+                            >&nbsp;低分子肝素钠</span
+                          >
                         </div>
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
@@ -728,7 +816,18 @@
                               : "/"
                           }}
                         </div>
-                        lu
+                        <span v-if="record.prescription.anticoagulant == 4"
+                          >mg</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 3"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 2"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 1"
+                          >mg</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         维持：
@@ -762,7 +861,21 @@
                               : 0
                           }}
                         </div>
-                        lu
+                        <span v-if="record.prescription.anticoagulant == 5"
+                          >ml/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 4"
+                          >mg/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 3"
+                          >iu/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 2"
+                          >iu/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 1"
+                          >mg/h</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         总量：
@@ -777,7 +890,18 @@
                               : "/"
                           }}
                         </div>
-                        lu
+                        <span v-if="record.prescription.anticoagulant == 4"
+                          >mg</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 3"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 2"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 1"
+                          >mg</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left:20px;">
                         透析机号：
@@ -1022,8 +1146,8 @@
                             <span v-if="advice[0].parent_id > 0">---></span>
                             <span>{{ advice[0].advice_name }}</span>
                             <span v-if="advice[0].advice_desc != ''"
-                              >{{ advice[0].advice_desc
-                              }}{{ advice[0].drug_spec_unit }}</span
+                              >({{ advice[0].advice_desc
+                              }}{{ advice[0].drug_spec_unit }})</span
                             >
                             <span v-if="advice[0].prescribing_number"
                               >&nbsp;&nbsp; {{ advice[0].prescribing_number
@@ -1082,26 +1206,27 @@
                           <td height="35px">
                             <span
                               v-if="
-                                setAdminUserES(advice[0].execution_staff) == ''
+                                setAdminUserES(advice[0], 'execution_staff') ==
+                                  ''
                               "
                               >{{
-                                getAdminUser(advice[0].execution_staff)
+                                getAdminUser(advice[0], "execution_staff")
                               }}</span
                             >
                             <img
-                              style="height:20px;"
-                              :src="setAdminUserES(advice[0].execution_staff)"
+                              class="es-img"
+                              :src="
+                                setAdminUserES(advice[0], 'execution_staff')
+                              "
                               alt=""
                               srcset=""
                               v-else
+                              style="height: 40px;"
                             />
                           </td>
                           <td height="35px">
                             <span v-if="advice[0].execution_time">{{
-                              getTime(
-                                advice[0].execution_time,
-                                "{y}-{m}-{d} {h}:{i}"
-                              )
+                              getTime(advice[0].execution_time, " {h}:{i}")
                             }}</span>
                           </td>
                         </tr>

src/xt_pages/dialysis/details/dialog/MultiSelectBox/index.vue

@@ -79,7 +79,7 @@ export default {
     }
   },
   created() {
-    console.log(11111111111, this.propsForm);
+    //console.log(11111111111, this.propsForm);
   },
   watch: {
     "propsForm.type": function() {

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

@@ -43,9 +43,20 @@
             </el-form-item>
           </el-col>
 
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="透析机型号:" v-if="isShow('透析机型号')">-->
+<!--              <el-input v-model="assessmentBeforeDislysis.machine_type"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
           <el-col :span="8">
-            <el-form-item label="透析机型号:" v-if="isShow('透析机型号')">
-              <el-input v-model="assessmentBeforeDislysis.machine_type"></el-input>
+            <el-form-item label="透析机型号" v-if="isShow('透析机型号')">
+              <el-select v-model="assessmentBeforeDislysis.machine_type">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option v-for="item in machineType" :label="item.name" :value="item.id"
+                           :key="item.id"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -581,7 +592,8 @@
           customContent: '',
           titles: '',
           type: '' // 不同弹框类型，用来匹配数据
-        }
+        },
+        machineType:[],
 
       }
     },
@@ -805,7 +817,15 @@
       }, innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, handleComfirm: function() {
-        const ParamsQuery = this.assessmentBeforeDislysis
+         var arr = this.assessmentBeforeDislysis
+         for(let i=0;i<this.machineType.length;i++){
+           if(arr.machine_type == this.machineType[i].id){
+                arr.machine_type = this.machineType[i].name
+           }
+         }
+         console.log("arr",arr)
+        const ParamsQuery = arr
+        console.log("paramsquery",ParamsQuery)
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = "1"
@@ -935,6 +955,7 @@
       this.internal_fistula = getDataConfig('hemodialysis', 'internal_fistula')
       this.internal_fistula_skin = getDataConfig('hemodialysis', 'internal_fistula_skin')
       this.puncture_method = getDataConfig('hemodialysis', 'puncture_method')
+      this.machineType = getDataConfig('hemodialysis','machine_type')
       this.blood_access_noise = this.$store.getters.blood_access_noise
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')

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

@@ -283,11 +283,30 @@
             </el-form-item>
           </el-col>
 
+          <!--          <el-col :span="8" v-if="isShows('透析器/灌流器')">-->
+          <!--            <el-form-item label="透析器/灌流器：">-->
+          <!--              <el-input-->
+          <!--                v-model="dialysisPrescription.dialyzer_perfusion_apparatus"-->
+          <!--              ></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
-            <el-form-item label="透析器/灌流器：">
-              <el-input
+            <el-form-item label="透析器/灌流器">
+              <el-select
                 v-model="dialysisPrescription.dialyzer_perfusion_apparatus"
-              ></el-input>
+                placeholder="请选择"
+                style="width:100%;"
+              >
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option
+                  v-for="(item, index) in dialyzerPerfusionApparatus"
+                  :label="item.name"
+                  :key="index"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -1130,7 +1149,8 @@ export default {
         gaijiliang_unit: ""
       },
 
-      doctorAdvices: []
+      doctorAdvices: [],
+      dialyzerPerfusionApparatus: []
     };
   },
   methods: {
@@ -1230,7 +1250,13 @@ export default {
         "hemodialysis",
         "vascular_access_desc"
       );
-      // console.log("血管通路", this.blood_access_option);
+
+      console.log("血管通路", this.blood_access_option);
+      this.dialyzerPerfusionApparatus = getDataConfig(
+        "hemodialysis",
+        "dialyzer_perfusion_apparatus"
+      );
+      console.log("灌流器", this.dialyzerPerfusionApparatus);
       var date = this.$route.query && this.$route.query.date;
       this.record_date = uParseTime(date, "{y}-{m}-{d}");
 
@@ -1273,11 +1299,13 @@ export default {
           }
         }
       } else {
+        console.log("排班----------", schedual.mode_id);
         if (
           schedual.mode_id == 2 ||
           schedual.mode_id == 5 ||
           schedual.mode_id == 12
         ) {
+          console.log("进来----");
           this.zhiShow = true;
           this.huShow = true;
           this.totalShow = true;
@@ -1579,7 +1607,20 @@ export default {
         this.zhiShow = true;
         this.huShow = true;
         this.totalShow = true;
-      } else {
+      } else if (
+        pre.mode_id == 1 ||
+        pre.mode_id == 3 ||
+        pre.mode_id == 4 ||
+        pre.mode_id == 6 ||
+        pre.mode_id == 7 ||
+        pre.mode_id == 8 ||
+        pre.mode_id == 9 ||
+        pre.mode_id == 10 ||
+        pre.mode_id == 11 ||
+        pre.mode_id == 13 ||
+        pre.mode_id == 14 ||
+        pre.mode_id == 19
+      ) {
         this.zhiShow = false;
         this.huShow = false;
         this.totalShow = false;
@@ -1677,7 +1718,21 @@ 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("night", ParamsQuery);
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           ParamsQuery["mode"] = "1";
@@ -1715,7 +1770,21 @@ 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("ParamsQuerytwo", ParamsQuery);
             ParamsQuery["patient"] = this.patient.id;
             ParamsQuery["record_date"] = this.record_date;
             ParamsQuery["mode"] = "1";
@@ -1759,7 +1828,21 @@ 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("paramsquerythree", ParamsQuery);
             ParamsQuery["patient"] = this.patient.id;
             ParamsQuery["record_date"] = this.record_date;
             ParamsQuery["mode"] = "1";
@@ -1822,16 +1905,29 @@ export default {
               return;
             }
 
-            const ParamsQuery = this.dialysisPrescription;
-            ParamsQuery["patient"] = this.patient.id;
-            ParamsQuery["record_date"] = this.record_date;
-            // console.log(this.prescription);
+            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("paramsqueryfour", ParamsQuery);
             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);
 
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
@@ -1866,7 +1962,21 @@ 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("paramsqueryfive", ParamsQuery);
             ParamsQuery["patient"] = this.patient.id;
             ParamsQuery["record_date"] = this.record_date;
             ParamsQuery["mode"] = "1";
@@ -1904,7 +2014,21 @@ 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("ParamsQuerysix", ParamsQuery);
               ParamsQuery["patient"] = this.patient.id;
               ParamsQuery["record_date"] = this.record_date;
               ParamsQuery["mode"] = "1";
@@ -1948,7 +2072,21 @@ 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("parasmqueryseven", parasmqueryseven);
               ParamsQuery["patient"] = this.patient.id;
               ParamsQuery["record_date"] = this.record_date;
               ParamsQuery["mode"] = "1";
@@ -2013,7 +2151,20 @@ 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("eight", ParamsQuery);
               ParamsQuery["patient"] = this.patient.id;
               ParamsQuery["record_date"] = this.record_date;
               ParamsQuery["mode"] = "1";
@@ -2048,7 +2199,21 @@ 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("night", ParamsQuery);
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           ParamsQuery["mode"] = "2";
@@ -2115,7 +2280,21 @@ 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("长期处方1", ParamsQuery);
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           ParamsQuery["mode"] = "1";
@@ -2158,7 +2337,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("长期处方2", ParamsQuery);
+
             ParamsQuery["patient"] = this.patient.id;
             ParamsQuery["record_date"] = this.record_date;
             ParamsQuery["mode"] = "1";
@@ -2208,7 +2402,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("长期处方3", ParamsQuery);
+
             ParamsQuery["patient"] = this.patient.id;
             ParamsQuery["record_date"] = this.record_date;
             console.log(this.prescription);
@@ -2271,7 +2480,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";
@@ -2313,7 +2537,21 @@ 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("长期处方6", ParamsQuery);
             ParamsQuery["patient"] = this.patient.id;
             ParamsQuery["record_date"] = this.record_date;
             ParamsQuery["mode"] = "1";
@@ -2356,7 +2594,21 @@ 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("长期处方7", ParamsQuery);
               ParamsQuery["patient"] = this.patient.id;
               ParamsQuery["record_date"] = this.record_date;
               ParamsQuery["mode"] = "1";
@@ -2405,7 +2657,21 @@ 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("长期处方8", ParamsQuery);
               ParamsQuery["patient"] = this.patient.id;
               ParamsQuery["record_date"] = this.record_date;
               ParamsQuery["mode"] = "1";
@@ -2474,7 +2740,21 @@ 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("长期处方9", ParamsQuery);
               ParamsQuery["patient"] = this.patient.id;
               ParamsQuery["record_date"] = this.record_date;
               ParamsQuery["mode"] = "1";
@@ -2514,7 +2794,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("长期处方10", ParamsQuery);
+
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           ParamsQuery["mode"] = "1";
@@ -2734,7 +3029,8 @@ export default {
         id === 13 ||
         id === 14 ||
         id === 15 ||
-        id === 16
+        id === 16 ||
+        id === 19
       ) {
         this.zhiShow = false;
         this.huShow = false;

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

@@ -471,20 +471,22 @@
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col
             :span="8"
             v-if="
               isShow('超滤量') &&
-                (template_id != 6 ||
-                  template_id != 10 ||
-                  template_id != 11 ||
-                  template_id != 12)
+                (template_id == 6 ||
+                  template_id == 10 ||
+                  template_id == 11 ||
+                  template_id == 12)
             "
           >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col
             :span="8"
             v-if="
@@ -499,6 +501,7 @@
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="8" v-if="isShow('钠浓度')">
             <el-form-item label="钠浓度(mmol/L)：">
               <el-input v-model="form.sodium_concentration"></el-input>
@@ -753,6 +756,7 @@ export default {
   },
   created() {
     this.template_id = this.$store.getters.xt_user.template_info.template_id;
+    console.log("模版ID", this.template_id);
     var date = this.$route.query.date;
     var patient_id = this.$route.query.patient_id;
     this.patient_id = patient_id;

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

@@ -5,217 +5,298 @@
     width="854px"
     :visible.sync="isVisibility"
     :modal-append-to-body="false"
-  > 
+  >
     <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
     <el-form :model="treatmentSummary">
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="宣教知识：">
             <el-select @change="dialysisAfterTeachSelectChange" v-model="value">
-              <el-option v-for="(item,index) in education" :label="item.text" :value="item.value" :key="index"></el-option>
+              <el-option
+                v-for="(item, index) in education"
+                :label="item.text"
+                :value="item.value"
+                :key="index"
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-form-item>
-        <el-input type="textarea" v-model="treatmentSummary.mission" :rows="4"></el-input>
+        <el-input
+          type="textarea"
+          v-model="treatmentSummary.mission"
+          :rows="4"
+        ></el-input>
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="透析小结：">
             <el-select @change="dialysisSummarySelectChange" v-model="value2">
-              <el-option v-for="(item,index) in summary" :label="item.text" :value="item.value" :key="index"></el-option>
+              <el-option
+                v-for="(item, index) in summary"
+                :label="item.text"
+                :value="item.value"
+                :key="index"
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-form-item>
-        <el-input type="textarea" v-model="treatmentSummary.dialysis_summary" :rows="4"></el-input>
+        <el-input
+          type="textarea"
+          v-model="treatmentSummary.dialysis_summary"
+          :rows="4"
+        ></el-input>
       </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="24" v-if="isShow('透析护理记录')">
+          <el-form-item label="透析护理记录:">
+            <el-input
+              type="textarea"
+              v-model="treatmentSummary.nursing_record"
+              :rows="4"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24" v-if="isShow('特殊记录')">
+          <el-form-item label="特殊记录:">
+            <el-input
+              type="textarea"
+              v-model="treatmentSummary.special_record"
+              :rows="4"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button type="primary" @click="handleComfirm" v-if="hasPermission">保 存</el-button>
+      <el-button type="primary" @click="handleComfirm" v-if="hasPermission"
+        >保 存</el-button
+      >
     </div>
   </el-dialog>
 </template>
 
 <script>
-  import { getDataConfig } from '@/utils/data'
-import { postTreatmentsummary } from '@/api/dialysis'
-import { uParseTime } from '@/utils/tools'
-
-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 }
-        }
-      }, patient: { // 患者信息
-        type: Object,
-        default: () => {
-          return { id: 0 }
-        }
+  props: {
+    treatment_summary: {
+      // 治疗小结
+      type: Object,
+      default: () => {
+        return { id: 0 };
       }
-
     },
-    data() {
-      return {
-        showTxt:'',
-        hasPermission:true,
-        value: '',
-        value2: '',
+    patient: {
+      // 患者信息
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    }
+  },
+  data() {
+    return {
+      showTxt: "",
+      hasPermission: true,
+      value: "",
+      value2: "",
 
-        isVisibility: false,
-        record_date: '',
-        education: [],
-        summary: [],
-        treatmentSummary: {
-          mission: '',
-          dialysis_summary: '',
-          sj_nurse: '',
-          zl_nurse: '',
-          hd_nurse: '',
-          xj_nurse: '',
-          zl_doctor: ''
-        }
+      isVisibility: false,
+      record_date: "",
+      education: [],
+      summary: [],
+      treatmentSummary: {
+        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()
-      },
-      hide() {
-        this.isVisibility = false
-      },
-      dialysisAfterTeachSelectChange: function(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) {
-              this.treatmentSummary.mission = this.treatmentSummary.mission + ',' + values
-            } else {
-              this.treatmentSummary.mission = this.treatmentSummary.mission + values
-            }
+  methods: {
+    show(record) {
+      this.isVisibility = true;
+      this.record = record;
+      console.log("治疗小结", record);
+      this.getPermission();
+    },
+    hide() {
+      this.isVisibility = false;
+    },
+    dialysisAfterTeachSelectChange: function(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
+          ) {
+            this.treatmentSummary.mission =
+              this.treatmentSummary.mission + "," + values;
+          } else {
+            this.treatmentSummary.mission =
+              this.treatmentSummary.mission + values;
           }
         }
-      }, dialysisSummarySelectChange: function(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) {
-              this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + ',' + values
-            } else {
-              this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + ',' + values
-              this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + values
-            }
+      }
+    },
+    dialysisSummarySelectChange: function(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
+          ) {
+            this.treatmentSummary.dialysis_summary =
+              this.treatmentSummary.dialysis_summary + "," + values;
+          } else {
+            this.treatmentSummary.dialysis_summary =
+              this.treatmentSummary.dialysis_summary + "," + values;
+            this.treatmentSummary.dialysis_summary =
+              this.treatmentSummary.dialysis_summary + values;
           }
         }
-      }, handleCancle: function() {
-        this.isVisibility = false
-      }, handleComfirm: function() {
-        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"
-          if(this.treatment_summary.creater != this.$store.getters.xt_user.user.id){
-            ParamsQuery['mode'] = "3"
-          }
+      }
+    },
+    handleCancle: function() {
+      this.isVisibility = false;
+    },
+    handleComfirm: function() {
+      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";
+        if (
+          this.treatment_summary.creater != this.$store.getters.xt_user.user.id
+        ) {
+          ParamsQuery["mode"] = "3";
         }
-        postTreatmentsummary(ParamsQuery).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.$notify({
-              title: '成功',
-              message: '提交成功',
-              type: 'success',
-              duration: 2000
-            })
+      }
+      postTreatmentsummary(ParamsQuery).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.$notify({
+            title: "成功",
+            message: "提交成功",
+            type: "success",
+            duration: 2000
+          });
 
-            const summary_resp = response.data.data.summary
-            // prop
-            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])
-            }
+          const summary_resp = response.data.data.summary;
+          // prop
+          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.hide()
+          this.hide();
+        }
+      });
+    },
+    getPermission() {
+      request
+        .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",
+            module: 9
           }
         })
-      },
-      getPermission(){
-        request.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",
-            module:9
-          }
-        }).then(res => {
-          console.log(res)
-          console.log("小结",this.record)
-          if(res.data.state == 0){
-            this.hasPermission = false
-          }else if(res.data.state == 1){
-            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 = "你没有修改治疗小结权限"
+        .then(res => {
+          if (res.data.state == 0) {
+            this.hasPermission = false;
+          } else if (res.data.state == 1) {
+            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 = "你没有修改治疗小结权限";
                 }
-              }else{//创建人不是自己
-                if(res.data.data.is_has_modify_other == false){
-                  this.hasPermission = false
-                  this.showTxt = "你没有修改他人治疗小结权限"
+              } else {
+                //创建人不是自己
+                if (res.data.data.is_has_modify_other == false) {
+                  this.hasPermission = false;
+                  this.showTxt = "你没有修改他人治疗小结权限";
                 }
               }
-            }else if(this.record.id == "" || this.record.creater == 0){
-              if(res.data.data.is_has_create  == false){
-                this.hasPermission = false
-                this.showTxt = "你没有新增治疗小结权限"
+            } else if (this.record.id == "" || this.record.creater == 0) {
+              if (res.data.data.is_has_create == false) {
+                this.hasPermission = false;
+                this.showTxt = "你没有新增治疗小结权限";
               }
             }
           }
-        })
-      }
-    }, watch: {
-      isVisibility(val) {
+        });
+    },
+    isShow(name) {
+      var filedList = store.getters.xt_user.fileds;
 
-      },
-      'treatment_summary.id': function() {
-        if (this.treatment_summary.id > 0) {
-          for (var index in this.treatmentSummary) {
-            this.treatmentSummary[index] = this.treatment_summary[index]
-          }
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 6 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_show == 1
+        ) {
+          return true;
         }
       }
-    }, created() {
-      this.education = getDataConfig('education', 'education')
-      this.summary = getDataConfig('summary', 'summary')
+      return false;
+    }
+  },
+  watch: {
+    isVisibility(val) {},
+    "treatment_summary.id": function() {
+      if (this.treatment_summary.id > 0) {
+        for (var index in this.treatmentSummary) {
+          this.treatmentSummary[index] = this.treatment_summary[index];
+        }
+      }
+    }
+  },
+  created() {
+    this.education = getDataConfig("education", "education");
+    this.summary = getDataConfig("summary", "summary");
 
-      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>
-.warnTxt{
+.warnTxt {
   text-align: center;
   margin: 0 auto;
   background: #faa331;
@@ -223,12 +304,12 @@ export default {
   padding: 10px 20px;
   border-radius: 4px;
   margin-bottom: 10px;
-  color:#fff;
+  color: #fff;
 }
 </style>
 <style lang="scss">
-.newDialog{
-  .el-dialog__body{
+.newDialog {
+  .el-dialog__body {
     padding: 10px 20px 30px;
   }
 }

src/xt_pages/dialysis/details/index.vue

@@ -544,10 +544,10 @@ export default {
           var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
           var predialysis_evaluation = resp.data.predialysis_evaluation; // 透前评估
           var doctor_advices = resp.data.doctor_advices; // 临时医嘱
-          console.log("力气-------", doctor_advices);
+          //console.log("力气-------", doctor_advices);
           var double_check = resp.data.double_check; // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis; // 透后评估
-          console.log("透后品谷数", assessment_after_dislysis);
+          //console.log("透后品谷数", assessment_after_dislysis);
           var treatment_summary = resp.data.treatment_summary; // 治疗小结
           var monitor_records = resp.data.monitor_records; // 透析监测
           var dialysis_order = resp.data.dialysis_order; // 透析记录

src/xt_pages/dialysis/details/treatmentOf.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="plate-box">
-    <h2 class="DetailsTit"><span>{{ title }}</span></h2>
-    <div class="plate " >   
+    <h2 class="DetailsTit">
+      <span>{{ title }}</span>
+    </h2>
+    <div class="plate ">
       <ul>
         <li>
           <label>透后宣教 : </label>
@@ -9,23 +11,37 @@
         </li>
       </ul>
       <ul>
-         <li>
+        <li>
           <label>透析小结 : </label>
           <span class="content">{{ dialysis_summary }}</span>
         </li>
       </ul>
     </div>
+    <div class="plate ">
+      <ul>
+        <li>
+          <label>透析护理记录 : </label>
+          <span class="content">{{ nursing_record }}</span>
+        </li>
+      </ul>
+      <ul>
+        <li>
+          <label>特殊记录 : </label>
+          <span class="content">{{ special_record }}</span>
+        </li>
+      </ul>
+    </div>
     <div class="middleLine"></div>
-  </div>    
+  </div>
 </template>
 
 <script>
 export default {
-  name: 'DialysisPrescription',
+  name: "DialysisPrescription",
   data() {
     return {
-      title: '治疗小结'
-    }
+      title: "治疗小结"
+    };
   },
   props: {
     record: {
@@ -35,25 +51,33 @@ export default {
   computed: {
     mission: function() {
       if (this.record.id == 0) {
-        return ''
+        return "";
       }
-      return this.record.mission
+      return this.record.mission;
     },
     dialysis_summary: function() {
       if (this.record.id == 0) {
-        return ''
+        return "";
       }
-      return this.record.dialysis_summary
+      return this.record.dialysis_summary;
+    },
+    nursing_record: function() {
+      if (this.record.id == 0) {
+        return "";
+      }
+
+      return this.record.nursing_record;
+    },
+    special_record: function() {
+      if (this.record.id == 0) {
+        return "";
+      }
+
+      return this.record.special_record;
     }
   },
-  methods: {
-
-  }
-}
+  methods: {}
+};
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-</style>
-
-
-
+<style rel="stylesheet/scss" lang="scss" scoped></style>

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -861,7 +861,7 @@
         <tr>
           <td style="text-align:left;" colspan="12">
             <span style="display:inline-block;margin-left:15px;"
-              >透析护理记录:</span
+              >透析护理记录:{{ nursing_record }}</span
             >
           </td>
         </tr>
@@ -1142,7 +1142,7 @@
         <tr>
           <td style="text-align:left;" colspan="6">
             <span style="display:inline-block;margin-left:15px;"
-              >特殊记录:{{ mission }}{{ dialysis_summary }}</span
+              >特殊记录:{{ special_record }}</span
             >
           </td>
         </tr>
@@ -1347,7 +1347,9 @@ export default {
       arr: [],
       arrtwo: [],
       bloodAccess: [],
-      vascularAccess: []
+      vascularAccess: [],
+      nursing_record: "",
+      special_record: ""
     };
   },
   methods: {
@@ -1824,9 +1826,11 @@ export default {
           this.monitors = response.data.data.monitors;
           //console.log("透析监测", this.monitors);
           var summary = response.data.data.summary;
-          //  console.log('透析小结', summary)
+          console.log("透析小结", summary);
           this.mission = summary.mission;
           this.dialysis_summary = summary.dialysis_summary;
+          this.nursing_record = summary.nursing_record;
+          this.special_record = summary.special_record;
           this.org_template_info = response.data.data.org_template_info;
           if (this.monitors.length < 7) {
             var nl = 8 - this.monitors.length;

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -123,9 +123,14 @@
                   <td style="text-align:left;margin-left:15px" colspan="2">
                     透析次数:
                     <span class="under-line"
-                      >&nbsp;{{
+                      >&nbsp;
+                      {{
                         patientInfo.total_dialysis +
-                          patientInfo.user_sys_before_count
+                        patientInfo.user_sys_before_count
+                          ? patientInfo.total_dialysis +
+                            patientInfo.user_sys_before_count -
+                            1
+                          : "/"
                       }}</span
                     >
                   </td>
@@ -652,7 +657,13 @@
             <td v-if="advice_index === 0">透前体重:</td>
             <td v-if="advice_index === 0">{{ predialysis.weight_before }}kg</td>
             <td v-if="advice_index === 1">体重增加量:</td>
-            <td v-if="advice_index === 1"></td>
+            <td v-if="advice_index === 1">
+              {{
+                (
+                  predialysis.weight_before - assessmentafter.weight_after
+                ).toFixed(1)
+              }}kg
+            </td>
             <td v-if="advice_index === 2">干体重(DW):</td>
             <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
             <td v-if="advice_index === 3">较干体重增加量:</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -475,6 +475,13 @@
                     >
                       HDF后置换
                     </div>
+                    <div
+                      class="under_line"
+                      style="width: 100px;text-align: center;font-weight:600;"
+                      v-if="prescription.mode_id == 19"
+                    >
+                      IUF+HD
+                    </div>
                   </div>
 
                   <div class="inline_block" style="margin-left:10px;flex:1;">
@@ -2313,7 +2320,7 @@ export default {
         );
 
         this.prescription = response.data.data.dialysisPrescription;
-        // console.log("透析处方", this.prescription);
+        console.log("透析处方", this.prescription);
         this.receiverTreatmentAccess =
           response.data.data.receiverTreatmentAccess;
         this.prescription.mode = this.modeName(this.prescription.mode_id);

src/xt_pages/stock/cancelStockOrder.vue

@@ -336,6 +336,13 @@ export default {
       this.GetCancelStock();
     },
     startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetCancelStock();
+      }
       this.GetCancelStock();
     },
     endTimeChange(val) {

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -378,7 +378,13 @@ export default {
       this.GetCancelStock();
     },
     startTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetCancelStock();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -377,7 +377,13 @@ export default {
       this.GetCancelStock();
     },
     startTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetCancelStock();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/detail/stockInDetail.vue

@@ -419,7 +419,13 @@ export default {
       this.GetCancelStock();
     },
     startTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetCancelStock();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -401,7 +401,13 @@ export default {
       this.GetCancelStock();
     },
     startTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetCancelStock();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -334,7 +334,13 @@ export default {
       this.GetCancelStock();
     },
     startTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetCancelStock();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -340,8 +340,14 @@ export default {
       this.GetSalesReturn();
     },
     startTimeChange(val) {
-      this.startTime = this.getTimestamp(val);
-      this.GetSalesReturn();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.startTime = this.getTimestamp(val);
+        this.GetSalesReturn();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/otherStockInOrder.vue

@@ -450,7 +450,13 @@ export default {
       this.GetWarehouse();
     },
     startTimeChange(val) {
-      this.GetWarehouse();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetWarehouse();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/otherStockOutOrder.vue

@@ -333,7 +333,13 @@ export default {
       this.GetWarehouseOut();
     },
     startTimeChange(val) {
-      this.GetWarehouseOut();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetWarehouseOut();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/salesReturnOrder.vue

@@ -335,6 +335,13 @@ export default {
       this.GetSalesReturn();
     },
     startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetSalesReturn();
+      }
       this.GetSalesReturn();
     },
     endTimeChange(val) {

src/xt_pages/stock/stockDetail.vue

@@ -1,36 +1,76 @@
 <template>
-
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button size="small" @click="AddNewOrder" class="filter-item" style="float:right;" type="primary"
-                 icon="el-icon-circle-plus-outline">新增
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+        size="small"
+        @click="AddNewOrder"
+        class="filter-item"
+        style="float:right;"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+        >新增
       </el-button>
     </div>
 
     <div class="app-container">
-
-
-      <div class="cell clearfix" >
-        <el-input size="small" style="width: 400px;" class="filter-item" v-model.trim="searchKey" placeholder="单据编码/制单人/厂商"/>
-        <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      <div class="cell clearfix">
+        <el-input
+          size="small"
+          style="width: 400px;"
+          class="filter-item"
+          v-model.trim="searchKey"
+          placeholder="单据编码/制单人/厂商"
+        />
+        <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="search"
+          >搜索</el-button
+        >
       </div>
 
       <div class="cell clearfix">
         <label class="title"><span class="name">日期查询</span> : </label>
-        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <el-date-picker
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
         <span class="cellLine"> - </span>
-        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+        <el-date-picker
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
       </div>
 
       <div class="filter-container" style="margin-top: 10px">
-        <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
-
+        <el-checkbox
+          style="width: 30px"
+          v-model="checked"
+          @change="changeAllSelected"
+          >全选</el-checkbox
+        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+          >删除</el-button
+        >
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -41,58 +81,51 @@
           highlight-current-row
           ref="multipleTable"
           @selection-change="select"
-          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
-
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-
-
-
           <el-table-column label="单据编号" align="center">
             <template slot-scope="scope">
-              {{scope.row.warehousing_order}}
+              {{ scope.row.warehousing_order }}
             </template>
           </el-table-column>
 
           <el-table-column label="商品类型" align="center">
             <template slot-scope="scope">
-              {{specificationName(scope.row.good_id)}}
+              {{ specificationName(scope.row.good_id) }}
             </template>
           </el-table-column>
 
-
           <el-table-column label="单据类型" align="center">
             <template slot-scope="scope">
-              {{getTypeName(scope.row)}}
+              {{ getTypeName(scope.row) }}
             </template>
           </el-table-column>
 
           <el-table-column label="操作时间" align="center">
             <template slot-scope="scope">
-              {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
+              {{ scope.row.warehousing_time | parseTime("{y}-{m}-{d}") }}
             </template>
           </el-table-column>
           <el-table-column label="制单人" align="center">
             <template slot-scope="scope">
-              {{getXuserName(scope.row.creater)}}
-
+              {{ getXuserName(scope.row.creater) }}
             </template>
           </el-table-column>
           <el-table-column label="单价" align="center">
             <template slot-scope="scope">
-              {{scope.row.price}}
+              {{ scope.row.price }}
             </template>
           </el-table-column>
           <el-table-column label="数量" align="center">
             <template slot-scope="scope">
-              {{scope.row.warehousing_count}}
+              {{ scope.row.warehousing_count }}
             </template>
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              {{scope.row.price *  scope.row.warehousing_count}}
+              {{ scope.row.price * scope.row.warehousing_count }}
             </template>
           </el-table-column>
-
         </el-table>
 
         <el-pagination
@@ -103,347 +136,385 @@
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
+          :total="total"
+        >
         </el-pagination>
-
       </el-row>
     </div>
   </div>
 </template>
 
 <script>
-  import { uParseTime } from '@/utils/tools'
-  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
-  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
-  import BreadCrumb from '../components/bread-crumb'
-
-  export default {
-    name: 'salesReturnOrder',
-    components: { BreadCrumb },
-    created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { deleteCancelStock, GetAllConfig, getStockDetail } from "@/api/stock";
+import BreadCrumb from "../components/bread-crumb";
+
+export default {
+  name: "salesReturnOrder",
+  components: { BreadCrumb },
+  created() {
+    var year = new Date().getFullYear();
+    var month = new Date().getMonth() + 1;
+    var day = new Date().getDate();
+    if (parseInt(month) < 10) {
+      month = "0" + month;
+    }
+    if (parseInt(day) < 10) {
+      day = "0" + day;
+    }
+    const endTime = year + "-" + month + "-" + day;
+    this.end_time = endTime;
+
+    var year = new Date().getFullYear();
+    var month = new Date().getMonth();
+    var day = new Date().getDate();
+    if (parseInt(month) < 10) {
+      month = "0" + month;
+    }
+    if (parseInt(day) < 10) {
+      day = "0" + day;
+    }
+    const startTime = year + "-" + month + "-" + day;
+    this.start_time = startTime;
+    this.GetCancelStock();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/detail", name: "出入库明细查询" }
+      ],
+      searchKey: "",
+      type: 1,
+      page: 1,
+      limit: 7,
+      checked: false,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      cancelStockDate: [],
+      end_time: "",
+      goodType: [],
+      goodInfo: [],
+      manufacturer: [],
+      selectedTableData: [],
+      dealer: []
+    };
+  },
+  methods: {
+    getTypeName: function(row) {
+      let name = "";
+      let name2 = "";
+      if (row.type == 1) {
+        name = "耗材";
+      } else if (row.type == 2) {
+        name = "其他";
       }
-      if (parseInt(day) < 10) {
-        day = '0' + day
+      if (row.types == 1) {
+        name2 = "入库单";
+      } else if (row.types == 2) {
+        name2 = "出库单";
+      } else if (row.types == 3) {
+        name2 = "退货单";
+      } else if (row.types == 4) {
+        name2 = "退库单";
       }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
-      this.GetCancelStock()
-      this.GetConfigInfo()
-      this.fetchAllAdminUsers()
+      return name + name2;
     },
-    data() {
-      return {
-        crumbs: [
-          { path: false, name: '库存管理' },
-          { path: '/stock/detail', name: '出入库明细查询' }
-        ],
-        searchKey: '',
-        type: 1,
-        page: 1,
-        limit: 7,
-        checked: false,
-        total: 0,
-        pageTotal: 0,
-        pageSelect: 0,
-        adminUserOptions: [],
-        multipleSelection: [],
-        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-        start_time: '',
-        cancelStockDate: [],
-        end_time: '',
-        goodType: [],
-        goodInfo: [],
-        manufacturer: [],
-        selectedTableData: [],
-        dealer: []
-
+    specificationName: function(good_info_id) {
+      let name = "";
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_info_id) {
+          name = this.goodInfo[i].specification_name;
+        }
       }
+      return name;
     },
-    methods: {
-      getTypeName: function(row) {
-        let name = ''
-        let name2 = ''
-        if (row.type == 1) {
-          name = '耗材'
-        } else if (row.type == 2) {
-          name = '其他'
-        }
-        if (row.types == 1) {
-          name2 = '入库单'
-        } else if (row.types == 2) {
-          name2 = '出库单'
-        } else if (row.types == 3) {
-          name2 = '退货单'
-        } else if (row.types == 4) {
-          name2 = '退库单'
-        }
-        return name + name2
-      },
-      specificationName: function(good_info_id) {
-        let name = ''
-        for (let i = 0; i < this.goodInfo.length; i++) {
-          if (this.goodInfo[i].id == good_info_id) {
-            name = this.goodInfo[i].specification_name
-          }
-        }
-        return name
-      },
-      search: function() {
-        const Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time,
-          type: this.type,
-          keywords: this.searchKey
-        }
-        this.cancelStockDate = []
-        getStockDetail(Params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.cancelStockDate.push(response.data.data.list[i])
-            }
+    search: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords: this.searchKey
+      };
+      this.cancelStockDate = [];
+      getStockDetail(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.cancelStockDate.push(response.data.data.list[i]);
           }
-        })
-      },
-      AddNewOrder: function() {
-        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
-      },
-      GetCancelStock: function() {
-        const Params = {
-          page: this.page,
-          limit: this.limit,
-          start_time: this.start_time,
-          end_time: this.end_time,
-          type: this.type
         }
-        this.cancelStockDate = []
-        getStockDetail(Params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.total = response.data.data.total
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              this.cancelStockDate.push(response.data.data.list[i])
-            }
+      });
+    },
+    AddNewOrder: function() {
+      this.$router.push({
+        name: "cancelStockOrderAdd",
+        query: { type: this.type }
+      });
+    },
+    GetCancelStock: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type
+      };
+      this.cancelStockDate = [];
+      getStockDetail(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.cancelStockDate.push(response.data.data.list[i]);
           }
-        })
-      }, getXuserName(id) {
-        if (id <= 0) {
-          return ''
         }
-        var name = ''
-        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
-          return name
-        }
-        var leng = this.adminUserOptions.length
-        if (leng == 0) {
-          return name
-        }
-        for (let index = 0; index < leng; index++) {
-          if (this.adminUserOptions[index].id == id) {
-            name = this.adminUserOptions[index].name
-            break
-          }
+      });
+    },
+    getXuserName(id) {
+      if (id <= 0) {
+        return "";
+      }
+      var name = "";
+      if (
+        this.adminUserOptions == null ||
+        typeof this.adminUserOptions.length === "undefined"
+      ) {
+        return name;
+      }
+      var leng = this.adminUserOptions.length;
+      if (leng == 0) {
+        return name;
+      }
+      for (let index = 0; index < leng; index++) {
+        if (this.adminUserOptions[index].id == id) {
+          name = this.adminUserOptions[index].name;
+          break;
         }
-        return name
-      }, fetchAllAdminUsers() {
-        fetchAllAdminUsers().then(response => {
-          console.log(response)
-          if (response.data.state == 1) {
-            this.adminUserOptions = response.data.data.users
-            var alen = this.adminUserOptions.length
-            for (let index = 0; index < alen; index++) {
-              if (this.adminUserOptions[index].user_type == 2) {
-                // this.doctorOptions.push(this.adminUserOptions[index]);
-              }
+      }
+      return name;
+    },
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        console.log(response);
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
+          for (let index = 0; index < alen; index++) {
+            if (this.adminUserOptions[index].user_type == 2) {
+              // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
-        })
-      }, handleSelectionChange: function(val) {
-        this.multipleSelection = val
-      }, handleSizeChange(val) {
-        this.limit = val
-        this.GetWarehouse()
-      }, handleCurrentChange(val) {
-        this.page = val
-        this.GetWarehouse()
-      }, startTimeChange(val) {
-        this.GetWarehouse()
-      }, endTimeChange(val) {
-        this.GetWarehouse()
-      }, calculate: function(val) {
-        return Math.round(parseFloat(val) * 100) / 100
-      }, GetConfigInfo: function() {
-        GetAllConfig().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.manufacturer = response.data.data.manufacturer
-            this.dealer = response.data.data.dealer
-            this.goodInfo = response.data.data.goodInfo
-          }
-        })
-      }, getManufactuerName: function(manufacturer_id) {
-        for (let i = 0; i < this.manufacturer.length; i++) {
-          if (this.manufacturer[i].id == manufacturer_id) {
-            return this.manufacturer[i].manufacturer_name
-          }
         }
-      }, getDealerName: function(dealer_id) {
-        for (let i = 0; i < this.dealer.length; i++) {
-          if (this.dealer[i].id == dealer_id) {
-            return this.dealer[i].dealer_name
-          }
+      });
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.GetWarehouse();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.GetWarehouse();
+    },
+    startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      console.log("time是-----", time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+    },
+    endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
+    calculate: function(val) {
+      return Math.round(parseFloat(val) * 100) / 100;
+    },
+    GetConfigInfo: function() {
+      GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo;
         }
-      }, handleEdit: function(index, row) {
-        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type }})
-      }, handleDelete: function(index, row) {
-        const ids = []
-        ids.push(row.id)
-        const idStr = ids.join(',')
-
-        const params = {
-          ids: idStr
+      });
+    },
+    getManufactuerName: function(manufacturer_id) {
+      for (let i = 0; i < this.manufacturer.length; i++) {
+        if (this.manufacturer[i].id == manufacturer_id) {
+          return this.manufacturer[i].manufacturer_name;
         }
-
-        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      }
+    },
+    getDealerName: function(dealer_id) {
+      for (let i = 0; i < this.dealer.length; i++) {
+        if (this.dealer[i].id == dealer_id) {
+          return this.dealer[i].dealer_name;
+        }
+      }
+    },
+    handleEdit: function(index, row) {
+      this.$router.push({
+        name: "cancelStockDetail",
+        query: { id: row.id, type: this.type }
+      });
+    },
+    handleDelete: function(index, row) {
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           deleteCancelStock(params).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
-              })
+              });
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.cancelStockDate.length; y++) {
                   if (ids[i] == this.cancelStockDate[y].id) {
-                    this.cancelStockDate.splice(y, 1)
+                    this.cancelStockDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
-        }).catch(() => {
+          });
         })
-      }, changeAllSelected: function(val) {
-        if (val) {
-          this.$refs.multipleTable.toggleAllSelection()
-        } else {
-          this.$refs.multipleTable.clearSelection()
-        }
-      }, select(selection) {
-        this.selectedTableData = selection
-      }, batchDelete() {
-        if (this.selectedTableData.length <= 0) {
-          this.$message.error('请选择要删除的记录')
-          return
-        }
-        const ids = []
-        for (let i = 0; i < this.selectedTableData.length; i++) {
-          ids.push(this.selectedTableData[i].id)
-        }
-        const idStr = ids.join(',')
-        const params = {
-          ids: idStr
-        }
-        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+        .catch(() => {});
+    },
+    changeAllSelected: function(val) {
+      if (val) {
+        this.$refs.multipleTable.toggleAllSelection();
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    select(selection) {
+      this.selectedTableData = selection;
+    },
+    batchDelete() {
+      if (this.selectedTableData.length <= 0) {
+        this.$message.error("请选择要删除的记录");
+        return;
+      }
+      const ids = [];
+      for (let i = 0; i < this.selectedTableData.length; i++) {
+        ids.push(this.selectedTableData[i].id);
+      }
+      const idStr = ids.join(",");
+      const params = {
+        ids: idStr
+      };
+      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
           deleteCancelStock(params).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
-              })
+              });
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.cancelStockDate.length; y++) {
                   if (ids[i] == this.cancelStockDate[y].id) {
-                    this.cancelStockDate.splice(y, 1)
+                    this.cancelStockDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
-        }).catch(() => {
+          });
         })
-      }
+        .catch(() => {});
     }
   }
+};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-  .information {
-    border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
 
   .border {
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+}
 
-  }
-
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
-  }
-
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
 </style>
 
 <style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
-  }
-
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
-  }
-
-  .count {
-    color: #bd2c00;
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
 
-  }
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
 
+.count {
+  color: #bd2c00;
+}
 </style>

src/xt_pages/stock/stockInOrder.vue

@@ -480,7 +480,14 @@ export default {
       this.GetWarehouse();
     },
     startTimeChange(val) {
-      this.startTime = this.getTimestamp(val);
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.startTime = this.getTimestamp(val);
+        this.GetWarehouse();
+      }
     },
     endTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

src/xt_pages/stock/stockOutOrder.vue

@@ -332,6 +332,13 @@ export default {
       this.GetWarehouseOut();
     },
     startTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.start_time = "";
+      } else {
+        this.GetWarehouseOut();
+      }
       this.GetWarehouseOut();
     },
     endTimeChange(val) {

src/xt_pages/user/components/PatientForm.vue

@@ -1124,6 +1124,9 @@ export default {
   },
   data() {
     var checkContagions = (rule, value, callback) => {
+      if (this.form.is_infectious == 0) {
+        return callback(new Error("至少选择一项传染病"));
+      }
       if (this.form.is_infectious == "2" && value.length == 0) {
         return callback(new Error("至少选择一项传染病"));
       }

src/xt_pages/user/patients.vue

@@ -673,7 +673,14 @@ export default {
       this.getList();
     },
     changeTimeOne(val) {
-      this.startTime = this.getTimestamp(val);
+      var time = this.getTimestamp(val) - this.end_time;
+      if (time > 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.start_time = "";
+      } else {
+        this.getList();
+        this.startTime = this.getTimestamp(val);
+      }
     },
     changeTime(val) {
       var time = this.getTimestamp(val) - this.startTime;
@@ -682,6 +689,7 @@ export default {
         this.listQuery.end_time = "";
       } else {
         this.getList();
+        this.end_time = this.getTimestamp(val);
       }
     },
     getTimestamp(time) {

src/xt_pages/workforce/components/tableData.vue

@@ -1020,7 +1020,7 @@ export default {
                 }
               });
             }
-            console.log(that.scheduleZone);
+            console.log("hhhh", that.scheduleZone);
             console.log(theSchedules);
           });
         } else {