优化退款收款页面 部分冲账页面 房态详情冲账数据字体变红

src/mixins/JeecgListMixin.js

@@ -71,7 +71,7 @@ export const JeecgListMixin = {
     }
   },
   methods:{
-    loadData(arg) {
+    async loadData(arg) {
       if (this.url.list==2) {
         return
       }
@@ -86,13 +86,14 @@ export const JeecgListMixin = {
       var params = this.getQueryParams();//查询条件
       // debugger
       this.loading = true;
-      getAction(this.url.list, params).then((res) => {
+      await getAction(this.url.list, params).then((res) => {
+        console.log(res);
         if (res.success) {
           //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
           this.dataSource = []
-          setTimeout(() => {
+          // setTimeout(() => {
             this.dataSource = res.result.records || res.result;
-          }, 50)
+          // }, 50)
           if(res.result.total)
           {
             this.ipagination.total = res.result.total;

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

@@ -436,12 +436,36 @@
                 onChange: onSelectChange,
               }"
             >
-              <template slot="subjectType" slot-scope="text, record, index">
-                {{ getSubjectTypeText(text,record) }}
+              <template slot="subjectType" slot-scope="text, record, index" class="strike_style">
+                <span class="strike_style" v-if="record.returnItem">{{ getSubjectTypeText(text,record) }}</span>
+                <span v-else>{{ getSubjectTypeText(text,record) }}</span>
               </template>
               <template slot="roomId" slot-scope="text, record, index">
-                {{ getRoomName(text) }}
+                <span class="strike_style" v-if="record.returnItem">{{ getRoomName(text) }}</span> 
+                <span v-else>{{ getRoomName(text) }}</span>
+              </template>
+              <template slot="dayTime" slot-scope="text, record, index" class="strike_style">
+                <span class="strike_style" v-if="record.returnItem">{{ record.dayTime }}</span>
+                <span v-else>{{ record.dayTime }}</span>
               </template>
+              <!-- <template slot="originalPrice" slot-scope="text, record, index" class="strike_style">
+                {{ record.originalPrice }}
+              </template> -->
+              <template slot="feeType" slot-scope="text, record, index" class="strike_style">
+                <span class="strike_style" v-if="record.returnItem">{{ (record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.num ? record.feeGoodVo.num : 1 }}</span>
+                <span v-else>{{ (record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.num ? record.feeGoodVo.num : 1 }}</span>
+                </template>
+              <template slot="originalMoney" slot-scope="text, record, index" class="strike_style">
+                <span class="strike_style" v-if="record.returnItem">{{ record.originalMoney }}</span>
+                <span v-else>{{ record.originalMoney }}</span>
+              </template>
+              <template slot="money" slot-scope="text, record, index" class="strike_style">
+                <span class="strike_style" v-if="record.returnItem">{{ record.money }}</span>
+                <span v-else>{{ record.money }}</span>
+              </template>
+              <!-- <template slot="roomId" slot-scope="text, record, index" class="strike_style">
+                {{ getRoomName(text) }}
+              </template> -->
             </a-table>
             <div
               style="
@@ -761,6 +785,7 @@ const columns = [
     dataIndex: 'dayTime',
     width: 180,
     align: 'center',
+    scopedSlots: { customRender: 'dayTime' }
     // customRender: function (text, record) {
     //   if (text !== null && text !== '') {
     //     return record.dayTime.substring(0, 10)
@@ -772,6 +797,7 @@ const columns = [
     // dataIndex: 'money',
     width: 67,
     align: 'center',
+    scopedSlots: { customRender: 'originalPrice' },
     customRender: function (text, record) {
       if ((record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.originalPrice) {
         return record.feeGoodVo.originalPrice
@@ -784,23 +810,26 @@ const columns = [
     dataIndex: 'feeType',
     width: 60,
     align: 'center',
-    customRender: function (text, record) {
-      if ((record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.num) {
-        return record.feeGoodVo.num
-      }
-      return 1
-    }
+    scopedSlots: { customRender: 'feeType' },
+    // customRender: function (text, record) {
+    //   if ((record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.num) {
+    //     return record.feeGoodVo.num
+    //   }
+    //   return 1
+    // }
   },
   {
     title: '小计',
     align: 'center',
     dataIndex: 'originalMoney',
+    scopedSlots: { customRender: 'originalMoney' },
     width: 67
   },
   {
     title: '优惠价',
     align: 'center',
     dataIndex: 'money',
+    scopedSlots: { customRender: 'money' },
     width: 67
   }
 ]
@@ -2090,4 +2119,7 @@ export default {
 #livingCustomers-grid [class~="ant-col"]:last-child {
   border: 0;
 }
+.strike_style {
+  color: red !important;
+}
 </style>

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

@@ -19,7 +19,8 @@
                 :wrapperCol="wrapperCol"
                 prop="money"
               > -->
-              <span>{{ &quot;应&quot; + (model.money < 0 ? &quot;退&quot; : &quot;收&quot;) }}: {{ Math.abs(model.money.toFixed(2)) }}元</span>
+              <!--  {{ Math.abs(model.money.toFixed(2)) }}元 -->
+              <span>{{ &quot;应&quot; + (model.money < 0 ? &quot;退&quot; : &quot;收&quot;) }}: {{ realityAmount.toFixed(2) }}元</span>
               <!-- </a-form-model-item> -->
             </a-col>
             <a-col :span="16">
@@ -49,33 +50,36 @@
                     style="width: 50px"
                     v-model="model.discount"
                     :min="1"
-                    :max="9"
+                    :max="99"
                   ></a-input-number
                   >折
                   </template>
-              </a-form-model-item>
-              <!-- <a-col :span="24" v-if="model.preferentialType == 2"> -->
-                <div v-if="model.preferentialType == 2">
-                <a-form-model-item
+                  <template v-if="model.preferentialType == 2">
+                    优惠金额: <a-input-number
+                    style="width: 100px"
+                    :min="0"
+                    v-model="model.couponFirstAmount"
+                    placeholder="请输入优惠金额"
+                    ></a-input-number
+                    >元
+                <!-- <a-form-model-item
                   label="优惠金额"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   prop="couponFirstAmount"
                 >
-                  <a-input-number
-                    style="width: 100px"
-                    :min="0"
-                    v-model="model.couponFirstAmount"
-                    placeholder="请输入优惠金额"
-                  ></a-input-number
-                  >元
-                </a-form-model-item>
-              </div>
+                  
+                </a-form-model-item> -->
+              </template>
+              </a-form-model-item>
+              <!-- <a-col :span="24" v-if="model.preferentialType == 2"> -->
+                
               <a-form-model-item
                   label="优惠券"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
                   prop="refund"
+                  v-if='model.coupon'
                 >
                   <a-select
                     v-if="model.couponCard"
@@ -94,6 +98,7 @@
                   <a-switch v-model="model.couponCard" />使用优惠券
                 </a-form-model-item>
                 <a-form-model-item
+                v-if='model.coupon'
                   label="惠后金额"
                   :labelCol="labelCol"
                   :wrapperCol="wrapperCol"
@@ -237,7 +242,9 @@
               {{ Math.abs(sumAmount.toFixed(2)) }}元
             </a-form-model-item>
           </a-col>
-          <div class="presentation_style_two" v-if="model.money < 0">退款:</div> 
+          <div class="presentation_style_two" v-if="model.money < 0">退款:
+            <a-button danger type="link" @click="addCustomRefund">新增自定义退款</a-button>
+          </div> 
           <a-col :span="24" v-if="model.money < 0">
             <a-table :columns="columns" :data-source="feeList" bordered>
               <template slot="payType" slot-scope="text, record, index">
@@ -250,12 +257,27 @@
                 {{ getRoomName(text) }}
               </template>
               <template slot="payType" slot-scope="text, record, index">
-                <a-select style="width: 100px" v-model="record.payType">
+                <a-select style="width: 100px" v-model="record.payType" :disabled="record.createTime !== '自定义退款'">
                   <a-select-option v-for="(item, key) in payTypeList" :key="key" :value="item.id" :disabled="item.disable">{{ item.name }}</a-select-option>
                 </a-select>
               </template>
               <template slot="prerefund" slot-scope="text, record, index">
-                <a-input-number :max="record.money - record.returnMoney" v-model="record.prerefund"></a-input-number>
+                <a-input-number :min="1" :max="record.money - record.returnMoney" v-model="record.prerefund"></a-input-number>
+              </template>
+              <template slot="operation" slot-scope="text, record, index">
+                <!-- <a-popconfirm
+                  title="Sure to delete?"
+                  :disable="record.createTime == '自定义退款'"
+                >
+                  <a>删除</a>
+                </a-popconfirm> -->
+                <a-button danger v-if="record.createTime === '自定义退款'" type="link" @click="reduceCustomization(record)">删除</a-button>
+                <!-- <a-button
+                v-if="record.returnMoney"
+                  @click="reduceCustomization"
+                ><a-icon type="exception" /></a-button
+                >
+                <span v-else>{{ record.returnMoney }}</span> -->
               </template>
             </a-table>
           </a-col>
@@ -273,7 +295,6 @@
 import { httpAction, getAction,postAction } from '@/api/manage'
 import { validateDuplicateValue } from '@/utils/util'
 import moment from 'moment/moment'
-
 export default {
   name: 'PayOrRefund',
   components: {},
@@ -378,6 +399,13 @@ export default {
         {
           title: '已退金额（元）',
           dataIndex: 'returnMoney',
+          scopedSlots: { customRender: 'returnMoney' }
+        },
+        {
+          title: '操作',
+          width: '100px',
+          scopedSlots: { customRender: 'operation' },
+          // dataIndex: 'operation',
         },
       ],
 //       [
@@ -442,15 +470,33 @@ export default {
     }
   },
   computed: {
+    discount() {
+      return 1
+    },
     formDisabled() {
       return this.disabled
     },
     sumAmount() {
-      var sum = this.payList.reduce(function (total, item) {
-        return total + item.money
-      }, 0)
-      return sum
+      // console.log(this.isRefund);
+      if (this.isRefund) {
+        var sum = this.feeList.reduce(function (total, item) {
+          return total + item.prerefund
+        }, 0)
+        return sum
+      } else {
+        var sum = this.payList.reduce(function (total, item) {
+          return total + item.money
+        }, 0)
+        return sum
+      }
+      
     },
+    // sumAmount() {
+    //   var sum = this.payList.reduce(function (total, item) {
+    //     return total + item.money
+    //   }, 0)
+    //   return sum
+    // },
     couponAmount() {
       var sum = 0
       if (this.model.coupon) {
@@ -459,9 +505,22 @@ export default {
         } else if (this.model.preferentialType == 2) {
           sum = this.model.consumption - (this.model.couponFirstAmount || 0)
         } else if (this.model.preferentialType == 3) {
-          sum = parseFloat(
+          if (this.model.discount > 10) {
+            // console.log(this.model.consumption);
+            // console.log(this.model.discount);
+            sum = parseFloat(
+              ((this.model.consumption * this.model.discount) / 100).toFixed(2)
+            )
+          } else if(this.model.discount == 10){
+            sum = parseFloat(
               ((this.model.consumption * this.model.discount) / 10).toFixed(2)
-          )
+            )
+          } else if (this.model.discount < 10){
+            sum = parseFloat(
+              ((this.model.consumption * this.model.discount) / 10).toFixed(2)
+            )
+          }
+          
         }
       } else {
         sum = this.model.consumption
@@ -469,6 +528,7 @@ export default {
       return sum
     },
     realityAmount() {
+      console.log(this.model);
       // 实际要收的钱,为负表示要退的钱
       let relMoney = this.couponAmount.toFixed(2) - this.model.collection
       this.isRefund = relMoney < 0
@@ -725,9 +785,24 @@ export default {
           //     preferentialMoney: this.model.preferentialMoney
           //   })
           // })
+          console.log(this.feeList);
+          console.log(this.realityAmount);
+          console.log(this.sumAmount);
+          let tempbreak = false
+          this.feeList.forEach(index => {
+            if (index.payType == null && this.isRefund) {
+              this.$message.warning('请选择自定义退款退款方式')
+              tempbreak = true
+              return
+            }
+          })
+          if (tempbreak) {
+            return
+          }
+          // return
           if (this.isRefund) {
             this.feeList.forEach((item) => {
-              let remark = 
+              // let remark = 
               // let money = -money
               fees.push({
                 feeType: this.model.feeType,
@@ -821,8 +896,8 @@ export default {
             returnFeeList.push(e)
           }
         })
-        console.log(templist);
-        console.log(returnFeeList);
+        // console.log(templist);
+        // console.log(returnFeeList);
         
         templist.forEach(e => {
           let returnMoney = returnFeeList.filter(ele => e.id === ele.returnFeeId).reduce((accumulator, ele) => accumulator + ele.money, 0)
@@ -894,7 +969,22 @@ export default {
       }
       
     },
-
+    // 新增自定义退款
+    addCustomRefund() {
+      this.feeList.push({
+        createTime: '自定义退款',
+        payType: null,
+        prerefund: null,
+        // pullDown: false
+      })
+      console.log(this.feeList);
+    },
+    // 减少自定义退款
+    reduceCustomization(val) {
+      console.log(val);
+      let tempindex = this.feeList.findIndex(index => index == val)
+      this.feeList.splice(tempindex,1)
+    },
   }
 }
 </script>
@@ -919,7 +1009,7 @@ export default {
   font-size: 32px;
   color: red;
   text-align: center;
-  padding-top: 7%;
+  padding-top: 3%;
   /* margin: 0 auto; */
   /* display: inline-block; */
   /* margin-top: 60px; */

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

@@ -28,7 +28,7 @@ export default {
   data() {
     return {
       title: "",
-      width: 1200,
+      width: 1400,
       visible: false,
       disableSubmit: false,
       showYinshou: true,

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

@@ -9,7 +9,12 @@
     @cancel="handleCancel"
     cancelText="关闭"
   >
+    <a-radio-group v-model="tebdata" style="margin-bottom: 16px">
+      <a-radio-button value="small">金额冲账</a-radio-button>
+      <a-radio-button value="default">商品冲账</a-radio-button>
+    </a-radio-group>
     <a-table
+    v-if="tebdata == 'small'"
       :columns="columns"
       :data-source="feesList"
       :pagination="false"
@@ -25,6 +30,29 @@
         <a-textarea v-model=record.remark></a-textarea>
       </template>
     </a-table>
+    <a-table
+    v-if="tebdata == 'default'"
+      :columns="columnstwo"
+      :data-source="productList"
+      :pagination="false"
+      :scroll="{ y: 160 }"
+      rowKey="id">
+      <template slot="subjectType" slot-scope="text, record">
+        {{ getSubjectTypeText(text, record) }}
+      </template>
+      <template slot="money" slot-scope="text, record">
+        <!-- <a-input-number v-model=record.money @blur="handleBlur()" :min="0"></a-input-number> -->
+        {{ record.money }}
+      </template>
+      <template slot="num" slot-scope="text, record">
+        <a-input-number v-model='record.num' :min="1" :max="record.feeGoodVo.num"></a-input-number>
+        <!-- {{ record.money }} -->
+      </template>
+      
+      <template slot="remark" slot-scope="text, record">
+        <a-textarea v-model=record.remark></a-textarea>
+      </template>
+    </a-table>
   </j-modal>
 </template>
 
@@ -72,6 +100,66 @@ const columns = [
     scopedSlots: { customRender: 'remark'}
   },
   ]
+  const columnstwo = [
+  {
+    title: '房间',
+    dataIndex: 'roomName',
+    width: 30,
+    align: 'center'
+  },
+  {
+    title: '费项',
+    dataIndex: 'subjectType',
+    width: 60,
+    align: 'center',
+    scopedSlots: { customRender: 'subjectType' }
+  },
+  {
+    title: '日期',
+    dataIndex: 'dayTime',
+    width: 100,
+    align: 'center'
+  },
+  {
+    title: '金额',
+    dataIndex: 'oldPrice',
+    width: 60,
+    align: 'center'
+  },
+  {
+    title: '数量',
+    // dataIndex: 'oldPrice',
+    width: 60,
+    align: 'center',
+    customRender: function (text, record) {
+        return record.feeGoodVo.num
+    }
+  },
+  {
+    title: '冲账数量',
+    dataIndex: 'num',
+    width: 60,
+    align: 'center',
+    scopedSlots: { customRender: 'num'},
+    customRender: function (text, record) {
+        return record.feeGoodVo.num
+    }
+  },
+  {
+    title: '冲账金额',
+    dataIndex: 'money',
+    width: 60,
+    align: 'center',
+    scopedSlots: { customRender: 'money'}
+  },
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 60,
+    align: 'center',
+    scopedSlots: { customRender: 'remark'}
+  },
+  ]
 export default {
   name: 'StrikeBalanceModel',
   components: {
@@ -84,7 +172,11 @@ export default {
       disableSubmit: false,
       showYinshou: true,
       columns: columns,
+      columnstwo: columnstwo,
       feesList: [],
+      tebdata: 'small',
+      // 商品
+      productList:[]
     }
   },
   methods: {
@@ -92,18 +184,31 @@ export default {
     edit(record, map) {
       this.visible = true
       console.log(record)
-      this.feesList = record
+      record.forEach(index => {
+        if (index.feeGoodVo == null) {
+          this.feesList.push(index)
+        } else if (index.feeGoodVo !== null) [
+          this.productList.push(index)
+        ]
+      })
+      console.log(this.feesList);
+      console.log(this.productList);
+      // this.feesList = record
       this.feesList.forEach(e => {
         e.roomName = map.get(e.roomId)
         e.oldPrice = e.money
       })
+      this.productList.forEach(e => {
+        e.roomName = map.get(e.roomId)
+        e.oldPrice = e.money
+      })
     },
     close() {
       this.$emit('close')
       this.visible = false
     },
     handleOk() {
-      console.log(111);
+      // console.log(111);
       let fees = []
       if (this.feesList.some(e => e.money > e.oldPrice || e.money < 0)) {
         this.$message.warning('冲账金额不能超过原金额,且不能小于0')
@@ -113,7 +218,8 @@ export default {
           // 一条消费可能有多次冲账，所以传入后端的money是冲账的负数差值
           if (e.oldPrice - e.money > 0) {
             let param = Object.assign({}, e)
-            param.money = param.money - param.oldPrice
+            param.money = -param.money
+            // param.money = param.money - param.oldPrice
             fees.push(param)
           }
         })
@@ -121,7 +227,7 @@ export default {
       if (fees.length === 0) {
         return
       }
-
+      console.log(fees);
       postAction('/business/busOrderFee/strike-balance', fees).then(resp => {
         if (resp.result === true) {
           this.$message.success('冲账成功')

src/views/settings/components/roomModules/housePriceSchemeList.vue

@@ -118,6 +118,7 @@
         },
         data() {
             return {
+                
                 queryParam: {},
                 // 分页参数
                 ipagination: {
@@ -210,8 +211,11 @@
         },
         created() {
             // this.loadData()
+            // console.log(111);
+            // this.getMember()
         },
         methods: {
+            
             onSaveOk() {
                 this.loadData()
             },

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

@@ -6,7 +6,7 @@
         </a-radio-group>
         <div>
             <a-table ref="table" size="middle" :scroll="{ x: true }" bordered rowKey="id" :columns="columns"
-                     :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{
+                     :dataSource="handlelistData" :pagination="ipagination" :loading="loading" :rowSelection="{
                     selectedRowKeys: selectedRowKeys,
                     onChange: onSelectChange,
                 }" class="j-table-force-nowrap" @change="handleTableChange"
@@ -21,6 +21,11 @@
                                         @blur="onMoneyChange(record)" />
                     </div>
                 </template>
+                <template slot="layoutPrice" slot-scope="text, record">
+                    <div>
+                        {{ record.layoutPrice }}
+                    </div>
+                </template>
                 <template slot="breakfastNumberSlot" slot-scope="text, record">
                     <div>
                         <a-input-number v-model="record.breakfastNumber" :step="1" :min="0" :precision="0"
@@ -58,11 +63,13 @@
 </template>
 
 <script>
+    // 引入中文转拼音的组件  循环表头需要用到
+    // import PY from '../../../../../utils/vue-py.js'
     import '@/assets/less/TableExpand.less'
     import { mixinDevice } from '@/utils/mixin'
     import { JeecgListMixin } from '@/mixins/JeecgListMixin'
     import moment from 'moment';
-    import { httpAction } from '@/api/manage'
+    import { httpAction, getAction } from '@/api/manage'
     import HousePriceSchemeLayoutModal from "./housePriceSchemeLayout/housePriceSchemeLayoutModal";
 
     export default {
@@ -94,11 +101,11 @@
                         align:"center",
                         dataIndex: 'layoutName'
                     },
-                    {
-                        title:'间数（间）1',
-                        align:"center",
-                        dataIndex: 'layoutName'
-                    },
+                    // {
+                    //     title:'间数（间）1',
+                    //     align:"center",
+                    //     dataIndex: 'layoutName'
+                    // },
                     // {
                     //     title:'门市价',
                     //     align:"center",
@@ -107,24 +114,50 @@
                     {
                         title:'挂牌价(元)1',
                         align:"center",
-                        dataIndex: 'layoutPrice'
+                        // dataIndex: 'layoutPrice',
+                        customRender(text, record) {
+                            return record.layoutPrice
+                        }
                     },
                     {
                         title:'前台价(散客)1',
                         align:"center",
-                        dataIndex: 'layoutPrice'
+                        // dataIndex: 'layoutPrice',
+                        customRender(text, record) {
+                            return record.layoutPrice
+                        }
                     },
                     {
                         title:'微信小程序(散客)1',
                         align:"center",
-                        dataIndex: 'layoutPrice'
-                    },
-                    {
-                        title:'钟点房间(元/小时)1',
-                        align:"center",
-                        dataIndex: 'layoutPrice'
+                        // dataIndex: 'layoutPrice',
+                        customRender(text, record) {
+                            return record.layoutPrice
+                        }
                     },
                     // {
+                    //     title:'钟点房间(元/小时)1',
+                    //     align:"center",
+                    //     dataIndex: 'layoutPrice'
+                    // },
+                    // {
+                    //     title: 'Block',
+                    //     children: [
+                    //     {
+                    //         title: 'Building',
+                    //         dataIndex: 'building',
+                    //         key: 'building',
+                    //         width: 100,
+                    //     },
+                    //     {
+                    //         title: 'Door No.',
+                    //         dataIndex: 'number',
+                    //         key: 'number',
+                    //         width: 100,
+                    //     },
+                    //     ],
+                    // },
+                    // {
                     //     title:'执行房价',
                     //     align:"center",
                     //     dataIndex: 'money',
@@ -169,11 +202,30 @@
                 queryParam: {
                   schemeId: this.schemeId
                 },
-                tablemode: 'ordinaryDays'
+                tablemode: 'ordinaryDays',
+                // 会员参数
+                memberList: [],
+                // 列表数据处理
+                handlelistData: [],
+
             }
         },
-        created() {
+         created() {
+            // console.log(JeecgListMixin);
             this.getSuperFieldList();
+            
+            // console.log(this.dataSource);
+            // console.log(this.dataSource);
+        },
+        async mounted() {
+            await this.loadData()
+            // console.log(this.dataSource);
+            this.handlelistData = this.dataSource
+            this.getMember()
+            console.log(this.handlelistData);
+            // console.log(this.memberList);
+            
+
         },
         computed: {
             importExcelUrl: function(){
@@ -184,6 +236,44 @@
             moment,
             initDictConfig(){
             },
+            // 拿到会员
+            async getMember() {
+                await getAction("/org.jeecg.modules.business/busMarketMember/list", {
+                    pageNo: 1,
+                    pageSize: 100,
+                }).then(res => {
+                    console.log(res);
+                    this.memberList = res.result.records
+                })
+                let templist = {
+                    title: '会员',
+                    children: [
+                    ],
+                }
+                this.memberList.forEach(item => {
+                    let tempchildren = {
+                        title: item.name,
+                        dataIndex: item.id,
+                        discount: item.discount
+                    }
+                    templist.children.push(tempchildren)
+
+                })
+                this.columns.splice(1,0,templist)
+                // this.memberList = templist
+                this.handlelistData.forEach(item => {
+                    templist.children.forEach(index => {
+                        item[index.dataIndex] = (item.layoutPrice * (index.discount * 0.01))
+                    })
+                })
+                console.log(this.columns);
+                console.log(templist);
+                // console.log(this.superFieldList);
+                console.log(this.handlelistData);
+                
+                // console.log(this.dataSource);
+            },
+
             getSuperFieldList(){
                 let fieldList=[];
                 fieldList.push({type:'string',value:'tenantId',text:'关联租户'})
@@ -265,7 +355,7 @@
             },
             // 重置按钮
             handleReset() {
-                
+
             }
 
         }

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

@@ -28,9 +28,11 @@
                 visible: false,
                 disableSubmit: false,
                 schemeId:null,
+                
             }
         },
         methods: {
+            
             add () {
                 this.visible=true
                 this.$nextTick(()=>{