Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen

src/api/healthCenter/index.js

@@ -37,7 +37,7 @@ export function editHealthScienceApi(data) {
 }
 
 // 营养科普-删除
-export function delHealthScienceApi(Id) { 
+export function delHealthScienceApi(Id) {
     return request({
         url: '/smart-canteen/health_popular_science/del/'+Id,
         method: 'post',
@@ -81,7 +81,7 @@ export function addChronicApi(data) {
         },
         data: data
     })
-} 
+}
 // 慢性病-更新
 export function editChronicApi(data) {
     return request({
@@ -103,7 +103,17 @@ export function delChronicApi(Id) {
         }
     })
 }
-
+// 分页查询 健康档案-列表
+export function getHealthInfoPageApi(data) {
+  return request({
+    url: '/smart-canteen/health/info/list',
+    method: 'get',
+    headers: {
+        "merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}
 
 
 

src/views/stockManage/depotManage/index.vue

@@ -199,8 +199,8 @@
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
-        <el-dialog :visible.sync="dialogVisible" width="700px">
-            <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
+        <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
       </div>
 
@@ -359,7 +359,7 @@ export default {
                 return delWareHouseCategoryApi({categoryId:row.categoryId});
             }).then(() => {
                 this.getList();
-                this.$modal.msgSuccess("删除成功");
+                this.$modal.msgSuccess("删除成功！");
             }).catch(() => {});
         }
     }