修改pos套餐，添加会员商品折扣

src/views/pos/diandan.vue

@@ -28,7 +28,7 @@
           <template slot="num" slot-scope="text, record, index">
             <div style="text-align: center">
               <a-input-number
-                v-if="record.id == null"
+                v-if="record.detailId == null"
                 v-model="record.num"
                 style="width: auto; "
                 :max="record.inventory"
@@ -133,7 +133,7 @@
               </div>
               <div>{{ item.name }}</div>
               <div style="margin-top: 10px; color: red">
-                ￥{{ item.price.toFixed(2) }}
+                ￥{{ item.sellingPrice.toFixed(2) }}
               </div>
             </div>
           </a-col>
@@ -173,7 +173,7 @@
                 <div :style="item.state == '1' ? 'backgroundColor: #00a0e9;border: 2px solid #000;color: #fff;' : 'backgroundColor: #0a7a72;border: 2px solid #000;color: #fff;'" :class="{'active': model.reserveTableList.some(t => t.id == item.id) }">
                 <div>{{ item.name }}</div>
                 <div style="margin-top: 10px">
-                  <div v-if="item.state == '2'">￥{{ item.posOrderGoods ? item.posOrderGoods.money : 0 }}</div> 
+                  <div v-if="item.state == '2'">￥{{ item.posOrderGoods ? item.posOrderGoods.money : 0 }}</div>
                   <div v-else>待下单</div>
                 </div>
                 <div
@@ -364,7 +364,7 @@ export default {
       model: {
         reserveTableList: []
       }
-      
+
     }
   },
   provide() {
@@ -515,19 +515,17 @@ export default {
     },
     /** 不支付，关闭弹窗，要刷新选中的商品表  */
     modalFormClose() {
-      getAction('/pos/posOrderGoodsDetail/list', {
-        pageNo: 1,
-        pageSize: 99,
+      getAction('/pos/posOrderGoodsDetail/getDetailByOrderId', {
         orderId: this.selectOrderInfo.code
       }).then((res) => {
         if (res.success) {
-          this.selectGoodsList = res.result.records;
-          res.result.records.forEach((t) => {
+          this.selectGoodsList = res.result;
+          res.result.forEach((t) => {
             t.sellingPrice = t.payMoney
             t.name = t.goodsName
             t.id = t.goodsId
           })
-          this.selectGoodsList = res.result.records
+          this.selectGoodsList = res.result
         }
       });
     },
@@ -553,6 +551,7 @@ export default {
         e.orderDetailList.forEach((t) => {
           t.sellingPrice = t.payMoney
           t.name = t.goodsName
+          t.detailId = t.id
           t.id = t.goodsId
         })
         this.selectGoodsList = e.orderDetailList
@@ -712,12 +711,14 @@ export default {
     pendingOrder() {
       this.selectOrderInfo.isPending = true
       this.handleAdd()
+      this.clean()
     },
     handleAdd(callback) {
       if (!this.selectGoodsList || this.selectGoodsList.length <= 0) {
         this.$message.warning('请先选择商品')
         return
       }
+      console.log(this.selectGoodsList)
       let param = this.getParam()
       postAction('/pos/posOrderGoods/add', param)
         .then((res) => {
@@ -757,15 +758,33 @@ export default {
       var posOrderGoodsDetailList = []
       this.selectGoodsList.forEach((t) => {
         // 过滤掉订单中已经保存的商品
-        if (t.id != null) {
+        if (t.detailId != null) {
           return
         }
-        posOrderGoodsDetailList.push({
-          id: t.id,
-          goodsId: t.goodsId,
-          num: t.num,
-          money: t.sellingPrice
-        })
+        if (t.cesGoodsList == null) {
+          posOrderGoodsDetailList.push({
+            goodsId: t.goodsId,
+            num: t.num,
+            money: t.sellingPrice
+          })
+        } else {
+          let childDetails = []
+          t.cesGoodsList.forEach(goods => {
+            childDetails.push({
+              goodsId: goods.id,
+              thaliId: t.goodsId,
+              num: t.num * goods.thaliNum,
+              money: 0
+            })
+          })
+          posOrderGoodsDetailList.push({
+            childDetails,
+            id: t.id,
+            thaliId: t.goodsId,
+            num: t.num,
+            money: t.sellingPrice
+          })
+        }
       })
       model.posOrderGoodsDetailList = posOrderGoodsDetailList
       return model
@@ -790,6 +809,7 @@ export default {
       }
       var good = JSON.parse(JSON.stringify(row))
       this.$set(good, 'num', 1)
+      // 如果选的是套餐，这个地方是套餐id
       this.$set(good, 'goodsId', good.id)
       delete good.id
       var find = this.selectGoodsList.find((t) => t.inventory != null && t.goodsId === row.id)

src/views/pos/goodsOrder.vue

@@ -448,13 +448,11 @@ export default {
           click: (e) => {
             console.log(row);
             this.selectOrderInfo = row;
-            getAction("/pos/posOrderGoodsDetail/list", {
-              pageNo: 1,
-              pageSize: 99,
+            getAction("/pos/posOrderGoodsDetail/getDetailByOrderId", {
               orderId: row.code,
             }).then((res) => {
               if (res.success) {
-                this.orderGoodsDetailList = res.result.records;
+                this.orderGoodsDetailList = res.result;
               }
             });
           },
@@ -519,4 +517,4 @@ export default {
   opacity: 0.7;
   color: #ffffff;
 }
-</style>
+</style>

src/views/pos/modules/PickingGoodsOrder.vue

@@ -314,13 +314,11 @@ export default {
         on: {
           click: (e) => {
             this.selectOrderInfo = row;
-            getAction("/pos/posOrderGoodsDetail/list", {
-              pageNo: 1,
-              pageSize: 99,
+            getAction("/pos/posOrderGoodsDetail/getDetailByOrderId", {
               orderId: row.code,
             }).then((res) => {
               if (res.success) {
-                this.orderGoodsDetailList = res.result.records;
+                this.orderGoodsDetailList = res.result;
               }
             });
           },
@@ -385,4 +383,4 @@ export default {
   opacity: 0.7;
   color: #ffffff;
 }
-</style>
+</style>

src/views/pos/tablediandan.vue

@@ -125,7 +125,7 @@
     ></select-check-in-room-order-modal>
   </a-card>
 </template>
-  
+
   <script>
 // import { JeecgListMixin } from "@/mixins/JeecgListMixin";
 // import PosRegionModal from "./modules/PosRegionModal";
@@ -252,18 +252,16 @@ export default {
             this.tableOrderInfo.state == 3
           ) {
             this.selectOrderInfo = this.tableOrderInfo.posOrderGoods;
-            getAction("/pos/posOrderGoodsDetail/list", {
-              pageNo: 1,
-              pageSize: 99,
+            getAction("/pos/posOrderGoodsDetail/getDetailByOrderId", {
               orderId: this.tableOrderInfo.posOrderGoods.code,
             }).then((res2) => {
               if (res2.success) {
-                res2.result.records.forEach((t) => {
+                res2.result.forEach((t) => {
                   t.sellingPrice = t.payMoney;
                   t.name = t.goodsName;
                   t.id = t.goodsId;
                 });
-                this.selectGoodsList = res2.result.records;
+                this.selectGoodsList = res2.result;
               }
             });
           }
@@ -514,4 +512,4 @@ export default {
   -ms-user-select: none;
   user-select: none;
 }
-</style>
+</style>

src/views/report/index.vue

@@ -41,7 +41,7 @@ export default {
           path: '/report/room/sellDetail'
         },
         {
-          name: '商品销售明细报表',
+          name: '商品销售汇总报表',
           path: '/report/room/sellCollect'
         },
       ]

src/views/report/room/sellDetail.vue

@@ -98,7 +98,14 @@ const columns = [
     title: '类型',
     align: 'center',
     dataIndex: '',
-    width: 80
+    width: 80,
+    customRender: function (text, record) {
+      if (record.feeGoodId != null) {
+        return '现结'
+      } else if (record.feeId != null) {
+        return '挂房账'
+      }
+    }
   },
   {
     title: '购买位置',

src/views/report/room/sellDetailModel.vue

@@ -78,19 +78,20 @@ const columns = [
     title: '类型',
     align: 'center',
     dataIndex: '',
-    width: 80
-  },
-  {
-    title: '购买位置',
-    align: 'center',
     width: 80,
     customRender: function (text, record) {
       if (record.feeGoodId != null) {
-        return 'pos'
+        return '现结'
       } else if (record.feeId != null) {
-        return '客房'
+        return '挂房账'
       }
-    },
+    }
+  },
+  {
+    title: '购买位置',
+    dataIndex: 'placeName',
+    align: 'center',
+    width: 80
   }
 ]
 

src/views/report/stock/storageInDetail.vue

@@ -23,13 +23,14 @@ export default {
         {
           title: '入库类型',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'stockType',
           width: 80,
           customRender(text, record) {
             console.log(text)
             if (text == null && record.feeId != null) {
-              return '销售出库'
+              return '销售退货'
             }
+            return text
           }
         },
         {

src/views/room/fangtailive.vue

@@ -2365,8 +2365,11 @@ export default {
         })
       } else if (e.key == 99) {
         console.log('商品销售')
-        this.$refs.modalFeeForm.add()
-        this.$refs.modalFeeForm.livingOrderId = row.livingData.livingOrder.id
+        let obj = {
+          livingOrderId: row.livingData.livingOrder.id
+        }
+        this.$refs.modalFeeForm.add(obj)
+        // this.$refs.modalFeeForm.livingOrderId = row.livingData.livingOrder.id
         this.$refs.modalFeeForm.title = '增加消费项目'
         this.$refs.modalFeeForm.disableSubmit = false
       } else if (e.key == 98) {

src/views/room/modules/checkIn/BillRoomInfo.vue

@@ -834,7 +834,7 @@ const columns = [
     scopedSlots: { customRender: 'originalMoney' },
     width: 67
   },
-  
+
 ]
 
 const columns2 = [
@@ -1491,8 +1491,15 @@ export default {
         (t) => t.roomId == this.selectRoomId
       )
       var livingRoom = this.model.livingRoomIds[index]
-      this.$refs.modalFeeForm.add()
-      this.$refs.modalFeeForm.livingOrderId = livingRoom.livingOrder.id
+      console.log(livingRoom)
+      console.log(this.model.orderInfo)
+      console.log(livingRoom.livingOrder.vipCustomerId)
+      let obj = {
+        livingOrderId: livingRoom.livingOrder.id,
+        vipCustomerId: livingRoom.livingOrder.vipCustomerId
+      }
+      this.$refs.modalFeeForm.add(obj)
+      // this.$refs.modalFeeForm.livingOrderId = livingRoom.livingOrder.id
       this.$refs.modalFeeForm.title = '增加消费项目'
       this.$refs.modalFeeForm.disableSubmit = false
     },
@@ -1529,7 +1536,6 @@ export default {
       var index = this.model.livingRoomIds.findLastIndex(
         (t) => t.roomId == this.selectRoomId
       )
-      debugger
       var livingRoom = this.model.livingRoomIds[index]
       this.$refs.modalPaymentForm.edit({
         billAmount: parseFloat(amount.toFixed(2)),
@@ -1739,7 +1745,7 @@ export default {
           console.log(this.model);
           this.getWakeServiceData()
           this.getMessageData()
-          
+
           // 查询账单
         getAction('/business/busRoomBookingOrders/living-fees', {
             bookingOrderId: this.model.orderInfo.id,

src/views/room/modules/checkIn/FeeForm.vue

@@ -1,126 +1,142 @@
 <template>
-<a-spin :spinning="confirmLoading">
+  <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
-        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-            <a-row style="display:flex;justify-content:center;">
-                <a-col :span="12">
-                    <a-form-model-item label="消费项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="subjectType">
-                        <a-select v-model="model.subjectType"  placeholder="消费项目" :allowClear="true">
-                            <a-select-option :value="6">商品</a-select-option>
-                            <a-select-option :value="10">手工房费</a-select-option>
-                            <a-select-option :value="11">水电煤抄表</a-select-option>
-                            <a-select-option :value="12">赔偿费</a-select-option>
-                        </a-select>
-                    </a-form-model-item>
-                      <a-col :span="24">
-<!--                            <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" v-if="model.subjectType==6">-->
-<!--                                <a-input-number :disabled="model.subjectType==6" v-model="goodsPrice" placeholder="请输入金额" :min="0"></a-input-number>-->
-<!--                            </a-form-model-item>-->
-                          <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money" v-if="model.subjectType !== 6">
-                              <a-input-number v-model="model.money" placeholder="请输入金额" :min="0"></a-input-number>
-                          </a-form-model-item>
-                      </a-col>
-                </a-col>
-                <a-col v-if="model.subjectType==6" :span="12">
-                <a-space>
-                  <a-input v-model="queryParams.name" placeholder="名称" />
-                  <a-button @click="searchQuery" type="primary">搜索</a-button>
-                </a-space>
-              </a-col>
-            </a-row>
-            <!-- <a-row>
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row style="display:flex;justify-content:center;">
+          <a-col :span="12">
+            <a-form-model-item label="消费项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="subjectType">
+              <a-select v-model="model.subjectType" placeholder="消费项目" :allowClear="true">
+                <a-select-option :value="6">商品</a-select-option>
+                <a-select-option :value="10">手工房费</a-select-option>
+                <a-select-option :value="11">水电煤抄表</a-select-option>
+                <a-select-option :value="12">赔偿费</a-select-option>
+              </a-select>
+            </a-form-model-item>
+            <a-col :span="24">
+              <!--                            <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="" v-if="model.subjectType==6">-->
+              <!--                                <a-input-number :disabled="model.subjectType==6" v-model="goodsPrice" placeholder="请输入金额" :min="0"></a-input-number>-->
+              <!--                            </a-form-model-item>-->
+              <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money" v-if="model.subjectType !== 6">
+                <a-input-number v-model="model.money" placeholder="请输入金额" :min="0"></a-input-number>
+              </a-form-model-item>
+            </a-col>
+          </a-col>
+          <a-col v-if="model.subjectType==6" :span="12">
+            <a-space>
+              <a-input v-model="queryParams.name" placeholder="名称" />
+              <a-button @click="loadData" type="primary">搜索</a-button>
+            </a-space>
+          </a-col>
+        </a-row>
+        <!-- <a-row>
                 <a-col :span="24">
                     <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
                         <a-input-number v-model="model.money" placeholder="请输入金额" :min="0"></a-input-number>
                     </a-form-model-item>
                 </a-col>
             </a-row> -->
-          <a-row >
-            <a-table v-if="model.subjectType==6" :columns="columns" :loading="loading" :dataSource="dataSource" style="margin-top:10px;">
-              <template slot="sellingPrice" slot-scope="text, record">
-                <a-input-number v-model="record.sellingPrice" :min="0"></a-input-number>
-              </template>
-              <template slot="number" slot-scope="text, record">
-                <a-input-number :max="record.inventory" v-model="record.number" @change="changeNumber" :min="0"></a-input-number>
-              </template>
-              <template slot="inventorySlot" slot-scope="text,record">
-                {{record.inventory - record.number}}
-              </template>
-            </a-table>
-          </a-row>
-        </a-form-model>
+        <a-row >
+          <a-table v-if="model.subjectType==6" :columns="columns" @change="pageChange" :dataSource="dataSource" :pagination="ipagination" :scroll="{ y: 500 }" style="margin-top:10px;">
+            <template slot="sellingPrice" slot-scope="text, record">
+              <a-input-number v-model="record.sellingPrice" :min="0"></a-input-number>
+            </template>
+            <template slot="number" slot-scope="text, record">
+              <a-input-number :max="record.inventory" v-model="record.number" @change="changeNumber" :min="0"></a-input-number>
+            </template>
+            <template slot="inventorySlot" slot-scope="text,record">
+              {{ record.inventory - record.number }}
+            </template>
+          </a-table>
+        </a-row>
+      </a-form-model>
 
     </j-form-container>
-</a-spin>
+  </a-spin>
 </template>
 
 <script>
 import {
     httpAction,
     getAction
-} from "@/api/manage";
+} from '@/api/manage'
 import {
     validateDuplicateValue
-} from "@/utils/util";
+} from '@/utils/util'
 
 import {
     JeecgListMixin
 } from '@/mixins/JeecgListMixin'
 export default {
-    name: "BusMemberCardForm",
+    name: 'BusMemberCardForm',
     components: {},
-    mixins: [JeecgListMixin],
     props: {
-        //表单禁用
+        // 表单禁用
         disabled: {
             type: Boolean,
             default: false,
-            required: false,
+            required: false
         },
         livingOrderId: {
-            type: String,
-        },
+            type: String
+        }
     },
     data() {
         return {
-            dataSource: [],
-            columns: [{
-                    title: "名称",
-                    align: "center",
-                    dataIndex: "name",
+          dataSource: [],
+          columns: [
+                {
+                    title: '名称',
+                    align: 'center',
+                    dataIndex: 'name'
                 },
                 {
-                    title: "售价",
-                    align: "center",
-                    dataIndex: "sellingPrice",
+                    title: '售价',
+                    align: 'center',
+                    dataIndex: 'sellingPrice',
                     scopedSlots: {
                         customRender: 'sellingPrice'
-                    },
+                    }
                 },
                 {
-                    title: "数量",
-                    align: "center",
-                    dataIndex: "number",
+                    title: '数量',
+                    align: 'center',
+                    dataIndex: 'number',
+                    width: '80',
                     scopedSlots: {
                         customRender: 'number'
-                    },
+                    }
                 },
                 {
-                    title: "剩余库存",
-                    align: "center",
-                    dataIndex: "inventory",
+                    title: '剩余库存',
+                    align: 'center',
+                    dataIndex: 'inventory',
+                    width: '80',
                     scopedSlots: {
                         customRender: 'inventorySlot'
                     }
-                },
+                }
             ],
-            model: {
+          ipagination: {
+            current: 1,
+            pageSize: 10,
+            pageSizeOptions: ['10', '20', '30'],
+            showTotal: (total, range) => {
+              return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+          },
+
+          model: {
                 payType: 1,
-                livingOrderId: "",
+                livingOrderId: '',
                 certType: 1,
                 gender: 1,
                 subjectType: 6,
+                vipCustomerId: null
             },
+            markerMemberCard: {},
             queryParams: {},
             labelCol: {
                 xs: {
@@ -128,7 +144,7 @@ export default {
                 },
                 sm: {
                     span: 5
-                },
+                }
             },
             wrapperCol: {
                 xs: {
@@ -136,34 +152,34 @@ export default {
                 },
                 sm: {
                     span: 16
-                },
+                }
             },
             confirmLoading: false,
             validatorRules: {
                 subjectType: [{
                     required: true,
-                    message: "请输入消费项目!"
+                    message: '请输入消费项目!'
                 }],
                 money: [{
                     required: true,
-                    message: "请输入金额!"
-                }],
+                    message: '请输入金额!'
+                }]
             },
             url: {
-                list: "/rooms/cesGoods/kf-goods-list",
-                edit: "/business/busMemberCard/edit",
-                queryById: "/business/busMemberCard/queryById",
+                list: '/rooms/cesGoods/kf-goods-list',
+                edit: '/business/busMemberCard/edit',
+                queryById: '/business/busMemberCard/queryById'
             },
             gradeList: [],
             paymentMethodList: [],
             staffList: [],
             customerList: [],
-            oldcustomerList: [],
-        };
+            oldcustomerList: []
+        }
     },
     computed: {
         formDisabled() {
-            return this.disabled;
+            return this.disabled
         },
         goodsPrice() {
             let money = this.dataSource.reduce((pre, cur) => pre + cur.sellingPrice * (cur.number || 0), 0)
@@ -171,71 +187,86 @@ export default {
         }
     },
     created() {
-        var _info = JSON.parse(localStorage.getItem("storeInfo"));
+        var _info = JSON.parse(localStorage.getItem('storeInfo'))
         if (_info) {
-            this.model.hotelId = _info.id;
+            this.model.hotelId = _info.id
         }
-        //备份model原始值
-        this.modelDefault = JSON.parse(JSON.stringify(this.model));
-        this.getbusCustomer();
-        // getAction('/kc/kcGoods/list').then(res=>{
-        //   if (res.success) {
-        //     this.dataSource = res.result.records;
-        //   }
-        // })
-        // getAction('/rooms/cesGoods/queryList').then(res=>{
-        //   if (res.success) {
-        //     this.dataSource = res.result.records;
-        //   }
-        // })
+        // 备份model原始值
+        this.modelDefault = JSON.parse(JSON.stringify(this.model))
+        this.getbusCustomer()
+
     },
     methods: {
         changeNumber() {
-            console.log(this.dataSource);
+            console.log(this.dataSource)
         },
         handleSearch(value) {
-            let result;
+            let result
             if (!value) {
-                result = this.oldcustomerList;
+                result = this.oldcustomerList
             } else {
-                result = this.oldcustomerList.filter((t) => t.name.includes(value));
+                result = this.oldcustomerList.filter((t) => t.name.includes(value))
             }
-            this.customerList = result;
+            this.customerList = result
         },
         handleSelectMember(e) {
-            var find = this.customerList.find((t) => t.id === e);
-            this.model.phone = find.phone;
-            this.model.customerName = find.name;
-            this.model.customerId = find.id;
+            var find = this.customerList.find((t) => t.id === e)
+            this.model.phone = find.phone
+            this.model.customerName = find.name
+            this.model.customerId = find.id
         },
         getbusCustomer() {
-            getAction("/bus/busCustomer/list", {}).then((res) => {
+            getAction('/bus/busCustomer/list', {}).then((res) => {
                 if (res.success) {
-                    this.customerList = res.result.records;
-                    this.oldcustomerList = JSON.parse(JSON.stringify(this.customerList));
+                    this.customerList = res.result.records
+                    this.oldcustomerList = JSON.parse(JSON.stringify(this.customerList))
                 }
-            });
+            })
         },
-        add(livingOrderId, roomId) {
-            this.modelDefault.livingOrderId = livingOrderId;
-            this.modelDefault.roomId = roomId;
-            this.edit(this.modelDefault);
+        getMarkerMemberByCarId() {
+          console.log(this.model)
+          if (this.model.vipCustomerId == null || this.model.vipCustomerId === '') {
+            this.markerMemberCard = null;
+            return
+          }
+          if (this.markerMemberCard != null && this.markerMemberCard.goodsDiscount != null) {
+            this.dataSource.forEach(e => {
+              e.sellingPrice = e.sellingPrice * this.markerMemberCard.goodsDiscount / 100
+            })
+            return
+          }
+          console.log(this.model.vipCustomerId)
+          getAction('/business/busMemberCard/getMarkerMemberByCarId', { id: this.model.vipCustomerId }).then((res) => {
+            if (res.success) {
+              this.markerMemberCard = res.result
+              this.dataSource.forEach(e => {
+                e.sellingPrice = e.sellingPrice * this.markerMemberCard.goodsDiscount / 100
+              })
+            }
+          })
+          },
+        add(obj) {
+            this.modelDefault.livingOrderId = obj.livingOrderId
+            this.modelDefault.roomId = obj.roomId
+            this.modelDefault.vipCustomerId = obj.vipCustomerId
+            this.edit(this.modelDefault)
         },
         edit(record) {
-            this.model = Object.assign({}, record);
-            this.visible = true;
+            this.model = Object.assign({}, record)
+            this.visible = true
+            this.loadData()
         },
         submitForm() {
-            const that = this;
+            const that = this
             // 触发表单验证
             this.$refs.form.validate((valid) => {
                 if (valid) {
-                    if (this.dataSource.every(ele=>ele.number==0) && this.model.subjectType == 6) {
-                        this.$message.warning("请至少选择一件商品")
+                    if (this.dataSource.every(ele => ele.number == 0) && this.model.subjectType == 6) {
+                        this.$message.warning('请至少选择一件商品')
                         return
                     }
-                    that.confirmLoading = true;
-                    var orders = [];
+                    that.confirmLoading = true
+                    var orders = []
                     let feeGood = {}
 
                     if (this.model.subjectType === 6) {
@@ -250,7 +281,7 @@ export default {
                               money: ele.sellingPrice * (ele.number || 0),
                               subjectType: this.model.subjectType,
                               feeGoodVo: feeGood
-                          });
+                          })
                             }
                         })
                         that.model.money = that.goodsPrice
@@ -262,55 +293,61 @@ export default {
                       }
                       orders.push({
                         money: this.model.money,
-                        subjectType: this.model.subjectType,
-                      });
+                        subjectType: this.model.subjectType
+                      })
                     }
-                    this.model.orders = orders;
-                    this.model.livingOrderId = this.livingOrderId;
-                    httpAction("/business/busRoomBookingOrders/set-living-order-fee?livingOrderId=" + this.livingOrderId, orders, "post")
+                    this.model.orders = orders
+                    this.model.livingOrderId = this.livingOrderId
+                    httpAction('/business/busRoomBookingOrders/set-living-order-fee?livingOrderId=' + this.livingOrderId, orders, 'post')
                         .then((res) => {
                             if (res.success) {
-                                that.$message.success(res.message);
-                                that.$emit("ok");
+                                that.$message.success(res.message)
+                                that.$emit('ok')
                             } else {
-                                that.$message.warning(res.message);
+                                that.$message.warning(res.message)
                             }
                         })
                         .finally(() => {
-                            that.confirmLoading = false;
-                        });
+                            that.confirmLoading = false
+                        })
                 }
-            });
+            })
         },
         loadData(arg) {
             if (this.url.list == 2) {
                 return
             }
             if (!this.url.list) {
-                this.$message.error("请设置url.list属性!")
+                this.$message.error('请设置url.list属性!')
                 return
             }
-            //加载数据 若传入参数1则加载第一页的内容
+            // 加载数据 若传入参数1则加载第一页的内容
             if (arg === 1) {
-                this.ipagination.current = 1;
+                this.ipagination.current = 1
             }
-            var params = this.getQueryParams(); //查询条件
-            this.loading = true;
+            let params = {
+              pageSize: this.ipagination.pageSize,
+              pageNo: this.ipagination.current,
+              name: this.queryParams.name
+            }
+            this.loading = true
             getAction(this.url.list, params).then((res) => {
                 if (res.success) {
-                    //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+                    // update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
                     let arr = []
-                    arr = res.result.records || res.result;
-                    arr.forEach(ele=>{
+                    arr = res.result.records || res.result
+                    arr.forEach(ele => {
                         ele.number = 0
                     })
-                    this.dataSource = JSON.parse(JSON.stringify(arr));
+                    this.dataSource = JSON.parse(JSON.stringify(arr))
                     if (res.result.total) {
-                        this.ipagination.total = res.result.total;
+                        this.ipagination.total = res.result.total
                     } else {
-                        this.ipagination.total = 0;
+                        this.ipagination.total = 0
                     }
-                    //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+                    this.getMarkerMemberByCarId()
+                  this.loading = false
+                    // update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
                 } else {
                     this.$message.warning(res.message)
                 }
@@ -318,6 +355,11 @@ export default {
                 this.loading = false
             })
         },
-    },
-};
+        pageChange(page) {
+          console.log(page)
+          this.ipagination = page
+          this.loadData()
+        },
+    }
+}
 </script>

src/views/room/modules/checkIn/FeeModal.vue

@@ -30,10 +30,10 @@
       }
     },
     methods: {
-      add (livingOrderId,roomId) {
+      add (obj) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add(livingOrderId,roomId);
+          this.$refs.realForm.add(obj);
         })
       },
       edit (record) {

src/views/settings/components/pos/modules/PosThaliForm.vue

@@ -59,10 +59,10 @@
               label="售价"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
-              prop="price"
+              prop="sellingPrice"
             >
               <a-input-number
-                v-model="model.price"
+                v-model="model.sellingPrice"
                 placeholder="请输入售价"
                 style="width: 100%"
               />
@@ -215,7 +215,7 @@ export default {
         posTypeId: [{ required: true, message: "请输入pos类型id!" }],
         barCode: [{ required: true, message: "请输入套餐条形码!" }],
         thailType: [{ required: true, message: "请输入分类!" }],
-        price: [{ required: true, message: "请输入售价!" }],
+        sellingPrice: [{ required: true, message: "请输入售价!" }],
       },
       url: {
         add: "/pos/posThali/add",
@@ -320,4 +320,4 @@ export default {
     },
   },
 };
-</script>
+</script>

src/views/settings/components/pos/posThali.vue

@@ -120,7 +120,7 @@
     <pos-thali-modal ref="modalForm" @ok="modalFormOk"></pos-thali-modal>
   </a-card>
 </template>
-  
+
   <script>
 import { JeecgListMixin } from "@/mixins/JeecgListMixin";
 import posThaliModal from "./modules/PosThaliModal";
@@ -162,7 +162,7 @@ export default {
         {
           title: "售价",
           align: "center",
-          dataIndex: "price",
+          dataIndex: "sellingPrice",
         },
         {
           title: "状态",
@@ -306,4 +306,4 @@ export default {
 </script>
   <style scoped>
 @import "~@assets/less/common.less";
-</style>
+</style>

src/views/settings/components/roomModules/modules/housePriceSchemeDetailList.vue

@@ -217,7 +217,7 @@
          created() {
             // console.log(JeecgListMixin);
             this.getSuperFieldList();
-            
+
             // console.log(this.dataSource);
             // console.log(this.dataSource);
         },
@@ -233,7 +233,7 @@
             this.getMember()
             console.log(this.handlelistData);
             // console.log(this.memberList);
-            
+
 
         },
         computed: {
@@ -279,7 +279,7 @@
                 // console.log(templist);
                 // console.log(this.superFieldList);
                 // console.log(this.handlelistData);
-                
+
                 // console.log(this.dataSource);
             },
             // 拿到协议方案