Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/api/case-front-sheet/index.js

@@ -234,4 +234,4 @@ export function analyzeQualityControl(data) {
     method: 'post',
     data,
   })
-}
+}

src/components/inpatient/frontsheet-printpage/HeadPage.vue

@@ -61,7 +61,7 @@
         </div>
         <div style="margin: 10px 8px 10px 0">
           现住址:
-          <span style="display: inline-block; margin-right: 8px; padding: 0 4px; border-bottom: 1px solid black; width: 300px">{{ patient.livePlace }}</span>
+          <span style="display: inline-block; margin-right: 8px; padding: 0 4px; border-bottom: 1px solid black; width: 300px">{{ patient.livePlaceCombo }}</span>
           电话:
           <span style="display: inline-block; margin-right: 8px; padding: 0 4px; border-bottom: 1px solid black">{{ patient.phone }}</span>
           邮编:

src/views/hospitalization/case-front-sheet/FillCaseFrontSheet.vue

@@ -99,8 +99,16 @@
                   <option v-for="(item, index) in dics.getMarriageCode" :key="index" :value="item.code">&nbsp;&nbsp;{{ item.name }}&nbsp;&nbsp;</option>
                 </select>
               </div>
+              <div id="livePlace">
+                现住址:
+                <span id="livePlace1">
+                  <el-cascader v-model="patient.standardAddress" :options="regions" placeholder="省/市/区" style="width:230px"></el-cascader>
+                </span>
+                <input id="livePlace2" v-model="patient.livePlace" style="width: 300px" placeholder="街道/小区/乡镇" />
+              </div>
               <div>
-                现住址: <input id="livePlace" v-model="patient.livePlace" style="width: 300px" /> 电话: <input id="phone" v-model="patient.phone" style="width: 90px" />
+                电话:
+                <input id="phone" v-model="patient.phone" style="width: 90px" />
                 邮编:
                 <input id="addrZipCode" v-model="patient.addrZipCode" style="width: 70px" maxlength="6" />
               </div>
@@ -809,6 +817,7 @@ import TailPage from '../../../components/inpatient/frontsheet-printpage/TailPag
 import router from '@/router/index'
 import Sleep from '@/utils/sleep'
 import { smoothScrollTableColumn } from '@/utils/el-table-scroll'
+import { regions } from '@/data/region'
 
 const userWards = ref([])
 const currentWard = ref('')
@@ -1697,4 +1706,16 @@ table td {
   left: calc(100vw - 260px);
   background: transparent !important;
 }
+
+:deep(#livePlace .el-input__wrapper) {
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  border-radius: 0;
+  border-bottom: 1px solid black;
+  color: black;
+}
+:deep(#livePlace .el-input__inner) {
+  color: black;
+}
 </style>