房务 配置易耗品 房务审核

src/views/fangwu/index.vue

@@ -40,7 +40,7 @@
                         <div>
                             <div>房务审核记录及调整</div>
                         </div>
-                        <div class="assgin-center">0条需要审核，<span @click="lookLook">点击查看></span> </div>
+                        <div class="assgin-center">{{verifyCount}}条需要审核，<a @click="lookLook">点击查看></a> </div>
                     </a-card>
                     <a-card class="card">
                         <div>
@@ -182,6 +182,7 @@ import {
 } from '@/api/roomBuildingApi'
 
 import { HousekeepingApi } from '@/api/fwApi.js'
+import { getAction } from '../../api/manage'
 let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
 export default {
     mixins: [JeecgListMixin],
@@ -198,6 +199,12 @@ export default {
     data() {
         return {
             list: ['今天', '昨日', '本周', '本月', '更多'],
+
+            /**
+             * 待审核的数量
+             */
+            verifyCount: 0,
+
             activeIndex: 0,
             dataSource:[],
             assignVisible: false,
@@ -292,12 +299,15 @@ export default {
         }
     },
     mounted() {
-        getAllLayouts().then((res) => {
-            if (res.code == 200) {
-                this.layouts = res.result.records;
-                this.loadData();
-            }
-        });
+        // getAllLayouts().then((res) => {
+        //     if (res.code == 200) {
+        //         this.layouts = res.result.records;
+        //         this.loadData();
+        //     }
+        // });
+        getAction(`/fw/fwRoomClean/list?verifyState=0`).then(res=>{
+            this.verifyCount = res.result.total
+        })
         HousekeepingApi.getLockedRoom().then(res=>{
             this.LockedRoom = res.result.total
         })

src/views/fangwu/modalList/ConsumableModal/ConsumableForm.vue

@@ -0,0 +1,163 @@
+<template>
+<a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+            <a-row>
+                <a-col :span="24">
+                    <a-form-model-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodName">
+                        <a-input v-model="model.goodName" placeholder="请输入商品名称"></a-input>
+                    </a-form-model-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-model-item label="商品规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodSpe">
+                        <a-input v-model="model.goodSpe" placeholder="请输入商品规格"></a-input>
+                    </a-form-model-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+                        <a-select v-model="model.type" placeholder="请选择">
+                            <a-select-option :value="1">
+                                客房易耗品
+                            </a-select-option>
+                            <a-select-option :value="2">
+                                布草
+                            </a-select-option>
+                        </a-select>
+                    </a-form-model-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="">
+                        <a-input v-model="model.unit" placeholder="请输入单位"></a-input>
+                    </a-form-model-item>
+                </a-col>
+            </a-row>
+        </a-form-model>
+    </j-form-container>
+</a-spin>
+</template>
+
+<script>
+import {
+    httpAction,
+    getAction
+} from "@/api/manage";
+import {
+    validateDuplicateValue
+} from "@/utils/util";
+
+export default {
+    name: "PosTypeForm",
+    components: {},
+    props: {
+        //表单禁用
+        disabled: {
+            type: Boolean,
+            default: false,
+            required: false,
+        },
+    },
+    data() {
+        return {
+            model: {
+                
+            },
+            labelCol: {
+                xs: {
+                    span: 24
+                },
+                sm: {
+                    span: 5
+                },
+            },
+            wrapperCol: {
+                xs: {
+                    span: 24
+                },
+                sm: {
+                    span: 16
+                },
+            },
+            confirmLoading: false,
+            validatorRules: {
+                goodName: [{
+                    required: true,
+                    message: "请输入名称!"
+                }],
+                goodSpe: [{
+                    required: true,
+                    message: "请输入规格!"
+                }],
+                type: [{
+                    required: true,
+                    message: "请选择规格!"
+                }],
+                unit: [{
+                    required: true,
+                    message: "请输入单位!"
+                }],
+                address: [{
+                    required: true,
+                    message: "请输入地址!"
+                }],
+            },
+            url: {
+                add: "/fw/fwRoomConsumable/add",
+                edit: "/fw/fwRoomConsumable/edit",
+                queryById: "/kc/kcSupplier/queryById",
+            },
+        };
+    },
+    computed: {
+        formDisabled() {
+            return this.disabled;
+        },
+    },
+    created() {
+        var _info = JSON.parse(localStorage.getItem("storeInfo"));
+        if (_info) {
+            this.model.hotelId = _info.id;
+        }
+        //备份model原始值
+        this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+        add() {
+            this.edit(this.modelDefault);
+        },
+        edit(record) {
+            this.model = Object.assign({}, record);
+            this.visible = true;
+        },
+        submitForm() {
+            const that = this;
+            // 触发表单验证
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    that.confirmLoading = true;
+                    let httpurl = "";
+                    let method = "";
+                    if (!this.model.id) {
+                        httpurl += this.url.add;
+                        method = "post";
+                    } else {
+                        httpurl += this.url.edit;
+                        method = "put";
+                    }
+                    httpAction(httpurl, this.model, method)
+                        .then((res) => {
+                            if (res.success) {
+                                that.$message.success(res.message);
+                                that.$emit("ok");
+                            } else {
+                                that.$message.warning(res.message);
+                            }
+                        })
+                        .finally(() => {
+                            that.confirmLoading = false;
+                        });
+                }
+            });
+        },
+    },
+};
+</script>

src/views/fangwu/modalList/ConsumableModal/ConsumableModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <bus-market-member-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></bus-market-member-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import BusMarketMemberForm from './ConsumableForm.vue'
+  export default {
+    name: 'BusMarketMemberModal',
+    components: {
+      BusMarketMemberForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/fangwu/modalList/editVerifyModal/editVerifyForm.vue

@@ -0,0 +1,162 @@
+<template>
+<a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+            <a-row>
+                <a-col :span="24">
+                    <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waiterId">
+                        <a-select placeholder="服务员" v-model="model.waiterId" style="width:40%">
+                            <a-select-option :value="item.id" v-for="(item, index) in busWaiterList" :key="item.id">
+                                {{ item.name }}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-model-item>
+                </a-col>
+                <!-- <a-col :span="24">
+                    <a-form-model-item label="" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                        
+                    </a-form-model-item>
+                </a-col> -->
+            </a-row>
+        </a-form-model>
+    </j-form-container>
+</a-spin>
+</template>
+
+<script>
+import {
+    httpAction,
+    getAction
+} from "@/api/manage";
+import {
+    validateDuplicateValue
+} from "@/utils/util";
+
+export default {
+    name: "PosTypeForm",
+    components: {},
+    props: {
+        //表单禁用
+        disabled: {
+            type: Boolean,
+            default: false,
+            required: false,
+        },
+    },
+    data() {
+        return {
+            busWaiterList: [],
+            model: {
+                state: 1,
+                online: 0,
+                waiterId: ''
+            },
+            labelCol: {
+                xs: {
+                    span: 24
+                },
+                sm: {
+                    span: 5
+                },
+            },
+            wrapperCol: {
+                xs: {
+                    span: 24
+                },
+                sm: {
+                    span: 16
+                },
+            },
+            confirmLoading: false,
+            validatorRules: {
+                waiterId: [{
+                    required: true,
+                    message: "请选择服务员!"
+                }],
+                state: [{
+                    required: true,
+                    message: "请输入状态!"
+                }],
+                contactName: [{
+                    required: true,
+                    message: "请输入姓名!"
+                }],
+                mobile: [{
+                    required: true,
+                    message: "请输入手机号!"
+                }],
+                address: [{
+                    required: true,
+                    message: "请输入地址!"
+                }],
+            },
+            url: {
+                add: "/kc/kcSupplier/add",
+                edit: "/fw/fwRoomClean/edit",
+                queryById: "/kc/kcSupplier/queryById",
+            },
+        };
+    },
+    computed: {
+        formDisabled() {
+            return this.disabled;
+        },
+    },
+    created() {
+        var _info = JSON.parse(localStorage.getItem("storeInfo"));
+        if (_info) {
+            this.model.hotelId = _info.id;
+        }
+        //备份model原始值
+        this.modelDefault = JSON.parse(JSON.stringify(this.model));
+        getAction("/business/busWaiter/list", {
+            // hotelId: _info.id,
+            pageNo: 1,
+            pageSize: 99999,
+        }).then((res) => {
+            if (res.success) {
+                this.busWaiterList = res.result.records;
+            }
+        });
+    },
+    methods: {
+        add() {
+            this.edit(this.modelDefault);
+        },
+        edit(record) {
+            this.model = Object.assign({}, record);
+            this.visible = true;
+        },
+        submitForm() {
+            const that = this;
+            // 触发表单验证
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    that.confirmLoading = true;
+                    let httpurl = "";
+                    let method = "";
+                    if (!this.model.id) {
+                        httpurl += this.url.add;
+                        method = "post";
+                    } else {
+                        httpurl += this.url.edit;
+                        method = "put";
+                    }
+                    httpAction(httpurl, this.model, method)
+                        .then((res) => {
+                            if (res.success) {
+                                that.$message.success(res.message);
+                                that.$emit("ok");
+                            } else {
+                                that.$message.warning(res.message);
+                            }
+                        })
+                        .finally(() => {
+                            that.confirmLoading = false;
+                        });
+                }
+            });
+        },
+    },
+};
+</script>

src/views/fangwu/modalList/editVerifyModal/editVerifyModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <bus-market-member-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></bus-market-member-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import BusMarketMemberForm from './editVerifyForm.vue'
+  export default {
+    name: 'BusMarketMemberModal',
+    components: {
+      BusMarketMemberForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/fangwu/modalList/verifyModal/verifyForm.vue

@@ -0,0 +1,190 @@
+<template>
+<a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+            <a-descriptions title="">
+                <a-descriptions-item label="扫房人">
+                    {{model.waiterName}}
+                </a-descriptions-item>
+                <a-descriptions-item label="房号">
+                    {{model.roomNo}}
+                </a-descriptions-item>
+                <!-- <a-descriptions-item label="脏房类型">
+                    {{'脏房'}}
+                </a-descriptions-item> -->
+            </a-descriptions>
+
+            <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>
+                            <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
+                        </div>
+                    </div>
+
+                </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>
+                            <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
+                        </div>
+                    </div>
+
+                </a-card>
+                <a-card title="审核意见" style="width: 100%">
+                    <a-textarea v-model="model.remark" placeholder="请输入内容" />
+                </a-card>
+            </a-space>
+        </a-form-model>
+    </j-form-container>
+</a-spin>
+</template>
+
+<script>
+import {
+    httpAction,
+    getAction
+} from "@/api/manage";
+import {
+    validateDuplicateValue
+} from "@/utils/util";
+
+export default {
+    name: "PosTypeForm",
+    components: {},
+    props: {
+        //表单禁用
+        disabled: {
+            type: Boolean,
+            default: false,
+            required: false,
+        },
+    },
+    data() {
+        return {
+            model: {
+
+            },
+            labelCol: {
+                xs: {
+                    span: 24
+                },
+                sm: {
+                    span: 5
+                },
+            },
+            wrapperCol: {
+                xs: {
+                    span: 24
+                },
+                sm: {
+                    span: 16
+                },
+            },
+            confirmLoading: false,
+            validatorRules: {
+                goodName: [{
+                    required: true,
+                    message: "请输入名称!"
+                }],
+                goodSpe: [{
+                    required: true,
+                    message: "请输入规格!"
+                }],
+                type: [{
+                    required: true,
+                    message: "请选择规格!"
+                }],
+                unit: [{
+                    required: true,
+                    message: "请输入单位!"
+                }],
+                address: [{
+                    required: true,
+                    message: "请输入地址!"
+                }],
+            },
+            url: {
+                // add: "/fw/fwRoomConsumable/add",
+                edit: "/fw/fwRoomClean/edit",
+                queryById: "/kc/kcSupplier/queryById",
+            },
+        };
+    },
+    computed: {
+        formDisabled() {
+            return this.disabled;
+        },
+    },
+    created() {
+        var _info = JSON.parse(localStorage.getItem("storeInfo"));
+        if (_info) {
+            this.model.hotelId = _info.id;
+        }
+        //备份model原始值
+        this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+        add() {
+            this.edit(this.modelDefault);
+        },
+        edit(record) {
+            console.log(record);
+            this.model = Object.assign({}, record);
+            this.visible = true;
+        },
+
+        handlePass() {
+            this.model.verifyState = 1;
+            this.submitForm();
+        },
+        handleNoPass() {
+            this.model.verifyState = 2;
+            this.submitForm();
+        },
+
+        submitForm() {
+            const that = this;
+            // 触发表单验证
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    that.confirmLoading = true;
+                    let httpurl = "";
+                    let method = "";
+                    if (!this.model.id) {
+                        httpurl += this.url.add;
+                        method = "post";
+                    } else {
+                        httpurl += this.url.edit;
+                        method = "put";
+                    }
+                    httpAction(httpurl, this.model, method)
+                        .then((res) => {
+                            if (res.success) {
+                                that.$message.success(res.message);
+                                that.$emit("ok");
+                            } else {
+                                that.$message.warning(res.message);
+                            }
+                        })
+                        .finally(() => {
+                            that.confirmLoading = false;
+                        });
+                }
+            });
+        },
+    },
+};
+</script>
+
+<style scoped>
+.flex {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-right: 20px;
+    margin-top: 10px;
+}
+</style>

src/views/fangwu/modalList/verifyModal/verifyModal.vue

@@ -0,0 +1,77 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    
+    >
+    <!-- cancelText="审核不通过"
+    okText="审核通过" -->
+    <template slot="footer">
+        <a-button key="back" @click="handleNoPass">
+          审核不通过
+        </a-button>
+        <a-button key="submit" type="primary" @click="handlePass">
+          审核通过
+        </a-button>
+      </template>
+    <bus-market-member-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></bus-market-member-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import BusMarketMemberForm from './verifyForm.vue'
+  export default {
+    name: 'BusMarketMemberModal',
+    components: {
+      BusMarketMemberForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      handlePass(){
+        this.$refs.realForm.handlePass();
+      },
+      handleNoPass(){
+        this.$refs.realForm.handleNoPass();
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/fangwu/tabList/configureTable.vue

@@ -8,10 +8,10 @@
             {{ buildingFloorSearchTag.name }}
             <a-icon type="close" @click="onFliterClose" />
         </a-tag>
-        <div style="display:flex;align-items:center;width:100%;">
-            <div class="list-container">
-                <div class="list-item" v-for="(item, index) in list" :key="index" :class="{active: activeIndex === index}" @click="handleClick(index)">
-                    {{ item }}
+        <div style="">
+            <div class="list-container-1">
+                <div class="list-item" v-for="(item, index) in layouts" :key="index" :class="{active: activeIndex === index}" @click="handleClick(item, index)">
+                    {{ item.name }}
                 </div>
             </div>
         </div>
@@ -19,42 +19,41 @@
 
     <!-- table区域-begin -->
     <div class="grid-clear">
-        <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="[1]" :pagination="false" :loading="loading" :rowSelection="{
-          selectedRowKeys: selectedRowKeys,
-          onChange: onSelectChange,
-        }" class="j-table-force-nowrap" @change="handleTableChange">
-            <template slot="houseType">
+        <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="[layouts[activeIndex]]" :pagination="false" :loading="loading" class="j-table-force-nowrap" @change="handleTableChange">
+            <template slot="houseType" v-if="layouts.length>0">
                 <div>
-                    {{list[activeIndex]}}
+                    {{layouts[activeIndex].name}}
                 </div>
             </template>
             <template slot="continueConsume" slot-scope="text, record">
-                <div class="flex" style="margin-bottom:10px;">
-                    <div>一次性牙刷(套)</div> <a-input-number :min="0" :max="1000" :step="1" />
-                </div>
-                <div class="flex">
-                    <div>一次性香皂(个)</div><a-input-number :min="0" :max="1000" :step="1" />
+                <div class="flex" style="margin-bottom:10px;" v-for="(item, index) in xfData.filter(item => item.type == 1)" :key="index">
+                    <div>{{item.goodName}}</div>
+                    <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
                 </div>
+                <!-- <div class="flex">
+                    <div>一次性香皂(个)</div>
+                    <a-input-number :min="0" :max="1000" :step="1" />
+                </div> -->
             </template>
             <template slot="Linen" slot-scope="text, record">
-                <div class="flex">
-                    <div>床单(张)</div><a-input-number :min="0" :max="1000" :step="1" />
+                <div class="flex" style="margin-bottom:10px;" v-for="(item, index) in xfData.filter(item => item.type == 2)" :key="index">
+                    <div>{{item.goodName}}</div>
+                    <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
                 </div>
             </template>
             <template slot="outConsume">
-                <div class="flex" style="margin-bottom:10px;">
-                    <div>一次性牙刷(套)</div> <a-input-number :min="0" :max="1000" :step="1" />
-                </div>
-                <div class="flex">
-                    <div>一次性香皂(个)</div><a-input-number :min="0" :max="1000" :step="1" />
+                <div class="flex" style="margin-bottom:10px;" v-for="(item, index) in tfData.filter(item => item.type == 1)" :key="index">
+                    <div>{{item.goodName}}</div>
+                    <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
                 </div>
             </template>
             <template slot="outLinen">
-                <div class="flex">
-                    <div>床单(张)</div><a-input-number :min="0" :max="1000" :step="1" />
+                <div class="flex" style="margin-bottom:10px;" v-for="(item, index) in tfData.filter(item => item.type == 2)" :key="index">
+                    <div>{{item.goodName}}</div>
+                    <a-input-number v-model="item.num" :min="0" :max="1000" :step="1" />
                 </div>
             </template>
-            <span slot="action" slot-scope="text, record">
+            <!-- <span slot="action" slot-scope="text, record">
                 <a @click="handleEdit(record)">编辑</a>
 
                 <a-divider type="vertical" />
@@ -63,7 +62,7 @@
                 </a-popconfirm>
                 <a-divider type="vertical" />
                 <a @click="handleImage(record)">图片</a>
-            </span>
+            </span> -->
         </a-table>
     </div>
     <!-- <room-num-modal ref="modalForm" @ok="modalFormOk"></room-num-modal> -->
@@ -84,6 +83,17 @@ import {
     delBatch,
     delAll
 } from '@/api/roomBuildingApi'
+
+import {
+    deleteAction,
+    getAction,
+    downFile,
+    getFileAccessHttpUrl
+} from '@/api/manage'
+import {
+    postAction
+} from '../../../api/manage';
+
 let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
 export default {
     mixins: [JeecgListMixin],
@@ -93,11 +103,13 @@ export default {
     },
     data() {
         return {
-            list: ['零压双床房', '零压大床房', '休闲家庭房', '特价房', '豪华大床套房','豪华麻将房','单间'],
+            list: [],
             activeIndex: 0,
             delLoading: false,
             layouts: [],
-            queryParam: {},
+            queryParam: {
+                roomLayoutId: '',
+            },
             // 分页参数
             ipagination: {
                 current: 1,
@@ -114,7 +126,7 @@ export default {
             columns: [{
                     title: "房型",
                     align: "center",
-                    width:150,
+                    width: 150,
                     scopedSlots: {
                         customRender: "houseType"
                     },
@@ -125,51 +137,53 @@ export default {
                     // align: "center",
                     // dataIndex: "floorName",
                     children: [{
-                        title: '客房易耗品',
-                        dataIndex: 'continueConsume',
-                        // key: 'companyAddress',
-                        width: 200,
-                        scopedSlots: {
-                            customRender: "continueConsume"
-                        },
-                    },
-                    {
-                        title: '布草',
-                        dataIndex: 'Linen',
-                        // key: 'companyAddress',
-                        width: 200,
-                        scopedSlots: {
-                            customRender: "Linen"
+                            title: '客房易耗品',
+                            // dataIndex: 'continueConsume',
+                            // key: 'companyAddress',
+                            width: 200,
+                            scopedSlots: {
+                                customRender: "continueConsume"
+                            },
                         },
-                    }],
+                        {
+                            title: '布草',
+                            // dataIndex: 'Linen',
+                            // key: 'companyAddress',
+                            width: 200,
+                            scopedSlots: {
+                                customRender: "Linen"
+                            },
+                        }
+                    ],
                 },
                 {
                     title: "退房",
                     // align: "center",
                     // dataIndex: "buildName",
                     children: [{
-                        title: '客房易耗品',
-                        dataIndex: 'outConsume',
-                        // key: 'companyAddress',
-                        width: 200,
-                        scopedSlots: {
-                            customRender: "outConsume"
+                            title: '客房易耗品',
+                            // dataIndex: 'outConsume',
+                            // key: 'companyAddress',
+                            width: 200,
+                            scopedSlots: {
+                                customRender: "outConsume"
+                            },
                         },
-                    },
-                    {
-                        title: '布草',
-                        // dataIndex: 'buildName',
-                        // key: 'companyAddress',
-                        width: 200,
-                        scopedSlots: {
-                            customRender: "outLinen"
-                        },
-                    }],
+                        {
+                            title: '布草',
+                            // dataIndex: 'buildName',
+                            // key: 'companyAddress',
+                            width: 200,
+                            scopedSlots: {
+                                customRender: "outLinen"
+                            },
+                        }
+                    ],
                 }
             ],
             url: {
                 // list: 'org.jeecg.modules.business/busMarketMember/list',
-                list: "/rooms/cesRooms/list",
+                list: "/fw/fwRoomLayoutInConsumable/layoutInConsumableList",
                 delete: "/rooms/cesRooms/remove",
                 deleteBatch: "/rooms/cesRooms/deleteBatch",
                 exportXlsUrl: "/rooms/cesRooms/exportXls",
@@ -185,6 +199,8 @@ export default {
                 column: "createTime",
                 order: "desc",
             },
+            xfData: [],
+            tfData: [],
         };
     },
     created() {
@@ -192,7 +208,12 @@ export default {
         getAllLayouts().then((res) => {
             if (res.code == 200) {
                 this.layouts = res.result.records;
-                this.loadData();
+                this.layouts.forEach(ele => {
+                    ele.children = []
+                })
+                this.queryParam.roomLayoutId = this.layouts[0].id;
+                this.loadData(0, 1);
+                this.loadData(0, 2);
             }
         });
     },
@@ -277,9 +298,14 @@ export default {
         onSaveOk() {
             this.loadData();
         },
-        handleClick(index) {
+        handleClick(item, index) {
             this.activeIndex = index
-            this.searchQuery()
+            this.queryParam.roomLayoutId = item.id
+            this.loadData(0, 1);
+            setTimeout(() => {
+                this.loadData(0, 2);
+            }, 1000);
+            // this.searchQuery()
         },
         onChange(checkedValues) {
             console.log('checked = ', checkedValues)
@@ -288,6 +314,86 @@ export default {
         onChangeTime(date, dateString) {
             console.log(date, dateString)
         },
+        loadData(arg, type) {
+            if (this.url.list == 2) {
+                return
+            }
+            if (this.layouts.length == 0) {
+                return
+            }
+            if (!this.url.list) {
+                this.$message.error("请设置url.list属性!")
+                return
+            }
+            //加载数据 若传入参数1则加载第一页的内容
+            if (arg === 1) {
+                this.ipagination.current = 1;
+            }
+            var params = this.getQueryParams(); //查询条件
+            if (type) {
+                params.type = type
+            }
+            this.loading = true;
+            getAction(this.url.list, params).then((res) => {
+                if (res.success) {
+                    //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+                    this.dataSource = res.result.records || res.result;
+                    if (type == 1) {
+                        this.xfData = res.result.records || res.result;
+                    } else if (type == 2) {
+                        this.tfData = res.result.records || res.result;
+                    }
+                    if (res.result.total) {
+                        this.ipagination.total = res.result.total;
+                    } else {
+                        this.ipagination.total = 0;
+                    }
+                    //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+                } else {
+                    this.$message.warning(res.message)
+                }
+            }).finally(() => {
+                this.loading = false
+            })
+        },
+        submitForm() {
+            if (this.xfData.length == 0 && this.tfData.length == 0) {
+                this.$message.error("未获取到数据!")
+                return
+            }
+            if (this.xfData.length > 0) {
+
+                this.xfData.forEach(ele => {
+                    ele.roomLayoutId = this.layouts[this.activeIndex].id
+                })
+
+                postAction('/fw/fwRoomLayoutInConsumable/layoutInConsumableSave', this.xfData).then((res) => {
+                    if (res.success) {
+                        // this.$message.success("保存成功!")
+                        this.$emit('ok')
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                }).finally(() => {
+
+                })
+            }
+            if (this.tfData.length > 0) {
+                this.tfData.forEach(ele => {
+                    ele.roomLayoutId = this.layouts[this.activeIndex].id
+                })
+                postAction('/fw/fwRoomLayoutInConsumable/layoutInConsumableSave', this.tfData).then((res) => {
+                    if (res.success) {
+                        this.$message.success("保存成功!")
+                        this.$emit('ok')
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                }).finally(() => {
+
+                })
+            }
+        },
     },
 };
 </script>
@@ -295,16 +401,13 @@ export default {
 <style scoped>
 @import "~@assets/less/common.less";
 
-.list-container {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
-    border: solid 1px #d9d9d9;
-    width: 70%;
-    border-radius: 5px;
-    /* margin-bottom: 20px; */
-    margin-right: 10px;
+.list-container-1 {
+    display: flex;
+    /* margin-right: 10px; */
+    width: 100%;
 }
-.flex{
+
+.flex {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -312,9 +415,13 @@ export default {
 
 .list-item {
     padding: 10px;
-    border-right: solid 1px #d9d9d9;
+    border: solid 1px #d9d9d9;
     cursor: pointer;
     text-align: center;
+    border-radius: 5px;
+    margin-right: 20px;
+    /* width:60px */
+    width: 100px;
 }
 
 .list-item.active {

src/views/fangwu/tabList/houseTypeConsumables.vue

@@ -4,30 +4,14 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-        <a-tag color="pink" v-if="buildingFloorSearchTag.name">
-            {{ buildingFloorSearchTag.name }}
-            <a-icon type="close" @click="onFliterClose" />
-        </a-tag>
-        <!-- <a-button @click="onAddBatch" type="primary" icon="tags">批量新增</a-button> -->
-        <!-- <a-popconfirm title="确定全部删除吗?" @confirm="delAll">
-            <a-button :disabled="delLoading" :loading="delLoading" type="primary" icon="stop">全部删除</a-button>
-        </a-popconfirm> -->
-        <j-input placeholder="商品名称" v-model="queryParam.name" style="width: 200px;margin-right:8px;"></j-input>
+        <j-input allowClear placeholder="商品名称" v-model="queryParam.goodName" style="width: 200px;margin-right:8px;"></j-input>
         <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
         <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
         <!--  style="margin-right:8px;" @change="onChangeTime" /> -->
-        <a-popconfirm v-if="selectedRowKeys.length > 0" title="确定删除吗?" @confirm="delBatch">
-            <a-button :disabled="delLoading" :loading="delLoading" icon="stop" style="">
+        <!-- <a-popconfirm title="确定删除吗?" @confirm="delBatch"> -->
+            <a-button type="danger" @click="batchDel" :disabled="delLoading" :loading="delLoading" icon="stop" style="">
                 批量删除</a-button>
-        </a-popconfirm>
-        <!-- <div style="display:flex;align-items:center;width:100%;">
-            <div class="list-container">
-                <div class="list-item" v-for="(item, index) in list" :key="index" :class="{active: activeIndex === index}" @click="handleClick(index)">
-                    {{ item }}
-                </div>
-            </div>
-            <a-range-picker v-show="activeIndex==4" @change="onChangeTime" size="large" />
-        </div> -->
+        <!-- </a-popconfirm> -->
     </div>
 
     <!-- table区域-begin -->
@@ -36,34 +20,18 @@
           selectedRowKeys: selectedRowKeys,
           onChange: onSelectChange,
         }" class="j-table-force-nowrap" @change="handleTableChange">
-
-            <template slot="layoutId" slot-scope="text, record">
-                {{ getLayoutName(record) }}
-            </template>
-            <template slot="prefix_name" slot-scope="text, record">
-                {{ (record.prefix || "") + record.name }}
-            </template>
-            <template slot="pictureSlot" slot-scope="text, record">
-                <img :src="record.cover" style="width:40px;height40px;" />
-            </template>
-            <template slot="htmlSlot" slot-scope="text">
-                <div v-html="text"></div>
-            </template>
-
             <span slot="action" slot-scope="text, record">
                 <a @click="handleEdit(record)">编辑</a>
-
                 <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                     <a>删除</a>
                 </a-popconfirm>
-                <a-divider type="vertical" />
-                <a @click="handleImage(record)">图片</a>
             </span>
         </a-table>
     </div>
-    <!-- <room-num-modal ref="modalForm" @ok="modalFormOk"></room-num-modal> -->
-    <!-- <room-imgs @saveOk="onImgSave" ref="roomimgmodal"></room-imgs> -->
+
+    <CounsumableModal ref="modalForm" @ok="modalFormOk" />
+
 </a-card>
 </template>
 
@@ -71,8 +39,7 @@
 import {
     JeecgListMixin
 } from "@/mixins/JeecgListMixin";
-// import roomNumModal from "./roomNumModal.vue"; // todo roomLayoutForm 需要替换成房型的表单弹窗
-// import roomImgs from './roomImagesForm.vue'
+import CounsumableModal from '../modalList/ConsumableModal/ConsumableModal.vue'
 import {
     getAllLayouts
 } from "@/api/roomLayout";
@@ -84,8 +51,7 @@ let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
 export default {
     mixins: [JeecgListMixin],
     components: {
-        // roomNumModal,
-        // roomImgs
+        CounsumableModal
     },
     data() {
         return {
@@ -110,25 +76,37 @@ export default {
             columns: [{
                     title: "商品名称",
                     align: "center",
-                    dataIndex: "hotelName",
+                    dataIndex: "goodName",
                 },
                 {
                     title: "类型",
-                    // align: "center",
-                    dataIndex: "buildName",
+                    align: "center",
+                    dataIndex: "type",
+                    customRender: function (text) {
+                        var msg = "--";
+                        switch (text) {
+                            case 1:
+                                msg = '客房易耗品'
+                                break;
+                            case 2:
+                                msg = '布草'
+                                break;
+                            default:
+                                '--'
+                                break;
+                        }
+                        return msg;
+                    },
                 },
                 {
                     title: "商品规格",
-                    // align: "center",
-                    dataIndex: "floorName",
+                    align: "center",
+                    dataIndex: "goodSpe",
                 },
                 {
                     title: "单位",
                     align: "center",
-                    dataIndex: "layoutId",
-                    scopedSlots: {
-                        customRender: "layoutId"
-                    },
+                    dataIndex: "unit"
                 },
                 {
                     title: "操作",
@@ -140,10 +118,9 @@ export default {
                 }
             ],
             url: {
-                // list: 'org.jeecg.modules.business/busMarketMember/list',
-                list: "/rooms/cesRooms/list",
-                delete: "/rooms/cesRooms/remove",
-                deleteBatch: "/rooms/cesRooms/deleteBatch",
+                list: "/fw/fwRoomConsumable/list",
+                delete: "/fw/fwRoomConsumable/delete",
+                deleteBatch: "/fw/fwRoomConsumable/deleteBatch",
                 exportXlsUrl: "/rooms/cesRooms/exportXls",
                 importExcelUrl: "rooms/cesRooms/importExcel",
             },

src/views/fangwu/tabList/housekeepingAudit.vue

@@ -4,41 +4,15 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-        <a-tag color="pink" v-if="buildingFloorSearchTag.name">
-            {{ buildingFloorSearchTag.name }}
-            <a-icon type="close" @click="onFliterClose" />
-        </a-tag>
-        <!-- <a-button @click="onAddBatch" type="primary" icon="tags">批量新增</a-button> -->
-        <!-- <a-popconfirm title="确定全部删除吗?" @confirm="delAll">
-            <a-button :disabled="delLoading" :loading="delLoading" type="primary" icon="stop">全部删除</a-button>
-        </a-popconfirm> -->
-        <!-- <j-input placeholder="商品名称" v-model="queryParam.name" style="width: 200px;margin-right:8px;"></j-input> -->
-        <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-        <a-button type="primary" @click="searchQuery">全部</a-button>
-        <a-button type="primary" @click="searchQuery">待审核</a-button>
-        <a-button type="primary" @click="searchQuery">已审核</a-button>
-        <a-button type="primary" @click="searchQuery">审核不通过</a-button>
-        <!-- <a-range-picker style="margin-right:8px;" @change="onChangeTime" /> -->
-        <a-popconfirm v-if="selectedRowKeys.length > 0" title="确定删除吗?" @confirm="delBatch">
-            <a-button :disabled="delLoading" :loading="delLoading" icon="stop" style="">
-                批量删除</a-button>
-        </a-popconfirm>
-        <!-- <div style="display:flex;align-items:center;width:100%;">
-            <div class="list-container">
-                <div class="list-item" v-for="(item, index) in list" :key="index" :class="{active: activeIndex === index}" @click="handleClick(index)">
-                    {{ item }}
-                </div>
-            </div>
-            <a-range-picker v-show="activeIndex==4" @change="onChangeTime" size="large" />
-        </div> -->
+        <a-button type="primary" @click="searchButton('')">全部</a-button>
+        <a-button type="primary" @click="searchButton(0)">待审核</a-button>
+        <a-button type="primary" @click="searchButton(1)">已审核</a-button>
+        <a-button type="primary" @click="searchButton(2)">审核不通过</a-button>
     </div>
 
     <!-- table区域-begin -->
     <div class="grid-clear">
-        <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{
-          selectedRowKeys: selectedRowKeys,
-          onChange: onSelectChange,
-        }" class="j-table-force-nowrap" @change="handleTableChange">
+        <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" @change="handleTableChange">
 
             <template slot="layoutId" slot-scope="text, record">
                 {{ getLayoutName(record) }}
@@ -54,19 +28,22 @@
             </template>
 
             <span slot="action" slot-scope="text, record">
-                <a @click="handleEdit(record)">编辑</a>
+                <template v-if="record.verifyState == 0">
+                    <a @click="handleExamine(record)">审核</a>
 
-                <a-divider type="vertical" />
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                    <a>删除</a>
-                </a-popconfirm>
-                <a-divider type="vertical" />
-                <a @click="handleImage(record)">图片</a>
+                    <a-divider type="vertical" />
+                    <a @click="handleEdit(record)">修改</a>
+                </template>
+
+                <!-- <a-divider type="vertical" />
+                <a @click="handleImage(record)">图片</a> -->
             </span>
         </a-table>
     </div>
     <!-- <room-num-modal ref="modalForm" @ok="modalFormOk"></room-num-modal> -->
     <!-- <room-imgs @saveOk="onImgSave" ref="roomimgmodal"></room-imgs> -->
+    <verify-modal ref="verifyModalForm" @ok="modalFormOk"></verify-modal>
+    <editVerifyModalVue ref="modalForm" @ok="modalFormOk" />
 </a-card>
 </template>
 
@@ -76,6 +53,9 @@ import {
 } from "@/mixins/JeecgListMixin";
 // import roomNumModal from "./roomNumModal.vue"; // todo roomLayoutForm 需要替换成房型的表单弹窗
 // import roomImgs from './roomImagesForm.vue'
+import verifyModal from '../modalList/verifyModal/verifyModal.vue';
+import editVerifyModalVue from '../modalList/editVerifyModal/editVerifyModal.vue';
+
 import {
     getAllLayouts
 } from "@/api/roomLayout";
@@ -83,12 +63,15 @@ import {
     delBatch,
     delAll
 } from '@/api/roomBuildingApi'
+
 let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
 export default {
     mixins: [JeecgListMixin],
     components: {
         // roomNumModal,
-        // roomImgs
+        // roomImgs,
+        verifyModal,
+        editVerifyModalVue
     },
     data() {
         return {
@@ -113,42 +96,57 @@ export default {
             columns: [{
                     title: "房扫姓名",
                     align: "center",
-                    dataIndex: "hotelName",
+                    dataIndex: "waiterName",
                 },
                 {
                     title: "房型",
-                    // align: "center",
-                    dataIndex: "buildName",
+                    align: "center",
+                    dataIndex: "layoutName",
                 },
                 {
                     title: "时间",
-                    // align: "center",
-                    dataIndex: "floorName",
+                    align: "center",
+                    dataIndex: "createTime",
                 },
                 {
                     title: "房号",
                     align: "center",
-                    dataIndex: "layoutId",
-                    scopedSlots: {
-                        customRender: "layoutId"
-                    },
-                },
-                {
-                    title: "脏房类型",
-                    // align: "center",
-                    dataIndex: "floorName",
+                    dataIndex: "roomNo",
+                    // scopedSlots: {
+                    //     customRender: "layoutId"
+                    // },
                 },
+                // {
+                //     title: "脏房类型",
+                //     // align: "center",
+                //     dataIndex: "floorName",
+                // },
                 {
                     title: "备注",
-                    // align: "center",
-                    dataIndex: "floorName",
+                    align: "center",
+                    dataIndex: "remark",
                 },
                 {
                     title: "审核状态",
                     align: "center",
-                    dataIndex: "layoutId",
-                    scopedSlots: {
-                        customRender: "layoutId"
+                    dataIndex: "verifyState",
+                    customRender: function (text) {
+                        var msg = "--";
+                        switch (text) {
+                            case 0:
+                                msg = '待审核'
+                                break;
+                            case 1:
+                                msg = '已审核'
+                                break;
+                            case 2:
+                                msg = '审核不通过'
+                                break;
+                            default:
+                                '--'
+                                break;
+                        }
+                        return msg;
                     },
                 },
                 {
@@ -162,7 +160,7 @@ export default {
             ],
             url: {
                 // list: 'org.jeecg.modules.business/busMarketMember/list',
-                list: "/rooms/cesRooms/list",
+                list: "/fw/fwRoomClean/list",
                 delete: "/rooms/cesRooms/remove",
                 deleteBatch: "/rooms/cesRooms/deleteBatch",
                 exportXlsUrl: "/rooms/cesRooms/exportXls",
@@ -200,6 +198,20 @@ export default {
             this.buildingFloorSearchTag.name = null
             this.loadData()
         },
+        // handleEdit() {},
+
+        searchButton(type) {
+            this.queryParam.verifyState = type
+            this.searchQuery()
+        },
+        modalVerifyFormOk() {},
+
+        handleExamine(record) {
+            this.$refs.verifyModalForm.edit(record);
+            this.$refs.verifyModalForm.title = "审核";
+            this.$refs.verifyModalForm.disableSubmit = false;
+        },
+
         // 搜索
         searchParam(id, name, isBuilding) {
             this.$set(this.buildingFloorSearchTag, 'name', name)

src/views/room/fangwuLookRoom.vue

@@ -59,7 +59,7 @@
         </a-tab-pane>
     </a-tabs>
 
-    <a-modal :title="title" :visible="visibleLook" @cancel="visibleLook = false" @ok="submitOK">
+    <a-modal :title="title" :visible="visibleLook" @cancel="changeCancel" @ok="submitOK">
         <!-- <j-form-container :disabled="false"> -->
         <a-form-model-item label="服务员" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="status==2">
             <a-select placeholder="服务员" v-model="waiterId" style="width:40%">
@@ -275,6 +275,12 @@ export default {
             // this.editLookRoom(this.selectionRows.livingOrderId, 4)
         },
 
+        changeCancel(){
+            this.remarks = ''
+            this.waiterId = ''
+            this.visibleLook = false
+        },
+
         editLookRoom(data, state, remark = '') {
 
             // let obj = {
@@ -285,8 +291,10 @@ export default {
             //     waiterId: this.waiterId,
             //     cfTime: this.waiterId?new Date().toLocaleString().replaceAll('/','-'):''
             // }
-            data.state = state
-            data.remark = remark
+            data.state = state*1
+            if (remark && this.status !=3) {
+                data.remark = remark
+            }
             if (this.status == 2) {
                 data.waiterId = this.waiterId
                 data.cfTime = new Date().toLocaleString().replaceAll('/', '-')
@@ -295,7 +303,10 @@ export default {
                 // data.remark = ''
                 data.feedback = this.remarks
             }
-            httpAction("/fw/fwRoomExamine/edit", data, 'post').then(res => {
+            console.log(typeof data.state);
+            console.log(data);
+            // return
+            httpAction("/fw/fwRoomExamine/checkRoom", data, 'post').then(res => {
                     this.confirmLoading = false;
                     if (res.success) {
                         this.$message.success("成功");
@@ -346,9 +357,13 @@ export default {
          * 表单提交
          */
         submitOK() {
+            if (this.status == 2 && !this.waiterId) {
+                this.$message.warning('请选择查房人')
+                return                
+            }
             this.confirmLoading = true;
             this.selectionRows.forEach(item => {
-                this.editLookRoom(item, this.status)
+                this.editLookRoom(item, this.status, this.remarks)
             })
         },
         handleBillInfo(data){

src/views/room/modules/fangtaiModal/lookRoomModal/lookRoomTable.vue

@@ -221,7 +221,7 @@ export default {
         submitOK(){
             this.confirmLoading = true;
             console.log(this.model);
-            httpAction("/fw/fwRoomExamine/edit", {
+            httpAction("/fw/fwRoomExamine/checkRoom", {
                 id: this.selectData.id,
                 livingOrderId: this.selectData.livingOrderId,
                 remark: this.model.remarks,
@@ -244,7 +244,7 @@ export default {
         },
         cancelRoom(record){
             this.confirmLoading = true;
-            httpAction("/fw/fwRoomExamine/edit", {
+            httpAction("/fw/fwRoomExamine/checkRoom", {
                 id: record.id,
                 livingOrderId: record.livingOrderId,
                 // remark: record.remarks,