Browse Source

no message

DESKTOP-B78GIPM\admin 2 years ago
parent
commit
b4892f4364

+ 4 - 4
src/views/fangwu/modalList/verifyModal/verifyForm.vue

@@ -17,8 +17,8 @@
             <a-space direction="vertical" style="width:100%;">
                 <a-card title="客房用品统计" style="width: 100%">
                     <div style="display:flex;align-items:center;flex-wrap:wrap">
-                        <div class="flex" v-for="(item, index) in model.useConsumableList.filter(item => item.type == 1)" :key="index" >
-                            <div>{{item.goodName}}({{item.unit}})</div>
+                        <div class="flex" v-for="(item, index) in (model.useConsumableList || []).filter(item => item.roomConsumable.type == 1)" :key="index" >
+                            <div>{{item.roomConsumable.goodName}}({{item.roomConsumable.unit}})</div>
                             <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
                         </div>
                     </div>
@@ -26,8 +26,8 @@
                 </a-card>
                 <a-card title="布草统计" style="width: 100%">
                     <div style="display:flex;align-items:center;flex-wrap:wrap">
-                        <div class="flex" v-for="(item, index) in model.useConsumableList.filter(item => item.type == 2)" :key="index" >
-                            <div>{{item.goodName}}({{item.unit}})</div>
+                        <div class="flex" v-for="(item, index) in (model.useConsumableList || []).filter(item => item.roomConsumable.type == 2)" :key="index" >
+                            <div>{{item.roomConsumable.goodName}}({{item.roomConsumable.unit}})</div>
                             <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
                         </div>
                     </div>

+ 4 - 1
src/views/fangwu/tabList/configureTable.vue

@@ -106,7 +106,7 @@ export default {
             list: [],
             activeIndex: 0,
             delLoading: false,
-            layouts: [],
+            layouts: [{children:[]}],
             queryParam: {
                 roomLayoutId: '',
             },
@@ -325,6 +325,9 @@ export default {
                 this.$message.error("请设置url.list属性!")
                 return
             }
+            if (!type) {
+                return
+            }
             //加载数据 若传入参数1则加载第一页的内容
             if (arg === 1) {
                 this.ipagination.current = 1;