谁DVD发DVD发到付v

# Conflicts:
#	src/views/canteen/order/reserveManagement/index.vue

src/api/healthCenter/index.js

@@ -157,17 +157,6 @@ export function delHealthInfoApi(data) {
         data: data
     })
 }
-
-export function getHealthReportPageApi(data) {
-  return request({
-    url: '/smart-canteen/health_person_medical_report/list',
-    method: 'get',
-    headers: {
-        //"merchant-id":"378915229716713472",
-    },
-    params:data
-  })
-}
 // 模板-列表
 export function getModelListApi() {
   return request({

src/views/canteen/healthCenter/examinationReport/index.vue

@@ -42,6 +42,8 @@
             </el-table-column>
             <el-table-column label="住院日期" align="center" prop="inpatientDate" :show-overflow-tooltip="true">
             </el-table-column>
+            <el-table-column label="慢性病" align="center" prop="chronicNames" :show-overflow-tooltip="true">
+            </el-table-column>
             <el-table-column label="劳动强度" align="center" prop="labourIntensity" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                   <span v-if="scope.row.labourIntensity==1">轻劳动</span>

src/views/canteen/order/reserveManagement/index.vue

@@ -192,9 +192,17 @@
       <el-table-column label="餐次" align="center" prop="mealtimeName" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="菜品明细" align="center" prop="orderDetailList" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
-          <span v-for="item in scope.row.orderDetailList" :key="item.detailId">{{ item.goodsName }}*{{
+          <!-- 如果是数组（List<OrderDetail>） -->
-              item.quantity
+          <span v-if="Array.isArray(scope.row.orderDetailList)">
-            }};</span>
+            <span v-for="item in scope.row.orderDetailList" :key="item.detailId">
+              {{ item.goodsName }}*{{ item.quantity }};
+            </span>
+          </span>
+
+          <!-- 如果是字符串（yrorder_details） -->
+          <span v-else>
+            {{ scope.row.orderDetailList }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="订单金额" align="center" prop="payableAmount" :show-overflow-tooltip="true" width="80">