t

src/components/Common/BaseForm.vue

@@ -169,7 +169,7 @@
           :on-error="uploadError"
           :before-upload="uploadBefore"
         >
-          <img v-if="baseForm[item.key]" :src="baseForm[item.key]" class="img" @click="focusHandle(item.key)">
+          <img v-if="baseForm[item.key]" :src="baseForm[item.key].indexOf('_adm0') > -1 ? baseForm[item.key] : baseForm[item.key] + '_adm0'" class="img" @click="focusHandle(item.key)">
           <i v-else class="el-icon-plus icon" @click="focusHandle(item.key)" />
         </el-upload>
       </el-form-item>

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

@@ -200,13 +200,15 @@ export default {
       let params = { ...this.cObj }
       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: '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: 'under_way', rules: 1 },
+        { label: '本期包含期数', key: 'building_num', rules: 1 },
         { label: '摇号中的日期', key: 'time', type: 'datePicker', rules: 1 },
         { label: '摇号结果的标题', key: 'lottery_res' },
       ]
+      params.project_img = this.IMadd(params.project_img)
       this.setDefaultValue(params)
     },
     close(str) {
@@ -230,6 +232,7 @@ export default {
             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)
             // console.log(newForm)
             // return
             let apiStr = 'admestatelottery2add'

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

@@ -6,7 +6,7 @@
       :wrapper-closable="false"
       :close-on-press-escape="false"
       :visible.sync="isShow"
-      size="960px"
+      size="1100px"
       custom-class="xl-drawer"
       direction="rtl"
     >
@@ -24,6 +24,7 @@
         :columns="listConfig"
         :current-page="currentPage"
         :page-size="-1"
+        :operationsDefaultLength="4"
       />
       <div class="xl-form">
         <div class="xl-form-footer fixed" style="width:960px;padding-top: 20px;border-top: 1px solid #dcdcdc;right:0;">
@@ -32,13 +33,22 @@
         </div>
       </div>
     </el-drawer>
+    <rpt-edit
+      :isShow="isREShow"
+      :curObj="reObj"
+      :roomAreaList="roomAreaList"
+      @close="closeREPopup"
+     />
   </div>
 </template>
 <script>
 import { arrToObj } from '@/utils'
 import baseTable from '_m/baseTable.js'
+import RptEdit from './RoomPriceTypeEdit.vue'
 export default {
-  components: {},
+  components: {
+    RptEdit
+  },
   mixins: [...mixins, baseTable],
   props: {
     isShow: Boolean,
@@ -55,6 +65,8 @@ export default {
       cObj: {},
       searchData: [],
       roomAreaList: [],
+      isREShow: false,
+      reObj: {},
     }
   },
   computed: {
@@ -78,11 +90,12 @@ export default {
         { label: '套内面积(㎡)', prop: 'space', type: 'input', width: '80px'},
         { label: '毛坯单价(元/㎡)', prop: 'blank', type: 'input', width: '90px'},
         { label: '装修单价(元/㎡)', prop: 'decoration', type: 'input', width: '90px'},
-        { label: '户型名', prop: 'house_type', type: 'input', width: '120px'},
+        { label: '户型名', prop: 'house_type', width: '100px'},
         { label: '户型图', prop: 'houseImg', type: 'img'},
-        { label: '操作', width: 120, type: 'handle2', operations:
+        { label: '操作', width: 200, type: 'handle2', operations:
           [
             { label: '保存', func: this.saveHandle, btnType: 'primary', hide: 'noCan' },
+            { label: '修改户型', func: this.openREPopup, btnType: 'success', hide: 'noCan' },
             { label: '删除', func: this.delHandle, btnType: 'danger' },
           ]
         }
@@ -92,7 +105,6 @@ export default {
   watch: {
     isShow: function(val) {
       if (val) {
-        console.log(this.curObj)
         if (this.type === 'edit') {
           this.getData()
         }
@@ -112,6 +124,17 @@ export default {
     },
   },
   methods: {
+    openREPopup(row) {
+      console.log(row)
+      this.reObj = row
+      this.isREShow = true
+    },
+    closeREPopup(obj) {
+      this.isREShow = false
+      if (obj) {
+        this.getData()
+      }
+    },
     getData () {
       this.$api.house.admestatelotterypricelist({estate_id: this.curObj.estate_id}).then(res => {
         let list = res.list || []
@@ -191,7 +214,7 @@ export default {
             space = newForm[f]
           }
         }
-        curArr.push({
+        curArr.unshift({
           ...n,
           storey: rowIndex,
           room: `${rowIndex}0${colIndex}`,
@@ -200,6 +223,7 @@ export default {
           house_type,
           house_img,
           houseImg,
+          blank: 1,
         })
       })
       this.tableData = [...curArr]

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

@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :visible.sync="isShow"
+      :title="curObj.room + '-修改户型'"
+      :fullscreen="false"
+      width="700px"
+      custom-class="xl-dialog"
+      center
+    >
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px">
+      </base-form>
+      <div class="xl-form">
+        <div class="xl-form-footer">
+          <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
+          <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  components: { },
+  mixins,
+  props: {
+    isShow: Boolean,
+    curObj: Object,
+    roomAreaList: Array,
+  },
+  inject: ['parentData'],
+  data() {
+    return {
+      loading: false,
+      formData: [],
+    }
+  },
+  watch: {
+    isShow: function(val) {
+      if (val) {
+        console.log(this.curObj)
+        this.getDef()
+      }
+    },
+  },
+  methods: {
+    getDef (str) {
+      let params = {}
+      this.formData = [
+        { label: `户型`, key: 'ht', type: 'select', options: this.roomAreaList}
+      ]
+      this.setDefaultValue(params)
+    },
+    close (str) {
+      if (str === 'confirm') {
+        this.$refs['ruleForm'].$refs['baseForm'].validate((valid) => {
+          if (valid) {
+            const oldform = this.$refs.ruleForm.baseForm
+            let newForm = { ...oldform }
+            let house_type = ''
+            let house_img = ''
+            this.roomAreaList.forEach(ra => {
+              if (newForm['ht'] === ra.id) {
+                house_type = ra.key2
+                house_img = ra.pri_image
+              }
+            })
+            this.$api.house.admestatelotterypriceedit({
+              ...this.curObj,
+              house_type,
+              house_img,
+            }).then(res => {
+              this.$emit('close', house_type)
+              this.$msgs('更新成功~')
+            })
+          }
+        })
+      } else {
+        this.$emit('close')
+      }
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '../../../../styles/libEdit.scss';
+.lib-edit {
+  padding-top: 0;
+  ::v-deep .el-date-editor.el-input {
+    width: 100%;
+  }
+  ::v-deep .el-textarea__inner {
+    height: 300px;
+  }
+}
+
+.scoped-img-area {
+  padding-left: 40px;
+  .sia-op {
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    border: 1px solid #f2f2f2;
+    width: 80px;
+    height: 80px;
+    position: relative;
+    &:hover {
+      .img-big {
+        display: block;
+      }
+    }
+    .img {
+      width: 80px;
+      height: 80px;
+    }
+    .close {
+      position: absolute;
+      width: 20px;
+      height: 20px;
+      top: -10px;
+      right: -10px;
+      background: url(../../../../assets/icon_g_close.png) no-repeat;
+      background-size: 20px;
+      cursor: pointer;
+    }
+    .img-big {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 400px;
+      height: auto;
+      display: none;
+      box-shadow: 10px 10px 10px #ccc;
+      z-index: 99;
+    }
+  }
+  .sia-img {
+    display: inline-block;
+    vertical-align: middle;
+    width: 80px;
+    height: 80px;
+    overflow: hidden;
+    border: 1px dashed #999;
+    margin-bottom: 10px;
+    .el-icon-plus {
+      color: #999;
+      padding: 30px;
+    }
+  }
+}
+</style>