新增预约表单带入

public/index.html

@@ -39,8 +39,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
     //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.4.174:8036/xiangan-crf';
     </script>
   <% } %>

src/page-subspecialty/views/modules/formList/mraOrder.vue

@@ -31,9 +31,14 @@
         </tr>
         <tr>
           <td>
+            <div class="flex">
               <div class="flex">
                 出生日期：<el-input v-model="formData.patientBirthday" style="flex: 1" />
               </div>
+              <div class="flex">
+                来源：<el-input v-model="formData.source" style="flex: 1" />
+              </div>
+            </div>
           </td>
           <td>
             <div class="flex">
@@ -254,7 +259,8 @@ export default {
         isPrint: '',
         examineDate: '',
         checkAdvice: '',
-        docAdvice: ''
+        docAdvice: '',
+        source: ''
       },
       context: [
         {
@@ -307,7 +313,7 @@ export default {
       })
     },
     handleSaveTable() {
-      this.formData.jzNumber = window.sessionStorage.getItem('jzNumber')
+      this.formData.jzNumber = window.sessionStorage.getItem('jzNumber') || this.$route.query.jzNumber || ''
       this.$http.post('/mzbl/saveMzblYdxgzy', {
         caseId: this.caseId,
         ...this.formData
@@ -315,6 +321,21 @@ export default {
         this.$emit('handleSaveTable')
       })
     },
+    // 新增预约时数据带入
+    queryOrderForm() {
+      this.$http.get('/mzbl/getLastAppointInfo', { params: {
+        patientId: this.formData.patientId
+      }}).then(data => {
+        const formDetail = data.data.data
+        this.formData.source = formDetail.source
+        this.formData.remark = formDetail.remark
+        this.formData.project = formDetail.project
+        this.formData.doctor = formDetail.doctor
+        this.formData.checkAdvice = formDetail.checkAdvice
+        this.formData.examineDate = formDetail.examineDate
+        this.formData.lightEye = formDetail.lightEye
+      })
+    },
     getOrderDetail() {
       this.$http.get('/mzbl/getMzblYdxgzyInfo', { params: {
         caseId: this.caseId,
@@ -330,6 +351,7 @@ export default {
           this.formData.patientId = this.patientDetail.patientId
           this.formData.patientBirthday = this.$moment(this.patientDetail.patientBirthday).format('YYYY-MM-DD')
           this.formData.patientPhone = this.patientDetail.patientPhone
+          this.queryOrderForm()
         }
       })
     },

src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue

@@ -39,20 +39,7 @@
         </el-col>
       </el-form-item>
       <el-form-item label="备注:">
-        <el-select
-          v-model="form.remark"
-          filterable
-          allow-create
-          default-first-option
-          placeholder=""
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+        <el-input v-model="form.remark" type="textarea" />
       </el-form-item>
       <div style="display: flex;padding:0 0 20px 0">
         <el-col :span="10" style="display: flex;align-items: center">
@@ -166,13 +153,6 @@ export default {
       startTime: '08:30',
       step: '00:15',
       endTime: '18:00',
-      options: [{
-        value: 'FFA',
-        label: 'FFA'
-      }, {
-        value: 'ICGA',
-        label: 'ICGA'
-      }],
       doctorList: []
     }
   },
@@ -301,13 +281,15 @@ export default {
       this.$emit('closeDialog')
     },
     goFormList() {
+      this.handleSave()
       if (this.patientInfo) {
         const { href } = this.$router.resolve({
           path: '/360view',
           query: {
             onlyRead: false,
             isSearch: '2',
-            patientId: this.patientInfo.patientId
+            patientId: this.patientInfo.patientId,
+            jzNumber: this.patientInfo.jzNumber
           }
         })
         window.open(href, '_blank')