Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/store/modules/xt_permission.js

@@ -14,6 +14,7 @@ const xt_permission = {
   actions: {
     xt_GenerateRoutes({ commit }, urls) {
       return new Promise(resolve => {
+
         setupRouters(urls)
         var addRouters = xt_filterAsyncRouter(xt_asyncRouterMap)
         commit('XT_SET_ROUTERS', { concatRouters:xt_constantRouterMap.concat(xt_asyncRouterMap), addRouters:addRouters })

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -445,7 +445,7 @@
                         <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;" >
                           <span v-if="advice.parent_id > 0">---></span>
                           <span >{{advice.advice_name }}</span>
-                          <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                          <span v-if="advice&&advice.advice_desc">({{advice.advice_desc}}{{advice.drug_spec_unit}})</span>
                           <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                            <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                           <span v-if="advice.parent_id == 0 ">{{advice.delivery_way}}</span>

src/xt_pages/management/components/ManageForm.vue

@@ -8,17 +8,19 @@
        <el-form ref="form" :model="form" :rules="rules">
             <el-row>
               <el-col :span="8">
-                 <el-form-item label="序列号:" prop="serial_number">
+                 <el-form-item label="序列号:" required prop="serial_number">
                    <el-input style="width:135px" v-model="form.serial_number"></el-input>
                  </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="分区:" prop="device_type">
+
+                 <el-col :span="8">
+                <el-form-item label="设备类型:" required prop="device_type">
                     <el-select style="width:135px" v-model="form.device_type">
-                      <el-option v-for="item in this.deviceType" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+                      <el-option v-for="item in this.DeviceType" :key="item.id" :label="item.name" :value="item.id" ></el-option>
                     </el-select>
                 </el-form-item>
               </el-col>
+
               <el-col :span="8">
                  <el-form-item label="床位号:" prop="bed_number">
                     <el-select style="width:135px" v-model="form.bed_number">
@@ -29,7 +31,7 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                  <el-form-item label="设备名称:" prop="device_name">
+                  <el-form-item label="设备名称:" required prop="device_name">
                      <el-input style="width:135px" v-model="form.device_name"></el-input>
                   </el-form-item>
               </el-col>
@@ -64,7 +66,7 @@
               <el-row>
               <el-col :span="8">
                   <el-form-item label="购买日期:" prop="buy_date">
-                    <el-date-picker type="date" value-format="timestamp" size="small" style="width: 135px;" v-model="form.buy_date"></el-date-picker>
+                    <el-date-picker type="date" value-format="timestamp" size="small" style="width: 135px;" v-model="form.buy_date" format=""></el-date-picker>
                   </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -121,8 +123,8 @@
                  </el-form-item>
                </el-col>
                <el-col :span="8">
-                  <el-form-item label="报废原因:" prop="remarks">
-                      <el-input style="width:135px" v-model="form.remarks"></el-input>
+                  <el-form-item label="报废原因:" prop="rubbish_reason">
+                      <el-input style="width:135px" v-model="form.rubbish_reason"></el-input>
                   </el-form-item>
                </el-col>
                <el-col :span="8">
@@ -186,30 +188,30 @@
         // ],
         checked1: '',
         form: {
-          serial_number: '',
-          device_type: '',
-          bed_number: '',
-          device_name: '',
-          manufacture_factory: '',
-          service_manufacturer: '',
-          unit_type: '',
-          use_section: '',
-          section_number: '',
-          buy_date: '',
-          install_date: '',
-          start_date: '',
-          maintenance_engineer: '',
-          telephone: '',
-          guarantee_date: '',
-          machine_status: '',
-          user_total: '',
-          remarks: '',
-          rubbish_date: '',
-          rubbish_reason: '',
-          user_year: '',
-          work_time: '',
+          serial_number: '', // 序列号
+          device_type: '', // 设备类型
+          bed_number: '', // 床位号
+          device_name: '', // 设备名称
+          manufacture_factory: '', // 生产厂家
+          service_manufacturer: '', // 维修厂家
+          unit_type: '', // 设备型号
+          use_section: '', // 使用科室
+          section_number: '', // 科室编号
+          buy_date: 0, // 购买日期
+          install_date: '', // 安装日期
+          start_date: '', // 启用日期
+          maintenance_engineer: '', // 维修工程师
+          telephone: '', // 联系电话
+          guarantee_date: '', // 保修日期
+          machine_status: '', // 机器状态
+          user_total: '', // 初次使用次数
+          remarks: '', // 备注
+          rubbish_date: '', // 报废日期
+          rubbish_reason: '', // 报废原因
+          user_year: '', // 使用年限
+          work_time: '', // 工作时长
           treat_mode: [],
-          treat_type: []
+          treat_type: [] // 治疗模式
         },
         deviceType: [],
         bedNumber: [],
@@ -222,9 +224,16 @@
         checkAll: false,
         isIndeterminate: true,
         treatmentmode: treatmentmodes,
+        DeviceType: [
+          { id: 1, name: '透析机' },
+          { id: 2, name: '水处理机' },
+          { id: 3, name: '其他' }
+        ],
+
         rules: {
-          serial_number: [{ required: true, messeage: '请填写序列号' }],
-          device_name: [{ required: true, messeage: '请填写序列号' }]
+          serial_number: [{ required: true, message: '请填写序列号' }],
+          device_name: [{ required: true, message: '请填写序列号' }],
+          device_type: [{ required: true, message: '请填写设备类型' }]
         }
       }
     },
@@ -268,7 +277,20 @@
         this.form.treat_type = arr1
         console.log('arr1', arr1)
         console.log('arr2', this.form.treat_type)
-        this.$refs[formName].validate(valid => {
+
+        var serial_number = this.form.serial_number
+        var serial_numbers = parseInt(serial_number)
+        this.form.serial_number = serial_numbers
+
+        var device_type = this.form.device_type
+        var device_types = parseInt(device_type)
+        this.form.device_type = device_types
+  
+        var bed_number = this.form.bed_number
+        var bed_numbers = parseInt(bed_number)
+        this.form.bed_number = bed_numbers
+
+        this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveManageInfo(this.form).then(response => {
   
@@ -289,8 +311,11 @@
     width: 100px;
     font-size: 14px;
   }
-.el-form-item {
-    margin-bottom: 4px;
+// .el-form-item {
+//     margin-bottom: 10px;
+// }
+.el-form-item__error{
+  margin-left: 110px
 }
 .el-checkbox{
   line-height: 26px;

src/xt_pages/management/index.vue

@@ -19,12 +19,22 @@
              </div>
          </div>
 
+               
+         <div class="cell clearfix">
+            <label class="title"><span class="name">设备类型:</span></label>
+             <div class="time">
+                <ul class="">
+                    <li :class="item.id==schedulTypeone?'active':''" v-for="item in this.DeviceType" :key="item.id"  @click='selectSchedulTypeOne(item.id)'>{{item.name}}</li>
+                </ul>
+             </div>
+         </div>
+
          
          <div class="cell clearfix">
             <label class="title"><span class="name">状态:</span></label>
              <div class="time">
                 <ul class="">
-                    <li :class="item.id==schedulType?'active':''" v-for="item in this.AllStatus" :key="item.id"  @click='selectSchedulType(item.id)'>{{item.name}}</li>
+                    <li :class="item.id==schedulTypetwo?'active':''" v-for="item in this.AllStatus" :key="item.id"  @click='selectSchedulTypeTwo(item.id)'>{{item.name}}</li>
                 </ul>
              </div>
          </div>
@@ -62,9 +72,11 @@
               align="center">
              </el-table-column>
               <el-table-column
-           
               label="操作"
               align="center">
+              <template slot-scope="scope">
+                 <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+              </template>
              </el-table-column>
             </el-table>
             <!-- 新增设备 -->
@@ -94,6 +106,15 @@ export default {
         { id: 0, name: '全部' }
       ],
       schedulType: 0,
+      schedulTypeone: 0,
+      schedulTypetwo: 0,
+      DeviceType: [
+        { id: 0, name: '全部' },
+        { id: 1, name: '透析机' },
+        { id: 2, name: '水处理机' },
+        { id: 3, name: '其他' }
+      ],
+
       AllStatus: [
         { id: 0, name: '全部' },
         { id: 1, name: '使用机' },
@@ -101,6 +122,7 @@ export default {
         { id: 3, name: '急诊机' },
         { id: 4, name: '报废机' }
       ],
+
       tableData: []
 
     }
@@ -124,6 +146,12 @@ export default {
     selectSchedulType(scheduleType) {
       this.schedulType = scheduleType
     },
+    selectSchedulTypeOne(scheduleType) {
+      this.schedulTypeone = scheduleType
+    },
+    selectSchedulTypeTwo(scheduleType) {
+      this.schedulTypetwo = scheduleType
+    },
     AddManage() {
       console.log(this.$refs.ManageForm)
       this.$refs.manageForm.open()

src/xt_pages/user/dialysisSolution.vue

@@ -27,7 +27,7 @@
           label="透析模式"
           min-width="50">
           <template slot-scope="scope">
-            {{scope.row.mode_name}}
+            {{modeOptions[scope.row.mode_id].name}}
           </template>
         </el-table-column>
         <el-table-column
@@ -36,7 +36,7 @@
           label="透析时长"
           min-width="50">
           <template slot-scope="scope">
-            {{scope.row.dialysis_duration}}h
+            {{scope.row.dialysis_duration_hour}} 小时 {{scope.row.dialysis_duration_minute}} 分钟
           </template>
         </el-table-column>
         <!-- <el-table-column
@@ -58,16 +58,16 @@
               <span >{{scope.row.name}}{{scope.row.sub_name}}</span>
           </template>
         </el-table-column> -->
-        <el-table-column
-          prop="doctor"
-          label="医生"
-          align="center"
-          min-width="110">
-          <template slot-scope="scope">
-            <span>{{getAdminUserName(scope.row.doctor)}}</span>
-          </template>
+        <!--<el-table-column-->
+          <!--prop="doctor"-->
+          <!--label="医生"-->
+          <!--align="center"-->
+          <!--min-width="110">-->
+          <!--<template slot-scope="scope">-->
+            <!--<span>{{getAdminUserName(scope.row.doctor)}}</span>-->
+          <!--</template>-->
 
-        </el-table-column>
+        <!--</el-table-column>-->
 
         <el-table-column
           prop="updated_time"
@@ -293,8 +293,8 @@
           </el-col>
 
 
-          <el-col :span="8" v-if="isShows('碳酸氢根')">
-            <el-form-item label="碳酸氢根（mmol/L）: " prop="bicarbonate">
+          <el-col :span="8" v-if="isShows('碳酸氢盐')">
+            <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
               <el-input v-model="addPlan.bicarbonate"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/user/dryWeight.vue

@@ -52,11 +52,11 @@
          :visible.sync="dialogVisible"
          width="30%"
          center>
-      <el-form label-width="120px" :model="dryWeightForm" ref="dryWeightForm">
-          <el-form-item label="干体重:">
+      <el-form label-width="120px" :model="dryWeightForm" ref="dryWeightForm" :rules="rules">
+          <el-form-item label="干体重:" required prop="dry_weight">
               <el-input style="width:200px" v-model="dryWeightForm.dry_weight"></el-input>
           </el-form-item>
-          <el-form-item label="医生:">
+          <el-form-item label="医生:" required prop="doctors">
               <el-select v-model="dryWeightForm.doctors" placeholder="请选择">
                 <el-option
                   v-for="item in options"
@@ -118,7 +118,11 @@
         adjustShow: false,
         page: 1,
         limit: 10,
-        total: 0
+        total: 0,
+        rules: {
+          dry_weight: [{ required: true, message: '请输入干体重!' }],
+          doctors: [{ required: true, message: '请选择医生!' }]
+        }
       }
     },
     methods: {
@@ -446,5 +450,9 @@
     float: left;
     text-align: left;
   }
+
+.el-form-item__error {
+    margin-left: 0px;
+}
 </style>
 

src/xt_pages/user/patients.vue

@@ -489,6 +489,7 @@ export default {
             return false
           } else {
             this.tableData = response.data.data.patients
+            console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           }