webapp / GreenwayWeb

Commit 542e27d5696da5bb7d4af2766a383ef1defab17d

Authored by wesley88
1 parent 9d80ead0

1

Inline Side-by-side
Showing 22 changed files with 417 additions and 97 deletions
admin-web-master/src/api/newly.js
  View file @542e27d
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 // import request from '@/utils/request2' 2 // import request from '@/utils/request2'
  3 +
  4 +// 方案资源
  5 +export function resourcesFindPlan(data) {
  6 + return request({
  7 + url: '/cereBusinessPlan/resourcesFindPlan',
  8 + method: 'post',
  9 + data
  10 + })
  11 +}
  12 +// 发消息
  13 +export function sendToUser(data) {
  14 + return request({
  15 + url: '/cereMessage/sendToUser',
  16 + method: 'post',
  17 + data
  18 + })
  19 +}
  20 +// 修改查询合同的店铺
  21 +export function cereAssetShopInformationedit(data) {
  22 + return request({
  23 + url: '/cereAssetShopInformation/edit',
  24 + method: 'post',
  25 + data
  26 + })
  27 +}
  28 +// 查询合同的店铺
  29 +export function cereAssetShopInformationqueryByPage(data) {
  30 + return request({
  31 + url: '/cereAssetShopInformation/queryByPage',
  32 + method: 'post',
  33 + data
  34 + })
  35 +}
3 // 退租决算管理oa 36 // 退租决算管理oa
4 export function generalBySurrenderTenancy(data) { 37 export function generalBySurrenderTenancy(data) {
5 return request({ 38 return request({
admin-web-master/src/components/add/addcd.vue
  View file @542e27d
@@ -32,7 +32,26 @@ @@ -32,7 +32,26 @@
32 </el-form-item> 32 </el-form-item>
33 </el-col> 33 </el-col>
34 </el-row> 34 </el-row>
35 - 35 + <el-row :gutter="20">
  36 + <el-col :span="12">
  37 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  38 + <el-select v-model="ruleForm.belongingGreenwaySection" placeholder="请选择"
  39 + style="margin-top:5px;width: 100%;" @change="lvdaoSel">
  40 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
  41 + :key="index"></el-option>
  42 + </el-select>
  43 + </el-form-item>
  44 + </el-col>
  45 +
  46 + <el-col :span="12">
  47 + <el-form-item label="所属公园/步道" prop="belongingParkTrail">
  48 + <el-select v-model="ruleForm.belongingParkTrail" placeholder="请选择" style="width: 100%;">
  49 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in gongyuanList"
  50 + :key="index"></el-option>
  51 + </el-select>
  52 + </el-form-item>
  53 + </el-col>
  54 + </el-row>
36 <el-row :gutter="20"> 55 <el-row :gutter="20">
37 <el-col :span="12"> 56 <el-col :span="12">
38 <el-form-item label="归属部门" prop="department"> 57 <el-form-item label="归属部门" prop="department">
@@ -112,16 +131,16 @@ @@ -112,16 +131,16 @@
112 miniioupload 131 miniioupload
113 } from '../../api/commodityLease.js' 132 } from '../../api/commodityLease.js'
114 import { 133 import {
115 - gongyuan,  
116 - addList,  
117 - editList  
118 - } from '../../api/map1.js';  
119 - import {  
120 changadd, 134 changadd,
121 changedit 135 changedit
122 } from '../../api/information' 136 } from '../../api/information'
123 import newmap from "@/components/newmap/indexall"; 137 import newmap from "@/components/newmap/indexall";
124 import wangEditor from "@/components/editor/index" 138 import wangEditor from "@/components/editor/index"
  139 + import {
  140 + lvdaoduan,
  141 + parkTrails,
  142 + gongyuan
  143 + } from '@/api/information.js';
125 export default { 144 export default {
126 components: { 145 components: {
127 upimg, 146 upimg,
@@ -132,6 +151,7 @@ @@ -132,6 +151,7 @@
132 }, 151 },
133 data() { 152 data() {
134 return { 153 return {
  154 +
135 lat: 30.67, 155 lat: 30.67,
136 lng: 104.06, 156 lng: 104.06,
137 ontype: '线上广告位', 157 ontype: '线上广告位',
@@ -167,8 +187,15 @@ @@ -167,8 +187,15 @@
167 phoneNumber: '', // 联系电话 187 phoneNumber: '', // 联系电话
168 createDate: '', // 创建时间 188 createDate: '', // 创建时间
169 createUser: '', // 创建人 189 createUser: '', // 创建人
  190 + belongingGreenwaySection: '', // 所属绿道段
  191 + belongingParkTrail: '', // 所属公园/步道
170 }, 192 },
171 rulesSt: { 193 rulesSt: {
  194 + belongingGreenwaySection: [{
  195 + required: true,
  196 + message: '请填写所属绿道段',
  197 + trigger: 'blur'
  198 + }, ],
172 venueName: [{ 199 venueName: [{
173 required: true, 200 required: true,
174 message: '请输入场地名称', 201 message: '请输入场地名称',
@@ -208,6 +235,7 @@ @@ -208,6 +235,7 @@
208 uploadFiles: [], 235 uploadFiles: [],
209 filesLength: 1, 236 filesLength: 1,
210 gongyuanList: [], 237 gongyuanList: [],
  238 + lvdaoList: [],
211 fileData: [], 239 fileData: [],
212 parentMessage: {}, 240 parentMessage: {},
213 edit: true 241 edit: true
@@ -235,6 +263,9 @@ @@ -235,6 +263,9 @@
235 } else { 263 } else {
236 264
237 } 265 }
  266 + const lvdao = await lvdaoduan()
  267 + const gongyua = await parkTrails()
  268 + this.lvdaoList = lvdao.data.concat(gongyua.data)
238 }, 269 },
239 methods: { 270 methods: {
240 271
admin-web-master/src/components/add/addht.vue
  View file @542e27d
@@ -40,7 +40,8 @@ @@ -40,7 +40,8 @@
40 cereContractTemplate,cerePlatformMerchant 40 cereContractTemplate,cerePlatformMerchant
41 } from '@/api/newly.js' 41 } from '@/api/newly.js'
42 import { 42 import {
43 - dataInprotDocument,modifyResourceStatus 43 + dataInprotDocument,modifyResourceStatus,
  44 + cereAssetShopInformationqueryByPage,cereAssetShopInformationedit
44 } from '@/api/newly.js' 45 } from '@/api/newly.js'
45 import { 46 import {
46 msgedit 47 msgedit
@@ -115,7 +116,8 @@ import { @@ -115,7 +116,8 @@ import {
115 templateInformationUrl:'' 116 templateInformationUrl:''
116 }, 117 },
117 templateAttachment:'', 118 templateAttachment:'',
118 - AddData:[] 119 + AddData:[],
  120 + dpinfo:null
119 } 121 }
120 }, 122 },
121 props: { 123 props: {
@@ -142,6 +144,12 @@ import { @@ -142,6 +144,12 @@ import {
142 if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { 144 if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
143 this.AddData.push(this.info.cereBasicInformationVenue) 145 this.AddData.push(this.info.cereBasicInformationVenue)
144 } 146 }
  147 + cereAssetShopInformationqueryByPage({"pageNumber":0,"pageSize":10,"contractId":this.info.id}).then(res => {
  148 + console.error(res.data.content)
  149 + if(res.data.content.length>0){
  150 + this.dpinfo = res.data.content[0]
  151 + }
  152 + })
145 // for (let index = 0; index < this.shopList.length; index++) { 153 // for (let index = 0; index < this.shopList.length; index++) {
146 // const element = this.shopList[index]; 154 // const element = this.shopList[index];
147 // console.error(element) 155 // console.error(element)
@@ -256,6 +264,14 @@ import { @@ -256,6 +264,14 @@ import {
256 }).then(res => { 264 }).then(res => {
257 console.error(res) 265 console.error(res)
258 }) 266 })
  267 + if(this.dpinfo) {
  268 + cereAssetShopInformationedit({
  269 + ...this.dpinfo,
  270 + contractId:res.data
  271 + }).then(res => {
  272 + console.error(res)
  273 + })
  274 + }
259 this.$emit('removeonaction', '1') 275 this.$emit('removeonaction', '1')
260 } else { 276 } else {
261 this.$message({ 277 this.$message({
admin-web-master/src/components/add/addmap.vue
  View file @542e27d
1 <template> 1 <template>
2 <div > 2 <div >
3 - <el-form v-if="ontype =='线上广告位' && iShsow" :model="formInline" :rules="rules" ref="formInline" label-width="100px" 3 + <el-form v-if="ontype =='线上广告位' && iShsow" :model="formInline" :rules="rules" ref="formInline" label-width="130px"
4 class="demo-ruleForm"> 4 class="demo-ruleForm">
5 <el-form-item label="广告位类型" prop="advertisingType"> 5 <el-form-item label="广告位类型" prop="advertisingType">
6 <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;"> 6 <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 </el-col> 56 </el-col>
57 </el-row> 57 </el-row>
58 </el-form> 58 </el-form>
59 - <el-form v-if="ontype =='实体广告位' && iShsow" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px" 59 + <el-form v-if="ontype =='实体广告位' && iShsow" :model="formInline" :rules="rulesSt" ref="formInline" label-width="130px"
60 class="demo-ruleForm"> 60 class="demo-ruleForm">
61 <el-form-item label="广告位类型" prop="advertisingType"> 61 <el-form-item label="广告位类型" prop="advertisingType">
62 <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;"> 62 <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
@@ -66,6 +66,19 @@ @@ -66,6 +66,19 @@
66 <el-form-item label="广告位名称" prop="advertisingName"> 66 <el-form-item label="广告位名称" prop="advertisingName">
67 <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input> 67 <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input>
68 </el-form-item> 68 </el-form-item>
  69 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  70 + <el-select v-model="formInline.belongingGreenwaySection" placeholder="请选择"
  71 + style="margin-top:5px;width: 100%;" @change="lvdaoSel">
  72 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
  73 + :key="index"></el-option>
  74 + </el-select>
  75 + </el-form-item>
  76 + <el-form-item label="所属公园/步道" prop="belongingParkTrail">
  77 + <el-select v-model="formInline.belongingParkTrail" placeholder="请选择" style="width: 100%;">
  78 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in gongyuanList"
  79 + :key="index"></el-option>
  80 + </el-select>
  81 + </el-form-item>
69 <el-form-item label="详细位置" prop="detailedLocation"> 82 <el-form-item label="详细位置" prop="detailedLocation">
70 <el-input v-model="formInline.detailedLocation" :disabled="true" placeholder="请地图标点选择位置" maxlength="100"></el-input> 83 <el-input v-model="formInline.detailedLocation" :disabled="true" placeholder="请地图标点选择位置" maxlength="100"></el-input>
71 </el-form-item> 84 </el-form-item>
@@ -128,12 +141,13 @@ @@ -128,12 +141,13 @@
128 import { 141 import {
129 miniioupload 142 miniioupload
130 } from '../../api/commodityLease.js' 143 } from '../../api/commodityLease.js'
131 - import {  
132 - gongyuan,  
133 - addList,  
134 - editList  
135 - } from '../../api/map1.js'; 144 + import { addList } from '@/api/map1.js';
136 import wangEditor from "@/components/editor/index" 145 import wangEditor from "@/components/editor/index"
  146 + import {
  147 + lvdaoduan,
  148 + parkTrails,
  149 + gongyuan
  150 + } from '@/api/information.js';
137 export default { 151 export default {
138 components: { 152 components: {
139 upimg, 153 upimg,
@@ -186,9 +200,12 @@ @@ -186,9 +200,12 @@
186 playDuration: null, // 播放时长 200 playDuration: null, // 播放时长
187 pushAddress: '', // 推送地址 201 pushAddress: '', // 推送地址
188 memo: '', // 备注信息 202 memo: '', // 备注信息
189 - onlineType: '' // 线上类型 203 + onlineType: '' ,// 线上类型
  204 + belongingGreenwaySection: '', // 所属绿道段
  205 + belongingParkTrail: '', // 所属公园/步道
190 }, 206 },
191 rules: { 207 rules: {
  208 +
192 advertisingType: [{ 209 advertisingType: [{
193 required: true, 210 required: true,
194 message: '请选择广告类型', 211 message: '请选择广告类型',
@@ -216,6 +233,11 @@ @@ -216,6 +233,11 @@
216 }], 233 }],
217 }, 234 },
218 rulesSt: { 235 rulesSt: {
  236 + belongingGreenwaySection: [{
  237 + required: true,
  238 + message: '请填写所属绿道段',
  239 + trigger: 'blur'
  240 + }, ],
219 advertisingType: [{ 241 advertisingType: [{
220 required: true, 242 required: true,
221 message: '请选择广告类型', 243 message: '请选择广告类型',
@@ -258,7 +280,8 @@ @@ -258,7 +280,8 @@
258 fileData: [], 280 fileData: [],
259 parentMessage: {}, 281 parentMessage: {},
260 edit: true, 282 edit: true,
261 - iShsow:true 283 + iShsow:true,
  284 + lvdaoList: [],
262 }; 285 };
263 }, 286 },
264 props: { 287 props: {
@@ -303,6 +326,9 @@ @@ -303,6 +326,9 @@
303 this.formInline.advertisingType = '实体广告位' 326 this.formInline.advertisingType = '实体广告位'
304 } 327 }
305 } 328 }
  329 + const lvdao = await lvdaoduan()
  330 + const gongyua = await parkTrails()
  331 + this.lvdaoList = lvdao.data.concat(gongyua.data)
306 }, 332 },
307 methods: { 333 methods: {
308 validateNumber(field, value) { 334 validateNumber(field, value) {
admin-web-master/src/components/buscha/busCha.vue
  View file @542e27d
@@ -228,7 +228,7 @@ @@ -228,7 +228,7 @@
228 </div> 228 </div>
229 </el-tab-pane> 229 </el-tab-pane>
230 </el-tabs> 230 </el-tabs>
231 - <div v-if="info.dataStatus == '5' && issp == '2'" style="margin-top: 20px;"> 231 + <div v-if="info.dataStatus == '4' && issp == '2'" style="margin-top: 20px;">
232 <TitleWithCircle title="审核情况"/> 232 <TitleWithCircle title="审核情况"/>
233 <div style="padding: 20px;"> 233 <div style="padding: 20px;">
234 <el-form :model="info" label-width="100px" class="demo-ruleForm"> 234 <el-form :model="info" label-width="100px" class="demo-ruleForm">
@@ -257,7 +257,7 @@ @@ -257,7 +257,7 @@
257 </div> 257 </div>
258 </div> 258 </div>
259 <div> 259 <div>
260 - <el-button v-if="info.dataStatus == '5' && issp == '2'" @click="minSev" 260 + <el-button v-if="info.dataStatus == '4' && issp == '2'" @click="minSev"
261 style="background-color: #3F9B6A;color: #fff;">确定</el-button> 261 style="background-color: #3F9B6A;color: #fff;">确定</el-button>
262 <el-button class="buttonHover" 262 <el-button class="buttonHover"
263 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" 263 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
@@ -354,9 +354,13 @@ @@ -354,9 +354,13 @@
354 this.list1 = JSON.parse(this.info.templateInformation) 354 this.list1 = JSON.parse(this.info.templateInformation)
355 console.log(this.list1) 355 console.log(this.list1)
356 this.url = process.env.VUE_APP_DOMAIN_PREFIX_1 356 this.url = process.env.VUE_APP_DOMAIN_PREFIX_1
357 - queryByContractcontractNumber({ 357 + let infonew = {
358 contractNumber: this.info.contractNumber 358 contractNumber: this.info.contractNumber
359 - }).then(res => { 359 + }
  360 + if(this.info.dataStatus == 1) {
  361 + infonew.dataStatus = '1'
  362 + }
  363 + queryByContractcontractNumber(infonew).then(res => {
360 console.error(res) 364 console.error(res)
361 // this.shop = res.data.shop 365 // this.shop = res.data.shop
362 this.siteIds = res.data.siteIds 366 this.siteIds = res.data.siteIds
@@ -376,6 +380,7 @@ @@ -376,6 +380,7 @@
376 methods: { 380 methods: {
377 minSev() { 381 minSev() {
378 editById({ 382 editById({
  383 + isInterior:'1',
379 contractNumber: this.info.contractNumber, 384 contractNumber: this.info.contractNumber,
380 dataStatus: this.radio, 385 dataStatus: this.radio,
381 reviewComments: this.reviewComments?this.reviewComments:null 386 reviewComments: this.reviewComments?this.reviewComments:null
admin-web-master/src/components/buscha/busChanew.vue
  View file @542e27d
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <el-form-item label="申请理由" prop="contractType"> 13 <el-form-item label="申请理由" prop="contractType">
14 <div class="duiqi">{{newinfo.reasonForApplication || '-'}}</div> 14 <div class="duiqi">{{newinfo.reasonForApplication || '-'}}</div>
15 </el-form-item> 15 </el-form-item>
16 - <el-form-item label="申请时间" prop="contractNumber"> 16 + <el-form-item label="申请时间" prop="applicationTime">
17 <div class="duiqi">{{newinfo.applicationTime || '-'}}</div> 17 <div class="duiqi">{{newinfo.applicationTime || '-'}}</div>
18 </el-form-item> 18 </el-form-item>
19 </el-form> 19 </el-form>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 </div> 162 </div>
163 </el-tab-pane> 163 </el-tab-pane>
164 </el-tabs> 164 </el-tabs>
165 - <div v-if="newinfo.status == '1' && issp == '2'" style="margin-top: 20px;"> 165 + <div v-if="(newinfo.status == null || newinfo.status == '0') && issp == '2'" style="margin-top: 20px;">
166 <TitleWithCircle title="审核情况"/> 166 <TitleWithCircle title="审核情况"/>
167 <div style="padding: 20px;"> 167 <div style="padding: 20px;">
168 <el-form :model="info" label-width="100px" class="demo-ruleForm"> 168 <el-form :model="info" label-width="100px" class="demo-ruleForm">
@@ -191,7 +191,7 @@ @@ -191,7 +191,7 @@
191 </div> 191 </div>
192 </div> 192 </div>
193 <div> 193 <div>
194 - <el-button v-if="newinfo.status == '1' && issp == '2'" @click="minSev" 194 + <el-button v-if="(newinfo.status == null || newinfo.status == '0') && issp == '2'" @click="minSev"
195 style="background-color: #3F9B6A;color: #fff;">确定</el-button> 195 style="background-color: #3F9B6A;color: #fff;">确定</el-button>
196 <el-button class="buttonHover" 196 <el-button class="buttonHover"
197 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" 197 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
@@ -319,7 +319,8 @@ @@ -319,7 +319,8 @@
319 changeContractInformationedit({ 319 changeContractInformationedit({
320 ...this.newinfo, 320 ...this.newinfo,
321 status: this.radio, 321 status: this.radio,
322 - reviewComments: this.reviewComments?this.reviewComments:null 322 + reviewComments: this.reviewComments?this.reviewComments:null,
  323 + isInterior:'1',
323 }).then(res => { 324 }).then(res => {
324 console.error(res) 325 console.error(res)
325 if (res.code == 200) { 326 if (res.code == 200) {
admin-web-master/src/components/chakan/cd.vue
  View file @542e27d
@@ -31,6 +31,16 @@ @@ -31,6 +31,16 @@
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
33 <el-col :span="8"> 33 <el-col :span="8">
  34 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  35 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}</div>
  36 + </el-form-item>
  37 + </el-col>
  38 + <el-col :span="8">
  39 + <el-form-item label="所属公园/步道" prop="belongingParkTrail">
  40 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无' }}</div>
  41 + </el-form-item>
  42 + </el-col>
  43 + <el-col :span="8">
34 <el-form-item label="归属部门" prop="department"> 44 <el-form-item label="归属部门" prop="department">
35 <div class="duiqi">{{editbgid.department || '无'}}</div> 45 <div class="duiqi">{{editbgid.department || '无'}}</div>
36 </el-form-item> 46 </el-form-item>
@@ -114,17 +124,30 @@ @@ -114,17 +124,30 @@
114 </el-tab-pane> 124 </el-tab-pane>
115 <el-tab-pane label="招商方案信息" name="second"> 125 <el-tab-pane label="招商方案信息" name="second">
116 <div style="margin-top: 30px;" class="editcss"> 126 <div style="margin-top: 30px;" class="editcss">
117 - <!-- <TitleWithCircle title="招商方案信息" /> 127 + <TitleWithCircle title="招商方案信息" />
118 <div style="padding: 20px;"> 128 <div style="padding: 20px;">
119 <el-table :data="datalist1" 129 <el-table :data="datalist1"
120 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 130 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
121 tooltip-effect="dark custom-tooltip-effect"> 131 tooltip-effect="dark custom-tooltip-effect">
122 - <el-table-column label="招商方案名称" prop="planName" min-width="200"> 132 + <el-table-column label="招商方案名称" prop="planName">
123 </el-table-column> 133 </el-table-column>
124 - <el-table-column label="创建日期" prop="createTime" min-width="100"> 134 + <el-table-column label="涵盖资源数" prop="createTime">
  135 + <template slot-scope="scope">
  136 + {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
  137 + </template>
  138 + </el-table-column>
  139 + <el-table-column label="创建时间" prop="createTime">
  140 + <template slot-scope="scope">
  141 + {{scope.row.createTime || '-' }}
  142 + </template>
  143 + </el-table-column>
  144 + <el-table-column label="创建人" prop="createUser">
  145 + <template slot-scope="scope">
  146 + {{scope.row.createUser || '-' }}
  147 + </template>
125 </el-table-column> 148 </el-table-column>
126 </el-table> 149 </el-table>
127 - </div> --> 150 + </div>
128 <TitleWithCircle title="策略方案" /> 151 <TitleWithCircle title="策略方案" />
129 <div style="padding: 20px;"> 152 <div style="padding: 20px;">
130 <el-table :data="datalist" 153 <el-table :data="datalist"
@@ -257,13 +280,18 @@ @@ -257,13 +280,18 @@
257 cereResourceStrategylist, 280 cereResourceStrategylist,
258 cereBusinessPlan, 281 cereBusinessPlan,
259 cereBusinessOperationqueryByPage, 282 cereBusinessOperationqueryByPage,
260 - cereContractInformation 283 + cereContractInformation,resourcesFindPlan
261 } from '@/api/newly'; 284 } from '@/api/newly';
262 import newmap from "@/components/newmap/indexall"; 285 import newmap from "@/components/newmap/indexall";
263 import { 286 import {
264 changedit 287 changedit
265 } from '@/api/information' 288 } from '@/api/information'
266 import allimg from '@/components/chakan/allimg.vue'; 289 import allimg from '@/components/chakan/allimg.vue';
  290 + import {
  291 + gongyuan,
  292 + parkTrails,
  293 + lvdaoduan,
  294 + } from '@/api/information.js';
267 export default { 295 export default {
268 components: { 296 components: {
269 TitleWithCircle, 297 TitleWithCircle,
@@ -312,7 +340,8 @@ @@ -312,7 +340,8 @@
312 list: [], 340 list: [],
313 parentMessage: {}, 341 parentMessage: {},
314 datalist: [], 342 datalist: [],
315 - datalist1:[] 343 + datalist1:[],
  344 + lvdaoList:[]
316 } 345 }
317 }, 346 },
318 created() { 347 created() {
@@ -326,12 +355,20 @@ @@ -326,12 +355,20 @@
326 console.error(res) 355 console.error(res)
327 this.datalist = res.data 356 this.datalist = res.data
328 }) 357 })
329 - cereBusinessPlan(c1).then(res => {  
330 - console.error(res) 358 + // cereBusinessPlan(c1).then(res => {
  359 + // console.error(res)
  360 + // this.datalist1 = res.data
  361 + // })
  362 + resourcesFindPlan( {resourceManagement: 'cd' + this.editbgid.id}).then(res => {
  363 + if (!Array.isArray(res.data)) {
  364 + this.datalist1 = [];
  365 + return;
  366 + }
331 this.datalist1 = res.data 367 this.datalist1 = res.data
332 }) 368 })
333 this.getAllxsj() 369 this.getAllxsj()
334 this.getAllzl() 370 this.getAllzl()
  371 + this.getAll()
335 } 372 }
336 373
337 }, 374 },
@@ -339,6 +376,30 @@ @@ -339,6 +376,30 @@
339 376
340 }, 377 },
341 methods: { 378 methods: {
  379 + async getAll(){
  380 + const lvdao = await lvdaoduan()
  381 + const gongyua = await parkTrails()
  382 + const budao = await gongyuan()
  383 + const lvList = lvdao.data.concat(gongyua.data)
  384 +
  385 + this.lvdaoList = lvList.concat(budao.data)
  386 + },
  387 + getLvdaoNameByCode(code) {
  388 + // 若传入的 code 为空，直接返回空字符串
  389 + if (!code) {
  390 + return '';
  391 + }
  392 + // 遍历 this.lvdaoList 数组
  393 + for (let i = 0; i < this.lvdaoList.length; i++) {
  394 + const item = this.lvdaoList[i];
  395 + // 当传入的 code 等于 item 的 code 时，返回 item 的 name
  396 + if (item.code === code) {
  397 + return item.name;
  398 + }
  399 + }
  400 + // 若遍历完数组都没找到匹配的 code，返回空字符串
  401 + return '无';
  402 + },
342 open(row) { 403 open(row) {
343 console.error(row) 404 console.error(row)
344 this.xiangTab= 'first' 405 this.xiangTab= 'first'
admin-web-master/src/components/chakan/map.vue
  View file @542e27d
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <div style="margin-top: 30px;" class="editcss"> 6 <div style="margin-top: 30px;" class="editcss">
7 <TitleWithCircle title="基础信息" /> 7 <TitleWithCircle title="基础信息" />
8 <div style="padding: 20px;"> 8 <div style="padding: 20px;">
9 - <el-form :model="editbgid" ref="formInline" label-width="100px" class="demo-ruleForm"> 9 + <el-form :model="editbgid" ref="formInline" label-width="130px" class="demo-ruleForm">
10 <el-row :gutter="20"> 10 <el-row :gutter="20">
11 <el-col :span="8"> 11 <el-col :span="8">
12 <el-form-item label="广告位名称" prop="advertisingName"> 12 <el-form-item label="广告位名称" prop="advertisingName">
@@ -59,6 +59,16 @@ @@ -59,6 +59,16 @@
59 </el-row> 59 </el-row>
60 <el-row :gutter="20" v-if="editbgid.advertisingType == '实体广告位'"> 60 <el-row :gutter="20" v-if="editbgid.advertisingType == '实体广告位'">
61 <el-col :span="8"> 61 <el-col :span="8">
  62 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  63 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}</div>
  64 + </el-form-item>
  65 + </el-col>
  66 + <el-col :span="8">
  67 + <el-form-item label="所属公园/步道" prop="belongingParkTrail">
  68 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无' }}</div>
  69 + </el-form-item>
  70 + </el-col>
  71 + <el-col :span="8">
62 <el-form-item label="设备类型" prop="deviceType" > 72 <el-form-item label="设备类型" prop="deviceType" >
63 <div class="duiqi">{{editbgid.deviceType || '无'}}</div> 73 <div class="duiqi">{{editbgid.deviceType || '无'}}</div>
64 </el-form-item> 74 </el-form-item>
@@ -125,17 +135,30 @@ @@ -125,17 +135,30 @@
125 </el-tab-pane> 135 </el-tab-pane>
126 <el-tab-pane label="招商方案信息" name="second"> 136 <el-tab-pane label="招商方案信息" name="second">
127 <div style="margin-top: 30px;" class="editcss"> 137 <div style="margin-top: 30px;" class="editcss">
128 - <!-- <TitleWithCircle title="招商方案信息" /> 138 + <TitleWithCircle title="招商方案信息" />
129 <div style="padding: 20px;"> 139 <div style="padding: 20px;">
130 <el-table :data="datalist1" 140 <el-table :data="datalist1"
131 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 141 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
132 tooltip-effect="dark custom-tooltip-effect"> 142 tooltip-effect="dark custom-tooltip-effect">
133 - <el-table-column label="招商方案名称" prop="planName" min-width="200"> 143 + <el-table-column label="招商方案名称" prop="planName">
  144 + </el-table-column>
  145 + <el-table-column label="涵盖资源数" prop="createTime">
  146 + <template slot-scope="scope">
  147 + {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
  148 + </template>
134 </el-table-column> 149 </el-table-column>
135 - <el-table-column label="创建日期" prop="createTime" min-width="100"> 150 + <el-table-column label="创建时间" prop="createTime">
  151 + <template slot-scope="scope">
  152 + {{scope.row.createTime || '-' }}
  153 + </template>
  154 + </el-table-column>
  155 + <el-table-column label="创建人" prop="createUser">
  156 + <template slot-scope="scope">
  157 + {{scope.row.createUser || '-' }}
  158 + </template>
136 </el-table-column> 159 </el-table-column>
137 </el-table> 160 </el-table>
138 - </div> --> 161 + </div>
139 <TitleWithCircle title="策略方案" /> 162 <TitleWithCircle title="策略方案" />
140 <div style="padding: 20px;"> 163 <div style="padding: 20px;">
141 <el-table :data="datalist" 164 <el-table :data="datalist"
@@ -268,12 +291,17 @@ @@ -268,12 +291,17 @@
268 cereBusinessOperationqueryByPage, 291 cereBusinessOperationqueryByPage,
269 cereResourceStrategylist, 292 cereResourceStrategylist,
270 cereBusinessPlan, 293 cereBusinessPlan,
271 - cereContractInformation, 294 + cereContractInformation,resourcesFindPlan
272 } from '@/api/newly'; 295 } from '@/api/newly';
273 import { 296 import {
274 editList 297 editList
275 } from '@/api/map1.js'; 298 } from '@/api/map1.js';
276 import allimg from '@/components/chakan/allimg.vue'; 299 import allimg from '@/components/chakan/allimg.vue';
  300 + import {
  301 + gongyuan,
  302 + parkTrails,
  303 + lvdaoduan,
  304 + } from '@/api/information.js';
277 export default { 305 export default {
278 components: { 306 components: {
279 TitleWithCircle, 307 TitleWithCircle,
@@ -323,7 +351,8 @@ @@ -323,7 +351,8 @@
323 list: [], 351 list: [],
324 parentMessage: {}, 352 parentMessage: {},
325 datalist: [], 353 datalist: [],
326 - datalist1:[] 354 + datalist1:[],
  355 + lvdaoList:[]
327 } 356 }
328 }, 357 },
329 created() { 358 created() {
@@ -341,8 +370,15 @@ @@ -341,8 +370,15 @@
341 } 370 }
342 this.datalist = res.data 371 this.datalist = res.data
343 }) 372 })
344 - cereBusinessPlan(c1).then(res => {  
345 - console.error(res) 373 + // cereBusinessPlan(c1).then(res => {
  374 + // console.error(res)
  375 + // if (!Array.isArray(res.data)) {
  376 + // this.datalist1 = [];
  377 + // return;
  378 + // }
  379 + // this.datalist1 = res.data
  380 + // })
  381 + resourcesFindPlan( {resourceManagement: 'gg' + this.editbgid.id}).then(res => {
346 if (!Array.isArray(res.data)) { 382 if (!Array.isArray(res.data)) {
347 this.datalist1 = []; 383 this.datalist1 = [];
348 return; 384 return;
@@ -353,12 +389,37 @@ @@ -353,12 +389,37 @@
353 this.getAllzl() 389 this.getAllzl()
354 } 390 }
355 391
356 - 392 + this.getAll()
357 }, 393 },
358 computed: { 394 computed: {
359 395
360 }, 396 },
361 methods: { 397 methods: {
  398 + async getAll(){
  399 + const lvdao = await lvdaoduan()
  400 + const gongyua = await parkTrails()
  401 + const budao = await gongyuan()
  402 + const lvList = lvdao.data.concat(gongyua.data)
  403 +
  404 + this.lvdaoList = lvList.concat(budao.data)
  405 + },
  406 +
  407 + getLvdaoNameByCode(code) {
  408 + // 若传入的 code 为空，直接返回空字符串
  409 + if (!code) {
  410 + return '';
  411 + }
  412 + // 遍历 this.lvdaoList 数组
  413 + for (let i = 0; i < this.lvdaoList.length; i++) {
  414 + const item = this.lvdaoList[i];
  415 + // 当传入的 code 等于 item 的 code 时，返回 item 的 name
  416 + if (item.code === code) {
  417 + return item.name;
  418 + }
  419 + }
  420 + // 若遍历完数组都没找到匹配的 code，返回空字符串
  421 + return '无';
  422 + },
362 open(row) { 423 open(row) {
363 console.error(row) 424 console.error(row)
364 this.xiangTab= 'first' 425 this.xiangTab= 'first'
admin-web-master/src/components/resourceCommodity/index.vue
  View file @542e27d
@@ -49,12 +49,12 @@ @@ -49,12 +49,12 @@
49 </el-col> 49 </el-col>
50 <el-col :span="8"> 50 <el-col :span="8">
51 <el-form-item label="所属绿道段" prop="belongingGreenwaySection"> 51 <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
52 - <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection)}}</div> 52 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}</div>
53 </el-form-item> 53 </el-form-item>
54 </el-col> 54 </el-col>
55 <el-col :span="8"> 55 <el-col :span="8">
56 <el-form-item label="所属公园/步道" prop="belongingParkTrail"> 56 <el-form-item label="所属公园/步道" prop="belongingParkTrail">
57 - <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail)}}</div> 57 + <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无'}}</div>
58 </el-form-item> 58 </el-form-item>
59 </el-col> 59 </el-col>
60 <el-col :span="8"> 60 <el-col :span="8">
@@ -146,17 +146,30 @@ @@ -146,17 +146,30 @@
146 </el-tab-pane> 146 </el-tab-pane>
147 <el-tab-pane label="招商方案信息" name="second"> 147 <el-tab-pane label="招商方案信息" name="second">
148 <div style="margin-top: 30px;" class="editcss"> 148 <div style="margin-top: 30px;" class="editcss">
149 - <!-- <TitleWithCircle title="招商方案信息" /> 149 + <TitleWithCircle title="招商方案信息" />
150 <div style="padding: 20px;"> 150 <div style="padding: 20px;">
151 <el-table :data="datalist1" 151 <el-table :data="datalist1"
152 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 152 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
153 tooltip-effect="dark custom-tooltip-effect"> 153 tooltip-effect="dark custom-tooltip-effect">
154 - <el-table-column label="招商方案名称" prop="planName" min-width="200"> 154 + <el-table-column label="招商方案名称" prop="planName">
155 </el-table-column> 155 </el-table-column>
156 - <el-table-column label="创建日期" prop="createTime" min-width="100"> 156 + <el-table-column label="涵盖资源数" prop="createTime">
  157 + <template slot-scope="scope">
  158 + {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
  159 + </template>
  160 + </el-table-column>
  161 + <el-table-column label="创建时间" prop="createTime">
  162 + <template slot-scope="scope">
  163 + {{scope.row.createTime || '-' }}
  164 + </template>
  165 + </el-table-column>
  166 + <el-table-column label="创建人" prop="createUser">
  167 + <template slot-scope="scope">
  168 + {{scope.row.createUser || '-' }}
  169 + </template>
157 </el-table-column> 170 </el-table-column>
158 </el-table> 171 </el-table>
159 - </div> --> 172 + </div>
160 <TitleWithCircle title="策略方案" /> 173 <TitleWithCircle title="策略方案" />
161 <div style="padding: 20px;"> 174 <div style="padding: 20px;">
162 <el-table :data="datalist" 175 <el-table :data="datalist"
@@ -311,6 +324,7 @@ @@ -311,6 +324,7 @@
311 cereBusinessPlan, 324 cereBusinessPlan,
312 cereBusinessOperationqueryByPage, 325 cereBusinessOperationqueryByPage,
313 cereContractInformation, 326 cereContractInformation,
  327 + resourcesFindPlan
314 } from '@/api/newly'; 328 } from '@/api/newly';
315 import newmap from "@/components/newmap/index"; 329 import newmap from "@/components/newmap/index";
316 import { 330 import {
@@ -385,7 +399,14 @@ @@ -385,7 +399,14 @@
385 } 399 }
386 this.datalist = res.data 400 this.datalist = res.data
387 }) 401 })
388 - cereBusinessPlan(c1).then(res => { 402 + // cereBusinessPlan(c1).then(res => {
  403 + // if (!Array.isArray(res.data)) {
  404 + // this.datalist1 = [];
  405 + // return;
  406 + // }
  407 + // this.datalist1 = res.data
  408 + // })
  409 + resourcesFindPlan( {resourceManagement: 'sp' + this.editbgid.id}).then(res => {
389 if (!Array.isArray(res.data)) { 410 if (!Array.isArray(res.data)) {
390 this.datalist1 = []; 411 this.datalist1 = [];
391 return; 412 return;
admin-web-master/src/main.js
  View file @542e27d
@@ -32,8 +32,39 @@ Vue.prototype.$echarts = echarts @@ -32,8 +32,39 @@ Vue.prototype.$echarts = echarts
32 32
33 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api' 33 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
34 Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cdwlMall` 34 Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cdwlMall`
  35 +import {
  36 + sendToUser
  37 +} from '@/api/newly.js'
  38 +Vue.prototype.$setmsg = async function() {
35 39
36 - 40 + let info = {
  41 + "content": "测试消息内容", // 消息内容
  42 + "messageClass": 1, // 消息类型（1:指定用户发送）
  43 + "messageType": "通知", // 消息类型描述
  44 + "cereMessageReceipts": [ // 接收人列表
  45 + {
  46 + "phone": '18121815567', // 用户ID
  47 + "messageType": "通知", // 消息类型
  48 + "content": "测试内容" // 消息内容
  49 + }
  50 + ]
  51 + }
  52 + await sendToUser(info).then(res => {
  53 + console.error(res)
  54 + if (res.code == 200) {
  55 + this.$message({
  56 + message: '发送成功',
  57 + type: 'success'
  58 + })
  59 + this.$emit('removeonaction', '1')
  60 + } else {
  61 + this.$message({
  62 + message: '发送失败',
  63 + type: 'error'
  64 + })
  65 + }
  66 + })
  67 +};
37 68
38 let host = window.location.host; 69 let host = window.location.host;
39 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 70 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
admin-web-master/src/utils/request.js
  View file @542e27d
@@ -16,13 +16,13 @@ let hostall = window.location.href; @@ -16,13 +16,13 @@ let hostall = window.location.href;
16 let baseURL = '' 16 let baseURL = ''
17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18
19 - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; 19 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20 // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; 20 // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23
24 24
25 - // baseURL = 'http://128.10.249.26:9003'; 25 + baseURL = 'http://128.10.249.47:9003';
26 26
27 27
28 } else { 28 } else {
admin-web-master/src/utils/request2.js
  View file @542e27d
@@ -17,9 +17,9 @@ let baseURL = &#39;&#39; @@ -17,9 +17,9 @@ let baseURL = &#39;&#39;
17 // || host === 'localhost:9528' 17 // || host === 'localhost:9528'
18 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 18 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20 - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; 20 + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
21 // baseURL = 'http://172.16.61.125:9004'; 21 // baseURL = 'http://172.16.61.125:9004';
22 - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; 22 + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
23 // baseURL = 'http://128.10.249.20:9004'; 23 // baseURL = 'http://128.10.249.20:9004';
24 } else { 24 } else {
25 console.error('---------------------') 25 console.error('---------------------')
admin-web-master/src/views/couponmanagement/capitalpool.vue
  View file @542e27d
@@ -566,7 +566,7 @@ @@ -566,7 +566,7 @@
566 async getAll() { 566 async getAll() {
567 const res = await getcereFundsPoolData(this.query) 567 const res = await getcereFundsPoolData(this.query)
568 this.tableData = res.data.content 568 this.tableData = res.data.content
569 - this.total = res.data.numberOfElements 569 + this.total = res.data.totalElements
570 }, 570 },
571 handleSizeChange(val) { 571 handleSizeChange(val) {
572 this.query.pageSize = val 572 this.query.pageSize = val
@@ -664,7 +664,7 @@ @@ -664,7 +664,7 @@
664 <style scoped lang="scss"> 664 <style scoped lang="scss">
665 665
666 .el-table { 666 .el-table {
667 - height: calc(100vh - 330px); 667 + // height: calc(100vh - 330px);
668 } 668 }
669 669
670 670
admin-web-master/src/views/shopRental/manage/index.vue
  View file @542e27d
@@ -98,8 +98,9 @@ @@ -98,8 +98,9 @@
98 <template slot-scope="scope"> 98 <template slot-scope="scope">
99 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div> 99 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
100 <!-- --> 100 <!-- -->
101 - <div v-if='scope.row.dataStatus == 5 && scope.row.isInterior == 1' @click="details(scope.row,'2')" class="tableBtn greens">审核</div>  
102 - <div v-if='scope.row.dataStatus == 4' @click="remove(scope.row)" class="tableBtn greens">内部审核</div> 101 + <!-- <div v-if='scope.row.dataStatus == 5 && scope.row.isInterior == 1' @click="details(scope.row,'2')" class="tableBtn greens">审核</div> -->
  102 + <div v-if='scope.row.dataStatus == 4' @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
  103 + <!-- <div v-if='scope.row.dataStatus == 4' @click="remove(scope.row)" class="tableBtn greens">内部审核</div> -->
103 <div v-if='scope.row.dataStatus == 4' @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div> 104 <div v-if='scope.row.dataStatus == 4' @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div>
104 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div> 105 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
105 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div> 106 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
admin-web-master/src/views/shopRental/renewalMan/index.vue
  View file @542e27d
@@ -77,9 +77,10 @@ @@ -77,9 +77,10 @@
77 <el-table-column label="操作" min-width="150" fixed="right"> 77 <el-table-column label="操作" min-width="150" fixed="right">
78 <template slot-scope="scope"> 78 <template slot-scope="scope">
79 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div> 79 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
  80 + <div v-if="scope.row.status == null || scope.row.status == '0'" @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
80 <!-- <div v-if='scope.row.status == 2' @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div> --> 81 <!-- <div v-if='scope.row.status == 2' @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div> -->
81 - <div v-if='scope.row.status == 1 && scope.row.isInterior == 1' @click="details(scope.row,'2')" class="tableBtn greens">审核</div>  
82 - <div v-if="scope.row.status == null || scope.row.status == '0'" @click="remove(scope.row)" class="tableBtn greens">内部审核</div> 82 + <!-- <div v-if='scope.row.status == 1 && scope.row.isInterior == 1' @click="details(scope.row,'2')" class="tableBtn greens">审核</div> -->
  83 + <!-- <div v-if="scope.row.status == null || scope.row.status == '0'" @click="remove(scope.row)" class="tableBtn greens">内部审核</div> -->
83 <div v-if="scope.row.status == null || scope.row.status == '0'" @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div> 84 <div v-if="scope.row.status == null || scope.row.status == '0'" @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div>
84 </template> 85 </template>
85 </el-table-column> 86 </el-table-column>
admin-web-master/src/views/shopRental/rentTermination/add.vue
  View file @542e27d
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div> 2 <div>
3 <el-form :model="formInline" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm"> 3 <el-form :model="formInline" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm">
4 <el-form-item label="退租日期" prop="exitDate"> 4 <el-form-item label="退租日期" prop="exitDate">
5 - <el-input v-model="info.contractTerminationDate" disabled></el-input> 5 + <el-input v-model="info.applicationTime" disabled></el-input>
6 </el-form-item> 6 </el-form-item>
7 <el-form-item label="退租原因" prop="reasonForExit"> 7 <el-form-item label="退租原因" prop="reasonForExit">
8 <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.reasonForExit" placeholder="请输入退租原因" 8 <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.reasonForExit" placeholder="请输入退租原因"
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="form-header">退租告知单</div> 33 <div class="form-header">退租告知单</div>
34 <div class="form-group"> 34 <div class="form-group">
35 <label for="remarks">退租日期：</label> 35 <label for="remarks">退租日期：</label>
36 - <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="info.contractTerminationDate"></div> 36 + <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="info.applicationTime"></div>
37 </div> 37 </div>
38 <div class="form-group"> 38 <div class="form-group">
39 <label for="remarks">退租原因：</label> 39 <label for="remarks">退租原因：</label>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 pdf.save('downloaded.pdf'); 162 pdf.save('downloaded.pdf');
163 }, 163 },
164 yulanShow() { 164 yulanShow() {
165 - this.formInline.exitDate = this.info.contractTerminationDate 165 + this.formInline.exitDate = this.info.applicationTime
166 this.$refs.heForm.validate((valid) => { 166 this.$refs.heForm.validate((valid) => {
167 console.log(valid) 167 console.log(valid)
168 if (valid) { 168 if (valid) {
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 178
179 }, 179 },
180 async add() { 180 async add() {
181 - 181 + let that = this
182 console.log({...this.info}) 182 console.log({...this.info})
183 const content = this.$refs.contentToConvert; 183 const content = this.$refs.contentToConvert;
184 184
@@ -188,28 +188,32 @@ @@ -188,28 +188,32 @@
188 this.formInline.contractId = this.info.id 188 this.formInline.contractId = this.info.id
189 this.formInline.tenantId = this.info.relatedMerchants 189 this.formInline.tenantId = this.info.relatedMerchants
190 this.formInline.tenantPhone = this.info.tenantTelephone 190 this.formInline.tenantPhone = this.info.tenantTelephone
191 - this.formInline.exitDate = this.info.contractTerminationDate 191 + this.formInline.exitDate = this.info.applicationTime
192 this.formInline.pdfUrl = canvas.toDataURL('image/png') 192 this.formInline.pdfUrl = canvas.toDataURL('image/png')
193 console.log({...this.formInline}) 193 console.log({...this.formInline})
194 // return 194 // return
195 this.$refs.heForm.validate((valid) => { 195 this.$refs.heForm.validate((valid) => {
196 console.log(valid) 196 console.log(valid)
197 if (valid) { 197 if (valid) {
198 - cereTerminateNotice(this.formInline).then(res => {  
199 - console.error(res)  
200 - if (res.code == 200) {  
201 - this.$message({  
202 - message: '发送成功',  
203 - type: 'success'  
204 - })  
205 - this.$emit('removeonaction', '1')  
206 - } else {  
207 - this.$message({  
208 - message: '发送失败',  
209 - type: 'error'  
210 - })  
211 - }  
212 - }) 198 + // 调用全局方法setmsg
  199 + that.$setmsg();
  200 +
  201 +
  202 + // cereTerminateNotice(this.formInline).then(res => {
  203 + // console.error(res)
  204 + // if (res.code == 200) {
  205 + // this.$message({
  206 + // message: '发送成功',
  207 + // type: 'success'
  208 + // })
  209 + // this.$emit('removeonaction', '1')
  210 + // } else {
  211 + // this.$message({
  212 + // message: '发送失败',
  213 + // type: 'error'
  214 + // })
  215 + // }
  216 + // })
213 } else { 217 } else {
214 this.$message({ 218 this.$message({
215 message: '请填写完整信息', 219 message: '请填写完整信息',
admin-web-master/src/views/shopRental/rentTermination/index.vue
  View file @542e27d
@@ -78,8 +78,9 @@ @@ -78,8 +78,9 @@
78 <template slot-scope="scope"> 78 <template slot-scope="scope">
79 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div> 79 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
80 <div v-if='scope.row.status == 2' @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div> 80 <div v-if='scope.row.status == 2' @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div>
81 - <div v-if='scope.row.status == 1 && scope.row.isInterior == 1' @click="details(scope.row,'2')" class="tableBtn greens">审核</div>  
82 - <div v-if="scope.row.status == null || scope.row.status == '0'" @click="remove(scope.row)" class="tableBtn greens">内部审核</div> 81 + <div v-if="scope.row.status == null || scope.row.status == '0'" @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
  82 + <!-- <div v-if='scope.row.status == 1 && scope.row.isInterior == 1' @click="details(scope.row,'2')" class="tableBtn greens">审核</div> -->
  83 + <!-- <div v-if="scope.row.status == null || scope.row.status == '0'" @click="remove(scope.row)" class="tableBtn greens">内部审核</div> -->
83 <div v-if="scope.row.status == null || scope.row.status == '0'" @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div> 84 <div v-if="scope.row.status == null || scope.row.status == '0'" @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div>
84 </template> 85 </template>
85 </el-table-column> 86 </el-table-column>
lvdao-miniapp/pages/message/message.vue
  View file @542e27d
@@ -233,7 +233,12 @@ @@ -233,7 +233,12 @@
233 url: '/pages/login/login' 233 url: '/pages/login/login'
234 }) 234 })
235 } else { 235 } else {
236 - 236 + this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{phone:uni.getStorageSync('user').phone},1).then(res => {
  237 + console.error(res)
  238 + })
  239 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{phone:uni.getStorageSync('user').phone},1).then(res => {
  240 + console.error(res)
  241 + })
237 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => { 242 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
238 if(res.data.code == '20004' || res.data.code == '20003'){ 243 if(res.data.code == '20004' || res.data.code == '20003'){
239 uni.navigateTo({ 244 uni.navigateTo({
lvdao-miniapp/pages/my/my.vue
  View file @542e27d
@@ -25,7 +25,13 @@ @@ -25,7 +25,13 @@
25 <view class="info"> 25 <view class="info">
26 <view class="nickname" @click="!user.name?gopath('/pages/login/login'):''"> 26 <view class="nickname" @click="!user.name?gopath('/pages/login/login'):''">
27 <text style="width: 100%;" v-if="!user.name" >请登录</text> 27 <text style="width: 100%;" v-if="!user.name" >请登录</text>
28 - <text v-else>{{user.name}}</text> 28 + <view v-else>
  29 + <view style="font-size: 28rpx;
  30 + font-weight: bold;
  31 + color: #fff;">{{user.name}}</view>
  32 + <view style="font-size: 25rpx;
  33 + color: #fff;margin-top: 14rpx;">{{user.phone}}</view>
  34 + </view>
29 </view> 35 </view>
30 </view> 36 </view>
31 <view class="user-right"> 37 <view class="user-right">
lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
  View file @542e27d
@@ -363,9 +363,10 @@ @@ -363,9 +363,10 @@
363 // }) 363 // })
364 } 364 }
365 }) 365 })
366 - const payIdbackPath= '/pages/home/home'  
367 - await toMiniPay(payId,payIdbackPath)  
368 - 366 + if(payId) {
  367 + const payIdbackPath= '/pages/home/home'
  368 + await toMiniPay(payId,payIdbackPath)
  369 + }
369 }, 370 },
370 confirm(e) { 371 confirm(e) {
371 console.log(e) 372 console.log(e)
lvdao-miniapp/pagesA/rentPay/rentPay.vue
  View file @542e27d
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false" 27 <u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false"
28 active-color="#0EBB5A" @change="xuanAll(item,$event)" /> 28 active-color="#0EBB5A" @change="xuanAll(item,$event)" />
29 29
30 - <view class="list-item"> 30 + <view class="list-item" @click="changeitemisshowxz(index)">
31 <view class="list-info"> 31 <view class="list-info">
32 <view class="info-items"> 32 <view class="info-items">
33 <view class="info-title">{{formatTime(payNum,item.tenementOrderDate)}}应缴租金：</view> 33 <view class="info-title">{{formatTime(payNum,item.tenementOrderDate)}}应缴租金：</view>
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@
60 </template> 60 </template>
61 61
62 <script> 62 <script>
  63 + import { toMiniPay } from "@/utils/tool.js"
63 export default { 64 export default {
64 data() { 65 data() {
65 return { 66 return {
@@ -162,6 +163,11 @@ @@ -162,6 +163,11 @@
162 163
163 }, 164 },
164 methods: { 165 methods: {
  166 + changeitemisshowxz(index) {
  167 + this.recordList[index].gouxuan = !this.recordList[index].gouxuan
  168 + this.xuanAll(this.recordList[index],{value:this.recordList[index].gouxuan})
  169 + this.$forceUpdate()
  170 + },
165 roundUpToTwoDecimals(num) { 171 roundUpToTwoDecimals(num) {
166 return Math.ceil(num * 100) / 100; 172 return Math.ceil(num * 100) / 100;
167 }, 173 },
@@ -205,7 +211,7 @@ @@ -205,7 +211,7 @@
205 url: `/pagesA/rentPay/rentPayDetails?msg=${msg}&merchants=${this.relatedMerchants}` 211 url: `/pagesA/rentPay/rentPayDetails?msg=${msg}&merchants=${this.relatedMerchants}`
206 }) 212 })
207 }, 213 },
208 - joinShow() { 214 + async joinShow() {
209 if (this.payAll == 0) { 215 if (this.payAll == 0) {
210 uni.showToast({ 216 uni.showToast({
211 icon: 'error', 217 icon: 'error',
@@ -230,14 +236,23 @@ @@ -230,14 +236,23 @@
230 }) 236 })
231 237
232 // return 238 // return
233 - this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => { 239 + const payId = this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
234 console.log(res.data) 240 console.log(res.data)
  241 + console.log(JSON.parse(res.data.data).payUrl)
  242 +
235 if (res.data.data) { 243 if (res.data.data) {
  244 + let payUrl = JSON.parse(res.data.data).payUrl
  245 + let c1 = payUrl.split('=')[1]
  246 + return c1
236 // uni.redirectTo({ 247 // uni.redirectTo({
237 // url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}` 248 // url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
238 // }) 249 // })
239 } 250 }
240 }) 251 })
  252 + if(payId) {
  253 + const payIdbackPath= '/pages/home/home'
  254 + await toMiniPay(payId,payIdbackPath)
  255 + }
241 256
242 257
243 258
lvdao-miniapp/utils/request.js
  View file @542e27d
@@ -21,17 +21,17 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -21,17 +21,17 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23
24 - // bases = 'http://128.10.249.20:9003'+ url; 24 + bases = 'http://128.10.249.39:9003'+ url;
25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26
27 - bases = c1 + 'cdwlMall/meserver/admin-server' + url; 27 + // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28
29 }else if(baseUrl == 3){ 29 }else if(baseUrl == 3){
30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 // bases = 'http://128.10.249.22:9003:9007' + url; 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33 - // bases = 'http://128.10.249.20:9007' + url;  
34 - bases = c1 + 'cdwlMall/meserver/api' + url; 33 + bases = 'http://128.10.249.39:9007' + url;
  34 + // bases = c1 + 'cdwlMall/meserver/api' + url;
35 35
36 }else{ 36 }else{
37 // bases = 'http://128.10.249.22:9004' + url; 37 // bases = 'http://128.10.249.22:9004' + url;
@@ -39,9 +39,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -39,9 +39,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42 - // bases = 'http://128.10.249.20:9004' + url; 42 + bases = 'http://128.10.249.39:9004' + url;
43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44 - bases = c1 + 'cdwlMall/business-server' + url; 44 + // bases = c1 + 'cdwlMall/business-server' + url;
45 45
46 } 46 }
47 var token = uni.getStorageSync('token') || ''; 47 var token = uni.getStorageSync('token') || '';