t

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

@@ -2,7 +2,7 @@
   <div>
     <el-drawer
       :show-close="false"
-      :title="curObj.estate_id ? '编辑摇号信息' : '新增摇号信息'"
+      :title="curObj.estate_id ? '编辑一房一价' : '新增一房一价'"
       :wrapper-closable="false"
       :close-on-press-escape="false"
       :visible.sync="isShow"
@@ -10,8 +10,8 @@
       custom-class="xl-drawer"
       direction="rtl"
     >
-      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[0,6]">
-        <div slot="OI0" class="scoped-other-form">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px">
+        <!-- <div slot="OI0" class="scoped-other-form">
           <div class="scoped-img-area">
             <div class="sia-title">项目图</div>
             <div class="sia-op" v-for="(imgsrc,index) in infoImg" :key="index">
@@ -30,9 +30,9 @@
               <i class="el-icon-plus icon" />
             </el-upload>
           </div>
-        </div>
-        <div slot="OI6">
-          <div class="scoped-img-area">
+        </div> -->
+        <div slot="otherItem">
+          <!-- <div class="scoped-img-area">
             <div class="sia-title">一房一价图</div>
             <div class="sia-op" v-for="(imgsrc,index) in houseImg" :key="index">
               <img class="img" :src="imgsrc" alt="img" @click="openbigImg(imgsrc)">
@@ -49,14 +49,14 @@
               >
               <i class="el-icon-plus icon" />
             </el-upload>
-          </div>
+          </div> -->
           <div class="scoped-price-area" v-if="this.curObj.id">
             <div class="spa-title">一房一价表</div>
             <div class="spa-label" @click="openRPPopup('edit')">编辑</div>
             <div class="spa-label" @click="openRPPopup('add')">添加</div>
           </div>
         </div>
-        <div slot="otherItem" class="scoped-other-form">
+        <!-- <div slot="otherItem" class="scoped-other-form">
           <div class="scoped-img-area">
             <div class="sia-title">摇号结果图</div>
             <div class="sia-op" v-for="(imgsrc,index) in lotteryImg" :key="index">
@@ -75,7 +75,7 @@
               <i class="el-icon-plus icon" />
             </el-upload>
           </div>
-        </div>
+        </div> -->
       </base-form>
       <div class="xl-form">
         <div class="xl-form-footer fixed" style="width:960px;padding-top: 20px;border-top: 1px solid #dcdcdc;right:0;">
@@ -203,15 +203,15 @@ export default {
       if (params.lottery_time) params.time = params.lottery_time.split('至')
       if (!params.hide_status) params.hide_status = '1'
       this.formData = [
-        { label: '楼栋分布图', key: 'project_img', type: 'upload', class: 'c-2', rules: 1 },
-        { label: '摇号期数', key: 'batch', class: 'c-2', rules: 1 },
         { label: '排序', key: 'sort', class: 'c-2', rules: 1 },
-        { label: '摇号中的日期', key: 'time', class: 'c-2', type: 'datePicker', rules: 1 },
         { label: '显示状态', key: 'hide_status', class: 'c-2', type: 'select', options: this.$dictData.hide_status, rules: 1 },
-        { label: '摇号中的标题', key: 'under_way', rules: 1 },
-        { label: '本期包含期数', key: 'building_num', rules: 1 },
-        { label: '摇号结果的标题', key: 'lottery_res' },
-        { label: '摇号结果时间', key: 'lottery_res_time', type: 'datePicker', type2: 'date' },
+        { label: '本期包含单元', key: 'building_num', rules: 1 },
+        // { label: '楼栋分布图', key: 'project_img', type: 'upload', class: 'c-2', rules: 1 },
+        // { label: '摇号期数', key: 'batch', class: 'c-2', rules: 1 },
+        // { label: '摇号中的日期', key: 'time', class: 'c-2', type: 'datePicker', rules: 1 },
+        // { label: '摇号中的标题', key: 'under_way', rules: 1 },
+        // { label: '摇号结果的标题', key: 'lottery_res' },
+        // { label: '摇号结果时间', key: 'lottery_res_time', type: 'datePicker', type2: 'date' },
       ]
       params.project_img = this.IMadd(params.project_img)
       this.setDefaultValue(params)
@@ -225,19 +225,19 @@ export default {
             if (this.curObj.estate_id) {
               newForm.estate_id = this.curObj.estate_id
             }
-            if (this.infoImg && this.infoImg.length > 0) {
-              newForm.info_img = this.infoImg.join(',')
-            }
-            if (this.houseImg && this.houseImg.length > 0) {
-              newForm.house_img = this.houseImg.join(',')
-            }
-            if (this.lotteryImg && this.lotteryImg.length > 0) {
-              newForm.lottery_img = this.lotteryImg.join(',')
-            }
-            newForm.lottery_time = newForm.time[0] + '至' + newForm.time[1]
-            delete newForm.time
+            // if (this.infoImg && this.infoImg.length > 0) {
+            //   newForm.info_img = this.infoImg.join(',')
+            // }
+            // if (this.houseImg && this.houseImg.length > 0) {
+            //   newForm.house_img = this.houseImg.join(',')
+            // }
+            // if (this.lotteryImg && this.lotteryImg.length > 0) {
+            //   newForm.lottery_img = this.lotteryImg.join(',')
+            // }
+            // newForm.lottery_time = newForm.time[0] + '至' + newForm.time[1]
+            // delete newForm.time
             newForm.building_num = newForm.building_num.replace(/，|、|\/|\\/g, ',')
-            newForm.project_img = this.IMdel(newForm.project_img)
+            // newForm.project_img = this.IMdel(newForm.project_img)
             // console.log(newForm)
             // return
             let apiStr = 'admestatelottery2add'

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

@@ -2,7 +2,7 @@
   <div>
     <el-drawer
       :show-close="false"
-      :title="curObj.id ? '编辑楼盘摇号信息' : '新增楼盘摇号信息'"
+      :title="curObj.id ? '编辑楼盘一房一价' : '新增楼盘一房一价'"
       :wrapper-closable="false"
       :close-on-press-escape="false"
       :visible.sync="isShow"
@@ -72,13 +72,14 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
-        { label: '期数', prop: 'batch'},
+        // { label: '期数', prop: 'batch'},
         { label: '排序', prop: 'sort' },
-        { label: '摇号中标题', prop: 'under_way'},
-        { label: '摇号时间', prop: 'lottery_time'},
-        { label: '摇号结果标题', prop: 'lottery_res'},
+        { label: '本期包含单元', prop: 'building_num'},
+        // { label: '摇号时间', prop: 'lottery_time'},
+        // { label: '摇号结果标题', prop: 'lottery_res'},
         { label: '推送状态', prop: 'push_state', type: 'flag', flags: arrToObj(this.$dictData.push_state) },
         { label: '显示状态', prop: 'hide_status', type: 'flag', flags: arrToObj(this.$dictData.hide_status) },
+        { label: '更新时间', prop: 'update_at'},
         { label: '操作', width: 180, type: 'handle2', operations:
           [
             { label: '编辑', func: this.openLEPopup, btnType: 'primary' },

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

@@ -11,8 +11,9 @@
       direction="rtl"
     >
       <div v-if="this.type === 'add'" class="scoped-top">
-        <base-form slot="content" ref="ruleForm" :data="searchData" :noLabel="false" labelWidth="100px" :insertSlotArr="[5]">
-          <div slot="OI5" class="scoped-tips">以下为销控表数据，可以为空不管，仅录一房一价忽略</div>
+        <base-form slot="content" ref="ruleForm" :data="searchData" :noLabel="false" labelWidth="100px" :insertSlotArr="[3,6]">
+          <div slot="OI3" class="scoped-tips">以下为销控表数据，可以为空不管，仅录一房一价忽略</div>
+          <div slot="OI6" class="scoped-tips">不知道套内面积，就填建筑面积(得房率100%)</div>
           <div slot="footer">
             <el-button icon="el-icon-Plus" class="xl-form-btn bgc2" @click="batchAdd">批量添加</el-button>
           </div>
@@ -88,13 +89,12 @@ export default {
     this.listConfig = {
       rows: [
         { label: '楼栋', prop: 'building_num', type: 'input', width: '100px'},
-        { label: '层高', prop: 'floor_height', type: 'input', width: '60px'},
         { label: '楼层', prop: 'storey', type: 'input', width: '60px'},
         { label: '房号', prop: 'room', type: 'input', width: '60px'},
         { label: '建筑面积(㎡)', prop: 'built', type: 'input', width: '80px'},
         { label: '套内面积(㎡)', prop: 'space', type: 'input', width: '80px'},
-        { label: '毛坯单价(元/㎡)', prop: 'blank', type: 'input', width: '90px'},
-        { label: '装修单价(元/㎡)', prop: 'decoration', type: 'input', width: '90px'},
+        { label: '基础单价(元/㎡)', prop: 'blank', type: 'input', width: '90px'},
+        { label: '装修增值单价(元/㎡)', prop: 'decoration', type: 'input', width: '90px'},
         { label: '销控状态', prop: 'house_sale_state', type: 'tag', tags: arrToObj(this.$dictData.house_sale_state), width: '90px'},
         { label: '真实折扣', prop: 'house_discount', type: 'input', width: '90px'},
         { label: '销控备注', prop: 'house_sale_remark', type: 'input', width: '90px'},
@@ -170,6 +170,13 @@ export default {
       })
     },
     getDef (str) {
+      const bnStr = this.curObj.building_num || ''
+      const bnArr = bnStr.split(',').map(item => {
+        return {
+          key: item,
+          val: item,
+        }
+      })
       if (str === 'col') {
         let params = {...this.$refs.ruleForm.baseForm}
         let addArr = []
@@ -180,11 +187,11 @@ export default {
           addArr.push({ label: `${itemIndex + 1}-户型`, key: `${itemIndex + 1}-HT`, type: 'select', options: this.roomAreaList})
         })
         this.searchData = [
+          { label: '楼栋名', key: 'building_num', type: 'select', options: bnArr },
           { label: '每层户数', key: 'batchCol', changeHandle: this.colChange },
           { label: '多少层', key: 'batchRow' },
-          { label: '楼栋名', key: 'building_num' },
-          { label: '层高', key: 'floor_height' },
-          { label: '装修单价', key: 'decoration' },
+          // { label: '层高', key: 'floor_height' },
+          // { label: '装修单价', key: 'decoration' },
           { label: '销控状态', key: 'house_sale_state', type: 'select', options: this.$dictData.house_sale_state },
           { label: '真实折扣', label2: '如: *0.95,-20000', key: 'house_discount' },
           { label: '销控备注', key: 'house_sale_remark' },
@@ -193,11 +200,11 @@ export default {
         this.setDefaultValue(params, 'searchData')
       } else {
         this.searchData = [
+          { label: '楼栋名', key: 'building_num', type: 'select', options: bnArr },
           { label: '每层户数', key: 'batchCol', changeHandle: this.colChange },
           { label: '多少层', key: 'batchRow' },
-          { label: '楼栋名', key: 'building_num' },
-          { label: '层高', key: 'floor_height' },
-          { label: '装修单价', key: 'decoration' },
+          // { label: '层高', key: 'floor_height' },
+          // { label: '装修单价', key: 'decoration' },
           { label: '销控状态', key: 'house_sale_state', type: 'select', options: this.$dictData.house_sale_state },
           { label: '真实折扣', label2: '如: *0.95,-20000', key: 'house_discount' },
           { label: '销控备注', key: 'house_sale_remark' },
@@ -248,7 +255,7 @@ export default {
           house_type,
           house_img,
           houseImg,
-          blank: 1,
+          blank: '',
         })
       })
       this.tableData = [...curArr]
@@ -317,9 +324,7 @@ export default {
   padding-bottom: 50px;
 }
 ::v-deep .el-form-item {
-  &:nth-child(5) {
-    margin-right: 300px;
-  }
+
 }
 
 .scoped-tips {

src/views/house/theme.vue

@@ -95,7 +95,7 @@ export default {
             { label: '更新时间', prop: 'update_at' },
             { label: '操作', width: 220, type: 'handle2', operations:
               [
-                { label: '更新摇号信息', func: this.openLEPopup, btnType: 'success' },
+                { label: '更新一房一价', func: this.openLEPopup, btnType: 'success' },
                 { label: '编辑', func: this.openPopup, btnType: 'primary' },
                 { label: '删除', func: this.delHandle, btnType: 'danger' },
               ]