Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-前台/src/views/patientFile/index.vue

@@ -163,6 +163,18 @@
         min-width="150"
         fixed
       />
+      <el-table-column
+        label="身高（cm）"
+        align="center"
+        prop="height"
+        min-width="100"
+      />
+      <el-table-column
+        label="体重（kg）"
+        align="center"
+        prop="weight"
+        min-width="100"
+      />
       <el-table-column
         label="民族"
         align="center"
@@ -336,6 +348,20 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="身高cm" prop="height">
+          <el-input
+            v-model="form.height"
+            type="number"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="体重kg" prop="weight">
+          <el-input
+            v-model="form.weight"
+            type="number"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="民族" prop="ethnicity">
           <el-select
             v-model="form.ethnicity"
@@ -761,6 +787,8 @@ export default {
         name: "", // 姓名
         gender: 0, // 性别
         birthDate: "", // 出生日期
+        height: "", // 身高
+        weight: "", // 体重
         ethnicity: "", // 民族
         educationYears: "", // 教育程度
         phone: "", // 联系电话

acupuncture-后台/src/store/modules/permission.js

@@ -126,12 +126,13 @@ export function filterDynamicRoutes(routes) {
 }
 
 export const loadView = (view) => {
-  if (process.env.NODE_ENV === "development") {
   return (resolve) => require([`@/views/${view}`], resolve);
-  } else {
-    // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`);
-  }
+  // if (process.env.NODE_ENV === "development") {
+  //   return (resolve) => require([`@/views/${view}`], resolve);
+  // } else {
+  //   // 使用 import 实现生产环境的路由懒加载
+  //   return () => import(`@/views/${view}`);
+  // }
 };
 
 export default permission;

acupuncture-后台/src/views/patientFile/index.vue

@@ -114,6 +114,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="姓名"
         min-width="130"
         show-overflow-tooltip
         align="center"
@@ -142,6 +143,18 @@
         min-width="150"
         fixed
       />
+      <el-table-column
+        label="身高（cm）"
+        align="center"
+        prop="height"
+        min-width="100"
+      />
+      <el-table-column
+        label="体重（kg）"
+        align="center"
+        prop="weight"
+        min-width="100"
+      />
       <el-table-column
         label="民族"
         align="center"
@@ -298,6 +311,20 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="身高cm" prop="height">
+          <el-input
+            v-model="form.height"
+            type="number"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="体重kg" prop="weight">
+          <el-input
+            v-model="form.weight"
+            type="number"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="民族" prop="ethnicity">
           <el-input
             v-model="form.ethnicity"