Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/api/schedule_template/patient.js

@@ -30,4 +30,24 @@ export function updateSchedules(template_id, add_schs, del_schs, change_schs) {
     method: 'post',
     params: params,
   })
-}
+}
+
+export function getTemplateScheduleSearchResult(params) {
+  return request({
+    url: '/api/schedule_template/search',
+    method: 'Get',
+    params: params
+  })
+}
+
+
+export function cancelScheduleTemplate(params) {
+  return request({
+    url: '/api/schedule_template/cancel',
+    method: 'Post',
+    params: params
+  })
+}
+
+
+

src/router/index.js

@@ -101,7 +101,7 @@ var _constant_router_map = [{
 var _asy_router_map = [
   patient,
   workforce,
-  medicalScheduling,
+  // medicalScheduling,
   weight_sign,
   dialysis,
   stock,

src/xt_pages/data/components/dialysisComputer.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="">
+    <el-table
+      :row-style="{ color: '#303133' }"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+      :data="dialysis_computer_data"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;min-height:500px;"
+    >
+      <el-table-column align="center" label="字段名">
+        <template slot-scope="scope">
+          <span>{{ scope.row.filed_name_cn }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="字段">
+        <template slot-scope="scope">
+          <span>{{ scope.row.filed_name }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="是否显示">
+        <template slot-scope="scope">
+          <span v-if="scope.row.is_show == 1">是</span>
+          <span v-if="scope.row.is_show == 2">否</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="不展示"
+            placement="top"
+            v-if="scope.row.is_show == 1"
+          >
+            <el-button
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHide(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="展示"
+            placement="top"
+            v-if="scope.row.is_show == 2"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  import { updateFieldIsShow } from "@/api/data";
+  import store from "@/store";
+
+  export default {
+    name: "dialysisComputer",
+
+    props: {
+      dialysis_computer_data: {
+        type: Array
+      }
+    },
+    methods: {
+      handleHide: function(index, row) {
+        this.$confirm("是否将该字段设为不可见?", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        })
+          .then(() => {
+            updateFieldIsShow(row.id, 2).then(response => {
+              if (response.data.state == 1) {
+                let params = {
+                  id: response.data.data.id,
+                  is_show: response.data.data.is_show
+                };
+                store.dispatch("updateFiledConfigList", params).then(() => {});
+                this.$emit("change", params);
+              }
+            });
+            this.$message({
+              type: "success",
+              message: "设置成功!"
+            });
+          })
+          .catch(() => {});
+      },
+      handleShow: function(index, row) {
+        this.$confirm("是否将该字段设为可见?", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        })
+          .then(() => {
+            updateFieldIsShow(row.id, 1).then(response => {
+              if (response.data.state == 1) {
+                let params = {
+                  id: response.data.data.id,
+                  is_show: response.data.data.is_show
+                };
+                store.dispatch("updateFiledConfigList", params).then(() => {});
+                this.$emit("change", params);
+              }
+            });
+            this.$message({
+              type: "success",
+              message: "设置成功!"
+            });
+          })
+          .catch(() => {});
+      }
+    },
+    watch: {
+
+    },
+  };
+</script>
+
+<style scoped></style>
+<style>
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/data/showConfig.vue

@@ -24,6 +24,12 @@
               @change="changeBeforeData"
             ></dialysis-before>
           </el-tab-pane>
+          <el-tab-pane label="透析上机">
+            <dialysis-computer
+              :dialysis_monitor_data="dialysis_computer_data"
+              @change="changeComputerData"
+            ></dialysis-computer>
+          </el-tab-pane>
           <el-tab-pane label="透析监测">
             <dialysis-monitor
               :dialysis_monitor_data="dialysis_monitor_data"
@@ -42,6 +48,7 @@
               @change="changeSummaryData"
             ></dialysis-summary>
           </el-tab-pane>
+
         </el-tabs>
       </div>
     </div>
@@ -58,10 +65,12 @@ import ReceiveTreatmentAsses from "./components/receiveTreatmentAsses";
 import DialysisSummary from "./components/dialysisSummary";
 import { getFiledConfigList } from "@/utils/data_config"; // getConfigList from sessionStorage
 import store from "@/store";
+import DialysisComputer from './components/dialysisComputer'
 
 export default {
   name: "showConfig",
   components: {
+    DialysisComputer,
     ReceiveTreatmentAsses,
     DialysisMonitor,
     DialysisBefore,
@@ -82,7 +91,8 @@ export default {
       dialysis_before_data: [],
       dialysis_monitor_data: [],
       dialysis_after_data: [],
-      dialysis_summary_data: []
+      dialysis_summary_data: [],
+      dialysis_computer_data:[],
     };
   },
   methods: {
@@ -109,6 +119,12 @@ export default {
           this.dialysis_before_data[i].is_show = object.is_show;
         }
       }
+    },changeComputerData:function(object){
+      for (let i = 0; i < this.dialysis_computer_data.length; i++) {
+        if (this.dialysis_computer_data[i].id == object.id) {
+          this.dialysis_computer_data[i].is_show = object.is_show;
+        }
+      }
     },
     changeMonitorData: function(object) {
       for (let i = 0; i < this.dialysis_monitor_data.length; i++) {

src/xt_pages/medicalScheduling/medical_print.vue

@@ -14,6 +14,9 @@
                     <div class="order_title_panl">
                         <span class="main_title">{{ $store.getters.xt_user.org.org_name }}医护排班表</span>
                     </div>
+                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                      打印时间：{{ getNowFormatDate() }}
+                    </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
@@ -29,15 +32,15 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='item in 6'>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
+                                <tr v-for='(item,index) in tableData' :key="index">
+                                    <td>{{ item.user_name }}</td>
+                                    <td>{{ getClass(item.user_name,1) }}</td>
+                                    <td>{{ getClass(item.user_name,2) }}</td>
+                                    <td>{{ getClass(item.user_name,3) }}</td>
+                                    <td>{{ getClass(item.user_name,4) }}</td>
+                                    <td>{{ getClass(item.user_name,5) }}</td>
+                                    <td>{{ getClass(item.user_name,6) }}</td>
+                                    <td>{{ getClass(item.user_name,7) }}</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -64,29 +67,33 @@ export default {
           ],
           start_time:"",
           end_time:"",
+
+          doctorlist:[],
+          tableData:[]
         }
     },
     methods:{
-        printAction: function() {
-            const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+      printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
-            printJS({
-            printable: 'print_content',
-            type: 'html',
-            documentTitle: '  ',
-            style: style,
-            scanStyles: false
-            })
-        },
-        getDoctorList(){
-          getDoctorList().then(response=>{
-             var list =  response.data.data.list
-             console.log("医护列表",list)
-              this.getStaffScheduleList()
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
           })
-        },
-        //获取本周的所有排班列表
-       getStaffScheduleList(){
+      },
+      getDoctorList(){
+        getDoctorList().then(response=>{
+          var list =  response.data.data.list
+          console.log("医护列表",list)
+          this.doctorlist = list
+          this.getStaffScheduleList()
+        })
+      },
+      //获取本周的所有排班列表
+      getStaffScheduleList(){
           const params = {
             start_time:this.start_time,
             end_time:this.end_time,
@@ -95,9 +102,68 @@ export default {
             if(response.data.state == 1){
               var staffList = response.data.data.staffList
               console.log("staffList",staffList)
+
+              let tempArr = [], newArr = []
+              for (let i = 0; i < staffList.length; i++) {
+                if(tempArr.indexOf(staffList[i].user_name) === -1) {
+                  newArr.push({
+                    user_name: staffList[i].user_name,
+                    admin_user_id:staffList[i].admin_user_id,
+                    list: [{class_name:staffList[i].class_name,schedule_week:staffList[i].schedule_week}]
+                  })
+                  tempArr.push(staffList[i].user_name);
+                } else {
+                  for (let j = 0; j < newArr.length; j++) {
+                    if (newArr[j].user_name == staffList[i].user_name) {
+                      newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week})
+                    }
+                  }
+                }
+              }
+              let arr = [...newArr]
+              this.doctorlist.map((item,index) => {
+                if(!(arr[index] && item.admin_user_id == arr[index].admin_user_id)){
+                  arr.splice(index,0,{user_name:item.user_name,admin_user_id: item.admin_user_id,list: []})
+                }
+              })
+              console.log(arr)
+              this.tableData = arr
+              
             }
          })
-       }
+      },
+      getClass(name,index){
+        if(name != undefined){
+          let newClass = '';
+          this.tableData.map(item => {
+            if(item.user_name == name){
+              if(item.list){
+                item.list.map(it => {
+                  if(it.schedule_week == index){
+                    newClass = it.class_name
+                  }
+                })
+              } 
+            }
+          })
+          return newClass
+        }
+      },
+      getNowFormatDate() {
+        var date = new Date();
+        var seperator1 = "-";
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var strDate = date.getDate();
+        if (month >= 1 && month <= 9) {
+            month = "0" + month;
+        }
+        if (strDate >= 0 && strDate <= 9) {
+            strDate = "0" + strDate;
+        }
+        var currentdate = year + seperator1 + month + seperator1 + strDate;
+        return currentdate;
+      }
     },
     created(){
       var starttime =  this.$route.query.starttime

src/xt_pages/user/components/PatientForm.vue

@@ -1388,7 +1388,6 @@ export default {
         return false;
       }
       this.form.user_sys_before_count =  this.form.user_sys_before_count.toString()
-      this.form.avatar =this.form.avatar.
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formSubmit = false;

src/xt_pages/workforce/template.vue

@@ -119,13 +119,13 @@
         <el-tab-pane name="first" :disabled="template_mode.mode == 0">
           <span slot="label"> 第一周 </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="first_template"
-                          :patients="patients"></template-table>
+                          :patients="patients" @cancel_sch="refresh"></template-table>
         </el-tab-pane>
 
         <el-tab-pane name="second" :disabled="template_mode.mode != 2">
           <span slot="label"> 第二周 </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="second_template"
-                          :patients="patients"></template-table>
+                          :patients="patients" @cancel_sch="refresh"></template-table>
         </el-tab-pane>
       </el-tabs>
 
@@ -180,9 +180,11 @@
         patients: [],
 
         first_template: {
+          id: 1,
           items: []
         },
         second_template: {
+          id: 2,
           items: []
         },
         this_week_schedules: {
@@ -238,6 +240,51 @@
       })
     },
     methods: {
+      refresh(){
+        getTemplateInitData().then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            var mode = resp.data.template_mode
+            var device_numbers = resp.data.device_numbers
+            var templates = resp.data.templates
+            var patients = resp.data.patients
+            var schedules = resp.data.schedules
+
+            this.template_mode = mode
+            this.origin_mode = mode.mode
+            this.device_numbers = device_numbers
+            console.log(this.device_numbers)
+            this.patients = patients
+
+            this.first_template = templates[0]
+            this.second_template = templates[1]
+
+            var fakeTemplateItems = []
+            for (let index = 0; index < schedules.length; index++) {
+              const schedule = schedules[index]
+              var item = {}
+              this.$set(item, 'id', schedule.id)
+              this.$set(item, 'template_id', 0)
+              this.$set(item, 'device_number_id', schedule.bed_id)
+              this.$set(item, 'treat_mode', schedule.mode_id)
+              this.$set(item, 'weekday', schedule.schedule_week)
+              this.$set(item, 'time_type', schedule.schedule_type)
+              var patient = {}
+              this.$set(patient, 'id', schedule.patient_id)
+              this.$set(patient, 'name', schedule.patient)
+              this.$set(item, 'patient', patient)
+
+              fakeTemplateItems.push(item)
+            }
+            this.this_week_schedules.items = fakeTemplateItems
+
+          } else {
+            this.$message(resp.msg)
+          }
+        })
+
+
+      },
       generateTxt:function(log) {
         var content = ''
         var errlog =  log.err_logs