Commit ad5052c5438222621d9ea785cdd68fe19916a7f4
1 parent
1d633c39
1
Showing
7 changed files
with
140 additions
and
109 deletions
admin-web-master/src/components/add/addht.vue
| ... | ... | @@ -40,7 +40,7 @@ |
| 40 | 40 | cereContractTemplate,cerePlatformMerchant |
| 41 | 41 | } from '@/api/newly.js' |
| 42 | 42 | import { |
| 43 | - dataInprotDocument | |
| 43 | + dataInprotDocument,modifyResourceStatus | |
| 44 | 44 | } from '@/api/newly.js' |
| 45 | 45 | import { |
| 46 | 46 | msgedit |
| ... | ... | @@ -248,6 +248,12 @@ import { |
| 248 | 248 | message: '添加成功', |
| 249 | 249 | type: 'success' |
| 250 | 250 | }) |
| 251 | + modifyResourceStatus({ | |
| 252 | + resourcesId: info1.shopNumber, | |
| 253 | + status:"4" | |
| 254 | + }).then(res => { | |
| 255 | + console.error(res) | |
| 256 | + }) | |
| 251 | 257 | this.$emit('removeonaction', '1') |
| 252 | 258 | } else { |
| 253 | 259 | this.$message({ |
| ... | ... | @@ -342,31 +348,37 @@ import { |
| 342 | 348 | message: '添加成功', |
| 343 | 349 | type: 'success' |
| 344 | 350 | }) |
| 345 | - if(this.info.id) { | |
| 346 | - if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) { | |
| 347 | - msgedit({ | |
| 348 | - auditStatus: '4', | |
| 349 | - id: this.info.id, | |
| 350 | - contractNumber: this.formInline.contractNumber | |
| 351 | - }) | |
| 352 | - } | |
| 353 | - if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) { | |
| 354 | - AdvertiserInfoEdit({ | |
| 355 | - auditStatus: '4', | |
| 356 | - id: this.info.id, | |
| 357 | - contractId: this.formInline.contractNumber | |
| 358 | - }).then(item => { | |
| 359 | - this.getAll() | |
| 360 | - }) | |
| 361 | - } | |
| 362 | - if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { | |
| 363 | - msgedit({ | |
| 364 | - auditStatus: '4', | |
| 365 | - id: this.info.id, | |
| 366 | - contractNumber: this.formInline.contractNumber | |
| 367 | - }) | |
| 368 | - } | |
| 369 | - } | |
| 351 | + modifyResourceStatus({ | |
| 352 | + resourcesId: info1.shopNumber, | |
| 353 | + status:"4" | |
| 354 | + }).then(res => { | |
| 355 | + console.error(res) | |
| 356 | + }) | |
| 357 | + // if(this.info.id) { | |
| 358 | + // if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) { | |
| 359 | + // msgedit({ | |
| 360 | + // auditStatus: '4', | |
| 361 | + // id: this.info.id, | |
| 362 | + // contractNumber: this.formInline.contractNumber | |
| 363 | + // }) | |
| 364 | + // } | |
| 365 | + // if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) { | |
| 366 | + // AdvertiserInfoEdit({ | |
| 367 | + // auditStatus: '4', | |
| 368 | + // id: this.info.id, | |
| 369 | + // contractId: this.formInline.contractNumber | |
| 370 | + // }).then(item => { | |
| 371 | + // this.getAll() | |
| 372 | + // }) | |
| 373 | + // } | |
| 374 | + // if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { | |
| 375 | + // msgedit({ | |
| 376 | + // auditStatus: '4', | |
| 377 | + // id: this.info.id, | |
| 378 | + // contractNumber: this.formInline.contractNumber | |
| 379 | + // }) | |
| 380 | + // } | |
| 381 | + // } | |
| 370 | 382 | this.$emit('removeonaction', '1') |
| 371 | 383 | } else { |
| 372 | 384 | this.$message({ | ... | ... |
admin-web-master/src/components/resourceCommodity/index.vue
| ... | ... | @@ -27,17 +27,17 @@ |
| 27 | 27 | <el-row :gutter="20"> |
| 28 | 28 | <el-col :span="8"> |
| 29 | 29 | <el-form-item label="测绘面积" prop="surveyingArea"> |
| 30 | - <div class="duiqi">{{editbgid.surveyingArea || '无'}}</div> | |
| 30 | + <div class="duiqi">{{editbgid.surveyingArea?editbgid.surveyingArea+' ㎡': '无'}}</div> | |
| 31 | 31 | </el-form-item> |
| 32 | 32 | </el-col> |
| 33 | 33 | <el-col :span="8"> |
| 34 | 34 | <el-form-item label="产权面积" prop="propertyArea"> |
| 35 | - <div class="duiqi">{{editbgid.propertyArea || '无'}}</div> | |
| 35 | + <div class="duiqi">{{editbgid.propertyArea?editbgid.propertyArea+' ㎡':'无'}}</div> | |
| 36 | 36 | </el-form-item> |
| 37 | 37 | </el-col> |
| 38 | 38 | <el-col :span="8"> |
| 39 | 39 | <el-form-item label="实际使用面积" prop="actualUsableArea"> |
| 40 | - <div class="duiqi">{{editbgid.actualUsableArea || '无'}}</div> | |
| 40 | + <div class="duiqi">{{editbgid.actualUsableArea?editbgid.actualUsableArea+' ㎡':'无'}}</div> | |
| 41 | 41 | </el-form-item> |
| 42 | 42 | </el-col> |
| 43 | 43 | </el-row> | ... | ... |
admin-web-master/src/views/detect/examine/index.vue
| ... | ... | @@ -78,7 +78,7 @@ |
| 78 | 78 | </el-table-column> |
| 79 | 79 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 80 | 80 | <template slot-scope="scope"> |
| 81 | - {{scope.row.cereBasicInformationShop.publishStatus=='0'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':'-'}} | |
| 81 | + {{scope.row.cereBasicInformationShop.publishStatus=='0'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} | |
| 82 | 82 | </template> |
| 83 | 83 | </el-table-column> |
| 84 | 84 | <el-table-column label="操作" fixed="right" prop="sh"> |
| ... | ... | @@ -123,7 +123,7 @@ |
| 123 | 123 | </el-table-column> |
| 124 | 124 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 125 | 125 | <template slot-scope="scope"> |
| 126 | - {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':'-'}} | |
| 126 | + {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} | |
| 127 | 127 | </template> |
| 128 | 128 | </el-table-column> |
| 129 | 129 | <el-table-column label="操作" fixed="right" prop="sh"> |
| ... | ... | @@ -168,7 +168,7 @@ |
| 168 | 168 | </el-table-column> |
| 169 | 169 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 170 | 170 | <template slot-scope="scope"> |
| 171 | - {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':'-'}} | |
| 171 | + {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} | |
| 172 | 172 | </template> |
| 173 | 173 | </el-table-column> |
| 174 | 174 | <el-table-column label="操作" fixed="right" prop="sh"> | ... | ... |
admin-web-master/src/views/detect/information/index.vue
| ... | ... | @@ -68,7 +68,7 @@ |
| 68 | 68 | <el-table-column label="提交时间" prop="createDate" > </el-table-column> |
| 69 | 69 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 70 | 70 | <template slot-scope="scope"> |
| 71 | - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} | |
| 71 | + {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} | |
| 72 | 72 | </template> |
| 73 | 73 | </el-table-column> |
| 74 | 74 | <el-table-column label="操作" min-width="100" fixed="right"> | ... | ... |
admin-web-master/src/views/detect/map/index.vue
| ... | ... | @@ -90,7 +90,7 @@ |
| 90 | 90 | <el-table-column label="提交时间" prop="createDate" > </el-table-column> |
| 91 | 91 | <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> |
| 92 | 92 | <template slot-scope="scope"> |
| 93 | - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} | |
| 93 | + {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} | |
| 94 | 94 | </template> |
| 95 | 95 | </el-table-column> |
| 96 | 96 | <el-table-column label="操作" min-width="100" fixed="right"> | ... | ... |
admin-web-master/src/views/serve/kefuServe/index.vue
| ... | ... | @@ -13,93 +13,101 @@ |
| 13 | 13 | </div> |
| 14 | 14 | </div> --> |
| 15 | 15 | <div> |
| 16 | + <el-tabs v-model="xiangTab"> | |
| 17 | + <el-tab-pane label="报修记录" name="first"> | |
| 18 | + <el-table :data=" | |
| 19 | + tableData.slice( | |
| 20 | + (currentPage - 1) * pageSize, | |
| 21 | + currentPage * pageSize | |
| 22 | + ) | |
| 23 | + " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | |
| 24 | + style="width: 100%"> | |
| 25 | + <el-table-column label="序号" width="auto" min-width="6%" align="center"> | |
| 26 | + <template slot-scope="scope"> | |
| 27 | + {{scope.$index+1}} | |
| 28 | + </template> | |
| 29 | + </el-table-column> | |
| 30 | + <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" /> | |
| 31 | + <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" /> | |
| 32 | + <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" /> | |
| 33 | + <el-table-column label="备注" prop="memo" width="auto" min-width="12%" /> | |
| 34 | + | |
| 35 | + | |
| 36 | + <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" /> | |
| 37 | + <el-table-column label="报修到期时间" prop="repairEndTime" width="auto" min-width="12%" /> | |
| 38 | + <el-table-column label="报修人" prop="repairman" width="auto" min-width="12%" /> | |
| 39 | + <!-- <el-table-column label="状态" prop="repairStatus" width="auto" min-width="12%" > | |
| 40 | + <template slot-scope="scope"> | |
| 41 | + {{scope.row.repairStatus==0?'暂未派单':scope.row.repairStatus==1?'已派单':scope.row.repairStatus==2?'已完成':scope.row.repairStatus==3?'已过期':''}} | |
| 42 | + </template> | |
| 43 | + </el-table-column> --> | |
| 44 | + <el-table-column label="操作" width="auto" min-width="12%"> | |
| 45 | + <template slot-scope="scope"> | |
| 46 | + <div class="tableBtn greens" @click="handleEditForm(scope.row)"> | |
| 47 | + 查看 | |
| 48 | + </div> | |
| 49 | + <!-- <div class="tableBtn greens" @click="setPei(scope.row)"> | |
| 50 | + 报修流程配置 | |
| 51 | + </div> --> | |
| 52 | + <div class="tableBtn greens" @click="delGuan(scope.row,1)"> | |
| 53 | + 删除 | |
| 54 | + </div> | |
| 55 | + </template> | |
| 56 | + </el-table-column> | |
| 57 | + </el-table> | |
| 58 | + </el-tab-pane> | |
| 59 | + <el-tab-pane label="投诉记录" name="second"> | |
| 60 | + <el-table :data=" | |
| 61 | + toushuData.slice( | |
| 62 | + (currentPage - 1) * pageSize, | |
| 63 | + currentPage * pageSize | |
| 64 | + ) | |
| 65 | + " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | |
| 66 | + style="width: 100%"> | |
| 67 | + <el-table-column label="序号" width="auto" min-width="6%" align="center"> | |
| 68 | + <template slot-scope="scope"> | |
| 69 | + {{scope.$index+1}} | |
| 70 | + </template> | |
| 71 | + </el-table-column> | |
| 72 | + <el-table-column label="投诉类型" prop="complaintType" width="auto" min-width="12%" /> | |
| 73 | + <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" /> | |
| 74 | + <el-table-column label="备注" prop="remark" width="auto" min-width="12%" /> | |
| 75 | + <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" /> | |
| 76 | + | |
| 77 | + <el-table-column label="操作" width="auto" min-width="12%"> | |
| 78 | + <template slot-scope="scope"> | |
| 79 | + <div class="tableBtn greens" @click="handleEditForm(scope.row)"> | |
| 80 | + 查看 | |
| 81 | + </div> | |
| 82 | + <!-- <div class="tableBtn greens"> | |
| 83 | + 再次发布 | |
| 84 | + </div> --> | |
| 85 | + <div class="tableBtn greens" @click="delGuan(scope.row,2)"> | |
| 86 | + 删除 | |
| 87 | + </div> | |
| 88 | + </template> | |
| 89 | + </el-table-column> | |
| 90 | + </el-table> | |
| 91 | + </el-tab-pane> | |
| 92 | + </el-tabs> | |
| 16 | 93 | <!-- 搜索 --> |
| 17 | - <div style="margin-bottom:20px;"> | |
| 94 | + <!-- <div style="margin-bottom:20px;"> | |
| 18 | 95 | 报修记录 |
| 19 | - </div> | |
| 96 | + </div> --> | |
| 20 | 97 | |
| 21 | 98 | <!-- 表格 --> |
| 22 | - <el-table :data=" | |
| 23 | - tableData.slice( | |
| 24 | - (currentPage - 1) * pageSize, | |
| 25 | - currentPage * pageSize | |
| 26 | - ) | |
| 27 | - " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | |
| 28 | - style="width: 100%"> | |
| 29 | - <el-table-column label="序号" width="auto" min-width="6%" align="center"> | |
| 30 | - <template slot-scope="scope"> | |
| 31 | - {{scope.$index+1}} | |
| 32 | - </template> | |
| 33 | - </el-table-column> | |
| 34 | - <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" /> | |
| 35 | - <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" /> | |
| 36 | -<el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" /> | |
| 37 | - <el-table-column label="备注" prop="memo" width="auto" min-width="12%" /> | |
| 38 | - | |
| 39 | - | |
| 40 | - <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" /> | |
| 41 | - <el-table-column label="报修到期时间" prop="repairEndTime" width="auto" min-width="12%" /> | |
| 42 | - <el-table-column label="报修人" prop="repairman" width="auto" min-width="12%" /> | |
| 43 | -<!-- <el-table-column label="状态" prop="repairStatus" width="auto" min-width="12%" > | |
| 44 | - <template slot-scope="scope"> | |
| 45 | - {{scope.row.repairStatus==0?'暂未派单':scope.row.repairStatus==1?'已派单':scope.row.repairStatus==2?'已完成':scope.row.repairStatus==3?'已过期':''}} | |
| 46 | - </template> | |
| 47 | - </el-table-column> --> | |
| 48 | - <el-table-column label="操作" width="auto" min-width="17%"> | |
| 49 | - <template slot-scope="scope"> | |
| 50 | - <div class="tableBtn greens" @click="handleEditForm(scope.row)"> | |
| 51 | - 查看 | |
| 52 | - </div> | |
| 53 | -<!-- <div class="tableBtn greens" @click="setPei(scope.row)"> | |
| 54 | - 报修流程配置 | |
| 55 | - </div> --> | |
| 56 | - <div class="tableBtn greens" @click="delGuan(scope.row,1)"> | |
| 57 | - 删除 | |
| 58 | - </div> | |
| 59 | - </template> | |
| 60 | - </el-table-column> | |
| 61 | - </el-table> | |
| 99 | + | |
| 62 | 100 | |
| 63 | 101 | </div> |
| 64 | 102 | |
| 65 | 103 | <div> |
| 66 | 104 | <!-- 搜索 --> |
| 67 | - <div style="margin:20px 0;"> | |
| 105 | + <!-- <div style="margin:20px 0;"> | |
| 68 | 106 | 投诉记录 |
| 69 | - </div> | |
| 107 | + </div> --> | |
| 70 | 108 | |
| 71 | 109 | <!-- 表格 --> |
| 72 | - <el-table :data=" | |
| 73 | - toushuData.slice( | |
| 74 | - (currentPage - 1) * pageSize, | |
| 75 | - currentPage * pageSize | |
| 76 | - ) | |
| 77 | - " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" | |
| 78 | - style="width: 100%"> | |
| 79 | - <el-table-column label="序号" width="auto" min-width="6%" align="center"> | |
| 80 | - <template slot-scope="scope"> | |
| 81 | - {{scope.$index+1}} | |
| 82 | - </template> | |
| 83 | - </el-table-column> | |
| 84 | - <el-table-column label="投诉类型" prop="complaintType" width="auto" min-width="12%" /> | |
| 85 | - <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" /> | |
| 86 | - <el-table-column label="备注" prop="remark" width="auto" min-width="12%" /> | |
| 87 | - <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" /> | |
| 88 | - | |
| 89 | - <el-table-column label="操作" width="auto" min-width="17%"> | |
| 90 | - <template slot-scope="scope"> | |
| 91 | - <div class="tableBtn greens" @click="handleEditForm(scope.row)"> | |
| 92 | - 查看 | |
| 93 | - </div> | |
| 94 | - <!-- <div class="tableBtn greens"> | |
| 95 | - 再次发布 | |
| 96 | - </div> --> | |
| 97 | - <div class="tableBtn greens" @click="delGuan(scope.row,2)"> | |
| 98 | - 删除 | |
| 99 | - </div> | |
| 100 | - </template> | |
| 101 | - </el-table-column> | |
| 102 | - </el-table> | |
| 110 | + | |
| 103 | 111 | <!-- 详情框 :visible.sync="detbox" --> |
| 104 | 112 | <el-dialog :visible.sync="detbox" custom-class="dialog_css" style="padding: 0" width="50%" center |
| 105 | 113 | :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false"> |
| ... | ... | @@ -203,6 +211,7 @@ |
| 203 | 211 | export default { |
| 204 | 212 | data() { |
| 205 | 213 | return { |
| 214 | + xiangTab: 'first', | |
| 206 | 215 | detbox: false, // 详情 |
| 207 | 216 | edit: true, // 编辑 |
| 208 | 217 | action: uploadUrl, // 上传图片 | ... | ... |
admin-web-master/src/views/shopRental/manage/index.vue
| ... | ... | @@ -161,6 +161,9 @@ |
| 161 | 161 | import { |
| 162 | 162 | cereContractInformation |
| 163 | 163 | } from '@/api/commodityLease.js' |
| 164 | + import { | |
| 165 | + modifyResourceStatus | |
| 166 | + } from '@/api/newly.js' | |
| 164 | 167 | export default { |
| 165 | 168 | data() { |
| 166 | 169 | return { |
| ... | ... | @@ -247,6 +250,13 @@ |
| 247 | 250 | message: '终止成功', |
| 248 | 251 | type: 'success' |
| 249 | 252 | }) |
| 253 | + let c1 = row.shopNumber | |
| 254 | + modifyResourceStatus({ | |
| 255 | + resourcesId: c1, | |
| 256 | + status:"0" | |
| 257 | + }).then(res => { | |
| 258 | + console.error(res) | |
| 259 | + }) | |
| 250 | 260 | // this.$emit('removeonaction', '1') |
| 251 | 261 | this.getAll() |
| 252 | 262 | } else { | ... | ... |