患者档案添加新增诊疗档案，诊疗档案url携带用户信息默认显示新增弹窗，名族受教育程度非必填

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

@@ -478,7 +478,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="民族" prop="ethnicity">
+        <el-form-item label="民族" prop="">
           <el-select v-model="form.ethnicity" placeholder="请选择" filterable>
             <el-option
               v-for="item in ethnicityList"
@@ -489,7 +489,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="受教育程度" prop="educationYears">
+        <el-form-item label="受教育程度" prop="">
           <el-select
             v-model="form.educationYears"
             placeholder="请选择"
@@ -954,8 +954,18 @@ export default {
     };
   },
   created() {
+    // 从url获取idCard
     let idCard = this.$route.query.idCard;
-    this.queryParams.param.keywords = idCard || "";
+    this.queryParams.param.keywords = idCard;
+
+    let patientInfo;
+    if (this.$route.query.patientInfo) {
+      this.form = JSON.parse(this.$route.query.patientInfo);
+      delete this.form.id;
+      this.form.visitType = 0; // 门诊/住院
+      this.form.status = 0; // 保存
+      this.open = true;
+    }
     this.getList();
     this.userInfo = JSON.parse(localStorage.getItem("user"));
     // this.getFollowupQuery();

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

@@ -239,7 +239,7 @@
         align="center"
         prop="source"
         show-overflow-tooltip
-        min-width="100"
+        min-width="80"
       >
         <template slot-scope="scope">
           <span v-if="scope.row.source == 0">筛查</span>
@@ -247,7 +247,7 @@
           <span v-if="scope.row.source == 2">HIS</span>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center" width="150">
+      <el-table-column fixed="right" label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -277,6 +277,13 @@
             @click="handleArchives(scope.row)"
             >诊疗档案</el-button
           >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleArchivesAdd(scope.row)"
+            >新增诊疗档案
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -817,7 +824,13 @@ export default {
     /** 诊疗档案 */
     handleArchives(row) {
       this.$router.push({
-        path: `/medicalIndex?idCard=${row.idCard}`,
+        path: `/medicalIndex?idCard=${row.idCard || ""}`,
+      });
+    },
+    /** 新增诊疗档案 */
+    handleArchivesAdd(row) {
+      this.$router.push({
+        path: `/medicalIndex?patientInfo=${JSON.stringify(row)}`,
       });
     },
     /** 提交按钮 */

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "针灸",
+  "name": "acupuncture",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {}