浏览代码

月子中心用户

wuyunfeng 3 年之前
父节点
当前提交
8d732024ef
共有 3 个文件被更改,包括 34 次插入33 次删除
  1. 1 1
      languages/zh-CN.js
  2. 14 14
      src/views/customer/components/customerManager.vue
  3. 19 18
      src/views/ncs-device/nurse_watch.vue

+ 1 - 1
languages/zh-CN.js

@@ -210,7 +210,7 @@ module.exports = {
     named: '用户姓名',
     named: '用户姓名',
     inputNamed: '请输入姓名',
     inputNamed: '请输入姓名',
     cardNo: '入住编号',
     cardNo: '入住编号',
-    inputCardNo: '请输入病人编号',
+    inputCardNo: '请输入入住编号',
     age: '年龄',
     age: '年龄',
     inputAge: '请输入年龄',
     inputAge: '请输入年龄',
     ageUnit: '年龄单位',
     ageUnit: '年龄单位',

+ 14 - 14
src/views/customer/components/customerManager.vue

@@ -43,7 +43,7 @@
     <el-dialog :visible.sync="customerFormVisible" :title="this.$t('customerManage.customerInfo')" class="customer-dialog">
     <el-dialog :visible.sync="customerFormVisible" :title="this.$t('customerManage.customerInfo')" class="customer-dialog">
       <el-tabs v-model="activeName" type="border-card" tab-position="bottom" width="50%" @tab-click="handleClick">
       <el-tabs v-model="activeName" type="border-card" tab-position="bottom" width="50%" @tab-click="handleClick">
         <el-tab-pane :label="this.$t('customerManage.baseInfo')" name="customerBaseInfo">
         <el-tab-pane :label="this.$t('customerManage.baseInfo')" name="customerBaseInfo">
-          <div style="height: 640px">
+          <div >
             <el-form ref="editForm" :model="formmodel" :rules="rules" label-width="120px">
             <el-form ref="editForm" :model="formmodel" :rules="rules" label-width="120px">
               <el-row>
               <el-row>
                 <el-col :span="12">
                 <el-col :span="12">
@@ -212,16 +212,16 @@
 
 
               </el-row>
               </el-row>
 
 
-              <el-row>
-                <el-col :span="24" :offset="8">
-                  <vue-qr
-                      v-if="formmodel.member_id"
-                      :text="qrCode(formmodel.member_id)"
-                      :size="150"
-                      :correctLevel="0"
-                  ></vue-qr>
-                </el-col>
-              </el-row>
+<!--              <el-row>-->
+<!--                <el-col :span="24" :offset="8">-->
+<!--                  <vue-qr-->
+<!--                      v-if="formmodel.member_id"-->
+<!--                      :text="qrCode(formmodel.member_id)"-->
+<!--                      :size="150"-->
+<!--                      :correctLevel="0"-->
+<!--                  ></vue-qr>-->
+<!--                </el-col>-->
+<!--              </el-row>-->
 
 
               <el-form-item>
               <el-form-item>
                 <el-button type="primary" :disabled="isDisabled" class="save" @click="handlerSubmit('editForm')">{{ this.$t('action.save') }}</el-button>
                 <el-button type="primary" :disabled="isDisabled" class="save" @click="handlerSubmit('editForm')">{{ this.$t('action.save') }}</el-button>
@@ -305,9 +305,9 @@
 
 
         </el-tab-pane>
         </el-tab-pane>
 
 
-        <el-tab-pane v-if="formmodel.id" :label="this.$t('customerManage.vital')" name="customer-vital-sign">
-            <vital-sign-log :member-id="formmodel.member_id+''" :active-name="'vital_signs1'"/>
-        </el-tab-pane>
+<!--        <el-tab-pane v-if="formmodel.id" :label="this.$t('customerManage.vital')" name="customer-vital-sign">-->
+<!--            <vital-sign-log :member-id="formmodel.member_id+''" :active-name="'vital_signs1'"/>-->
+<!--        </el-tab-pane>-->
 
 
         <el-tab-pane v-if="formmodel.id" :label="this.$t('customerManage.remark')" name="customerRemark">
         <el-tab-pane v-if="formmodel.id" :label="this.$t('customerManage.remark')" name="customerRemark">
           <div style="height: 450px;display: flex;flex-direction: column;">
           <div style="height: 450px;display: flex;flex-direction: column;">

+ 19 - 18
src/views/ncs-device/nurse_watch.vue

@@ -222,25 +222,26 @@ export default {
         minWidth: 100,
         minWidth: 100,
         resizable: false,
         resizable: false,
         sortable: false
         sortable: false
-      },
-      {
-        headerName: this.$t('watch.place'), field: 'shop_id',
-        cellRendererFramework: 'ButtonCellRender',
-        cellRendererParams: param => {
-          return {
-            onClick: this.getLocation,
-            label: this.$t('watch.place'),
-            buttonType: 'warning',
-            buttonSize: 'mini'
-          }
-        },
-        filter: false,
-        pinned: 'right',
-        lockPinned: true,
-        minWidth: 100,
-        resizable: false,
-        sortable: false
       }
       }
+      // ,
+      // {
+      //   headerName: this.$t('watch.place'), field: 'shop_id',
+      //   cellRendererFramework: 'ButtonCellRender',
+      //   cellRendererParams: param => {
+      //     return {
+      //       onClick: this.getLocation,
+      //       label: this.$t('watch.place'),
+      //       buttonType: 'warning',
+      //       buttonSize: 'mini'
+      //     }
+      //   },
+      //   filter: false,
+      //   pinned: 'right',
+      //   lockPinned: true,
+      //   minWidth: 100,
+      //   resizable: false,
+      //   sortable: false
+      // }
       // {
       // {
       //   headerName: '管理', field: 'shop_id',
       //   headerName: '管理', field: 'shop_id',
       //   cellRendererFramework: 'ButtonCellRender',
       //   cellRendererFramework: 'ButtonCellRender',