t

src/api/house.js

@@ -152,7 +152,7 @@ export default {
     return getRequest('/adm/estate/lottery2/list', params)
   },
   admestatehousearealist: params => { // 摇号期数 - 楼盘户型图列表
-    return getRequest('/adm/estate/house/area/list', params)
+    return getRequest('/adm/estate/house/area/list', params, 'loading')
   },
   admestatelotterypriceedit: params => { // 一房一价 - 编辑
     return getRequestNoSort('/adm/estate/lottery/price/edit', params, 'loading')

src/views/house/components/popup/DiscountGroupStatus.vue

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :visible.sync="isShow"
+      :title="'编辑状态'"
+      :fullscreen="false"
+      width="700px"
+      custom-class="xl-dialog"
+      center
+    >
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px">
+        <div slot="footer" style="padding-top: 20px;">
+          <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
+          <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
+        </div>
+      </base-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  components: { },
+  mixins,
+  props: {
+    isShow: Boolean,
+    curObj: Object
+  },
+  inject: ['parentData'],
+  data() {
+    return {
+      formData: [],
+      loading: true,
+      cObj: {},
+      isShowMap: false
+    }
+  },
+  watch: {
+    isShow: function(val) {
+      if (val) {
+        this.getDef()
+      }
+    },
+  },
+  methods: {
+    getDef() {
+      const params = { }
+      params.status = String(this.curObj.status)
+      this.formData = [
+        { label: '状态', key: 'status', rules: 1, type: 'select', options: this.$dictData.buying_status },
+      ]
+      this.setDefaultValue(params)
+    },
+    close(str) {
+      if (str === 'confirm') {
+        this.$refs['ruleForm'].$refs['baseForm'].validate((valid) => {
+          if (valid) {
+            const oldform = this.$refs.ruleForm.baseForm
+            const newForm = { ...oldform }
+            if (this.curObj.id) {
+              newForm.id = this.curObj.id
+            }
+            let apiStr = 'admactivitybuyinglaunchedit'
+            this.$api.other[apiStr](newForm).then(data => {
+              this.$msgs(newForm.id ? '编辑成功' : '新增成功')
+              this.$emit('close', newForm)
+            })
+          }
+        })
+      } else {
+        this.$emit('close')
+        this.setDefaultValue()
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '../../../../styles/libEdit.scss';
+.lib-edit {
+  padding-top: 0;
+  ::v-deep .el-form-item {
+    margin-bottom: 10px;
+  }
+  ::v-deep .el-date-editor.el-input {
+    width: 100%;
+  }
+}
+</style>

src/views/house/components/popup/LotteryEdit.vue

@@ -10,7 +10,7 @@
       custom-class="xl-drawer"
       direction="rtl"
     >
-      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[0,4]">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[0,5]">
         <div slot="OI0" class="scoped-other-form">
           <div class="scoped-img-area">
             <div class="sia-title">项目图</div>
@@ -31,7 +31,7 @@
             </el-upload>
           </div>
         </div>
-        <div slot="OI4">
+        <div slot="OI5">
           <div class="scoped-img-area">
             <div class="sia-title">一房一价图</div>
             <div class="sia-op" v-for="(imgsrc,index) in houseImg" :key="index">
@@ -195,11 +195,12 @@ export default {
     },
     getDef() {
       let params = { ...this.cObj }
-      params.time = params.lottery_time.split('至')
+      if (params.lottery_time) params.time = params.lottery_time.split('至')
       this.formData = [
         { label: '摇号期数', key: 'batch', rules: 1 },
         { label: '排序', key: 'sort' },
         { label: '摇号中的标题', key: 'under_way' },
+        { label: '本期包含期数', key: 'building_num' },
         { label: '摇号中的日期', key: 'time', type: 'datePicker', rules: 1 },
         { label: '摇号结果的标题', key: 'lottery_res' },
       ]
@@ -225,6 +226,7 @@ export default {
             }
             newForm.lottery_time = newForm.time[0] + '至' + newForm.time[1]
             delete newForm.time
+            newForm.building_num = newForm.building_num.replace(/，|、|\/|\\/g, ',')
             // console.log(newForm)
             // return
             let apiStr = 'admestatelottery2add'

src/views/house/components/popup/RoomPrice.vue

@@ -18,7 +18,8 @@
         </base-form>
       </div>
       <table-list
-        :list-loading="listLoading"
+        :listLoading="false"
+        listLoadStr="createdClose"
         :data="tableData2"
         :columns="listConfig"
         :current-page="currentPage"
@@ -198,7 +199,6 @@ export default {
           house_type,
           house_img,
           houseImg,
-          blank: 10000 + parseInt(Math.random() * 1000)
         })
       })
       this.tableData = [...curArr]

src/views/house/discountGroup.vue

@@ -16,19 +16,27 @@
     <dg-join
       :isShow="isDJShow"
       :curObj="curObj"
-      @close="closeDJPopup" />
+      @close="closeDJPopup"
+    />
+    <dg-status
+      :isShow="isDSShow"
+      :curObj="curObj"
+      @close="closeDSPopup"
+    />
   </div>
 </template>
 <script>
 import { arrToObj } from '@/utils'
 import SearchForm from './components/searchForm/DiscountGroup'
 import DgJoin from './components/popup/DiscountGroupJoin'
+import DgStatus from './components/popup/DiscountGroupStatus'
 import baseTable from '_m/baseTable.js'
 export default {
   name: 'index',
   components: {
     SearchForm,
     DgJoin,
+    DgStatus,
   },
   provide() {
     return {
@@ -46,6 +54,7 @@ export default {
       curObj: {},
       isTHEShow: false,
       isDJShow: false,
+      isDSShow: false,
     }
   },
   computed: {
@@ -68,16 +77,31 @@ export default {
         { label: '手机号', prop: 'phone' },
         { label: 'hash', prop: 'hash' },
         { label: '发起时间', prop: 'create_at' },
-        { label: '操作', width: 220, type: 'handle2', operations:
+        { label: '操作', width: 200, type: 'handle2', operations:
           [
-            { label: '已助用户', func: this.openDJPopup, btnType: 'primary' },
-            { label: '标记使用', func: this.markUsedHandle, btnType: 'warning', hide: 'noCan' },
+            { label: '已助用户', func: this.openDJPopup, btnType: 'success' },
+            { label: '编辑状态', func: this.openDSPopup, btnType: 'primary' },
+            // { label: '标记使用', func: this.markUsedHandle, btnType: 'warning', hide: 'noCan' },
           ]
         }
       ]
     }
   },
   methods: {
+    openDSPopup(row) {
+      if (row && row.id) {
+        this.curObj = row
+      } else {
+        this.curObj = {}
+      }
+      this.isDSShow = true
+    },
+    closeDSPopup(obj) {
+      this.isDSShow = false
+      if (obj) {
+        this.fetchData()
+      }
+    },
     openDJPopup(row) {
       if (row && row.id) {
         this.curObj = row

src/views/house/theme.vue

@@ -35,8 +35,8 @@
 import { arrToObj } from '@/utils'
 import SearchForm from './components/searchForm/Theme'
 import PopupEdit from './components/popup/ThemeEdit'
-import LotteryEdit from './components/popup/LotteryEdit2'
-// import LotteryEdit from './components/popup/LotteryList'
+// import LotteryEdit from './components/popup/LotteryEdit2'
+import LotteryEdit from './components/popup/LotteryList'
 // import LotteryEdit from './components/popup/RoomPrice'
 import baseTable from '_m/baseTable.js'
 export default {
@@ -54,7 +54,7 @@ export default {
   mixins: [baseTable],
   data() {
     const mtArr = this.$dictData.module_type || []
-    const curNavVal = mtArr.length > 0 ? mtArr[0].val : ''
+    const curNavVal = mtArr.length > 0 ? mtArr[5].val : ''
     return {
       apiStr: 'house.admestatemodulelist',
       searchForm: {},