wangfei 6 年前
父节点
当前提交
58ba3a7018
共有 5 个文件被更改,包括 23 次插入4 次删除
  1. 1
    1
      src/config/api.js
  2. 1
    1
      src/views/appointment/list.vue
  3. 18
    1
      src/views/building/edit.vue
  4. 2
    0
      src/views/cms/pageImgList.vue
  5. 1
    1
      vue.config.js

+ 1
- 1
src/config/api.js 查看文件

64
     },
64
     },
65
     delete: {
65
     delete: {
66
       method: 'delete',
66
       method: 'delete',
67
-      url: `${commPrefix}/buildingApartment/:id`
67
+      url: `${commPrefix}/apartment/deleted/:id`
68
     }
68
     }
69
   },
69
   },
70
   appointment: {
70
   appointment: {

+ 1
- 1
src/views/appointment/list.vue 查看文件

187
     appointHx () {
187
     appointHx () {
188
       this.appointWriteOff({
188
       this.appointWriteOff({
189
         id: this.currentRow.appointmentId,
189
         id: this.currentRow.appointmentId,
190
-        detail: JSON.stringify({writeoffRemark: this.remark})
190
+        detail: {writeoffRemark: this.remark}
191
       }).then(() => {
191
       }).then(() => {
192
         this.getList()
192
         this.getList()
193
         this.dialogHxVisible = false
193
         this.dialogHxVisible = false

+ 18
- 1
src/views/building/edit.vue 查看文件

24
         <el-form-item label="电话">
24
         <el-form-item label="电话">
25
           <el-input v-model="building.tel"></el-input>
25
           <el-input v-model="building.tel"></el-input>
26
         </el-form-item>
26
         </el-form-item>
27
+        <el-form-item label="项目动态">
28
+          <el-input v-model="building.dynamic"></el-input>
29
+        </el-form-item>
27
         <el-form-item label="物业类型">
30
         <el-form-item label="物业类型">
28
           <el-select v-model="buildingProperty" multiple placeholder="请选择">
31
           <el-select v-model="buildingProperty" multiple placeholder="请选择">
29
             <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
32
             <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
367
       })
370
       })
368
     },
371
     },
369
     handleDel (row) {
372
     handleDel (row) {
370
-      
373
+      this.$confirm('确认删除此数据?', '提示', {
374
+        confirmButtonText: '确定',
375
+        cancelButtonText: '取消',
376
+        type: 'warning'
377
+      }).then(() => {
378
+        if (this.building.status === 1) {
379
+          this.$message.error('当前楼盘处于发布状态,不允许删除!')
380
+          return false
381
+        }
382
+        this.deleteApartment({
383
+          id: row.apartmentId
384
+        }).then(() => {
385
+          this.getAparmentList()
386
+        })
387
+      })
371
     }
388
     }
372
   },
389
   },
373
   created () {
390
   created () {

+ 2
- 0
src/views/cms/pageImgList.vue 查看文件

101
   },
101
   },
102
   methods: {
102
   methods: {
103
     ...mapBannerActions([
103
     ...mapBannerActions([
104
+      'setDetailNull',
104
       'getBanners',
105
       'getBanners',
105
       'deleteBanner'
106
       'deleteBanner'
106
     ]),
107
     ]),
129
       this.getBannerList(this.activeName, page)
130
       this.getBannerList(this.activeName, page)
130
     },
131
     },
131
     addImg () {
132
     addImg () {
133
+      this.setDetailNull()
132
       this.$router.push({name: 'pageBannerEdit'})
134
       this.$router.push({name: 'pageBannerEdit'})
133
     },
135
     },
134
     handleEdit (row) {
136
     handleEdit (row) {

+ 1
- 1
vue.config.js 查看文件

3
   devServer: {
3
   devServer: {
4
     proxy: {
4
     proxy: {
5
       '/api': {
5
       '/api': {
6
-        target: 'http://localhost:8080',
6
+        target: 'http://localhost:8566',
7
         changeOrigin: true,
7
         changeOrigin: true,
8
         pathRewrite: {
8
         pathRewrite: {
9
           '^/api': '/'
9
           '^/api': '/'