房源 出售 出租模块修改优化

src/api/house.js

@@ -275,9 +275,12 @@ export default {
   admestateupdateprice: params => { // 楼盘自动更新均价 开关
     return getRequestNoSort('/adm/estate/update/price', params, 'loading')
   },
-  admrenthouselist: params => { // 租房 列表接口
+  admrenthouselist: params => { // 小程序编辑 新版本 租房 列表接口
     return getRequest('/adm/rent/house/list', params)
   },
+  admrenthouseshow: params => { // 小程序编辑 新版本  租房 显示隐藏
+    return getRequestNoSort('/adm/rent/house/show', params, 'loading')
+  },
   admrenthouseadd: params => { // 租房 添加
     return getRequestNoSort('/adm/rent/house/add', params, 'loading')
   },
@@ -293,4 +296,10 @@ export default {
   admrenthousedel: params => { // 租房 删除
     return getRequestNoSort('/adm/rent/house/del', params, 'loading')
   },
+  admeshouselist: params => { // 新版 小程序上房源  列表
+    return getRequest('/adm/eshouse/list', params)
+  },
+  admeshouseshow: params => { // 新版 小程序上房源  显示隐藏
+    return getRequest('/adm/eshouse/show', params, 'loading')
+  },
 }

src/views/room/components/searchForm/Index.vue

@@ -32,12 +32,13 @@ export default {
         { label: '所属楼盘', key: 'estate_id', type: 'selectRemote',
           remoteParams: { skey: 'estate_name', api: `house.admestatelist?estate_tag=二手`, opKey: 'estate_name', opVal: 'id' }
         },
-        { label: '置业经理', key: 'sale_id', type: 'selectRemote',
-          remoteParams: { skey: 'sale_name', api: `user.admsaleuserlist?page_size=999`, opKey: 'sale_name', opVal: 'id' }
-        },
+        // { label: '置业经理', key: 'sale_id', type: 'selectRemote',
+        //   remoteParams: { skey: 'sale_name', api: `user.admsaleuserlist?page_size=999`, opKey: 'sale_name', opVal: 'id' }
+        // },
         { label: '所属区域', key: 'area_type', type: 'select', options: this.$dictData.area_type},
-        { label: '楼盘类型', key: 'product_type', type: 'select', options: this.$dictData.product_type},
-        { label: '房源户型', key: 'house_type', type: 'select', options: this.$dictData.house_type},
+        { label: '状态', key: 'hide_status', type: 'select', options: this.$dictData.hide_status},
+        // { label: '楼盘类型', key: 'product_type', type: 'select', options: this.$dictData.product_type},
+        // { label: '房源户型', key: 'house_type', type: 'select', options: this.$dictData.house_type},
       ]
       this.setDefaultValue(params, 'searchData')
     },

src/views/room/components/searchForm/Rent.vue

@@ -32,12 +32,12 @@ export default {
         { label: '所属楼盘', key: 'estate_id', type: 'selectRemote',
           remoteParams: { skey: 'estate_name', api: `house.admestatelist?estate_tag=二手`, opKey: 'estate_name', opVal: 'id' }
         },
-        { label: '置业经理', key: 'sale_id', type: 'selectRemote',
-          remoteParams: { skey: 'sale_name', api: `user.admsaleuserlist?page_size=999`, opKey: 'sale_name', opVal: 'id' }
-        },
+        // { label: '置业经理', key: 'sale_id', type: 'selectRemote',
+        //   remoteParams: { skey: 'sale_name', api: `user.admsaleuserlist?page_size=999`, opKey: 'sale_name', opVal: 'id' }
+        // },
         { label: '所属区域', key: 'area_type', type: 'select', options: this.$dictData.area_type},
-        { label: '楼盘类型', key: 'product_type', type: 'select', options: this.$dictData.product_type},
-        { label: '房源户型', key: 'house_type', type: 'select', options: this.$dictData.house_type},
+        { label: '状态', key: 'hide_status', type: 'select', options: this.$dictData.hide_status},
+        // { label: '房源户型', key: 'house_type', type: 'select', options: this.$dictData.house_type},
       ]
       this.setDefaultValue(params, 'searchData')
     },

src/views/room/index.vue

@@ -13,8 +13,6 @@
       :total-records="totalRecords"
       @currentChange="pageHandle"
       @sizeChange="sizeChange"
-      :isAdd="true"
-      @add="openPopup"
       :operationsDefaultLength="5"
     />
     <popup-edit
@@ -43,7 +41,7 @@ export default {
   mixins: [baseTable],
   data() {
     return {
-      apiStr: 'house.admoldhouselist',
+      apiStr: 'house.admeshouselist',
       searchForm: null,
       isDtlShow: false,
       // noCreated: true,
@@ -63,53 +61,72 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
-        { label: '排序', prop: 'sort', type: 'input', width: 80},
+        // { label: '排序', prop: 'sort', type: 'input', width: 80},
         { label: '编号', prop: 'id' },
         { label: '楼盘', prop: 'estate_name' },
-        { label: '浏览数', prop: 'view_count' },
-        { label: '置业经理', prop: 'sale_name' },
-        { label: '标题', prop: 'title' },
+        // { label: '浏览数', prop: 'view_count' },
+        // { label: '置业经理', prop: 'sale_name' },
+        { label: '标题', prop: 'title', minWidth: 200, fullShow: true },
         { label: '主图', prop: 'pri_image', type: 'img' },
-        { label: '详细地址', prop: 'detail_address', fullShow: true, minWidth: 100 },
         { label: '总价', prop: 'price' },
         { label: '面积㎡', prop: 'area' },
-        { label: '房源类型', prop: 'house_type', width: 100, fullShow: true, type: 'flag', flags: arrToObj(this.$dictData.house_type) },
         { label: '所属区域', prop: 'area_type', type: 'flag', flags: arrToObj(this.$dictData.area_type) },
-        { label: '更新人', prop: 'update_by' },
+        { label: '状态', prop: 'hide_status', type: 'tag', tags: arrToObj(this.$dictData.hide_status), tagTypeObj: {'1': 'success', '2': 'danger'} },
         { label: '更新时间', prop: 'update_at' },
-        { label: '创建人', prop: 'create_by' },
         { label: '创建时间', prop: 'create_at' },
-        { label: '操作', width: 200, type: 'handle2', operations:
+        { label: '操作', width: 80, type: 'handle2', operations:
           [
-            { label: '保存排序', func: this.saveHandle, btnType: 'success' },
-            { label: '编辑', func: this.openPopup, btnType: 'primary' },
-            { label: '删除', func: this.delHandle, btnType: 'danger' },
+            { labelFor: 'hide_status', disabled: true, func: this.statusHandle, hide: 'nosys',
+              labelConfig: {
+                texts: {
+                  1: '隐藏',
+                  2: '显示'
+                },
+                btnTypes: {
+                  1: 'danger',
+                  2: 'success'
+                }
+              }
+            },
           ]
         }
       ]
     }
   },
   methods: {
-    saveHandle (row) {
-      this.$api.house.admoldhousesortedit({
-        id: row.id,
-        sort: row.sort,
-      }).then(data => {
-        this.$msgs(`已保存！`)
-        this.fetchData()
-      })
-    },
-    delHandle(row) {
-      this.$msg(`您确定要删除该楼盘吗？`, 'confirm', () => {
-        this.$api.house.admoldhousedel({
+    statusHandle (row) {
+      const hide_status = Number(row.hide_status) === 1 ? 2 : 1
+      const msgText = Number(row.hide_status) === 1 ? '隐藏' : '显示'
+      this.$msg(`确定要${msgText}该房源吗？`, 'confirm', ()=> {
+        this.$api.house.admeshouseshow({
           id: row.id,
-          status: 2
+          hide_status
         }).then(data => {
-          this.$msgs(`已删除！`)
+          this.$msgs(`${msgText}成功！`)
           this.fetchData()
         })
       }, null, true)
     },
+    // saveHandle (row) {
+    //   this.$api.house.admoldhousesortedit({
+    //     id: row.id,
+    //     sort: row.sort,
+    //   }).then(data => {
+    //     this.$msgs(`已保存！`)
+    //     this.fetchData()
+    //   })
+    // },
+    // delHandle(row) {
+    //   this.$msg(`您确定要删除该楼盘吗？`, 'confirm', () => {
+    //     this.$api.house.admoldhousedel({
+    //       id: row.id,
+    //       status: 2
+    //     }).then(data => {
+    //       this.$msgs(`已删除！`)
+    //       this.fetchData()
+    //     })
+    //   }, null, true)
+    // },
     openPopup(row) {
       if (row && row.id) {
         this.curObj = row

src/views/room/rent.vue

@@ -13,8 +13,6 @@
       :total-records="totalRecords"
       @currentChange="pageHandle"
       @sizeChange="sizeChange"
-      :isAdd="true"
-      @add="openPopup"
       :operationsDefaultLength="5"
     />
     <popup-edit
@@ -63,33 +61,59 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
-        { label: '排序', prop: 'sort', type: 'input', width: 80},
+        // { label: '排序', prop: 'sort', type: 'input', width: 80},
         { label: '编号', prop: 'id' },
         { label: '楼盘', prop: 'estate_name' },
-        { label: '浏览数', prop: 'view_count' },
-        { label: '置业经理', prop: 'sale_name' },
+        // { label: '浏览数', prop: 'view_count' },
+        // { label: '置业经理', prop: 'sale_name' },
         { label: '标题', prop: 'title' },
         { label: '主图', prop: 'pri_image', type: 'img' },
-        { label: '详细地址', prop: 'detail_address', fullShow: true, minWidth: 100 },
+        // { label: '详细地址', prop: 'detail_address', fullShow: true, minWidth: 100 },
         { label: '总价', prop: 'price' },
         { label: '面积㎡', prop: 'area' },
-        { label: '房源类型', prop: 'house_type', width: 100, fullShow: true, type: 'flag', flags: arrToObj(this.$dictData.house_type) },
+        // { label: '房源类型', prop: 'house_type', width: 100, fullShow: true, type: 'flag', flags: arrToObj(this.$dictData.house_type) },
         { label: '所属区域', prop: 'area_type', type: 'flag', flags: arrToObj(this.$dictData.area_type) },
-        { label: '更新人', prop: 'update_by' },
+        { label: '状态', prop: 'hide_status', type: 'tag', tags: arrToObj(this.$dictData.hide_status), tagTypeObj: {'1': 'success', '2': 'danger'} },
+        // { label: '更新人', prop: 'update_by' },
         { label: '更新时间', prop: 'update_at' },
-        { label: '创建人', prop: 'create_by' },
+        // { label: '创建人', prop: 'create_by' },
         { label: '创建时间', prop: 'create_at' },
-        { label: '操作', width: 200, type: 'handle2', operations:
+        { label: '操作', width: 80, type: 'handle2', operations:
           [
-            { label: '保存排序', func: this.saveHandle, btnType: 'success' },
-            { label: '编辑', func: this.openPopup, btnType: 'primary' },
-            { label: '删除', func: this.delHandle, btnType: 'danger' },
+            { labelFor: 'hide_status', disabled: true, func: this.statusHandle, hide: 'nosys',
+              labelConfig: {
+                texts: {
+                  1: '隐藏',
+                  2: '显示'
+                },
+                btnTypes: {
+                  1: 'danger',
+                  2: 'success'
+                }
+              }
+            },
+            // { label: '保存排序', func: this.saveHandle, btnType: 'success' },
+            // { label: '编辑', func: this.openPopup, btnType: 'primary' },
+            // { label: '删除', func: this.delHandle, btnType: 'danger' },
           ]
         }
       ]
     }
   },
   methods: {
+    statusHandle (row) {
+      const hide_status = Number(row.hide_status) === 1 ? 2 : 1
+      const msgText = Number(row.hide_status) === 1 ? '隐藏' : '显示'
+      this.$msg(`确定要${msgText}该房源吗？`, 'confirm', ()=> {
+        this.$api.house.admrenthouseshow({
+          id: row.id,
+          hide_status
+        }).then(data => {
+          this.$msgs(`${msgText}成功！`)
+          this.fetchData()
+        })
+      }, null, true)
+    },
     saveHandle (row) {
       this.$api.house.admrenthousesortedit({
         id: row.id,