webapp / GreenwayWeb

Commit 3b97e418e1a5b6e5eec78f55bb4470ab10b3d6c4

Authored by wesley88
1 parent 73551aa9

1

Inline Side-by-side
Showing 10 changed files with 248 additions and 444 deletions
admin-web-master/src/components/chakan/ggsh.vue
  View file @3b97e41
... ... @@ -84,7 +84,7 @@
84 84 <div style="margin-top: 30px;" class="editcss">
85 85 <TitleWithCircle title="基础信息" />
86 86 <div style="padding: 20px;margin-top: 10px;">
87   - <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  87 + <el-form :model="shopMsg" ref="ruleForm" label-width="140px" class="demo-ruleForm">
88 88 <el-row :gutter="20">
89 89 <el-col :span="9">
90 90 <el-form-item label="姓名" prop="name">
... ...
admin-web-master/src/components/chakan/zl.vue
  View file @3b97e41
... ... @@ -123,39 +123,39 @@
123 123 <div style="margin-top: 30px;" class="editcss">
124 124 <TitleWithCircle title="基础信息" />
125 125 <div style="padding: 20px;margin-top: 10px;">
126   - <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  126 + <el-form :model="shopMsg" ref="ruleForm" label-width="140px" class="demo-ruleForm">
127 127 <el-row :gutter="20">
128 128 <el-col :span="9">
129   - <el-form-item label="姓名" prop="operatorName">
130   - <div class="duiqi">{{info.operatorName}}</div>
  129 + <el-form-item label="姓名" prop="name">
  130 + <div class="duiqi">{{shopMsg.name}}</div>
131 131 </el-form-item>
132 132 </el-col>
133 133 <el-col :span="9">
134 134 <el-form-item label="手机号" prop="phone">
135   - <div class="duiqi">{{info.phone}}</div>
  135 + <div class="duiqi">{{shopMsg.phone}}</div>
136 136 </el-form-item>
137 137 </el-col>
138 138 </el-row>
139 139 <el-row :gutter="20">
140 140 <el-col :span="9">
141 141 <el-form-item label="证件类型" prop="idCardType">
142   - <div class="duiqi">{{info.idCardType}}</div>
  142 + <div class="duiqi">{{shopMsg.idCardType}}</div>
143 143 </el-form-item>
144 144 </el-col>
145 145 <el-col :span="9">
146   - <el-form-item label="身份证号码" prop="idNumber">
147   - <div class="duiqi">{{info.idNumber}}</div>
  146 + <el-form-item label="身份证号码" prop="idCardNumber">
  147 + <div class="duiqi">{{shopMsg.idCardNumber}}</div>
148 148 </el-form-item>
149 149 </el-col>
150 150 </el-row>
151   - <el-form-item label="身份证照片（正）" prop="idPhotoFront">
  151 + <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
152 152 <div style="margin-top: 10px;">
153   - <el-image style="width: 200px;" :src="$baseURL+info.idPhotoFront" fit="contain"></el-image>
  153 + <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
154 154 </div>
155 155 </el-form-item>
156   - <el-form-item label="身份证照片（反）" prop="idPhotoBack">
  156 + <el-form-item label="身份证照片（反）" prop="idCardBackImage">
157 157 <div style="margin-top: 10px;">
158   - <el-image style="width: 200px;" :src="$baseURL+info.idPhotoBack" fit="contain"></el-image>
  158 + <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
159 159 </div>
160 160 </el-form-item>
161 161 </el-form>
... ... @@ -174,298 +174,168 @@
174 174 </el-form-item>
175 175 </el-col>
176 176 <el-col :span="8">
177   - <el-form-item label="场地编号" prop="venueNumber">
  177 + <el-form-item label="编号" prop="venueNumber">
178 178 <div class="duiqi">{{info.cereBasicInformationShop.venueNumber}}</div>
179 179 </el-form-item>
180 180 </el-col>
181 181 <el-col :span="8">
182   - <el-form-item label="门牌号" prop="houseNumber">
183   - <div class="duiqi">{{info.cereBasicInformationShop.houseNumber}}</div>
  182 + <el-form-item label="商铺类型" prop="shopType">
  183 + <div class="duiqi">{{info.cereBasicInformationShop.shopType=='1'?'移动铺位':info.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}</div>
184 184 </el-form-item>
185 185 </el-col>
186 186 </el-row>
187 187 <el-row :gutter="20">
188 188 <el-col :span="8">
189   - <el-form-item label="建筑形式" prop="architecturalForm">
190   - <div class="duiqi">{{info.cereBasicInformationShop.architecturalForm}}</div>
  189 + <el-form-item label="测绘面积" prop="surveyingArea">
  190 + <div class="duiqi">{{info.cereBasicInformationShop.surveyingArea || '无'}}</div>
191 191 </el-form-item>
192 192 </el-col>
193 193 <el-col :span="8">
194   - <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
195   - <div class="duiqi">{{info.cereBasicInformationShop.belongingGreenwaySection}}</div>
  194 + <el-form-item label="产权面积" prop="propertyArea">
  195 + <div class="duiqi">{{info.cereBasicInformationShop.propertyArea || '无'}}</div>
196 196 </el-form-item>
197 197 </el-col>
198 198 <el-col :span="8">
199   - <el-form-item label="所属公园/步道" prop="belongingParkTrail">
200   - <div class="duiqi">{{info.cereBasicInformationShop.belongingParkTrail}}</div>
  199 + <el-form-item label="实际使用面积" prop="actualUsableArea">
  200 + <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea || '无'}}</div>
201 201 </el-form-item>
202 202 </el-col>
203 203 </el-row>
204 204 <el-row :gutter="20">
205 205 <el-col :span="8">
206   - <el-form-item label="建筑面积" prop="floorSpace">
207   - <div class="duiqi">{{info.cereBasicInformationShop.floorSpace}}</div>
  206 + <el-form-item label="所属区域" prop="belongingRegion">
  207 + <div class="duiqi">{{info.cereBasicInformationShop.belongingRegion || '无'}}</div>
208 208 </el-form-item>
209 209 </el-col>
210 210 <el-col :span="8">
211   - <el-form-item label="实际使用面积" prop="actualUsableArea">
212   - <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea}}</div>
  211 + <el-form-item label="归属部门" prop="belongingDepartment">
  212 + <div class="duiqi">{{info.cereBasicInformationShop.belongingDepartment || '无'}}</div>
213 213 </el-form-item>
214 214 </el-col>
215 215 <el-col :span="8">
216   - <el-form-item label="所属区域" prop="belongingRegion">
217   - <div class="duiqi">{{info.cereBasicInformationShop.belongingRegion}}</div>
  216 + <el-form-item label="负责人" prop="head">
  217 + <div class="duiqi">{{info.cereBasicInformationShop.head || '无'}}</div>
218 218 </el-form-item>
219 219 </el-col>
220 220 </el-row>
221 221 <el-row :gutter="20">
222 222 <el-col :span="8">
223   - <el-form-item label="归属部门" prop="belongingDepartment">
224   - <div class="duiqi">{{info.cereBasicInformationShop.belongingDepartment}}</div>
  223 + <el-form-item label="联系人" prop="contacts">
  224 + <div class="duiqi">{{info.cereBasicInformationShop.contacts || '无'}}</div>
225 225 </el-form-item>
226 226 </el-col>
227 227 <el-col :span="8">
228   - <el-form-item label="负责人" prop="head">
229   - <div class="duiqi">{{info.cereBasicInformationShop.head}}</div>
  228 + <el-form-item label="联系方式" prop="telephone">
  229 + <div class="duiqi">{{info.cereBasicInformationShop.telephone || '无'}}</div>
230 230 </el-form-item>
231 231 </el-col>
232 232 <el-col :span="8">
233   - <el-form-item label="详细位置" prop="detailedLocation">
234   - <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation}}</div>
235   - </el-form-item>
236 233 </el-col>
237 234 </el-row>
  235 + <el-form-item label="门牌号" prop="houseNumber">
  236 + <div class="duiqi">{{info.cereBasicInformationShop.houseNumber || '无'}}</div>
  237 + </el-form-item>
  238 + <el-form-item label="详细位置" prop="detailedLocation">
  239 + <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation || '无'}}</div>
  240 + </el-form-item>
  241 + <el-form-item label="地图标点" prop="mapPunctuation">
  242 + <div style="width: 100%;height: 300px;">
  243 + <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap>
  244 + </div>
  245 + </el-form-item>
238 246 <el-form-item label="建筑图纸" prop="architecturalDrawings">
239   - <div>
240   - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
  247 + <div v-if="info.cereBasicInformationShop.architecturalDrawings">
  248 + <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
241 249 v-for="item in info.cereBasicInformationShop.architecturalDrawings.split(',')">
242 250 </div>
  251 + <div class="duiqi" v-else>无</div>
243 252 </el-form-item>
244 253 <el-form-item label="商铺描述" prop="shopDescription">
245   - <div class="duiqi">{{info.cereBasicInformationShop.shopDescription}}</div>
  254 + <div class="duiqi">{{info.cereBasicInformationShop.shopDescription || '无'}}</div>
246 255 </el-form-item>
247 256 <el-form-item label="展示主图" prop="displayMainImage">
248   - <div>
249   - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
250   - v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')">
251   - </div>
252   - <!-- <img :src="info.cereBasicInformationShop.displayMainImage" alt="" style="width:140px;height:140px;"> -->
  257 + <img v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
  258 + </el-form-item>
  259 + <el-form-item label="其他视频" prop="otherImageVideos" >
  260 + <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile($baseURL+info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div>
253 261 </el-form-item>
254   - <!-- <el-form-item label="其他图片/视频" prop="otherImageVideos">
255   - <div class="duiqi">{{info.cereBasicInformationShop.otherImageVideos}}</div>
256   - </el-form-item> -->
257 262 </el-form>
258 263 </div>
259   - <div style="padding: 20px;" v-if="info.cereAdvertisingInformation.id">
260   - <el-form :model="info.cereAdvertisingInformation" ref="ruleForm" label-width="140px"
261   - class="demo-ruleForm">
  264 + <div style="padding: 20px;" v-if="info.cereBasicInformationVenue.id">
  265 + <el-form :model="info.cereBasicInformationVenue" ref="ruleForm" label-width="140px" class="demo-ruleForm">
262 266 <el-row :gutter="20">
263 267 <el-col :span="8">
264   - <el-form-item label="广告位名称" prop="advertisingName">
265   - <div class="duiqi">{{info.cereAdvertisingInformation.advertisingName}}</div>
  268 + <el-form-item label="场地名称" prop="venueName">
  269 + <div class="duiqi">{{info.cereBasicInformationVenue.venueName || '无'}}</div>
266 270 </el-form-item>
267 271 </el-col>
268 272 <el-col :span="8">
269   - <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
270   - <div class="duiqi">{{info.cereAdvertisingInformation.advertisingSpaceNumber}}</div>
  273 + <el-form-item label="场地类型" prop="venueType">
  274 + <div class="duiqi">{{info.cereBasicInformationVenue.venueType || '无'}}</div>
271 275 </el-form-item>
272 276 </el-col>
273 277 <el-col :span="8">
274   - <el-form-item label="广告位类型" prop="advertisingType">
275   - <div class="duiqi">{{info.cereAdvertisingInformation.advertisingType}}</div>
276   - </el-select>
  278 + <el-form-item label="实际使用面积" prop="actualArea">
  279 + <div class="duiqi">{{info.cereBasicInformationVenue.actualArea || '无'}}</div>
277 280 </el-form-item>
278 281 </el-col>
279 282 </el-row>
280 283 <el-row :gutter="20">
281   -
282 284 <el-col :span="8">
283   - <el-form-item label="所属端" prop="affiliation" v-if="ontype =='线上广告位'">
284   - <div class="duiqi">{{info.cereAdvertisingInformation.affiliation}}</div>
285   - </el-form-item>
286   - <el-form-item label="详细位置" prop="detailedLocation" v-if="ontype =='实体广告位'">
287   - <div class="duiqi">{{info.cereAdvertisingInformation.detailedLocation}}</div>
  285 + <el-form-item label="所属区域" prop="district">
  286 + <div class="duiqi">{{info.cereBasicInformationVenue.district || '无'}}</div>
288 287 </el-form-item>
289 288 </el-col>
290 289 <el-col :span="8">
291   - <el-form-item label="轮播顺序" prop="rotationOrder" v-if="ontype =='线上广告位'">
292   - <div class="duiqi">{{info.cereAdvertisingInformation.rotationOrder}}</div>
293   -
  290 + <el-form-item label="归属部门" prop="department">
  291 + <div class="duiqi">{{info.cereBasicInformationVenue.department || '无'}}</div>
294 292 </el-form-item>
295 293 </el-col>
296 294 <el-col :span="8">
297   - <el-form-item label="广告尺寸" prop="dimensions" v-if="ontype =='线上广告位'">
298   - <div class="duiqi">{{info.cereAdvertisingInformation.dimensions}}</div>
  295 + <el-form-item label="负责人" prop="responsiblePerson">
  296 + <div class="duiqi">{{info.cereBasicInformationVenue.belongingParkTrail || '无'}}</div>
299 297 </el-form-item>
300 298 </el-col>
301 299 </el-row>
302 300 <el-row :gutter="20">
303 301 <el-col :span="8">
304   - <el-form-item label="可上传大小" prop="size" v-if="ontype =='线上广告位'">
305   - <div class="duiqi">{{info.cereAdvertisingInformation.size}}</div>
306   - </el-form-item>
307   - </el-col>
308   - <el-col :span="8">
309   - <el-form-item label="上传格式" prop="uploadFormat" v-if="ontype =='线上广告位'">
310   - <div class="duiqi">{{info.cereAdvertisingInformation.uploadFormat}}</div>
  302 + <el-form-item label="联系人" prop="contact">
  303 + <div class="duiqi">{{info.cereBasicInformationVenue.contact || '无'}}</div>
311 304 </el-form-item>
312 305 </el-col>
313 306 <el-col :span="8">
314   - <el-form-item label="设备类型" prop="deviceType" v-if="ontype =='实体广告位'">
315   - <div class="duiqi">{{info.cereAdvertisingInformation.deviceType}}</div>
316   - </el-form-item>
317   - </el-col>
318   - </el-row>
319   - <el-row :gutter="20">
320   -
321   - <el-col :span="12">
322   - <el-form-item label="设备大小" prop="equipmentSize" v-if="ontype =='实体广告位'">
323   - <div style="display: flex;">
324   - <div>
325   - <span style="font-size: 14px;">长：</span>
326   - <span>{{ info.cereAdvertisingInformation.equipmentSizeH }}</span>
327   - <span style="font-size: 14px;margin-right:5px;">mm</span>
328   - </div>
329   - <div>
330   - <span style="font-size: 14px;">宽：</span>
331   - <span>{{ info.cereAdvertisingInformation.equipmentSizeK }}</span>
332   - <span style="font-size: 14px;margin-right:5px;">mm</span>
333   - </div>
334   - <div>
335   - <span style="font-size: 14px;">高：</span>
336   - <span>{{ info.cereAdvertisingInformation.equipmentSizeG }}</span>
337   - <span style="font-size: 14px;margin-right:5px;">mm</span>
338   - </div>
339   - </div>
340   -
341   - </el-form-item>
342   - </el-col>
343   - <el-col :span="12">
344   - <el-form-item label="广告尺寸" v-if="ontype =='实体广告位'">
345   - <div style="display: flex;">
346   - <div>
347   - <span style="font-size: 14px;">长：</span>
348   - <span>{{ info.cereAdvertisingInformation.dimensionsH }}</span>
349   - <span style="font-size: 14px;margin-right:5px;">mm</span>
350   - </div>
351   - <div>
352   - <span style="font-size: 14px;">宽：</span>
353   - <span>{{ info.cereAdvertisingInformation.dimensionsK }}</span>
354   - <span style="font-size: 14px;margin-right:5px;">mm</span>
355   - </div>
356   - </div>
  307 + <el-form-item label="联系电话" prop="phoneNumber">
  308 + <div class="duiqi">{{info.cereBasicInformationVenue.belongingParkTrail || '无'}}</div>
357 309 </el-form-item>
358 310 </el-col>
359   -
360 311 </el-row>
361   - <el-row :gutter="20">
362   -
363   -
364   - <el-col :span="8">
365   - <el-form-item label="广告材质" prop="advertisingMaterial" v-if="ontype =='实体广告位'">
366   - <div class="duiqi">{{info.cereAdvertisingInformation.advertisingMaterial}}</div>
367   - </el-form-item>
368   - </el-col>
369   - </el-row>
370   -
371   -
372   - <el-row :gutter="20">
373   - <el-col :span="12">
374   - <el-form-item label="位置示意图" prop="locationDiagram">
375   - <img :src="info.cereAdvertisingInformation.locationDiagram" alt=""
376   - style="width:140px;height:140px;">
377   - </el-form-item>
378   - </el-col>
379   -
380   - </el-row>
381   - </el-form>
382   - </div>
383   - <div style="padding: 20px;" v-if="info.cereBasicInformationVenue.id">
384   - <el-form :model="info.cereBasicInformationVenue" ref="ruleForm" label-width="140px" class="demo-ruleForm">
385   - <el-row :gutter="20">
386   - <el-col :span="12">
387   - <el-form-item label="场地名称" prop="venueName">
388   - <div class="duiqi">{{info.cereBasicInformationVenue.venueName}}</div>
389   -
390   - </el-form-item>
391   - </el-col>
392   - <el-col :span="12">
393   - <el-form-item label="场地类型" prop="venueType">
394   - <div class="duiqi">{{info.cereBasicInformationVenue.venueType}}</div>
395   -
396   - </el-form-item>
397   - </el-col>
398   - </el-row>
399   - <el-row :gutter="20">
400   - <el-col :span="12">
401   - <el-form-item label="实际使用面积" prop="actualArea">
402   - <div class="duiqi">{{info.cereBasicInformationVenue.actualArea}}</div>
403   -
404   - </el-form-item>
405   - </el-col>
406   - <el-col :span="12">
407   - <el-form-item label="所属区域" prop="district">
408   - <div class="duiqi">{{info.cereBasicInformationVenue.district}}</div>
409   -
410   - </el-form-item>
411   - </el-col>
412   - </el-row>
413   - <el-row :gutter="20">
414   - <el-col :span="12">
415   - <el-form-item label="归属部门" prop="department">
416   - <div class="duiqi">{{info.cereBasicInformationVenue.department}}</div>
417   -
418   - </el-form-item>
419   - </el-col>
420   - <el-col :span="12">
421   - <el-form-item label="负责人" prop="responsiblePerson">
422   - <div class="duiqi">{{info.cereBasicInformationVenue.belongingParkTrail}}</div>
423   -
424   - </el-form-item>
425   - </el-col>
426   - </el-row>
427   -
428   - <el-row :gutter="20">
429   - <el-col :span="12">
430   - <el-form-item label="详细位置" prop="detailedLocation">
431   - <div class="duiqi">{{info.cereBasicInformationVenue.detailedLocation}}</div>
432   -
433   - </el-form-item>
434   - </el-col>
435   - </el-row>
436   -
437   - <el-row :gutter="20">
438   - <el-col :span="12">
439   - <el-form-item label="场地描述" prop="description">
440   - <div class="duiqi">{{info.cereBasicInformationVenue.description}}</div>
441   -
442   - </el-form-item>
443   - </el-col>
444   -
445   - </el-row>
446   -
  312 + <el-form-item label="详细位置" prop="detailedLocation">
  313 + <div class="duiqi">{{info.cereBasicInformationVenue.detailedLocation || '无'}}</div>
  314 + </el-form-item>
  315 + <el-form-item label="地图标点" prop="mapMarker">
  316 + <div style="width: 100%;height: 300px;">
  317 + <newmap :isx="false" :message="info.cereBasicInformationVenue.mapMarker"></newmap>
  318 + </div>
  319 + </el-form-item>
  320 + <el-form-item label="场地描述" prop="description">
  321 + <div class="duiqi">{{info.cereBasicInformationVenue.description || '无'}}</div>
  322 + </el-form-item>
447 323 <el-form-item label="规划图纸" prop="planningDrawing">
448   - <div>
  324 + <div v-if="info.cereBasicInformationVenue.planningDrawing">
449 325 <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
450 326 v-for="item in info.cereBasicInformationVenue.planningDrawing.split(',')">
451 327 </div>
452   -
  328 + <div class="duiqi" v-else>无</div>
453 329 </el-form-item>
454   -
455 330 <el-form-item label="展示主图" prop="displayImage">
456   - <div>
  331 + <div >
457 332 <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
458 333 v-for="item in info.cereBasicInformationVenue.displayImage.split(',')">
459 334 </div>
460   -
461 335 </el-form-item>
462   - <!-- <el-row :gutter="20">
463   - <el-col :span="12">
464   - <el-form-item label="其他图片/视频" prop="otherMedia">
465   - <div class="duiqi">{{info.cereBasicInformationVenue.otherMedia}}</div>
466   - </el-form-item>
467   - </el-col>
468   - </el-row> -->
  336 + <el-form-item label="其他视频" prop="otherImageVideos" >
  337 + <div class="duiqi" :class="info.cereBasicInformationVenue.otherImageVideos?'greens':''" @click ="info.cereBasicInformationVenue.otherImageVideos?openfile($baseURL+info.cereBasicInformationVenue.otherImageVideos):''">{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}</div>
  338 + </el-form-item>
469 339 </el-form>
470 340 </div>
471 341 </div>
... ... @@ -473,20 +343,40 @@
473 343 </el-tabs>
474 344 </div>
475 345 <!-- v-if='info.auditStatus == 1' -->
476   - <div v-if='info.auditStatus == 1' style="border-top: 2px solid #eee;">
477   - <div style="padding-left: 130px;margin: 25px 0;">
  346 + <div v-if="info.auditStatus == 1 && issp == '2'">
  347 + <!-- <div style="padding-left: 130px;margin: 25px 0;">
478 348 <el-radio v-model="radio" label="2">同意</el-radio>
479 349 <el-radio v-model="radio" label="3">拒绝</el-radio>
480   - </div>
481   - <el-form :model="info" label-width="130px" class="demo-ruleForm">
482   - <el-form-item label="审核意见">
483   - <el-input maxlength="200" show-word-limit rows="4" v-model="info.reviewComments" placeholder="请输入审核意见"
484   - type="textarea" />
  350 + </div> -->
  351 + <TitleWithCircle title="审核情况"/>
  352 + <div style="padding: 20px;">
  353 + <el-form :model="info" label-width="130px" class="demo-ruleForm">
  354 + <el-form-item label="状态">
  355 + <el-radio v-model="radio" label="2">同意</el-radio>
  356 + <el-radio v-model="radio" label="3">拒绝</el-radio>
485 357 </el-form-item>
486   - </el-form>
  358 + <el-form-item label="审核意见">
  359 + <el-input maxlength="200" show-word-limit rows="4" v-model="info.reviewComments" placeholder="请输入审核意见"
  360 + type="textarea" />
  361 + </el-form-item>
  362 + </el-form>
  363 + </div>
  364 + </div>
  365 + <div v-if="info.auditStatus == '2' || info.auditStatus == '3'">
  366 + <TitleWithCircle title="审核结果"/>
  367 + <div style="padding: 20px;">
  368 + <el-form :model="info" label-width="100px" class="demo-ruleForm">
  369 + <el-form-item label="状态">
  370 + <div class="duiqi">{{info.auditStatus=='2'?'已通过':info.auditStatus=='3'?'不通过':'无'}}</div>
  371 + </el-form-item>
  372 + <el-form-item label="审核意见">
  373 + <div class="duiqi">{{info.reviewComments || '无'}}</div>
  374 + </el-form-item>
  375 + </el-form>
  376 + </div>
487 377 </div>
488 378 <div>
489   - <el-button v-if='info.auditStatus == 1' @click="minSev"
  379 + <el-button v-if="info.auditStatus == 1 && issp == '2'" @click="minSev"
490 380 style="background-color: #3F9B6A;color: #fff;">确定</el-button>
491 381 <el-button class="buttonHover"
492 382 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
... ... @@ -505,13 +395,18 @@
505 395 import TitleWithCircle from '@/components/top/index';
506 396 import MapXian from "@/components/MapContainer/MapXian";
507 397 import {
  398 + cerePlatformMerchant
  399 + } from '@/api/newly.js'
  400 + import {
508 401 msgedit,
509 402  
510 403 } from '@/api/cereBusinessInfo'
  404 + import newmap from "@/components/newmap/index";
511 405 export default {
512 406 components: {
513 407 TitleWithCircle,
514   - MapXian
  408 + MapXian,
  409 + newmap
515 410 },
516 411 props: {
517 412 info: {
... ... @@ -520,6 +415,12 @@
520 415 return {}; // 返回一个空数组作为默认值
521 416 },
522 417 },
  418 + issp: {
  419 + type: String,
  420 + default: function() {
  421 + return '1';
  422 + },
  423 + },
523 424 },
524 425 data() {
525 426 return {
... ... @@ -536,11 +437,22 @@
536 437 shop: {},
537 438 newshop: {},
538 439 newinfo: {},
539   - parentMessage: {}
  440 + parentMessage: {},
  441 + pagequery: {
  442 + pageNumber: 0,
  443 + pageSize: 10,
  444 + checkState:'2',
  445 + phone: '',
  446 + },
  447 + shopMsg:{}
540 448 }
541 449 },
542 450 created() {
543 451 console.log(this.info)
  452 + this.pagequery.phone = this.info.applicant
  453 + cerePlatformMerchant(this.pagequery).then(res=>{
  454 + this.shopMsg = res.data.content[0]
  455 + })
544 456 if (this.info.cereAdvertisingInformation) {
545 457 this.ontype = this.info.cereAdvertisingInformation.advertisingType
546 458 }
... ...
admin-web-master/src/components/merchantInformation/index.vue
  View file @3b97e41
... ... @@ -43,7 +43,7 @@
43 43 </el-form-item>
44 44 </el-form>
45 45 </div>
46   - <TitleWithCircle title="审核信息" />
  46 + <!-- <TitleWithCircle title="审核信息" />
47 47 <div style="padding: 20px;margin-top: 10px;">
48 48 <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
49 49 <el-row :gutter="20">
... ... @@ -63,7 +63,7 @@
63 63 </el-col>
64 64 </el-row>
65 65 </el-form>
66   - </div>
  66 + </div> -->
67 67 <!-- <div style="padding: 20px;margin-top: 10px;">
68 68 <el-table :data="list"
69 69 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
... ... @@ -93,7 +93,37 @@
93 93 </el-tab-pane>
94 94 </el-tabs>
95 95 </div>
  96 + <div v-if="info.checkState == '1' && issp == '2'">
  97 + <TitleWithCircle title="审核情况"/>
  98 + <div style="padding: 20px;">
  99 + <el-form :model="info" label-width="100px" class="demo-ruleForm">
  100 + <el-form-item label="状态" style="align-items: center;">
  101 + <el-radio v-model="radio" label="2">通过</el-radio>
  102 + <el-radio v-model="radio" label="3">不通过</el-radio>
  103 + </el-form-item>
  104 + <el-form-item label="审核意见">
  105 + <el-input maxlength="200" show-word-limit rows="4" v-model="checkOpinion" placeholder="请输入审核意见"
  106 + type="textarea" />
  107 + </el-form-item>
  108 + </el-form>
  109 + </div>
  110 + </div>
  111 + <div v-if="info.checkState == '2' || info.checkState == '3'">
  112 + <TitleWithCircle title="审核结果"/>
  113 + <div style="padding: 20px;">
  114 + <el-form :model="info" label-width="100px" class="demo-ruleForm" >
  115 + <el-form-item label="状态">
  116 + <div class="duiqi">{{info.checkState=='2'?'已通过':info.checkState=='3'?'不通过':'无'}}</div>
  117 + </el-form-item>
  118 + <el-form-item label="审核意见">
  119 + <div class="duiqi">{{info.checkOpinion || '无'}}</div>
  120 + </el-form-item>
  121 + </el-form>
  122 + </div>
  123 + </div>
96 124 <div>
  125 + <el-button v-if="info.checkState == '1' && issp == '2'" @click="minSev"
  126 + style="background-color: #3F9B6A;color: #fff;">确定</el-button>
97 127 <el-button class="buttonHover"
98 128 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
99 129 @click="changetype">返回</el-button>
... ... @@ -102,6 +132,9 @@
102 132 </template>
103 133  
104 134 <script>
  135 + import {
  136 + cerePlatformMerchantedit
  137 + } from '@/api/newly.js'
105 138 import TitleWithCircle from '@/components/top/index';
106 139 export default {
107 140 components: {
... ... @@ -114,9 +147,17 @@
114 147 return {}; // 返回一个空数组作为默认值
115 148 },
116 149 },
  150 + issp: {
  151 + type: String,
  152 + default: function() {
  153 + return '1';
  154 + },
  155 + },
117 156 },
118 157 data() {
119 158 return {
  159 + checkOpinion:'',
  160 + radio: '2',
120 161 xiangTab: 'first',
121 162 list: [],
122 163 }
... ... @@ -127,6 +168,30 @@
127 168  
128 169 },
129 170 methods: {
  171 + minSev() {
  172 +
  173 + // return
  174 + cerePlatformMerchantedit({
  175 + ...this.info,
  176 + 'checkState': this.radio,
  177 + checkOpinion: this.checkOpinion?this.checkOpinion:null
  178 + }).then(res => {
  179 + console.error(res)
  180 + if (res.code == 200) {
  181 + this.$message({
  182 + message: '处理成功',
  183 + type: 'success'
  184 + })
  185 + this.info.checkState = this.radio
  186 + this.$emit('removeonaction', '1')
  187 + } else {
  188 + this.$message({
  189 + message: '处理失败',
  190 + type: 'error'
  191 + })
  192 + }
  193 + })
  194 + },
130 195 changetype(){
131 196 this.xiangTab= 'first'
132 197 this.$emit('removeonaction', '1')
... ...
admin-web-master/src/utils/request.js
  View file @3b97e41
... ... @@ -17,12 +17,12 @@ let baseURL = &#39;&#39;
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19 19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20   - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
21 21 // baseURL = 'http://172.16.61.125:9003';
22 22  
23 23 // baseURL = 'http://192.168.2.107:9003';
24 24  
25   - baseURL = 'http://192.168.2.138:9003';
  25 + // baseURL = 'http://192.168.2.138:9003';
26 26  
27 27 // baseURL = 'http://10.0.0.51:9003';
28 28  
... ...
admin-web-master/src/views/business/autd/index.vue
  View file @3b97e41
... ... @@ -72,7 +72,7 @@
72 72 <el-table-column label="操作" fixed="right">
73 73 <template slot-scope="scope">
74 74 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
75   - <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div>
  75 + <div @click="openyujingSet(scope.row)" class="tableBtn greens" v-if="scope.row.checkState == '1'">审核</div>
76 76 </template>
77 77 </el-table-column>
78 78 </el-table>
... ... @@ -117,7 +117,20 @@
117 117 </div>
118 118 </div>
119 119 </el-dialog>
120   -
  120 + <div class="zhuti" v-if="onaction == '2'">
  121 + <div style="height:58px;line-height:58px;">
  122 + <div style="color:#0006"> <span>商家入驻审核</span> <span style="padding:0 5px;">></span> <span
  123 + style="color:#000000e6">审核</span></div>
  124 + </div>
  125 + <div>
  126 + <merchantInformation :issp="'2'" :info="detailsinfo" @removeonaction="removeonaction"></merchantInformation>
  127 + </div>
  128 + <!-- <div>
  129 + <el-button class="buttonHover"
  130 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
  131 + @click="removeonaction('1')">返回</el-button>
  132 + </div> -->
  133 + </div>
121 134 <div class="zhuti" v-if="onaction == '3'">
122 135 <div style="height:58px;line-height:58px;">
123 136 <div style="color:#0006"> <span>商家入驻审核</span> <span style="padding:0 5px;">></span> <span
... ... @@ -212,6 +225,9 @@
212 225  
213 226 },
214 227 openyujingSet(row) {
  228 + this.detailsinfo = row
  229 + this.onaction = '2'
  230 + return
215 231 // cereReminderSet({
216 232 // reminderType: '1'
217 233 // }).then(res => {
... ... @@ -273,62 +289,27 @@
273 289  
274 290 <style scoped>
275 291 .zhuti {
276   - padding: 0 20px 20px 20px;
  292 + padding: 0 20px 20px 20px;
277 293 min-height: calc(100vh - 50px - 20px);
278 294 background-color: #Fff;
279 295  
280 296 }
281   - .chengeXia{
282   - border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
283   - }
284   -
285   - /deep/ .el-form-item__content {
286   - line-height: 0;
  297 + .chengeXia {
  298 + border-bottom: 6px solid #3F9B6A;
  299 + padding-bottom: 4px;
  300 + color: #3F9B6A;
287 301 }
288 302  
289   -
290 303  
291 304 .formSearch {
292 305 display: flex;
293 306 width: 100%;
294 307 font-size: 14px;
295 308 justify-content: space-between;
296   - padding-bottom: 10px;
297   -
298 309 }
299   -
300 310 .greens {
301 311 color: #3F9B6A;
302 312 }
303   -
304   - /deep/ .el-table__row {
305   - font-size: 14px;
306   - color:#000000e6;
307   - height:42px;
308   - }
309   -
310   - .fenye {
311   - margin-top: 20px;
312   - display: flex;
313   - justify-content: flex-end;
314   - }
315   -
316   - /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
317   - background-color: #3F9B6A;
318   - }
319   -
320   - .el-row {
321   - margin-bottom: 20px;
322   -
323   - &:last-child {
324   - margin-bottom: 0;
325   - }
326   - }
327   -
328   - .el-col {
329   - border-radius: 4px;
330   - }
331   -
332 313 .bg-purple-dark {
333 314 background: #99a9bf;
334 315 }
... ... @@ -340,176 +321,20 @@
340 321 .bg-purple-light {
341 322 background: #e5e9f2;
342 323 }
343   -
344 324 .grid-content {
345 325 border-radius: 4px;
346 326 min-height: 36px;
347 327 }
348 328  
349   - .row-bg {
350   - padding: 10px 0;
351   - background-color: #f9fafc;
352   - }
353   -
354   - /deep/ .bg-purple[data-v-0e3fe4ec] {
355   - background: #fff;
356   - height: 50px;
357   - }
358   - /deep/ .bg-purple[data-v-3bebae82]{
359   - background: #fff;
360   - height: 50px;
361   - }
362   -
363   -::v-deep .bg-purple{
364   - background: #fff;
365   - height: 50px;
366   - }
367   - /deep/ .el-form--label-top .el-form-item__label {
368   - padding: 0;
369   - }
370   -::v-deep .el-form-item{
371   - margin-bottom:16px;
372   -}
373   - .device-form .el-form-item__label::after {
374   - content: "*";
375   - color: #1A1A1A;
376   - margin-left: 5px;
377   - font-size: 16px;
378   - }
379   -
380   -
381   - ::v-deep .el-dialog__wrapper {
382   - .el-dialog__header {
383   - background-color: #FAFAFA;
384   - }
385   - }
386   - ::v-deep .el-input__inner:focus {
387   - border: #3F9B6A 1px solid;
388   - }
389   - .dialog-footer {
390   - display: flex;
391   - justify-content: flex-end;
392   - border-top: solid rgba(209, 209, 209, 0.2) 2px;
393   - padding-top: 20px;
394   - }
395   - ::v-deep .el-input__inner:focus {
396   - border: #3F9B6A 1px solid;
397   - }
398   - ::v-deep .el-input__inner:hover {
399   - border: #3F9B6A 1px solid;
400   - }
401   - ::v-deep .el-select .el-input.is-focus .el-input__inner{
402   - border-color:#3F9B6A
403   - }
404   -::v-deep .btn .el-button:focus,
405   -.el-button:hover {
406   - border: 1px solid #3F9B6A;
407   -}
408   -.el-select-dropdown__item.selected{
409   - color: #3F9B6A;
410   -}
411   -
412   -.el-pagination__sizes .el-input .el-input__inner:hover{
413   - border-color: #3F9B6A;
414   -}
415   -::v-deep .el-dialog__wrapper{
416   -
417   - .dialog_css{
418   - margin-right: 12px;
419   - margin-top:61px !important;
420   - .el-dialog__title {
421   - font-size: 16px !important;
422   - font-weight: 600;
423   - color: #000;
424   - }
425   - }
426   - .diaslog_zhong{
427   - margin-left: 20%;
428   - margin-top:61px !important;
429   - }
430   -
431   -}
432   - ::v-deep .diaslog_zhong{
433   - margin-left: 20%;
434   - margin-top:61px !important;
435   - .el-dialog__header{
436   - background-color:#fff;
437   - border-bottom:1px solid #EFEFEF;
438   - .el-dialog__title{
439   - font-size: 14px;
440   - color: #000000e6;
441   - }
442   - }
443   - .el-dialog__body{
444   - padding:10px 20px 30px 20px
445   - }
446   - }
447   -
448   - /deep/ .el-table_1_column_8 .hetong{
449   - color:#7DBB9A;
450   - text-decoration: underline;
451   -}
452   -/deep/ .first-column-bg {
453   - background-color: #FAFAFA !important;
454   - }
455   -
456   -.el-table tr{
457   - height:56px;
458   -}
459   -
460   -::v-deep .table3{
461   - .el-table__empty-block{
462   - display:none;
463   - }
464   -}
465   -::v-deep .textarea{
466   - width: 85%;
467   - .el-textarea__inner{
468   - width: 100%;
469   - }
470   -}
471   -::v-deep .el-button--mini{
472   - padding: 7px 10px;
473   -}
474   -::v-deep .pass_input{
475   - width: 100%;
476   - .el-input__inner {
477   - border: none;
478   - padding:0;
479   - }
480   - }
481   -::v-deep .pass_select{
482   - width: 100%;
483   - .el-input__inner {
484   - border: none;
485   - padding:0;
486   - }
487   - .el-icon-arrow-up:before{
488   - content:''
489   - }
490   -
491   -}
492   - /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
493   - background-color: #fff;
494   -}
495   -
496   -
497 329 </style>
498 330 <style lang="scss" scoped>
499   - ::v-deep .bian_css{
500   - .el-dialog__header{
501   - padding:0px;
502   - }
503   - }
504   - ::v-deep .buttonHover:hover{
505   - color:#3f9b6a !important;
506   - border-color: #c5e1d2 !important;
507   - background-color: #ecf5f0 !important;
508   - outline: none;
  331 + ::v-deep .el-dialog__body {
  332 + padding: 0 0 !important;
509 333 }
510   - ::v-deep .el-pagination__total{
511   - position: absolute;
512   - left: 33px;
  334 + .el-dialog__header{
  335 + padding: 0;
  336 + display: none;
513 337 }
514 338 </style>
515 339  
  340 +
... ...
admin-web-master/src/views/detect/admap.vue
  View file @3b97e41
... ... @@ -71,7 +71,7 @@
71 71 {{scope.row.head || '无'}}
72 72 </template>
73 73 </el-table-column>
74   - <el-table-column label="发布时间" prop="createDate"> </el-table-column>
  74 + <el-table-column label="提交时间" prop="createDate"> </el-table-column>
75 75 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
76 76 <template slot-scope="scope">
77 77 {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
... ... @@ -104,7 +104,7 @@
104 104 <el-table-column label="广告位类型" prop="advertisingType" show-overflow-tooltip>
105 105 </el-table-column>
106 106 <el-table-column label="创建人" prop="createUser"> </el-table-column>
107   - <el-table-column label="发布时间" prop="createDate"> </el-table-column>
  107 + <el-table-column label="提交时间" prop="createDate"> </el-table-column>
108 108 <!-- <el-table-column prop="publishStatus" label="发布状态" >
109 109 <template slot-scope="scope">
110 110 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
... ...
admin-web-master/src/views/detect/information/index.vue
  View file @3b97e41
... ... @@ -65,7 +65,7 @@
65 65 {{scope.row.head || '无'}}
66 66 </template>
67 67 </el-table-column>
68   - <el-table-column label="发布时间" prop="createDate" > </el-table-column>
  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 71 {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
... ...
admin-web-master/src/views/detect/map/index.vue
  View file @3b97e41
... ... @@ -87,7 +87,7 @@
87 87 </template>
88 88 </el-table-column> -->
89 89 <el-table-column label="创建人" prop="createUser" > </el-table-column>
90   - <el-table-column label="发布时间" prop="createDate" > </el-table-column>
  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 93 {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
... ...
admin-web-master/src/views/rent/audit/index.vue
  View file @3b97e41
... ... @@ -92,8 +92,8 @@
92 92  
93 93 <el-table-column label="操作" min-width="150" fixed="right">
94 94 <template slot-scope="scope">
95   - <div @click="details(scope.row)" class="tableBtn greens">查看</div>
96   - <div v-if="scope.row.auditStatus == '1'" @click="details(scope.row)" class="tableBtn greens">审核</div>
  95 + <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
  96 + <div v-if="scope.row.auditStatus == '1'" @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
97 97 <div v-if="scope.row.auditStatus == '2'" @click="openhet(scope.row)" class="tableBtn greens">录入合同</div>
98 98 </template>
99 99 </el-table-column>
... ... @@ -128,10 +128,10 @@
128 128 <div class="zhuti" v-if="onaction == '3'">
129 129 <div style="height:58px;line-height:58px;">
130 130 <div style="color:#0006"> <span>招商租赁审核</span> <span style="padding:0 5px;">></span> <span
131   - style="color:#000000e6">查看</span></div>
  131 + style="color:#000000e6">{{onindex=='1'?'查看':'审核'}}</span></div>
132 132 </div>
133 133 <div>
134   - <zl :info="detailsinfo" @removeonaction="removeonaction"></zl>
  134 + <zl :issp="onindex" :info="detailsinfo" @removeonaction="removeonaction"></zl>
135 135 </div>
136 136 </div>
137 137 <div class="zhuti" v-if="onaction == '4'">
... ... @@ -167,6 +167,7 @@
167 167 export default {
168 168 data() {
169 169 return {
  170 + onindex:'1',
170 171 contractChangeReason: '',
171 172 detailsinfo: {},
172 173 pagequery: {
... ... @@ -258,7 +259,8 @@
258 259 return formattedDateTime
259 260  
260 261 },
261   - details(row) {
  262 + details(row,e) {
  263 + this.onindex = e
262 264 this.detailsinfo = row
263 265 this.onaction = '3'
264 266 },
... ...
admin-web-master/src/views/serve/PerWorkstation/index.vue
  View file @3b97e41
... ... @@ -43,7 +43,7 @@
43 43 <el-table-column label="标题" prop="title" width="auto" min-width="12%" />
44 44 <el-table-column label="接收商家" prop="receiverMerchant" width="auto" min-width="12%" />
45 45 <!-- <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
46   - <el-table-column label="发布时间" prop="publishTime" width="auto" min-width="12%" /> -->
  46 + <el-table-column label="提交时间" prop="publishTime" width="auto" min-width="12%" /> -->
47 47 <el-table-column label="发布状态" prop="status" width="auto" min-width="12%" />
48 48  
49 49 <el-table-column label="创建时间" prop="createdAt" width="auto" min-width="12%" />
... ...