webapp / GreenwayWeb

Commit 9b392fc6ba9d90fa79ec309132db528c174b9f94

Authored by wesley88
1 parent 4c59d645

1

Inline Side-by-side
Showing 35 changed files with 2191 additions and 763 deletions
admin-web-master/dist.zip 0 → 100644
View file @9b392fc
No preview for this file type
admin-web-master/src/api/newly.js
  View file @9b392fc
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 import requestnew from '@/utils/request2' 2 import requestnew from '@/utils/request2'
  3 +// 获取续租管理合同
  4 +export function contractRenewalReminder(data) {
  5 + return request({
  6 + url: '/cereContractInformation/contractRenewalReminder',
  7 + method: 'post',
  8 + data
  9 + })
  10 +}
  11 +// 获取到期合同
  12 +export function expwarning(data) {
  13 + return request({
  14 + url: '/cereContractInformation/expwarning',
  15 + method: 'post',
  16 + data
  17 + })
  18 +}
  19 +// 获取资源的租赁列表
  20 +export function cereContractInformation(data) {
  21 + return request({
  22 + url: '/cereContractInformation/leaseRecords',
  23 + method: 'post',
  24 + data
  25 + })
  26 +}
3 27
4 // 上下架 28 // 上下架
5 // 列表 29 // 列表
admin-web-master/src/components/add/addmap copy.vue
  View file @9b392fc
@@ -5,14 +5,14 @@ @@ -5,14 +5,14 @@
5 <el-row :gutter="20"> 5 <el-row :gutter="20">
6 <el-col :span="12"> 6 <el-col :span="12">
7 <el-form-item label="广告位名称" prop="advertisingName"> 7 <el-form-item label="广告位名称" prop="advertisingName">
8 - <el-input v-model="formInline.advertisingName" placeholder="请输入" style="margin-top:5px;" 8 + <el-input v-model="formInline.advertisingName" placeholder="请输入"
9 maxlength="50"></el-input> 9 maxlength="50"></el-input>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 <el-col :span="12"> 12 <el-col :span="12">
13 <el-form-item label="广告位编号" prop="advertisingSpaceNumber"> 13 <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
14 <el-input v-model="formInline.advertisingSpaceNumber" disabled placeholder="将根据类型自动为资源编号" 14 <el-input v-model="formInline.advertisingSpaceNumber" disabled placeholder="将根据类型自动为资源编号"
15 - style="margin-top:5px;"></el-input> 15 + ></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 18
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <el-row :gutter="20"> 20 <el-row :gutter="20">
21 <el-col :span="12"> 21 <el-col :span="12">
22 <el-form-item label="广告位类型" prop="advertisingType"> 22 <el-form-item label="广告位类型" prop="advertisingType">
23 - <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;"> 23 + <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
24 <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option> 24 <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
25 <!-- <el-option label="实体广告位" value="实体广告位" v-else></el-option> --> 25 <!-- <el-option label="实体广告位" value="实体广告位" v-else></el-option> -->
26 </el-select> 26 </el-select>
@@ -28,13 +28,13 @@ @@ -28,13 +28,13 @@
28 </el-col> 28 </el-col>
29 <el-col :span="12"> 29 <el-col :span="12">
30 <el-form-item label="所属端" prop="affiliation" v-if="ontype =='线上广告位'"> 30 <el-form-item label="所属端" prop="affiliation" v-if="ontype =='线上广告位'">
31 - <el-select v-model="formInline.affiliation" placeholder="请选择" style="margin-top:5px;width: 100%;"> 31 + <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;">
32 <el-option label="游客小程序" value="游客小程序"></el-option> 32 <el-option label="游客小程序" value="游客小程序"></el-option>
33 <el-option label="商家客户端" value="商家客户端"></el-option> 33 <el-option label="商家客户端" value="商家客户端"></el-option>
34 </el-select> 34 </el-select>
35 </el-form-item> 35 </el-form-item>
36 <el-form-item label="详细位置" prop="detailedLocation" v-if="ontype =='实体广告位'"> 36 <el-form-item label="详细位置" prop="detailedLocation" v-if="ontype =='实体广告位'">
37 - <el-input v-model="formInline.detailedLocation" placeholder="请输入" style="margin-top:5px;" 37 + <el-input v-model="formInline.detailedLocation" placeholder="请输入"
38 maxlength="200"></el-input> 38 maxlength="200"></el-input>
39 <!-- </el-select> --> 39 <!-- </el-select> -->
40 </el-form-item> 40 </el-form-item>
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <el-row :gutter="20"> 53 <el-row :gutter="20">
54 <el-col :span="12"> 54 <el-col :span="12">
55 <el-form-item label="轮播顺序" prop="rotationOrder" v-if="ontype =='线上广告位'"> 55 <el-form-item label="轮播顺序" prop="rotationOrder" v-if="ontype =='线上广告位'">
56 - <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="margin-top:5px;width: 100%;"> 56 + <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="width: 100%;">
57 <el-option label="1" value="1"></el-option> 57 <el-option label="1" value="1"></el-option>
58 <el-option label="2" value="2"></el-option> 58 <el-option label="2" value="2"></el-option>
59 </el-select> 59 </el-select>
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 <el-col :span="12"> 62 <el-col :span="12">
63 <el-form-item label="广告尺寸" prop="dimensions" v-if="ontype =='线上广告位'"> 63 <el-form-item label="广告尺寸" prop="dimensions" v-if="ontype =='线上广告位'">
64 <el-input v-model="formInline.dimensions" disabled placeholder="宽:300px 长:400px" 64 <el-input v-model="formInline.dimensions" disabled placeholder="宽:300px 长:400px"
65 - style="margin-top:5px;"></el-input> 65 + ></el-input>
66 66
67 </el-form-item> 67 </el-form-item>
68 </el-col> 68 </el-col>
@@ -74,13 +74,13 @@ @@ -74,13 +74,13 @@
74 <el-row :gutter="20"> 74 <el-row :gutter="20">
75 <el-col :span="12"> 75 <el-col :span="12">
76 <el-form-item label="可上传大小" prop="size" v-if="ontype =='线上广告位'"> 76 <el-form-item label="可上传大小" prop="size" v-if="ontype =='线上广告位'">
77 - <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input> 77 + <el-input v-model="formInline.size" disabled placeholder="100kb" ></el-input>
78 </el-form-item> 78 </el-form-item>
79 </el-col> 79 </el-col>
80 <el-col :span="12"> 80 <el-col :span="12">
81 <el-form-item label="上传格式" prop="uploadFormat" v-if="ontype =='线上广告位'"> 81 <el-form-item label="上传格式" prop="uploadFormat" v-if="ontype =='线上广告位'">
82 <el-input v-model="formInline.uploadFormat" disabled placeholder="JPG、PNG、MP4" 82 <el-input v-model="formInline.uploadFormat" disabled placeholder="JPG、PNG、MP4"
83 - style="margin-top:5px;"></el-input> 83 + ></el-input>
84 </el-form-item> 84 </el-form-item>
85 </el-col> 85 </el-col>
86 86
@@ -88,11 +88,11 @@ @@ -88,11 +88,11 @@
88 <el-row :gutter="20"> 88 <el-row :gutter="20">
89 <el-col :span="12"> 89 <el-col :span="12">
90 <el-form-item label="可上传大小" prop="size" v-if="ontype =='实体广告位'"> 90 <el-form-item label="可上传大小" prop="size" v-if="ontype =='实体广告位'">
91 - <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input> 91 + <el-input v-model="formInline.size" disabled placeholder="100kb" ></el-input>
92 </el-form-item> 92 </el-form-item>
93 <el-form-item label="设备类型" prop="deviceType" v-if="ontype =='实体广告位'"> 93 <el-form-item label="设备类型" prop="deviceType" v-if="ontype =='实体广告位'">
94 <div style="display: flex;justify-content: space-between;"> 94 <div style="display: flex;justify-content: space-between;">
95 - <el-select v-model="formInline.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;"> 95 + <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 92%;">
96 <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option> 96 <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
97 97
98 </el-select> 98 </el-select>
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 <div> 105 <div>
106 <span style="font-size: 14px;">长：</span> 106 <span style="font-size: 14px;">长：</span>
107 <el-select v-model="formInline.equipmentSizeH" placeholder="请选择" 107 <el-select v-model="formInline.equipmentSizeH" placeholder="请选择"
108 - style="margin-top:5px;width: 90px;margin: 0 5px 0 0;"> 108 + style="width: 90px;margin: 0 5px 0 0;">
109 <el-option label="10" value="10"></el-option> 109 <el-option label="10" value="10"></el-option>
110 <el-option label="20" value="20"></el-option> 110 <el-option label="20" value="20"></el-option>
111 </el-select> 111 </el-select>
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 <div> 114 <div>
115 <span style="font-size: 14px;">宽：</span> 115 <span style="font-size: 14px;">宽：</span>
116 <el-select v-model="formInline.equipmentSizeK" placeholder="请选择" 116 <el-select v-model="formInline.equipmentSizeK" placeholder="请选择"
117 - style="margin-top:5px;width: 90px;margin: 0 5px 0 0;"> 117 + style="width: 90px;margin: 0 5px 0 0;">
118 <el-option label="10" value="10"></el-option> 118 <el-option label="10" value="10"></el-option>
119 <el-option label="20" value="20"></el-option> 119 <el-option label="20" value="20"></el-option>
120 </el-select> 120 </el-select>
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 <div> 123 <div>
124 <span style="font-size: 14px;">高：</span> 124 <span style="font-size: 14px;">高：</span>
125 <el-select v-model="formInline.equipmentSizeG" placeholder="请选择" 125 <el-select v-model="formInline.equipmentSizeG" placeholder="请选择"
126 - style="margin-top:5px;width: 90px;margin: 0 5px 0 0;"> 126 + style="width: 90px;margin: 0 5px 0 0;">
127 <el-option label="10" value="10"></el-option> 127 <el-option label="10" value="10"></el-option>
128 <el-option label="20" value="20"></el-option> 128 <el-option label="20" value="20"></el-option>
129 </el-select> 129 </el-select>
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 <div> 142 <div>
143 <span style="font-size: 14px;">长：</span> 143 <span style="font-size: 14px;">长：</span>
144 <el-select v-model="formInline.dimensionsH" placeholder="请选择" 144 <el-select v-model="formInline.dimensionsH" placeholder="请选择"
145 - style="margin-top:5px;width: 90px;margin: 0 5px 0 0;"> 145 + style="width: 90px;margin: 0 5px 0 0;">
146 <el-option label="10" value="10"></el-option> 146 <el-option label="10" value="10"></el-option>
147 <el-option label="20" value="20"></el-option> 147 <el-option label="20" value="20"></el-option>
148 </el-select> 148 </el-select>
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 <div> 151 <div>
152 <span style="font-size: 14px;">宽：</span> 152 <span style="font-size: 14px;">宽：</span>
153 <el-select v-model="formInline.dimensionsK" placeholder="请选择" 153 <el-select v-model="formInline.dimensionsK" placeholder="请选择"
154 - style="margin-top:5px;width: 90px;margin: 0 5px 0 0;"> 154 + style="width: 90px;margin: 0 5px 0 0;">
155 <el-option label="10" value="10"></el-option> 155 <el-option label="10" value="10"></el-option>
156 <el-option label="20" value="20"></el-option> 156 <el-option label="20" value="20"></el-option>
157 </el-select> 157 </el-select>
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 <el-col :span="12"> 164 <el-col :span="12">
165 <el-form-item label="广告材质" prop="advertisingMaterial" v-if="ontype =='实体广告位'"> 165 <el-form-item label="广告材质" prop="advertisingMaterial" v-if="ontype =='实体广告位'">
166 <div style="display: flex;justify-content: space-between;"> 166 <div style="display: flex;justify-content: space-between;">
167 - <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="margin-top:5px;width: 92%"> 167 + <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="width: 92%">
168 <el-option label="亚克力" value="亚克力"></el-option> 168 <el-option label="亚克力" value="亚克力"></el-option>
169 <el-option label="玻璃" value="玻璃"></el-option> 169 <el-option label="玻璃" value="玻璃"></el-option>
170 </el-select> 170 </el-select>
admin-web-master/src/components/add/addmap.vue
  View file @9b392fc
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <el-form v-if="ontype =='线上广告位'" :model="formInline" :rules="rules" ref="formInline" label-width="100px" 3 <el-form v-if="ontype =='线上广告位'" :model="formInline" :rules="rules" ref="formInline" label-width="100px"
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="margin-top:5px;width: 100%;"> 6 + <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
7 <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option> 7 <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
8 </el-select> 8 </el-select>
9 </el-form-item> 9 </el-form-item>
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 <el-form v-if="ontype =='实体广告位'" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px" 58 <el-form v-if="ontype =='实体广告位'" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px"
59 class="demo-ruleForm"> 59 class="demo-ruleForm">
60 <el-form-item label="广告位类型" prop="advertisingType"> 60 <el-form-item label="广告位类型" prop="advertisingType">
61 - <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;"> 61 + <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
62 <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option> 62 <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
63 </el-select> 63 </el-select>
64 </el-form-item> 64 </el-form-item>
@@ -90,12 +90,13 @@ @@ -90,12 +90,13 @@
90 <el-input v-model="formInline.dimensions" placeholder="宽:300px 长:400px" maxlength="20"></el-input> 90 <el-input v-model="formInline.dimensions" placeholder="宽:300px 长:400px" maxlength="20"></el-input>
91 </el-form-item> 91 </el-form-item>
92 <el-form-item label="广告材质" prop="advertisingMaterial"> 92 <el-form-item label="广告材质" prop="advertisingMaterial">
93 - <div style="display: flex;justify-content: space-between;"> 93 + <el-input v-model="formInline.advertisingMaterial" placeholder="请输入" maxlength="50"></el-input>
  94 + <!-- <div style="display: flex;justify-content: space-between;">
94 <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="width: 100%"> 95 <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="width: 100%">
95 <el-option label="亚克力" value="亚克力"></el-option> 96 <el-option label="亚克力" value="亚克力"></el-option>
96 <el-option label="玻璃" value="玻璃"></el-option> 97 <el-option label="玻璃" value="玻璃"></el-option>
97 </el-select> 98 </el-select>
98 - </div> 99 + </div> -->
99 </el-form-item> 100 </el-form-item>
100 <el-form-item label="位置示意图" prop="locationDiagram"> 101 <el-form-item label="位置示意图" prop="locationDiagram">
101 <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram" 102 <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
@@ -242,7 +243,7 @@ @@ -242,7 +243,7 @@
242 }], 243 }],
243 advertisingMaterial: [{ 244 advertisingMaterial: [{
244 required: true, 245 required: true,
245 - message: '请选择广告材质', 246 + message: '请输入广告材质',
246 trigger: ['change'] 247 trigger: ['change']
247 }], 248 }],
248 locationDiagram: [{ 249 locationDiagram: [{
@@ -307,7 +308,7 @@ @@ -307,7 +308,7 @@
307 // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数 308 // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
308 const regex = /^\d+(\.\d{1,2})?$/; 309 const regex = /^\d+(\.\d{1,2})?$/;
309 if (!regex.test(value)) { 310 if (!regex.test(value)) {
310 - this.ruleForm[field] = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1'); 311 + this.formInline[field] = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
311 } 312 }
312 }, 313 },
313 updatecenter(e) { 314 updatecenter(e) {
admin-web-master/src/components/buscha/busCha.vue
  View file @9b392fc
1 <template> 1 <template>
2 <div> 2 <div>
3 - <div v-if="type == '1'"> 3 + <div v-show="type == '1'">
4 <el-tabs v-model="xiangTab"> 4 <el-tabs v-model="xiangTab">
5 <el-tab-pane label="合同信息" name="first"> 5 <el-tab-pane label="合同信息" name="first">
6 <div style="margin-top: 30px;" class="editcss"> 6 <div style="margin-top: 30px;" class="editcss">
@@ -213,148 +213,8 @@ @@ -213,148 +213,8 @@
213 </el-tab-pane> 213 </el-tab-pane>
214 </el-tabs> 214 </el-tabs>
215 </div> 215 </div>
216 - <div v-else-if="type == '2'">  
217 - <el-tabs v-model="xiangTab">  
218 - <el-tab-pane label="合同信息" name="first">  
219 - <div style="margin-top: 30px;" class="editcss">  
220 - <TitleWithCircle title="合同信息" />  
221 - <div style="padding: 20px;margin-top: 10px;">  
222 - <el-form :model="newinfo" ref="ruleForm" label-width="140px" class="demo-ruleForm">  
223 - <el-row :gutter="20">  
224 - <el-col :span="9">  
225 - <el-form-item label="合同类型" prop="contractType">  
226 - <div class="duiqi">{{newinfo.contractType}}</div>  
227 - </el-form-item>  
228 - </el-col>  
229 - <el-col :span="9">  
230 - <el-form-item label="合同编号" prop="contractNumber">  
231 - <div class="duiqi">{{newinfo.contractNumber}}</div>  
232 - </el-form-item>  
233 - </el-col>  
234 - </el-row>  
235 - <el-row :gutter="20">  
236 - <el-col :span="9">  
237 - <el-form-item label="标段号" prop="sectionNumber">  
238 - <div class="duiqi">{{newinfo.sectionNumber}}</div>  
239 - </el-form-item>  
240 - </el-col>  
241 - <el-col :span="9">  
242 - <el-form-item label="合同名称" prop="contractName">  
243 - <div class="duiqi">{{newinfo.contractName}}</div>  
244 - </el-form-item>  
245 - </el-col>  
246 - </el-row>  
247 - <el-row :gutter="20">  
248 - <el-col :span="9">  
249 - <el-form-item label="合同签订日期" prop="contractSigningDate">  
250 - <div class="duiqi">{{newinfo.contractSigningDate}}</div>  
251 - </el-form-item>  
252 - </el-col>  
253 - <el-col :span="9">  
254 - <el-form-item label="押金" prop="earnestMoney">  
255 - <div class="duiqi">{{newinfo.earnestMoney}}</div>  
256 - </el-form-item>  
257 - </el-col>  
258 - </el-row>  
259 - <el-row :gutter="20">  
260 - <el-col :span="9">  
261 - <el-form-item label="起租日期" prop="leaseStartDate">  
262 - <div class="duiqi">{{newinfo.leaseStartDate}}</div>  
263 - </el-form-item>  
264 - </el-col>  
265 - <el-col :span="9">  
266 - <el-form-item label="终止日期" prop="contractTerminationDate">  
267 - <div class="duiqi">{{newinfo.contractTerminationDate}}</div>  
268 - </el-form-item>  
269 - </el-col>  
270 - </el-row>  
271 - <el-row :gutter="20">  
272 - <el-col :span="9">  
273 - <el-form-item label="付款周期" prop="paymentCycle">  
274 - <div class="duiqi">{{newinfo.paymentCycle}}</div>  
275 - </el-form-item>  
276 - </el-col>  
277 - <el-col :span="9">  
278 - <el-form-item label="租金" prop="contractAmount">  
279 - <div class="duiqi">{{newinfo.contractAmount}}</div>  
280 - </el-form-item>  
281 - </el-col>  
282 - </el-row>  
283 - <el-row :gutter="20">  
284 - <el-col :span="9">  
285 - <el-form-item label="付款日" prop="paymentDay">  
286 - <div class="duiqi">{{newinfo.paymentDay}}</div>  
287 - </el-form-item>  
288 - </el-col>  
289 - <el-col :span="9">  
290 - <el-form-item label="承租人银行账号" prop="tenantBankAccount">  
291 - <div class="duiqi">{{newinfo.tenantBankAccount}}</div>  
292 - </el-form-item>  
293 - </el-col>  
294 - </el-row>  
295 - <el-row :gutter="20">  
296 - <el-col :span="9">  
297 - <el-form-item label="出租人名称" prop="tenantName">  
298 - <div class="duiqi">{{newinfo.tenantName}}</div>  
299 - </el-form-item>  
300 - </el-col>  
301 - <el-col :span="9">  
302 - <el-form-item label="联系电话" prop="tenantTelephone">  
303 - <div class="duiqi">{{newinfo.tenantTelephone}}</div>  
304 - </el-form-item>  
305 - </el-col>  
306 - </el-row>  
307 - <el-form-item label="附件信息" prop="appendicesContract">  
308 - <div class="duiqi greens" @click ="newinfo.appendicesContract?openfile(newinfo.appendicesContract):''">{{newinfo.appendicesContract?'查看详情':'暂无文件'}}</div>  
309 - </el-form-item>  
310 - </el-form>  
311 - </div>  
312 - </div>  
313 - </el-tab-pane>  
314 - <el-tab-pane label="商家信息" name="second">  
315 - <div style="margin-top: 30px;" class="editcss">  
316 - <TitleWithCircle title="基础信息" />  
317 - <div style="padding: 20px;margin-top: 10px;">  
318 - <el-form :model="newshop" ref="ruleForm" label-width="140px" class="demo-ruleForm">  
319 - <el-row :gutter="20">  
320 - <el-col :span="9">  
321 - <el-form-item label="姓名" prop="name">  
322 - <div class="duiqi">{{newshop.name}}</div>  
323 - </el-form-item>  
324 - </el-col>  
325 - <el-col :span="9">  
326 - <el-form-item label="手机号" prop="phone">  
327 - <div class="duiqi">{{newshop.phone}}</div>  
328 - </el-form-item>  
329 - </el-col>  
330 - </el-row>  
331 - <el-row :gutter="20">  
332 - <el-col :span="9">  
333 - <el-form-item label="证件类型" prop="idCardType">  
334 - <div class="duiqi">{{newshop.idCardType}}</div>  
335 - </el-form-item>  
336 - </el-col>  
337 - <el-col :span="9">  
338 - <el-form-item label="身份证号码" prop="idCardNumber">  
339 - <div class="duiqi">{{newshop.idCardNumber}}</div>  
340 - </el-form-item>  
341 - </el-col>  
342 - </el-row>  
343 - <el-form-item label="身份证照片（正）" prop="idCardFrontImage">  
344 - <div style="margin-top: 10px;">  
345 - <el-image style="width: 200px;" :src="$baseURL+newshop.idCardFrontImage" fit="contain"></el-image>  
346 - </div>  
347 - </el-form-item>  
348 - <el-form-item label="身份证照片（反）" prop="idCardBackImage">  
349 - <div style="margin-top: 10px;">  
350 - <el-image style="width: 200px;" :src="$baseURL+newshop.idCardBackImage" fit="contain"></el-image>  
351 - </div>  
352 - </el-form-item>  
353 - </el-form>  
354 - </div>  
355 - </div>  
356 - </el-tab-pane>  
357 - </el-tabs> 216 + <div v-show="type == '2'">
  217 + <oneht ref="onhet"></oneht>
358 </div> 218 </div>
359 <div> 219 <div>
360 <el-button class="buttonHover" 220 <el-button class="buttonHover"
@@ -365,6 +225,7 @@ @@ -365,6 +225,7 @@
365 </template> 225 </template>
366 226
367 <script> 227 <script>
  228 + import oneht from "@/components/chakan/oneht";
368 import { 229 import {
369 queryByContractcontractNumber 230 queryByContractcontractNumber
370 } from '../../api/commodityLease.js' 231 } from '../../api/commodityLease.js'
@@ -377,6 +238,7 @@ @@ -377,6 +238,7 @@
377 } from '../../api/newly.js' 238 } from '../../api/newly.js'
378 export default { 239 export default {
379 components: { 240 components: {
  241 + oneht,
380 TitleWithCircle 242 TitleWithCircle
381 }, 243 },
382 props: { 244 props: {
@@ -427,7 +289,7 @@ @@ -427,7 +289,7 @@
427 methods: { 289 methods: {
428 openfile(e) { 290 openfile(e) {
429 if (e) { 291 if (e) {
430 - const fullUrl = this.url + e; 292 + const fullUrl = this.$baseURL + e;
431 try { 293 try {
432 window.open(fullUrl, '_blank'); // 在新标签页中打开文件 294 window.open(fullUrl, '_blank'); // 在新标签页中打开文件
433 } catch (error) { 295 } catch (error) {
@@ -448,15 +310,7 @@ @@ -448,15 +310,7 @@
448 open(row) { 310 open(row) {
449 console.error(row) 311 console.error(row)
450 this.type = '2' 312 this.type = '2'
451 - this.newinfo = row  
452 - // businessListGetById ({shopId:row.relatedMerchants}).then(res => {  
453 - // console.log(res)  
454 - // this.newshop = res.data  
455 - // })  
456 - cerePlatformMerchantinfo({id:row.relatedMerchants}).then(res => {  
457 - console.error(res)  
458 - this.newshop = res.data  
459 - }) 313 + this.$refs.onhet.open(row)
460 }, 314 },
461 closeFn() { 315 closeFn() {
462 this.$emit('change', false); 316 this.$emit('change', false);
admin-web-master/src/components/chakan/cd.vue
  View file @9b392fc
1 <template> 1 <template>
2 <div> 2 <div>
3 - <div> 3 + <div v-show="type == '1'">
4 <el-tabs v-model="xiangTab"> 4 <el-tabs v-model="xiangTab">
5 <el-tab-pane label="资源信息" name="first"> 5 <el-tab-pane label="资源信息" name="first">
6 <div style="margin-top: 30px;" class="editcss"> 6 <div style="margin-top: 30px;" class="editcss">
@@ -82,6 +82,26 @@ @@ -82,6 +82,26 @@
82 </el-form-item> 82 </el-form-item>
83 </el-form> 83 </el-form>
84 </div> 84 </div>
  85 + <TitleWithCircle title="历史发布/下架记录" />
  86 + <div style="padding: 20px;">
  87 + <el-table :data="datalistxsj"
  88 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  89 + tooltip-effect="dark custom-tooltip-effect">
  90 + <el-table-column label="类型" prop="type" >
  91 + </el-table-column>
  92 + <el-table-column label="操作时间" prop="operationTime" >
  93 + </el-table-column>
  94 + <el-table-column label="操作人" prop="operator">
  95 + </el-table-column>
  96 + </el-table>
  97 + <div style="display: flex;justify-content: space-between;" class="bom">
  98 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
  99 + <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
  100 + background small layout="prev, pager, next" :total="totalsxj" @size-change="handleCurrentChange"
  101 + @current-change="handleCurrentChange">
  102 + </el-pagination>
  103 + </div>
  104 + </div>
85 </div> 105 </div>
86 </el-tab-pane> 106 </el-tab-pane>
87 <el-tab-pane label="招商方案信息" name="second"> 107 <el-tab-pane label="招商方案信息" name="second">
@@ -127,9 +147,92 @@ @@ -127,9 +147,92 @@
127 </div> 147 </div>
128 </div> 148 </div>
129 </el-tab-pane> 149 </el-tab-pane>
  150 + <el-tab-pane label="租赁记录" name="third" >
  151 + <div style="margin-top: 30px;" class="editcss">
  152 + <div class="titles">
  153 + 租赁记录
  154 + </div>
  155 + <div style="padding: 20px;">
  156 + <el-table :data="datalistzl"
  157 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  158 + tooltip-effect="dark custom-tooltip-effect">
  159 + <el-table-column label="承租商家" prop="tenantName" show-overflow-tooltip>
  160 +
  161 + </el-table-column>
  162 + <el-table-column label="租赁期限" prop="houseNumber" show-overflow-tooltip>
  163 + <template slot-scope="scope">
  164 + {{scope.row.leaseStartDate}}至{{scope.row.contractTerminationDate}}
  165 + </template>
  166 + </el-table-column>
  167 + <!-- <el-table-column label="经营类型" prop="actualUsableArea"show-overflow-tooltip>
  168 + </el-table-column> -->
  169 +
  170 + <el-table-column label="租金/周期" prop="head" show-overflow-tooltip>
  171 + <template slot-scope="scope">
  172 + ￥{{scope.row.contractAmount}}/{{scope.row.paymentCycle}}
  173 + </template>
  174 + </el-table-column>
  175 + <el-table-column label="当前状态" prop="publishStatus" show-overflow-tooltip>
  176 + <template slot-scope="scope">
  177 + <span v-if='scope.row.dataStatus == 1'>使用中</span>
  178 + <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
  179 + <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
  180 + <span v-else>-</span>
  181 + </template>
  182 + </el-table-column>
  183 +
  184 + <el-table-column label="操作" fixed="right">
  185 + <template slot-scope="scope">
  186 + <div @click="open(scope.row)" class="tableBtn greens">查看</div>
  187 + </template>
  188 + </el-table-column>
  189 + </el-table>
  190 + <div style="display: flex;justify-content: space-between;" class="bom">
  191 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalzl}}</span> 项数据</div>
  192 + <el-pagination :current-page="pagequeryzl.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryzl.pageSize"
  193 + background small layout="prev, pager, next" :total="totalzl" @size-change="e => handleSizeChange(e,'pagequeryzl')"
  194 + @current-change="e=> handleCurrentChange(e,'pagequeryzl')">
  195 + </el-pagination>
  196 + </div>
  197 + </div>
  198 + </div>
  199 + </el-tab-pane>
130 </el-tabs> 200 </el-tabs>
131 </div> 201 </div>
  202 + <div v-show="type == '2'">
  203 + <oneht ref="onhet"></oneht>
  204 + </div>
  205 + <div v-if="editbgid.publishStatus == '1' && issp == '2'">
  206 + <TitleWithCircle title="审核情况"/>
  207 + <div style="padding: 20px;">
  208 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  209 + <el-form-item label="状态">
  210 + <el-radio v-model="radio" label="2">通过</el-radio>
  211 + <el-radio v-model="radio" label="3">不通过</el-radio>
  212 + </el-form-item>
  213 + <el-form-item label="审核意见">
  214 + <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见"
  215 + type="textarea" />
  216 + </el-form-item>
  217 + </el-form>
  218 + </div>
  219 + </div>
  220 + <div v-if="editbgid.publishStatus == '2' || editbgid.publishStatus == '3'">
  221 + <TitleWithCircle title="审核结果"/>
  222 + <div style="padding: 20px;">
  223 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  224 + <el-form-item label="状态">
  225 + <div class="duiqi">{{editbgid.publishStatus=='2'?'已发布':editbgid.publishStatus=='3'?'不通过':'无'}}</div>
  226 + </el-form-item>
  227 + <el-form-item label="审核意见">
  228 + <div class="duiqi">{{editbgid.reviewComments || '无'}}</div>
  229 + </el-form-item>
  230 + </el-form>
  231 + </div>
  232 + </div>
132 <div> 233 <div>
  234 + <el-button v-if="editbgid.publishStatus == '1' && issp == '2'" @click="minSev"
  235 + style="background-color: #3F9B6A;color: #fff;">确定</el-button>
133 <el-button class="buttonHover" 236 <el-button class="buttonHover"
134 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" 237 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
135 @click="changetype">返回</el-button> 238 @click="changetype">返回</el-button>
@@ -142,9 +245,14 @@ @@ -142,9 +245,14 @@
142 import TitleWithCircle from '@/components/top/index'; 245 import TitleWithCircle from '@/components/top/index';
143 import { 246 import {
144 cereResourceStrategylist, 247 cereResourceStrategylist,
145 - cereBusinessPlan 248 + cereBusinessPlan,
  249 + cereBusinessOperationqueryByPage,
  250 + cereContractInformation
146 } from '@/api/newly'; 251 } from '@/api/newly';
147 import newmap from "@/components/newmap/index"; 252 import newmap from "@/components/newmap/index";
  253 + import {
  254 + changedit
  255 + } from '@/api/information'
148 export default { 256 export default {
149 components: { 257 components: {
150 TitleWithCircle, 258 TitleWithCircle,
@@ -162,9 +270,32 @@ @@ -162,9 +270,32 @@
162 return {}; 270 return {};
163 }, 271 },
164 }, 272 },
  273 + issp: {
  274 + type: String,
  275 + default: function() {
  276 + return '1';
  277 + },
  278 + },
165 }, 279 },
166 data() { 280 data() {
167 return { 281 return {
  282 + type: '1',
  283 + totalzl:0,
  284 + pagequeryzl:{
  285 + pageNumber: 0,
  286 + pageSize: 10,
  287 + shopNumber: 'cd' + this.editbgid.id
  288 + },
  289 + datalistzl:[],
  290 + reviewComments:'',
  291 + radio: '2',
  292 + datalistxsj:[],
  293 + totalsxj:0,
  294 + pagequerysxj:{
  295 + pageNumber: 0,
  296 + pageSize: 10,
  297 + resourceId: 'cd' + this.editbgid.id
  298 + },
168 xiangTab: 'first', 299 xiangTab: 'first',
169 list: [], 300 list: [],
170 parentMessage: {}, 301 parentMessage: {},
@@ -187,7 +318,8 @@ @@ -187,7 +318,8 @@
187 console.error(res) 318 console.error(res)
188 this.datalist1 = res.data 319 this.datalist1 = res.data
189 }) 320 })
190 - 321 + this.getAllxsj()
  322 + this.getAllzl()
191 } 323 }
192 324
193 }, 325 },
@@ -195,6 +327,80 @@ @@ -195,6 +327,80 @@
195 327
196 }, 328 },
197 methods: { 329 methods: {
  330 + open(row) {
  331 + console.error(row)
  332 + this.xiangTab= 'first'
  333 + this.type = '2'
  334 + this.$refs.onhet.open(row)
  335 + },
  336 + minSev() {
  337 + console.error({
  338 + ...this.editbgid,
  339 + 'publishStatus': this.radio,
  340 + reviewComments: this.reviewComments
  341 + })
  342 + // return
  343 + changedit({
  344 + ...this.editbgid,
  345 + 'publishStatus': this.radio,
  346 + reviewComments: this.reviewComments?this.reviewComments:null
  347 + }).then(res => {
  348 + console.error(res)
  349 + if (res.code == 200) {
  350 + this.$message({
  351 + message: '处理成功',
  352 + type: 'success'
  353 + })
  354 + this.editbgid.publishStatus = this.radio
  355 + this.$emit('removeonaction', '1')
  356 + } else {
  357 + this.$message({
  358 + message: '处理失败',
  359 + type: 'error'
  360 + })
  361 + }
  362 + })
  363 + },
  364 + handleCurrentChange(val,type) {
  365 + this[type].pageNumber = val - 1
  366 + if(type == 'pagequeryzl') {
  367 + this.getAllzl()
  368 + } else if(type == 'pagequerysxj') {
  369 + this.getAllsxj()
  370 + }
  371 +
  372 + },
  373 + handleSizeChange(val,type) {
  374 + this[type].pageSize = val
  375 + this[type].pageNumber = 0
  376 + if(type == 'pagequeryzl') {
  377 + this.getAllzl()
  378 + } else if(type == 'pagequerysxj') {
  379 + this.getAllsxj()
  380 + }
  381 + },
  382 + getAllxsj() {
  383 + cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
  384 + console.error(res)
  385 + if (!Array.isArray(res.data.content)) {
  386 + this.datalistxsj = [];
  387 + return;
  388 + }
  389 + this.datalistxsj = res.data.content
  390 + this.totalsxj = res.data.totalElements
  391 + })
  392 + },
  393 + getAllzl() {
  394 + cereContractInformation(this.pagequeryzl).then(res => {
  395 + console.error(res)
  396 + if (!Array.isArray(res.data.content)) {
  397 + this.datalistzl = [];
  398 + return;
  399 + }
  400 + this.datalistzl = res.data.content
  401 + this.totalzl = res.data.totalElements
  402 + })
  403 + },
198 openfile(e) { 404 openfile(e) {
199 if (e) { 405 if (e) {
200 const fullUrl = e; 406 const fullUrl = e;
@@ -208,8 +414,12 @@ @@ -208,8 +414,12 @@
208 } 414 }
209 }, 415 },
210 changetype() { 416 changetype() {
211 - this.xiangTab = 'first'  
212 - this.$emit('removeonaction', '1') 417 + this.xiangTab= 'first'
  418 + if(this.type == '1'){
  419 + this.$emit('removeonaction', '1')
  420 + }else{
  421 + this.type = '1'
  422 + }
213 }, 423 },
214 } 424 }
215 } 425 }
admin-web-master/src/components/chakan/ggsh.vue 0 → 100644
  View file @9b392fc
  1 +<template>
  2 + <div>
  3 + <div>
  4 + <el-tabs v-model="xiangTab">
  5 + <el-tab-pane label="申请内容" name="first">
  6 + <div style="margin-top: 30px;" class="editcss">
  7 + <TitleWithCircle title="申请信息" />
  8 + <div style="padding: 20px;margin-top: 10px;">
  9 + <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  10 + <el-form-item label="Banner图" prop="coverImage">
  11 + <el-image style="width: 200px;margin-right: 10px;" v-for="item in info.coverImage.split(',')" :src="$baseURL+item" fit="contain"></el-image>
  12 + </el-form-item>
  13 + <el-form-item label="投放内容" prop="adTitle">
  14 + <div class="duiqi">{{info.adTitle}}</div>
  15 + </el-form-item>
  16 + </el-form>
  17 + </div>
  18 + <TitleWithCircle title="营业执照信息" />
  19 + <div style="padding: 20px;margin-top: 10px;">
  20 + <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  21 + <el-row :gutter="20">
  22 + <el-col :span="9">
  23 + <el-form-item label="主体名称" prop="entityName">
  24 + <div class="duiqi">{{info.entityName}}</div>
  25 + </el-form-item>
  26 + </el-col>
  27 + <el-col :span="9">
  28 + <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
  29 + <div class="duiqi">{{info.unifiedSocialCreditCode}}</div>
  30 + </el-form-item>
  31 + </el-col>
  32 + </el-row>
  33 + <el-row :gutter="20">
  34 + <el-col :span="9">
  35 + <el-form-item label="类型" prop="entityType">
  36 + <div class="duiqi">{{info.entityType}}</div>
  37 + </el-form-item>
  38 + </el-col>
  39 + <el-col :span="9">
  40 + <el-form-item label="法定代表人" prop="legalRepresentative">
  41 + <div class="duiqi">{{info.legalRepresentative}}</div>
  42 + </el-form-item>
  43 + </el-col>
  44 + </el-row>
  45 + <el-form-item label="经营范围" prop="businessScope">
  46 + <div class="duiqi">{{info.businessScope}}</div>
  47 + </el-form-item>
  48 + <el-row :gutter="20">
  49 + <el-col :span="9">
  50 + <el-form-item label="注册资本" prop="registeredCapital">
  51 + <div class="duiqi">{{info.registeredCapital}}</div>
  52 + </el-form-item>
  53 + </el-col>
  54 + <el-col :span="9">
  55 + <el-form-item label="成立日期" prop="establishmentDate">
  56 + <div class="duiqi">{{info.establishmentDate}}</div>
  57 + </el-form-item>
  58 + </el-col>
  59 + </el-row>
  60 + <el-form-item label="住所" prop="residence">
  61 + <div class="duiqi">{{info.residence}}</div>
  62 + </el-form-item>
  63 + <el-row :gutter="20">
  64 + <el-col :span="9">
  65 + <el-form-item label="邮箱地址" prop="emailAddress">
  66 + <div class="duiqi">{{info.emailAddress}}</div>
  67 + </el-form-item>
  68 + </el-col>
  69 + <el-col :span="9">
  70 + <el-form-item label="营业期限" prop="businessStartDate">
  71 + <div class="duiqi">{{info.businessStartDate}} - {{info.businessEndDate}}</div>
  72 + </el-form-item>
  73 + </el-col>
  74 + </el-row>
  75 + <el-form-item label="营业执照" prop="businessLicense">
  76 + <!-- <div class="duiqi">{{info.businessLicense}}</div> -->
  77 + <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image>
  78 + </el-form-item>
  79 + </el-form>
  80 + </div>
  81 + </div>
  82 + </el-tab-pane>
  83 + <el-tab-pane label="商家信息" name="second">
  84 + <div style="margin-top: 30px;" class="editcss">
  85 + <TitleWithCircle title="基础信息" />
  86 + <div style="padding: 20px;margin-top: 10px;">
  87 + <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  88 + <el-row :gutter="20">
  89 + <el-col :span="9">
  90 + <el-form-item label="姓名" prop="operatorName">
  91 + <div class="duiqi">{{info.operatorName}}</div>
  92 + </el-form-item>
  93 + </el-col>
  94 + <el-col :span="9">
  95 + <el-form-item label="手机号" prop="phone">
  96 + <div class="duiqi">{{info.phone}}</div>
  97 + </el-form-item>
  98 + </el-col>
  99 + </el-row>
  100 + <el-row :gutter="20">
  101 + <el-col :span="9">
  102 + <el-form-item label="证件类型" prop="idCardType">
  103 + <div class="duiqi">{{info.idCardType}}</div>
  104 + </el-form-item>
  105 + </el-col>
  106 + <el-col :span="9">
  107 + <el-form-item label="身份证号码" prop="idNumber">
  108 + <div class="duiqi">{{info.idNumber}}</div>
  109 + </el-form-item>
  110 + </el-col>
  111 + </el-row>
  112 + <el-form-item label="身份证照片（正）" prop="idPhotoFront">
  113 + <div style="margin-top: 10px;">
  114 + <el-image style="width: 200px;" :src="$baseURL+info.idPhotoFront" fit="contain"></el-image>
  115 + </div>
  116 + </el-form-item>
  117 + <el-form-item label="身份证照片（反）" prop="idPhotoBack">
  118 + <div style="margin-top: 10px;">
  119 + <el-image style="width: 200px;" :src="$baseURL+info.idPhotoBack" fit="contain"></el-image>
  120 + </div>
  121 + </el-form-item>
  122 + </el-form>
  123 + </div>
  124 + </div>
  125 + </el-tab-pane>
  126 + <el-tab-pane label="广告位信息" name="third">
  127 + <div style="margin-top: 30px;" class="editcss">
  128 + <TitleWithCircle title="基础信息" />
  129 + <div style="padding: 20px;" v-if="info.cereAdvertisingInformation.id">
  130 + <el-form :model="info.cereAdvertisingInformation" ref="ruleForm" label-width="140px"
  131 + class="demo-ruleForm">
  132 + <el-row :gutter="20">
  133 + <el-col :span="8">
  134 + <el-form-item label="广告位名称" prop="advertisingName">
  135 + <div class="duiqi">{{info.cereAdvertisingInformation.advertisingName || '无'}}</div>
  136 + </el-form-item>
  137 + </el-col>
  138 + <el-col :span="8">
  139 + <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
  140 + <div class="duiqi">{{info.cereAdvertisingInformation.advertisingSpaceNumber || '无'}}</div>
  141 + </el-form-item>
  142 + </el-col>
  143 + <el-col :span="8">
  144 + <el-form-item label="广告位类型" prop="advertisingType">
  145 + <div class="duiqi">{{info.cereAdvertisingInformation.advertisingType || '无'}}</div>
  146 + </el-form-item>
  147 + </el-col>
  148 + </el-row>
  149 + <el-row :gutter="20" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
  150 + <el-col :span="8">
  151 + <el-form-item label="所属端" prop="affiliation" >
  152 + <div class="duiqi">{{info.cereAdvertisingInformation.affiliation || '无'}}</div>
  153 + </el-form-item>
  154 + </el-col>
  155 + <el-col :span="8">
  156 + <el-form-item label="广告位数量" prop="advertisingNumber" >
  157 + <div class="duiqi">{{info.cereAdvertisingInformation.advertisingNumber || '无'}}</div>
  158 + </el-form-item>
  159 + </el-col>
  160 + <el-col :span="8">
  161 + <el-form-item label="广告尺寸" prop="dimensions">
  162 + <div class="duiqi">{{info.cereAdvertisingInformation.dimensions || '无'}}</div>
  163 + </el-form-item>
  164 + </el-col>
  165 + <el-col :span="8">
  166 + <el-form-item label="可上传大小" prop="size">
  167 + <div class="duiqi">{{info.cereAdvertisingInformation.size || '无'}}</div>
  168 + </el-form-item>
  169 + </el-col>
  170 + <el-col :span="8">
  171 + <el-form-item label="播放时长" prop="playDuration">
  172 + <div class="duiqi">{{info.cereAdvertisingInformation.playDuration || '无'}}</div>
  173 + </el-form-item>
  174 + </el-col>
  175 + <el-col :span="8">
  176 + <el-form-item label="推送地址" prop="pushAddress">
  177 + <div class="duiqi">{{info.cereAdvertisingInformation.pushAddress || '无'}}</div>
  178 + </el-form-item>
  179 + </el-col>
  180 + </el-row>
  181 + <el-row :gutter="20" v-if="info.cereAdvertisingInformation.advertisingType == '实体广告位'">
  182 + <el-col :span="8">
  183 + <el-form-item label="设备类型" prop="deviceType" >
  184 + <div class="duiqi">{{info.cereAdvertisingInformation.deviceType || '无'}}</div>
  185 + </el-form-item>
  186 + </el-col>
  187 + <el-col :span="8">
  188 + <el-form-item label="设备大小" prop="equipmentSize" >
  189 + <div class="duiqi">{{info.cereAdvertisingInformation.equipmentSize || '无'}}</div>
  190 + </el-form-item>
  191 + </el-col>
  192 + <el-col :span="8">
  193 + <el-form-item label="广告尺寸" prop="dimensions">
  194 + <div class="duiqi">{{info.cereAdvertisingInformation.dimensions || '无'}}</div>
  195 + </el-form-item>
  196 + </el-col>
  197 + <el-col :span="8">
  198 + <el-form-item label="广告材质" prop="advertisingMaterial">
  199 + <div class="duiqi">{{info.cereAdvertisingInformation.advertisingMaterial || '无'}}</div>
  200 + </el-form-item>
  201 + </el-col>
  202 + </el-row>
  203 + <el-form-item label="详细位置" prop="detailedLocation" v-if="info.cereAdvertisingInformation.advertisingType == '实体广告位'">
  204 + <div class="duiqi">{{info.cereAdvertisingInformation.detailedLocation || '无'}}</div>
  205 + </el-form-item>
  206 + <el-form-item label="地图标点" prop="mapPunctuation" v-if="info.cereAdvertisingInformation.advertisingType == '实体广告位'">
  207 + <div style="width: 100%;height: 300px;">
  208 + <newmap :isx="false" :message="info.cereAdvertisingInformation.mapPunctuation"></newmap>
  209 + </div>
  210 + </el-form-item>
  211 + <el-form-item label="位置示意图" prop="locationDiagram">
  212 + <img v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
  213 + </el-form-item>
  214 +
  215 + <el-form-item label="备注信息" prop="memo" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
  216 + <div class="duiqi">{{info.cereAdvertisingInformation.memo || '无'}}</div>
  217 + </el-form-item>
  218 + </el-form>
  219 + </div>
  220 +
  221 + </div>
  222 + </el-tab-pane>
  223 + </el-tabs>
  224 + </div>
  225 + <div v-if="info.auditStatus == 1 && issp == '2'" style="border-top: 2px solid #eee;">
  226 + <div style="padding-left: 130px;margin: 25px 0;">
  227 + <el-radio v-model="radio" label="2">同意</el-radio>
  228 + <el-radio v-model="radio" label="3">拒绝</el-radio>
  229 + </div>
  230 + <el-form :model="info" label-width="130px" class="demo-ruleForm">
  231 + <el-form-item label="审核意见">
  232 + <el-input maxlength="200" show-word-limit rows="4" v-model="auditComments" placeholder="请输入审核意见"
  233 + type="textarea" />
  234 + </el-form-item>
  235 + </el-form>
  236 + </div>
  237 + <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'">
  238 + <TitleWithCircle title="审核结果"/>
  239 + <div style="padding: 20px;">
  240 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  241 + <el-form-item label="状态">
  242 + <div class="duiqi">{{info.auditStatus=='2'?'已发布':info.auditStatus=='3'?'不通过':'无'}}</div>
  243 + </el-form-item>
  244 + <el-form-item label="审核意见">
  245 + <div class="duiqi">{{info.auditComments || '无'}}</div>
  246 + </el-form-item>
  247 + </el-form>
  248 + </div>
  249 + </div>
  250 + <div>
  251 + <el-button v-if="info.auditStatus == 1 && issp == '2'" @click="minSev"
  252 + style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  253 + <el-button class="buttonHover"
  254 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
  255 + @click="changetype">返回</el-button>
  256 + </div>
  257 + </div>
  258 +</template>
  259 +
  260 +<script>
  261 + import newmap from "@/components/newmap/index";
  262 + import {
  263 + AdvertiserInfoEdit,
  264 + } from '@/api/advertisement.js'
  265 +
  266 + import TitleWithCircle from '@/components/top/index';
  267 + import MapXian from "@/components/MapContainer/MapXian";
  268 + export default {
  269 + components: {
  270 + TitleWithCircle,
  271 + MapXian,
  272 + newmap
  273 + },
  274 + props: {
  275 + info: {
  276 + type: Object,
  277 + default: function() {
  278 + return {}; // 返回一个空数组作为默认值
  279 + },
  280 + },
  281 + issp: {
  282 + type: String,
  283 + default: function() {
  284 + return '1';
  285 + },
  286 + },
  287 + },
  288 + data() {
  289 + return {
  290 + auditComments:'',
  291 + radio: '2',
  292 + ontype: '线上广告位',
  293 + url: '',
  294 + type: '1',
  295 + tableData: [],
  296 + xiangTab: 'first',
  297 + siteIds: [],
  298 + list: [],
  299 + advIds: [],
  300 + shopIds: [],
  301 + shop: {},
  302 + newshop: {},
  303 + newinfo: {},
  304 + parentMessage: {}
  305 + }
  306 + },
  307 + created() {
  308 + console.log(this.info)
  309 +
  310 + },
  311 + computed: {
  312 +
  313 + },
  314 + methods: {
  315 + minSev() {
  316 + console.error(this.info)
  317 + console.error(this.radio)
  318 +
  319 + AdvertiserInfoEdit({
  320 + id: this.info.id,
  321 + 'auditStatus': this.radio,
  322 + auditComments: this.auditComments
  323 + }).then(res => {
  324 + console.error(res)
  325 + if (res.code == 200) {
  326 + this.$message({
  327 + message: '处理成功',
  328 + type: 'success'
  329 + })
  330 + this.info.auditStatus = this.radio
  331 + } else {
  332 + this.$message({
  333 + message: '处理失败',
  334 + type: 'error'
  335 + })
  336 + }
  337 + })
  338 + },
  339 + openfile(e) {
  340 + if (e) {
  341 + const fullUrl = this.$baseURL + e;
  342 + try {
  343 + window.open(fullUrl, '_blank'); // 在新标签页中打开文件
  344 + } catch (error) {
  345 + console.error('打开文件失败:', error);
  346 + }
  347 + } else {
  348 + console.error('无文件可查看');
  349 + }
  350 + },
  351 + changetype() {
  352 + this.xiangTab = 'first'
  353 + if (this.type == '1') {
  354 + this.$emit('removeonaction', '1')
  355 + } else {
  356 + this.type = '1'
  357 + }
  358 + },
  359 + open(row) {
  360 + console.error(row)
  361 + this.type = '2'
  362 + this.newinfo = row
  363 + businessListGetById({
  364 + shopId: row.relatedMerchants
  365 + }).then(res => {
  366 + console.log(res)
  367 + this.newshop = res.data
  368 + })
  369 + },
  370 + closeFn() {
  371 + this.$emit('change', false);
  372 + },
  373 + }
  374 + }
  375 +</script>
  376 +<style>
  377 + .el-form-item__label {
  378 + color: #a2a2a2;
  379 + }
  380 +
  381 + .greens {
  382 + color: #3F9B6A;
  383 + }
  384 +</style>
admin-web-master/src/components/chakan/map.vue
  View file @9b392fc
1 <template> 1 <template>
2 <div> 2 <div>
3 - <div> 3 + <div v-show="type == '1'">
4 <el-tabs v-model="xiangTab"> 4 <el-tabs v-model="xiangTab">
5 <el-tab-pane label="资源信息" name="first"> 5 <el-tab-pane label="资源信息" name="first">
6 <div style="margin-top: 30px;" class="editcss"> 6 <div style="margin-top: 30px;" class="editcss">
@@ -109,8 +109,8 @@ @@ -109,8 +109,8 @@
109 <div style="display: flex;justify-content: space-between;" class="bom"> 109 <div style="display: flex;justify-content: space-between;" class="bom">
110 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div> 110 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
111 <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize" 111 <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
112 - background small layout="prev, pager, next" :total="totalsxj" @size-change="handleSizeChangesxj"  
113 - @current-change="handleCurrentChangesxj"> 112 + background small layout="prev, pager, next" :total="totalsxj" @size-change="handleCurrentChange"
  113 + @current-change="handleCurrentChange">
114 </el-pagination> 114 </el-pagination>
115 </div> 115 </div>
116 </div> 116 </div>
@@ -160,9 +160,92 @@ @@ -160,9 +160,92 @@
160 </div> 160 </div>
161 </div> 161 </div>
162 </el-tab-pane> 162 </el-tab-pane>
  163 + <el-tab-pane label="租赁记录" name="third" >
  164 + <div style="margin-top: 30px;" class="editcss">
  165 + <div class="titles">
  166 + 租赁记录
  167 + </div>
  168 + <div style="padding: 20px;">
  169 + <el-table :data="datalistzl"
  170 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  171 + tooltip-effect="dark custom-tooltip-effect">
  172 + <el-table-column label="承租商家" prop="tenantName" show-overflow-tooltip>
  173 +
  174 + </el-table-column>
  175 + <el-table-column label="租赁期限" prop="houseNumber" show-overflow-tooltip>
  176 + <template slot-scope="scope">
  177 + {{scope.row.leaseStartDate}}至{{scope.row.contractTerminationDate}}
  178 + </template>
  179 + </el-table-column>
  180 + <!-- <el-table-column label="经营类型" prop="actualUsableArea"show-overflow-tooltip>
  181 + </el-table-column> -->
  182 +
  183 + <el-table-column label="租金/周期" prop="head" show-overflow-tooltip>
  184 + <template slot-scope="scope">
  185 + ￥{{scope.row.contractAmount}}/{{scope.row.paymentCycle}}
  186 + </template>
  187 + </el-table-column>
  188 + <el-table-column label="当前状态" prop="publishStatus" show-overflow-tooltip>
  189 + <template slot-scope="scope">
  190 + <span v-if='scope.row.dataStatus == 1'>使用中</span>
  191 + <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
  192 + <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
  193 + <span v-else>-</span>
  194 + </template>
  195 + </el-table-column>
  196 +
  197 + <el-table-column label="操作" fixed="right">
  198 + <template slot-scope="scope">
  199 + <div @click="open(scope.row)" class="tableBtn greens">查看</div>
  200 + </template>
  201 + </el-table-column>
  202 + </el-table>
  203 + <div style="display: flex;justify-content: space-between;" class="bom">
  204 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalzl}}</span> 项数据</div>
  205 + <el-pagination :current-page="pagequeryzl.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryzl.pageSize"
  206 + background small layout="prev, pager, next" :total="totalzl" @size-change="e => handleSizeChange(e,'pagequeryzl')"
  207 + @current-change="e=> handleCurrentChange(e,'pagequeryzl')">
  208 + </el-pagination>
  209 + </div>
  210 + </div>
  211 + </div>
  212 + </el-tab-pane>
163 </el-tabs> 213 </el-tabs>
164 </div> 214 </div>
  215 + <div v-show="type == '2'">
  216 + <oneht ref="onhet"></oneht>
  217 + </div>
  218 + <div v-if="editbgid.publishStatus == '1' && issp == '2'">
  219 + <TitleWithCircle title="审核情况"/>
  220 + <div style="padding: 20px;">
  221 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  222 + <el-form-item label="状态">
  223 + <el-radio v-model="radio" label="2">通过</el-radio>
  224 + <el-radio v-model="radio" label="3">不通过</el-radio>
  225 + </el-form-item>
  226 + <el-form-item label="审核意见">
  227 + <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见"
  228 + type="textarea" />
  229 + </el-form-item>
  230 + </el-form>
  231 + </div>
  232 + </div>
  233 + <div v-if="(editbgid.publishStatus == '2' || editbgid.publishStatus == '3') && xiangTab == 'first'">
  234 + <TitleWithCircle title="审核结果"/>
  235 + <div style="padding: 20px;">
  236 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  237 + <el-form-item label="状态">
  238 + <div class="duiqi">{{editbgid.publishStatus=='2'?'已发布':editbgid.publishStatus=='3'?'不通过':'无'}}</div>
  239 + </el-form-item>
  240 + <el-form-item label="审核意见">
  241 + <div class="duiqi">{{editbgid.reviewComments || '无'}}</div>
  242 + </el-form-item>
  243 + </el-form>
  244 + </div>
  245 + </div>
165 <div> 246 <div>
  247 + <el-button v-if="editbgid.publishStatus == '1' && issp == '2'" @click="minSev"
  248 + style="background-color: #3F9B6A;color: #fff;">确定</el-button>
166 <el-button class="buttonHover" 249 <el-button class="buttonHover"
167 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" 250 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
168 @click="changetype">返回</el-button> 251 @click="changetype">返回</el-button>
@@ -171,19 +254,25 @@ @@ -171,19 +254,25 @@
171 </template> 254 </template>
172 255
173 <script> 256 <script>
  257 + import oneht from "@/components/chakan/oneht";
174 import newmap from "@/components/newmap/index"; 258 import newmap from "@/components/newmap/index";
175 import MapXian from "@/components/MapContainer/MapXian"; 259 import MapXian from "@/components/MapContainer/MapXian";
176 import TitleWithCircle from '@/components/top/index'; 260 import TitleWithCircle from '@/components/top/index';
177 import { 261 import {
178 cereBusinessOperationqueryByPage, 262 cereBusinessOperationqueryByPage,
179 cereResourceStrategylist, 263 cereResourceStrategylist,
180 - cereBusinessPlan 264 + cereBusinessPlan,
  265 + cereContractInformation,
181 } from '@/api/newly'; 266 } from '@/api/newly';
  267 + import {
  268 + editList
  269 + } from '@/api/map1.js';
182 export default { 270 export default {
183 components: { 271 components: {
184 TitleWithCircle, 272 TitleWithCircle,
185 MapXian, 273 MapXian,
186 - newmap 274 + newmap,
  275 + oneht
187 }, 276 },
188 props: { 277 props: {
189 leixing: { 278 leixing: {
@@ -196,15 +285,31 @@ @@ -196,15 +285,31 @@
196 return {}; 285 return {};
197 }, 286 },
198 }, 287 },
  288 + issp: {
  289 + type: String,
  290 + default: function() {
  291 + return '1';
  292 + },
  293 + },
199 }, 294 },
200 data() { 295 data() {
201 return { 296 return {
  297 + type: '1',
  298 + totalzl:0,
  299 + pagequeryzl:{
  300 + pageNumber: 0,
  301 + pageSize: 10,
  302 + shopNumber: 'gg' + this.editbgid.id
  303 + },
  304 + datalistzl:[],
  305 + reviewComments:'',
  306 + radio: '2',
202 datalistxsj:[], 307 datalistxsj:[],
203 totalsxj:0, 308 totalsxj:0,
204 pagequerysxj:{ 309 pagequerysxj:{
205 pageNumber: 0, 310 pageNumber: 0,
206 pageSize: 10, 311 pageSize: 10,
207 - resourcesId: 'sp' + this.editbgid.id 312 + resourceId: 'gg' + this.editbgid.id
208 }, 313 },
209 xiangTab: 'first', 314 xiangTab: 'first',
210 list: [], 315 list: [],
@@ -237,6 +342,7 @@ @@ -237,6 +342,7 @@
237 this.datalist1 = res.data 342 this.datalist1 = res.data
238 }) 343 })
239 this.getAllxsj() 344 this.getAllxsj()
  345 + this.getAllzl()
240 } 346 }
241 347
242 348
@@ -245,14 +351,57 @@ @@ -245,14 +351,57 @@
245 351
246 }, 352 },
247 methods: { 353 methods: {
248 - handleCurrentChangesxj(val) {  
249 - this.pagequerysxj.pageNumber = val - 1  
250 - this.getAllxsj() 354 + open(row) {
  355 + console.error(row)
  356 + this.xiangTab= 'first'
  357 + this.type = '2'
  358 + this.$refs.onhet.open(row)
251 }, 359 },
252 - handleSizeChangesxj(val) {  
253 - this.pagequerysxj.pageSize = val  
254 - this.pagequerysxj.pageNumber = 0  
255 - this.getAllxsj() 360 + minSev() {
  361 + console.error({
  362 + ...this.editbgid,
  363 + 'publishStatus': this.radio,
  364 + reviewComments: this.reviewComments
  365 + })
  366 + // return
  367 + editList({
  368 + ...this.editbgid,
  369 + 'publishStatus': this.radio,
  370 + reviewComments: this.reviewComments?this.reviewComments:null
  371 + }).then(res => {
  372 + console.error(res)
  373 + if (res.code == 200) {
  374 + this.$message({
  375 + message: '处理成功',
  376 + type: 'success'
  377 + })
  378 + this.editbgid.publishStatus = this.radio
  379 + this.$emit('removeonaction', '1')
  380 + } else {
  381 + this.$message({
  382 + message: '处理失败',
  383 + type: 'error'
  384 + })
  385 + }
  386 + })
  387 + },
  388 + handleCurrentChange(val,type) {
  389 + this[type].pageNumber = val - 1
  390 + if(type == 'pagequeryzl') {
  391 + this.getAllzl()
  392 + } else if(type == 'pagequerysxj') {
  393 + this.getAllsxj()
  394 + }
  395 +
  396 + },
  397 + handleSizeChange(val,type) {
  398 + this[type].pageSize = val
  399 + this[type].pageNumber = 0
  400 + if(type == 'pagequeryzl') {
  401 + this.getAllzl()
  402 + } else if(type == 'pagequerysxj') {
  403 + this.getAllsxj()
  404 + }
256 }, 405 },
257 getAllxsj() { 406 getAllxsj() {
258 cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => { 407 cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
@@ -265,9 +414,36 @@ @@ -265,9 +414,36 @@
265 this.totalsxj = res.data.totalElements 414 this.totalsxj = res.data.totalElements
266 }) 415 })
267 }, 416 },
  417 + getAllzl() {
  418 + cereContractInformation(this.pagequeryzl).then(res => {
  419 + console.error(res)
  420 + if (!Array.isArray(res.data.content)) {
  421 + this.datalistzl = [];
  422 + return;
  423 + }
  424 + this.datalistzl = res.data.content
  425 + this.totalzl = res.data.totalElements
  426 + })
  427 + },
  428 + openfile(e) {
  429 + if (e) {
  430 + const fullUrl = e;
  431 + try {
  432 + window.open(fullUrl, '_blank'); // 在新标签页中打开文件
  433 + } catch (error) {
  434 + console.error('打开文件失败:', error);
  435 + }
  436 + } else {
  437 + console.error('无文件可查看');
  438 + }
  439 + },
268 changetype() { 440 changetype() {
269 - this.xiangTab = 'first'  
270 - this.$emit('removeonaction', '1') 441 + this.xiangTab= 'first'
  442 + if(this.type == '1'){
  443 + this.$emit('removeonaction', '1')
  444 + }else{
  445 + this.type = '1'
  446 + }
271 }, 447 },
272 } 448 }
273 } 449 }
admin-web-master/src/components/chakan/oneht.vue 0 → 100644
  View file @9b392fc
  1 +<template>
  2 + <div>
  3 + <el-tabs v-model="xiangTab">
  4 + <el-tab-pane label="合同信息" name="first">
  5 + <div style="margin-top: 30px;" class="editcss">
  6 + <TitleWithCircle title="合同信息" />
  7 + <div style="padding: 20px;margin-top: 10px;">
  8 + <el-form :model="newinfo" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  9 + <el-row :gutter="20">
  10 + <el-col :span="9">
  11 + <el-form-item label="合同类型" prop="contractType">
  12 + <div class="duiqi">{{newinfo.contractType}}</div>
  13 + </el-form-item>
  14 + </el-col>
  15 + <el-col :span="9">
  16 + <el-form-item label="合同编号" prop="contractNumber">
  17 + <div class="duiqi">{{newinfo.contractNumber}}</div>
  18 + </el-form-item>
  19 + </el-col>
  20 + </el-row>
  21 + <el-row :gutter="20">
  22 + <el-col :span="9">
  23 + <el-form-item label="标段号" prop="sectionNumber">
  24 + <div class="duiqi">{{newinfo.sectionNumber}}</div>
  25 + </el-form-item>
  26 + </el-col>
  27 + <el-col :span="9">
  28 + <el-form-item label="合同名称" prop="contractName">
  29 + <div class="duiqi">{{newinfo.contractName}}</div>
  30 + </el-form-item>
  31 + </el-col>
  32 + </el-row>
  33 + <el-row :gutter="20">
  34 + <el-col :span="9">
  35 + <el-form-item label="合同签订日期" prop="contractSigningDate">
  36 + <div class="duiqi">{{newinfo.contractSigningDate}}</div>
  37 + </el-form-item>
  38 + </el-col>
  39 + <el-col :span="9">
  40 + <el-form-item label="押金" prop="earnestMoney">
  41 + <div class="duiqi">{{newinfo.earnestMoney}}</div>
  42 + </el-form-item>
  43 + </el-col>
  44 + </el-row>
  45 + <el-row :gutter="20">
  46 + <el-col :span="9">
  47 + <el-form-item label="起租日期" prop="leaseStartDate">
  48 + <div class="duiqi">{{newinfo.leaseStartDate}}</div>
  49 + </el-form-item>
  50 + </el-col>
  51 + <el-col :span="9">
  52 + <el-form-item label="终止日期" prop="contractTerminationDate">
  53 + <div class="duiqi">{{newinfo.contractTerminationDate}}</div>
  54 + </el-form-item>
  55 + </el-col>
  56 + </el-row>
  57 + <el-row :gutter="20">
  58 + <el-col :span="9">
  59 + <el-form-item label="付款周期" prop="paymentCycle">
  60 + <div class="duiqi">{{newinfo.paymentCycle}}</div>
  61 + </el-form-item>
  62 + </el-col>
  63 + <el-col :span="9">
  64 + <el-form-item label="租金" prop="contractAmount">
  65 + <div class="duiqi">{{newinfo.contractAmount}}</div>
  66 + </el-form-item>
  67 + </el-col>
  68 + </el-row>
  69 + <el-row :gutter="20">
  70 + <el-col :span="9">
  71 + <el-form-item label="付款日" prop="paymentDay">
  72 + <div class="duiqi">{{newinfo.paymentDay}}</div>
  73 + </el-form-item>
  74 + </el-col>
  75 + <el-col :span="9">
  76 + <el-form-item label="承租人银行账号" prop="tenantBankAccount">
  77 + <div class="duiqi">{{newinfo.tenantBankAccount}}</div>
  78 + </el-form-item>
  79 + </el-col>
  80 + </el-row>
  81 + <el-row :gutter="20">
  82 + <el-col :span="9">
  83 + <el-form-item label="出租人名称" prop="tenantName">
  84 + <div class="duiqi">{{newinfo.tenantName}}</div>
  85 + </el-form-item>
  86 + </el-col>
  87 + <el-col :span="9">
  88 + <el-form-item label="联系电话" prop="tenantTelephone">
  89 + <div class="duiqi">{{newinfo.tenantTelephone}}</div>
  90 + </el-form-item>
  91 + </el-col>
  92 + </el-row>
  93 + <el-form-item label="附件信息" prop="appendicesContract">
  94 + <div class="duiqi greens" @click ="newinfo.appendicesContract?openfile(newinfo.appendicesContract):''">{{newinfo.appendicesContract?'查看详情':'暂无文件'}}</div>
  95 + </el-form-item>
  96 + </el-form>
  97 + </div>
  98 + </div>
  99 + </el-tab-pane>
  100 + <el-tab-pane label="商家信息" name="second">
  101 + <div style="margin-top: 30px;" class="editcss">
  102 + <TitleWithCircle title="基础信息" />
  103 + <div style="padding: 20px;margin-top: 10px;">
  104 + <el-form :model="newshop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
  105 + <el-row :gutter="20">
  106 + <el-col :span="9">
  107 + <el-form-item label="姓名" prop="name">
  108 + <div class="duiqi">{{newshop.name}}</div>
  109 + </el-form-item>
  110 + </el-col>
  111 + <el-col :span="9">
  112 + <el-form-item label="手机号" prop="phone">
  113 + <div class="duiqi">{{newshop.phone}}</div>
  114 + </el-form-item>
  115 + </el-col>
  116 + </el-row>
  117 + <el-row :gutter="20">
  118 + <el-col :span="9">
  119 + <el-form-item label="证件类型" prop="idCardType">
  120 + <div class="duiqi">{{newshop.idCardType}}</div>
  121 + </el-form-item>
  122 + </el-col>
  123 + <el-col :span="9">
  124 + <el-form-item label="身份证号码" prop="idCardNumber">
  125 + <div class="duiqi">{{newshop.idCardNumber}}</div>
  126 + </el-form-item>
  127 + </el-col>
  128 + </el-row>
  129 + <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
  130 + <div style="margin-top: 10px;">
  131 + <el-image style="width: 200px;" :src="$baseURL+newshop.idCardFrontImage" fit="contain"></el-image>
  132 + </div>
  133 + </el-form-item>
  134 + <el-form-item label="身份证照片（反）" prop="idCardBackImage">
  135 + <div style="margin-top: 10px;">
  136 + <el-image style="width: 200px;" :src="$baseURL+newshop.idCardBackImage" fit="contain"></el-image>
  137 + </div>
  138 + </el-form-item>
  139 + </el-form>
  140 + </div>
  141 + </div>
  142 + </el-tab-pane>
  143 + </el-tabs>
  144 + </div>
  145 + </template>
  146 +
  147 + <script>
  148 + import TitleWithCircle from '@/components/top/index';
  149 + import {
  150 + cerePlatformMerchantinfo
  151 + } from '@/api/newly.js'
  152 + export default {
  153 + components: {
  154 + TitleWithCircle
  155 + },
  156 + props: {
  157 + info: {
  158 + type: Object,
  159 + default: function() {
  160 + return {}; // 返回一个空数组作为默认值
  161 + },
  162 + },
  163 + },
  164 + data() {
  165 + return {
  166 + url:'',
  167 + type:'1',
  168 + tableData: [],
  169 + xiangTab: 'first',
  170 + siteIds: [],
  171 + list: [],
  172 + advIds: [],
  173 + shopIds: [],
  174 + shop: {},
  175 + newshop:{},
  176 + newinfo:{}
  177 + }
  178 + },
  179 + created() {
  180 +
  181 + },
  182 + computed: {
  183 +
  184 + },
  185 + methods: {
  186 + openfile(e) {
  187 + if (e) {
  188 + const fullUrl = this.$baseURL + e;
  189 + try {
  190 + window.open(fullUrl, '_blank'); // 在新标签页中打开文件
  191 + } catch (error) {
  192 + console.error('打开文件失败:', error);
  193 + }
  194 + } else {
  195 + console.error('无文件可查看');
  196 + }
  197 + },
  198 + changetype(){
  199 + this.xiangTab= 'first'
  200 + if(this.type == '1'){
  201 + this.$emit('removeonaction', '1')
  202 + }else{
  203 + this.type = '1'
  204 + }
  205 + },
  206 + open(row) {
  207 + console.error(row)
  208 + this.type = '2'
  209 + this.newinfo = row
  210 + cerePlatformMerchantinfo({id:row.relatedMerchants}).then(res => {
  211 + console.error(res)
  212 + this.newshop = res.data
  213 + })
  214 + },
  215 + closeFn() {
  216 + this.$emit('change', false);
  217 + },
  218 + }
  219 + }
  220 + </script>
  221 + <style>
  222 + .el-form-item__label {
  223 + color: #a2a2a2;
  224 + }
  225 +
  226 + .greens {
  227 + color: #3F9B6A;
  228 + }
  229 + </style>
  230 +
0 \ No newline at end of file 231 \ No newline at end of file
admin-web-master/src/components/chakan/zl.vue
  View file @9b392fc
@@ -575,7 +575,7 @@ @@ -575,7 +575,7 @@
575 }, 575 },
576 openfile(e) { 576 openfile(e) {
577 if (e) { 577 if (e) {
578 - const fullUrl = this.url + e; 578 + const fullUrl = this.$baseURL + e;
579 try { 579 try {
580 window.open(fullUrl, '_blank'); // 在新标签页中打开文件 580 window.open(fullUrl, '_blank'); // 在新标签页中打开文件
581 } catch (error) { 581 } catch (error) {
admin-web-master/src/components/change/cl.vue
  View file @9b392fc
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
62 return { 62 return {
63 total: 0, 63 total: 0,
64 pageindex: { 64 pageindex: {
  65 + isTemplate: "1",
65 pageNumber: 0, 66 pageNumber: 0,
66 pageSize: 5, 67 pageSize: 5,
67 policyName: '' 68 policyName: ''
admin-web-master/src/components/newmap/map.vue
  View file @9b392fc
@@ -88,11 +88,20 @@ export default { @@ -88,11 +88,20 @@ export default {
88 // 设置信息窗口的内容 88 // 设置信息窗口的内容
89 const content = ` 89 const content = `
90 <div> 90 <div>
91 - <p><strong>资源名称:</strong> ${item.name}</p>  
92 - <p><strong>位置:</strong> ${item.detailedLocation}</p> 91 + <p style="padding-top:5px;"><strong>资源名称:</strong> ${item.name}</p>
  92 + <p style="padding-top:5px;"><strong>位置:</strong> ${item.detailedLocation}</p>
93 </div> 93 </div>
94 `; 94 `;
95 - 95 + // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
  96 + // <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm">
  97 + // <el-form-item label="资源名称" prop="entityName">
  98 + // <div class="duiqi">${item.name}</div>
  99 + // </el-form-item>
  100 + // <el-form-item label="位置" prop="entityName">
  101 + // <div class="duiqi">${item.detailedLocation}</div>
  102 + // </el-form-item>
  103 + // </el-form>
  104 + // </div>
96 // 设置信息窗口的位置和内容 105 // 设置信息窗口的位置和内容
97 this.infoWindow.setPosition(marker.getPosition()); 106 this.infoWindow.setPosition(marker.getPosition());
98 this.infoWindow.setContent(content); 107 this.infoWindow.setContent(content);
admin-web-master/src/components/resourceCommodity/index.vue
  View file @9b392fc
1 <template> 1 <template>
2 <div> 2 <div>
3 - <div> 3 + <div v-show="type == '1'">
4 <el-tabs v-model="xiangTab"> 4 <el-tabs v-model="xiangTab">
5 <el-tab-pane label="资源信息" name="first"> 5 <el-tab-pane label="资源信息" name="first">
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="ruleForm" label-width="140px" class="demo-ruleForm"> 9 + <el-form :model="editbgid" ref="ruleForm" label-width="100px" 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="shopName"> 12 <el-form-item label="商铺名称" prop="shopName">
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
16 <el-col :span="8"> 16 <el-col :span="8">
17 - <el-form-item label="场地编号" prop="venueNumber"> 17 + <el-form-item label="编号" prop="venueNumber">
18 <div class="duiqi">{{editbgid.venueNumber}}</div> 18 <div class="duiqi">{{editbgid.venueNumber}}</div>
19 </el-form-item> 19 </el-form-item>
20 </el-col> 20 </el-col>
@@ -116,8 +116,8 @@ @@ -116,8 +116,8 @@
116 <div style="display: flex;justify-content: space-between;" class="bom"> 116 <div style="display: flex;justify-content: space-between;" class="bom">
117 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div> 117 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
118 <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize" 118 <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
119 - background small layout="prev, pager, next" :total="totalsxj" @size-change="handleSizeChangesxj"  
120 - @current-change="handleCurrentChangesxj"> 119 + background small layout="prev, pager, next" :total="totalsxj" @size-change="e => handleSizeChange(e,'pagequerysxj')"
  120 + @current-change="e=> handleCurrentChange(e,'pagequerysxj')">
121 </el-pagination> 121 </el-pagination>
122 </div> 122 </div>
123 </div> 123 </div>
@@ -164,49 +164,60 @@ @@ -164,49 +164,60 @@
164 </template> 164 </template>
165 </el-table-column> --> 165 </el-table-column> -->
166 </el-table> 166 </el-table>
  167 +
167 </div> 168 </div>
168 </div> 169 </div>
169 </el-tab-pane> 170 </el-tab-pane>
170 - <!-- <el-tab-pane label="租赁记录" name="third" v-if="edit"> 171 + <el-tab-pane label="租赁记录" name="third" >
171 <div style="margin-top: 30px;" class="editcss"> 172 <div style="margin-top: 30px;" class="editcss">
172 <div class="titles"> 173 <div class="titles">
173 租赁记录 174 租赁记录
174 </div> 175 </div>
175 <div style="padding: 20px;"> 176 <div style="padding: 20px;">
176 - <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 177 + <el-table :data="datalistzl"
177 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}" 178 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
178 tooltip-effect="dark custom-tooltip-effect"> 179 tooltip-effect="dark custom-tooltip-effect">
179 - <el-table-column label="承租商家" min-width="80">  
180 -  
181 - </el-table-column>  
182 - <el-table-column label="租赁期限" prop="houseNumber" min-width="80" show-overflow-tooltip> 180 + <el-table-column label="承租商家" prop="tenantName" show-overflow-tooltip>
183 181
184 </el-table-column> 182 </el-table-column>
185 - <el-table-column label="经营类型" prop="actualUsableArea" min-width="150" show-overflow-tooltip> 183 + <el-table-column label="租赁期限" prop="houseNumber" show-overflow-tooltip>
  184 + <template slot-scope="scope">
  185 + {{scope.row.leaseStartDate}}至{{scope.row.contractTerminationDate}}
  186 + </template>
186 </el-table-column> 187 </el-table-column>
  188 + <!-- <el-table-column label="经营类型" prop="actualUsableArea"show-overflow-tooltip>
  189 + </el-table-column> -->
187 190
188 - <el-table-column label="租金/周期" prop="head" min-width="120" show-overflow-tooltip>  
189 - </el-table-column>  
190 - <el-table-column label="租赁状态" prop="rentalStatus" min-width="120" show-overflow-tooltip> 191 + <el-table-column label="租金/周期" prop="head" show-overflow-tooltip>
191 <template slot-scope="scope"> 192 <template slot-scope="scope">
192 - {{scope.row.rentalStatus=='0'?'待租':'已租'}} 193 + ￥{{scope.row.contractAmount}}/{{scope.row.paymentCycle}}
193 </template> 194 </template>
194 </el-table-column> 195 </el-table-column>
195 - <el-table-column label="当前状态" prop="publishStatus" min-width="150" show-overflow-tooltip> 196 + <el-table-column label="当前状态" prop="publishStatus" show-overflow-tooltip>
196 <template slot-scope="scope"> 197 <template slot-scope="scope">
197 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':'已审核'}} 198 + <span v-if='scope.row.dataStatus == 1'>使用中</span>
  199 + <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
  200 + <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
  201 + <span v-else>-</span>
198 </template> 202 </template>
199 </el-table-column> 203 </el-table-column>
200 204
201 - <el-table-column label="操作" min-width="160" fixed="right"> 205 + <el-table-column label="操作" fixed="right">
202 <template slot-scope="scope"> 206 <template slot-scope="scope">
203 - <div @click="handleEditForm(scope.row)" class="tableBtn greens">查看</div> 207 + <div @click="open(scope.row)" class="tableBtn greens">查看</div>
204 </template> 208 </template>
205 </el-table-column> 209 </el-table-column>
206 </el-table> 210 </el-table>
  211 + <div style="display: flex;justify-content: space-between;" class="bom">
  212 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalzl}}</span> 项数据</div>
  213 + <el-pagination :current-page="pagequeryzl.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryzl.pageSize"
  214 + background small layout="prev, pager, next" :total="totalzl" @size-change="e => handleSizeChange(e,'pagequeryzl')"
  215 + @current-change="e=> handleCurrentChange(e,'pagequeryzl')">
  216 + </el-pagination>
  217 + </div>
207 </div> 218 </div>
208 </div> 219 </div>
209 - </el-tab-pane> --> 220 + </el-tab-pane>
210 <!-- <el-tab-pane label="人流情况" name="fourth" v-if="edit"> 221 <!-- <el-tab-pane label="人流情况" name="fourth" v-if="edit">
211 <div style="margin-top: 30px;" class="editcss"> 222 <div style="margin-top: 30px;" class="editcss">
212 <div class="titles"> 223 <div class="titles">
@@ -223,20 +234,39 @@ @@ -223,20 +234,39 @@
223 </el-tab-pane> --> 234 </el-tab-pane> -->
224 </el-tabs> 235 </el-tabs>
225 </div> 236 </div>
226 - <div v-if="editbgid.publishStatus == '3' && issp == '2'" style="border-top: 2px solid #eee;padding-top: 25px;">  
227 - <el-form :model="editbgid" label-width="80px" class="demo-ruleForm">  
228 - <el-form-item label="状态">  
229 - <el-radio v-model="radio" label="1">同意</el-radio>  
230 - <el-radio v-model="radio" label="4">拒绝</el-radio>  
231 - </el-form-item>  
232 - <el-form-item label="审核意见">  
233 - <el-input maxlength="200" show-word-limit rows="4" v-model="editbgid.reviewComments" placeholder="请输入审核意见"  
234 - type="textarea" />  
235 - </el-form-item>  
236 - </el-form> 237 + <div v-show="type == '2'">
  238 + <oneht ref="onhet"></oneht>
  239 + </div>
  240 + <div v-if="editbgid.publishStatus == '1' && issp == '2'">
  241 + <TitleWithCircle title="审核情况"/>
  242 + <div style="padding: 20px;">
  243 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  244 + <el-form-item label="状态">
  245 + <el-radio v-model="radio" label="2">通过</el-radio>
  246 + <el-radio v-model="radio" label="3">不通过</el-radio>
  247 + </el-form-item>
  248 + <el-form-item label="审核意见">
  249 + <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见"
  250 + type="textarea" />
  251 + </el-form-item>
  252 + </el-form>
  253 + </div>
  254 + </div>
  255 + <div v-if="(editbgid.publishStatus == '2' || editbgid.publishStatus == '3') && xiangTab == 'first'">
  256 + <TitleWithCircle title="审核结果"/>
  257 + <div style="padding: 20px;">
  258 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  259 + <el-form-item label="状态">
  260 + <div class="duiqi">{{editbgid.publishStatus=='2'?'已发布':editbgid.publishStatus=='3'?'不通过':'无'}}</div>
  261 + </el-form-item>
  262 + <el-form-item label="审核意见">
  263 + <div class="duiqi">{{editbgid.reviewComments || '无'}}</div>
  264 + </el-form-item>
  265 + </el-form>
  266 + </div>
237 </div> 267 </div>
238 <div> 268 <div>
239 - <el-button v-if="editbgid.publishStatus == '3' && issp == '2'" @click="minSev" 269 + <el-button v-if="editbgid.publishStatus == '1' && issp == '2'" @click="minSev"
240 style="background-color: #3F9B6A;color: #fff;">确定</el-button> 270 style="background-color: #3F9B6A;color: #fff;">确定</el-button>
241 <el-button class="buttonHover" 271 <el-button class="buttonHover"
242 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;" 272 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
@@ -246,12 +276,14 @@ @@ -246,12 +276,14 @@
246 </template> 276 </template>
247 277
248 <script> 278 <script>
  279 + import oneht from "@/components/chakan/oneht";
249 import MapXian from "@/components/MapContainer/MapXian"; 280 import MapXian from "@/components/MapContainer/MapXian";
250 import TitleWithCircle from '@/components/top/index'; 281 import TitleWithCircle from '@/components/top/index';
251 import { 282 import {
252 cereResourceStrategylist, 283 cereResourceStrategylist,
253 cereBusinessPlan, 284 cereBusinessPlan,
254 - cereBusinessOperationqueryByPage 285 + cereBusinessOperationqueryByPage,
  286 + cereContractInformation,
255 } from '@/api/newly'; 287 } from '@/api/newly';
256 import newmap from "@/components/newmap/index"; 288 import newmap from "@/components/newmap/index";
257 import { 289 import {
@@ -261,7 +293,8 @@ @@ -261,7 +293,8 @@
261 components: { 293 components: {
262 TitleWithCircle, 294 TitleWithCircle,
263 MapXian, 295 MapXian,
264 - newmap 296 + newmap,
  297 + oneht
265 }, 298 },
266 props: { 299 props: {
267 editbgid: { 300 editbgid: {
@@ -279,12 +312,21 @@ @@ -279,12 +312,21 @@
279 }, 312 },
280 data() { 313 data() {
281 return { 314 return {
282 - radio: '1', 315 + type: '1',
  316 + totalzl:0,
  317 + pagequeryzl:{
  318 + pageNumber: 0,
  319 + pageSize: 10,
  320 + shopNumber: 'sp' + this.editbgid.id
  321 + },
  322 + datalistzl:[],
  323 + reviewComments:'',
  324 + radio: '2',
283 totalsxj:0, 325 totalsxj:0,
284 pagequerysxj:{ 326 pagequerysxj:{
285 pageNumber: 0, 327 pageNumber: 0,
286 pageSize: 10, 328 pageSize: 10,
287 - resourcesId: 'sp' + this.editbgid.id 329 + resourceId: 'sp' + this.editbgid.id
288 }, 330 },
289 xiangTab: 'first', 331 xiangTab: 'first',
290 list: [], 332 list: [],
@@ -320,24 +362,30 @@ @@ -320,24 +362,30 @@
320 this.datalist1 = res.data 362 this.datalist1 = res.data
321 }) 363 })
322 this.getAllxsj() 364 this.getAllxsj()
323 - 365 + this.getAllzl()
324 } 366 }
325 }, 367 },
326 computed: { 368 computed: {
327 369
328 }, 370 },
329 methods: { 371 methods: {
  372 + open(row) {
  373 + console.error(row)
  374 + this.xiangTab= 'first'
  375 + this.type = '2'
  376 + this.$refs.onhet.open(row)
  377 + },
330 minSev() { 378 minSev() {
331 console.error({ 379 console.error({
332 ...this.editbgid, 380 ...this.editbgid,
333 'publishStatus': this.radio, 381 'publishStatus': this.radio,
334 - reviewComments: this.editbgid.reviewComments 382 + reviewComments: this.reviewComments
335 }) 383 })
336 // return 384 // return
337 editList({ 385 editList({
338 ...this.editbgid, 386 ...this.editbgid,
339 'publishStatus': this.radio, 387 'publishStatus': this.radio,
340 - reviewComments: this.editbgid.reviewComments 388 + reviewComments: this.reviewComments?this.reviewComments:null
341 }).then(res => { 389 }).then(res => {
342 console.error(res) 390 console.error(res)
343 if (res.code == 200) { 391 if (res.code == 200) {
@@ -345,7 +393,8 @@ @@ -345,7 +393,8 @@
345 message: '处理成功', 393 message: '处理成功',
346 type: 'success' 394 type: 'success'
347 }) 395 })
348 - this.info.publishStatus = this.radio 396 + this.editbgid.publishStatus = this.radio
  397 + this.$emit('removeonaction', '1')
349 } else { 398 } else {
350 this.$message({ 399 this.$message({
351 message: '处理失败', 400 message: '处理失败',
@@ -354,15 +403,23 @@ @@ -354,15 +403,23 @@
354 } 403 }
355 }) 404 })
356 }, 405 },
357 -  
358 - handleCurrentChangesxj(val) {  
359 - this.pagequerysxj.pageNumber = val - 1  
360 - this.getAllxsj() 406 + handleCurrentChange(val,type) {
  407 + this[type].pageNumber = val - 1
  408 + if(type == 'pagequeryzl') {
  409 + this.getAllzl()
  410 + } else if(type == 'pagequerysxj') {
  411 + this.getAllxsj()
  412 + }
  413 +
361 }, 414 },
362 - handleSizeChangesxj(val) {  
363 - this.pagequerysxj.pageSize = val  
364 - this.pagequerysxj.pageNumber = 0  
365 - this.getAllxsj() 415 + handleSizeChange(val,type) {
  416 + this[type].pageSize = val
  417 + this[type].pageNumber = 0
  418 + if(type == 'pagequeryzl') {
  419 + this.getAllzl()
  420 + } else if(type == 'pagequerysxj') {
  421 + this.getAllxsj()
  422 + }
366 }, 423 },
367 getAllxsj() { 424 getAllxsj() {
368 cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => { 425 cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
@@ -375,6 +432,17 @@ @@ -375,6 +432,17 @@
375 this.totalsxj = res.data.totalElements 432 this.totalsxj = res.data.totalElements
376 }) 433 })
377 }, 434 },
  435 + getAllzl() {
  436 + cereContractInformation(this.pagequeryzl).then(res => {
  437 + console.error(res)
  438 + if (!Array.isArray(res.data.content)) {
  439 + this.datalistzl = [];
  440 + return;
  441 + }
  442 + this.datalistzl = res.data.content
  443 + this.totalzl = res.data.totalElements
  444 + })
  445 + },
378 openfile(e) { 446 openfile(e) {
379 if (e) { 447 if (e) {
380 const fullUrl = e; 448 const fullUrl = e;
@@ -388,8 +456,12 @@ @@ -388,8 +456,12 @@
388 } 456 }
389 }, 457 },
390 changetype() { 458 changetype() {
391 - this.xiangTab = 'first'  
392 - this.$emit('removeonaction', '1') 459 + this.xiangTab= 'first'
  460 + if(this.type == '1'){
  461 + this.$emit('removeonaction', '1')
  462 + }else{
  463 + this.type = '1'
  464 + }
393 }, 465 },
394 } 466 }
395 } 467 }
admin-web-master/src/layout/index.vue
  View file @9b392fc
@@ -255,12 +255,12 @@ export default { @@ -255,12 +255,12 @@ export default {
255 } 255 }
256 } 256 }
257 return { 257 return {
258 - // msg:['招商服务系统'],  
259 - msg:['招商服务系统','推广策划系统','在线商城系统','支付服务模块','票务'], 258 + msg:['招商服务系统'],
  259 + // msg:['招商服务系统','推广策划系统','在线商城系统','支付服务模块','票务'],
260 listMune:[], 260 listMune:[],
261 list:[ 261 list:[
262 // ['招商资源监测','招商租赁管理','系统设置'] 262 // ['招商资源监测','招商租赁管理','系统设置']
263 - // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'], 263 + ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','轮播图设置'],
264 264
265 ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'], 265 ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'],
266 ['品牌策划','活动策划','氛围策划','媒体推广'], 266 ['品牌策划','活动策划','氛围策划','媒体推广'],
@@ -540,7 +540,8 @@ this.listMune[0] = All @@ -540,7 +540,8 @@ this.listMune[0] = All
540 gzt(){ 540 gzt(){
541 // window.location.href = 'https://admin-uat.028wlkj.com:1020/' 541 // window.location.href = 'https://admin-uat.028wlkj.com:1020/'
542 // window.location.href = 'https://admin.028wlkj.com:1020/application-manage' 542 // window.location.href = 'https://admin.028wlkj.com:1020/application-manage'
543 - window.location.href = 'https://admin-uat.028wlkj.com:1020' 543 + // window.location.href = 'https://admin-uat.028wlkj.com:1020'
  544 + window.location.href = 'https://admin.028wlkj.com:1020'
544 }, 545 },
545 findMatchingNames(List,msg){ 546 findMatchingNames(List,msg){
546 return List.filter((item) => msg.includes(item.name)) 547 return List.filter((item) => msg.includes(item.name))
@@ -641,8 +642,8 @@ this.listMune[0] = All @@ -641,8 +642,8 @@ this.listMune[0] = All
641 this.listMune = [] 642 this.listMune = []
642 this.list=[ 643 this.list=[
643 // ['招商资源监测','招商租赁管理','系统设置'] 644 // ['招商资源监测','招商租赁管理','系统设置']
644 - // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'],  
645 - ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'], 645 + ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','轮播图设置'],
  646 + // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'],
646 ['品牌策划','活动策划','氛围策划','媒体推广'], 647 ['品牌策划','活动策划','氛围策划','媒体推广'],
647 ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'], 648 ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'],
648 ['联机交易','对账处理','日志管理','商户服务'], 649 ['联机交易','对账处理','日志管理','商户服务'],
admin-web-master/src/main.js
  View file @9b392fc
@@ -39,7 +39,7 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd @@ -39,7 +39,7 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd
39 39
40 let host = window.location.host; 40 let host = window.location.host;
41 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' ) { 41 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' ) {
42 - Vue.prototype.$baseURL ='https://zhld.028wlkj.com:49008/cdwlMall' 42 + Vue.prototype.$baseURL ='http://172.16.61.125/cdwlMall'
43 } else { 43 } else {
44 Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall` 44 Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
45 } 45 }
admin-web-master/src/utils/request.js
  View file @9b392fc
@@ -15,8 +15,8 @@ let hostall = window.location.href; @@ -15,8 +15,8 @@ let hostall = window.location.href;
15 // const baseURL = 'http://192.168.2.38:9003'; 15 // const baseURL = 'http://192.168.2.38:9003';
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 - // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;  
19 - baseURL = 'http://192.168.2.225:9003'; 18 + baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
  19 + // baseURL = 'http://192.168.2.225:9003';
20 } else { 20 } else {
21 console.error('---------------------') 21 console.error('---------------------')
22 console.error(hostall) 22 console.error(hostall)
admin-web-master/src/utils/request2.js
  View file @9b392fc
@@ -15,14 +15,24 @@ let hostall = window.location.href; @@ -15,14 +15,24 @@ let hostall = window.location.href;
15 // const baseURL = 'http://192.168.2.38:9003'; 15 // const baseURL = 'http://192.168.2.38:9003';
16 let baseURL = '' 16 let baseURL = ''
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' ) {  
19 - // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';  
20 - baseURL = 'http://172.16.61.125:9004'; 18 +// if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
  19 +// // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
  20 +// baseURL = 'http://192.168.2.36:9003';
  21 +// } else {
  22 +// console.error('---------------------')
  23 +// console.error(hostall)
  24 +// let c1 = hostall.split('cdwlMall')[0];
  25 +// baseURL = c1 + 'cdwlMall/business-server';
  26 +// console.error(baseURL)
  27 +// }
  28 +if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
  29 + baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
  30 + // baseURL = 'http://192.168.2.225:9003';
21 } else { 31 } else {
22 console.error('---------------------') 32 console.error('---------------------')
23 console.error(hostall) 33 console.error(hostall)
24 let c1 = hostall.split('cdwlMall')[0]; 34 let c1 = hostall.split('cdwlMall')[0];
25 - baseURL = c1 + 'cdwlMall/business-server'; 35 + baseURL = c1 + 'cdwlMall/admin-server';
26 console.error(baseURL) 36 console.error(baseURL)
27 } 37 }
28 // const baseURL = process.env.VUE_APP_DOMAIN_PREFIX 38 // const baseURL = process.env.VUE_APP_DOMAIN_PREFIX
admin-web-master/src/views/aaa/index copy.vue 0 → 100644
  View file @9b392fc
  1 +<template>
  2 + <div style="background-color:#f7f7f7;padding:10px 10px;">
  3 + <div class="zhuti">
  4 + <div style="height:58px;line-height:58px;">
  5 + <div style="color:#0006"> <span>轮播图设置</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">轮播图管理</span></div>
  6 + </div>
  7 + <div>
  8 + <div style="margin:0 0 20px 0px;">
  9 + <el-button
  10 + @click="addbuss(1)"
  11 + style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
  12 + > 新增
  13 + </el-button>
  14 + </div>
  15 + <!-- 表格 -->
  16 + <el-table
  17 + :data="tableData"
  18 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  19 + style="width: 100%"
  20 + >
  21 + <el-table-column
  22 + label="序号"
  23 + width="auto"
  24 + min-width="4%"
  25 + prop="id"
  26 + >
  27 + <template slot-scope="scope">
  28 + {{scope.$index +1 }}
  29 + </template>
  30 + </el-table-column>
  31 + <el-table-column
  32 + label="轮播图"
  33 + prop=""
  34 + width="auto"
  35 + min-width="20%"
  36 + >
  37 + <template slot-scope="scope">
  38 + <img :src="scope.row.imageUrl" style="width:100px;height: 42px;"></img>
  39 + </template>
  40 + </el-table-column>
  41 +
  42 +<el-table-column
  43 + label="跳转地址"
  44 + width="auto"
  45 + min-width="20%"
  46 + prop="jumpUrl"
  47 + />
  48 +
  49 + <el-table-column
  50 + label="操作"
  51 + width="auto"
  52 + min-width="17%">
  53 + <template slot-scope="scope">
  54 + <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
  55 + </template>
  56 + </el-table-column>
  57 + </el-table>
  58 + <div class="fenye">
  59 + <el-pagination
  60 + class="pagination"
  61 + :hide-on-single-page="flag"
  62 + background
  63 + small
  64 + :current-page="currentPage"
  65 + :page-sizes="[10, 20, 50, 100]"
  66 + layout="total,prev, pager,next"
  67 + :total="total "
  68 + @size-change="handleSizeChange"
  69 + @current-change="handleCurrentChange"
  70 + />
  71 + </div>
  72 +
  73 + <!-- 新建商家弹框 -->
  74 + <el-dialog :title="index == 1?'新增':index == 2?'详情':'编辑'" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="30%" class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false" >
  75 + <div >
  76 + <div style="margin-bottom: 20px;">
  77 + <el-form ref="form" :model="formInline" label-width="80px">
  78 + <el-form-item label="轮播图">
  79 + <upimg v-model="formInline.imageUrl" :limit="1" :fileSize="1"></upimg>
  80 + </el-form-item>
  81 + <el-form-item label="跳转地址">
  82 + <el-input v-model="formInline.jumpUrl" placeholder="请输入" size="mini" />
  83 + </el-form-item>
  84 + </el-form>
  85 +
  86 + </div>
  87 + <div style="display: flex;justify-content: flex-end;">
  88 + <el-button @click="closeFn(1)" class="buttonHover"
  89 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
  90 + <el-button @click="addCheck(0)" v-if="index!= 2" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">确定</el-button>
  91 + </div>
  92 + </div>
  93 + </el-dialog>
  94 + </div>
  95 + </div>
  96 +
  97 + </div>
  98 +</template>
  99 +
  100 +<script>
  101 +import upimg from "@/components/ImageUpload/index";
  102 + import {
  103 + bannerGet,
  104 + bannerAdd,
  105 + bannerDel
  106 + } from '../../api/banner';
  107 +export default {
  108 + components: {upimg},
  109 + data () {
  110 + return {
  111 + rules: {},
  112 + currentPage: 1,
  113 + total: 100,
  114 + flag: false,
  115 + pageSize: 10,
  116 + ggXin: false,
  117 + index:1,
  118 + formInline: {
  119 + imageUrl:'',
  120 + jumpUrl:''
  121 + },
  122 + tableData: [],
  123 + formRul:{
  124 + pageNumber: 1,
  125 + pageSize: 10
  126 + }
  127 + }
  128 + },
  129 + computed: {},
  130 + mounted() {
  131 +
  132 + this.getAll()
  133 + },
  134 +
  135 + methods: {
  136 + addbuss (val,item) {
  137 + if(val == 1){
  138 + this.formInline= {
  139 + imageUrl:'',
  140 + jumpUrl:''
  141 + }
  142 + }
  143 + this.index = val
  144 + this.ggXin = true
  145 + },
  146 + async getAll(){
  147 + const res = await bannerGet(this.formRul)
  148 + this.tableData = res.data.content
  149 + this.total = res.data.content.length
  150 + },
  151 + onSubmit(){
  152 +
  153 + },
  154 + handleSizeChange(){
  155 +
  156 + },
  157 + handleCurrentChange(){
  158 +
  159 + },
  160 + async addCheck(){
  161 + await bannerAdd(this.formInline)
  162 + this.ggXin = false
  163 + this.getAll()
  164 + },
  165 + async handleDelete(row){
  166 + await bannerDel({id:row.id})
  167 + this.getAll()
  168 + },
  169 + closeFn () {
  170 + this.ggXin = false
  171 + this.index = 1
  172 + }
  173 + }
  174 +}
  175 +</script>
  176 +
  177 +<style scoped>
  178 +.zhuti {
  179 + padding: 0 20px 20px 20px;
  180 + background-color: #Fff;
  181 + min-height: calc(100vh - 50px - 20px);
  182 +}
  183 +
  184 +/deep/ .el-form-item__content {
  185 + line-height: 0;
  186 +}
  187 +
  188 +
  189 +
  190 +.formSearch {
  191 + display: flex;
  192 + width: 100%;
  193 + font-size: 14px;
  194 + justify-content: space-between;
  195 + align-items: center;
  196 + }
  197 +
  198 +.greens {
  199 + color: #3F9B6A;
  200 +}
  201 +
  202 +
  203 +
  204 +.fenye {
  205 + margin-top: 20px;
  206 + display: flex;
  207 + justify-content: flex-end;
  208 + position: relative;
  209 +}
  210 +
  211 +/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
  212 + background-color: #3F9B6A;
  213 +}
  214 +
  215 +.el-row {
  216 + margin-bottom: 20px;
  217 +}
  218 +:last-child {
  219 + margin-bottom: 0;
  220 +}
  221 +
  222 +.el-col {
  223 + border-radius: 4px;
  224 +}
  225 +
  226 +.bg-purple-dark {
  227 + background: #99a9bf;
  228 +}
  229 +
  230 +.bg-purple {
  231 + background: #d3dce6;
  232 +}
  233 +
  234 +.bg-purple-light {
  235 + background: #e5e9f2;
  236 +}
  237 +
  238 +.grid-content {
  239 + border-radius: 4px;
  240 + min-height: 36px;
  241 +}
  242 +
  243 +.row-bg {
  244 + padding: 10px 0;
  245 + background-color: #f9fafc;
  246 +}
  247 +
  248 +/deep/ .bg-purple[data-v-0e3fe4ec] {
  249 + background: #fff;
  250 + height: 50px;
  251 +}
  252 +
  253 +/deep/ .el-form--label-top .el-form-item__label {
  254 + padding: 0;
  255 +}
  256 +.demo-input-suffix{
  257 + display: flex;
  258 + margin-right: 20px;
  259 +}
  260 +.pagination{
  261 + text-align:right;
  262 + line-height: 20px;
  263 +}
  264 +/deep/ .el-pagination__total{
  265 + margin-top:4px;
  266 +}
  267 +
  268 +
  269 + ::v-deep .el-select .el-input.is-focus .el-input__inner{
  270 + border-color:#3F9B6A
  271 + }
  272 + ::v-deep .dialog_css_Xq{
  273 + .el-dialog__header{
  274 + background-color:#fafafa;
  275 +
  276 + }
  277 + .el-dialog__title{
  278 + color:#000
  279 + }
  280 + }
  281 +</style>
  282 +<style lang="scss" scoped>
  283 + ::v-deep .buttonHover:hover{
  284 + color:#3f9b6a !important;
  285 + border-color: #c5e1d2 !important;
  286 + background-color: #ecf5f0 !important;
  287 + outline: none;
  288 + }
  289 +::v-deep .el-pagination__total {
  290 + position: absolute;
  291 + left: 10px;
  292 + }
  293 +
  294 +</style>
admin-web-master/src/views/aaa/index.vue
  View file @9b392fc
@@ -2,94 +2,72 @@ @@ -2,94 +2,72 @@
2 <div style="background-color:#f7f7f7;padding:10px 10px;"> 2 <div style="background-color:#f7f7f7;padding:10px 10px;">
3 <div class="zhuti"> 3 <div class="zhuti">
4 <div style="height:58px;line-height:58px;"> 4 <div style="height:58px;line-height:58px;">
5 - <div style="color:#0006"> <span>轮播图设置</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">轮播图管理</span></div> 5 + <div style="color:#0006"> <span>轮播图设置</span> <span style="padding:0 5px;">></span> <span
  6 + style="color:#000000e6">轮播图管理</span></div>
6 </div> 7 </div>
7 <div> 8 <div>
8 <div style="margin:0 0 20px 0px;"> 9 <div style="margin:0 0 20px 0px;">
9 - <el-button  
10 - @click="addbuss(1)"  
11 - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"  
12 - > 新增 10 + <el-button @click="addbuss(1)" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
  11 + icon="el-icon-circle-plus-outline"> 新增
13 </el-button> 12 </el-button>
14 </div> 13 </div>
15 <!-- 表格 --> 14 <!-- 表格 -->
16 - <el-table  
17 - :data="tableData"  
18 - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"  
19 - style="width: 100%"  
20 - >  
21 - <el-table-column  
22 - label="序号"  
23 - width="auto"  
24 - min-width="4%"  
25 - prop="id"  
26 - >  
27 - <template slot-scope="scope">  
28 - {{scope.$index +1 }} 15 + <el-table :data="tableData"
  16 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  17 + style="width: 100%">
  18 + <el-table-column label="序号" width="auto" min-width="4%" prop="id">
  19 + <template slot-scope="scope">
  20 + {{scope.$index +1 }}
29 </template> 21 </template>
30 </el-table-column> 22 </el-table-column>
31 - <el-table-column  
32 - label="轮播图"  
33 - prop=""  
34 - width="auto"  
35 - min-width="20%"  
36 - >  
37 - <template slot-scope="scope">  
38 - <img :src="scope.row.imageUrl" style="width:100px;height: 42px;"></img>  
39 - </template> 23 + <el-table-column label="轮播图" prop="" width="auto" min-width="20%">
  24 + <template slot-scope="scope">
  25 + <el-image style="height: 80px;" :src="$baseURL+scope.row.imageUrl" fit="contain"></el-image>
  26 + </template>
40 </el-table-column> 27 </el-table-column>
41 28
42 -<el-table-column  
43 - label="跳转地址"  
44 - width="auto"  
45 - min-width="20%"  
46 - prop="jumpUrl"  
47 - />  
48 -  
49 - <el-table-column  
50 - label="操作"  
51 - width="auto"  
52 - min-width="17%"> 29 + <el-table-column label="跳转地址" width="auto" min-width="20%" prop="jumpUrl" >
  30 + <template slot-scope="scope">
  31 + {{ scope.row.jumpUrl || '-' }}
  32 + </template>
  33 + </el-table-column>
  34 + <el-table-column label="操作" width="auto" min-width="17%">
53 <template slot-scope="scope"> 35 <template slot-scope="scope">
54 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div> 36 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
55 </template> 37 </template>
56 </el-table-column> 38 </el-table-column>
57 </el-table> 39 </el-table>
58 - <div class="fenye">  
59 - <el-pagination  
60 - class="pagination"  
61 - :hide-on-single-page="flag"  
62 - background  
63 - small  
64 - :current-page="currentPage"  
65 - :page-sizes="[10, 20, 50, 100]"  
66 - layout="total,prev, pager,next"  
67 - :total="total "  
68 - @size-change="handleSizeChange"  
69 - @current-change="handleCurrentChange"  
70 - /> 40 + <div style="display: flex;justify-content: space-between;" class="bom">
  41 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
  42 + <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" :page-size="10"
  43 + background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
  44 + @current-change="handleCurrentChange">
  45 + </el-pagination>
71 </div> 46 </div>
72 -  
73 <!-- 新建商家弹框 --> 47 <!-- 新建商家弹框 -->
74 - <el-dialog :title="index == 1?'新增':index == 2?'详情':'编辑'" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="30%" class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false" >  
75 - <div >  
76 - <div style="margin-bottom: 20px;">  
77 - <el-form ref="form" :model="formInline" label-width="80px">  
78 - <el-form-item label="轮播图">  
79 - <upimg v-model="formInline.imageUrl" :limit="1" :fileSize="1"></upimg>  
80 - </el-form-item>  
81 - <el-form-item label="跳转地址">  
82 - <el-input v-model="formInline.jumpUrl" placeholder="请输入" size="mini" />  
83 - </el-form-item>  
84 - </el-form>  
85 -  
86 - </div>  
87 - <div style="display: flex;justify-content: flex-end;">  
88 - <el-button @click="closeFn(1)" class="buttonHover"  
89 - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>  
90 - <el-button @click="addCheck(0)" v-if="index!= 2" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">确定</el-button>  
91 - </div>  
92 - </div> 48 + <el-dialog :title="index == 1?'新增':index == 2?'详情':'编辑'" :visible.sync="ggXin" custom-class="diaslog_zhong"
  49 + style="padding: 0;" width="50%" class="dialog_css_Xq" center :close-on-click-modal="false"
  50 + :show-close="false">
  51 + <div style="padding: 30px;">
  52 + <div style="margin-bottom: 20px;">
  53 + <el-form ref="form" :model="formInline" label-width="80px">
  54 + <el-form-item label="轮播图">
  55 + <upimg :limit="1" :cmpOption="{disabled:false,isSetCover:false}" filePath="lb" inputtype="imageUrl" :value="formInline.imageUrl" @changimg="e=>changimg(e,'imageUrl')"></upimg>
  56 + <!-- <upimg v-model="formInline.imageUrl" :limit="1" :fileSize="1"></upimg> -->
  57 + </el-form-item>
  58 + <el-form-item label="跳转地址">
  59 + <el-input v-model="formInline.jumpUrl" placeholder="请输入" />
  60 + </el-form-item>
  61 + </el-form>
  62 +
  63 + </div>
  64 + <div style="display: flex;justify-content: flex-end;">
  65 + <el-button @click="closeFn(1)" class="buttonHover"
  66 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
  67 + <el-button @click="addCheck(0)" v-if="index!= 2"
  68 + style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">确定</el-button>
  69 + </div>
  70 + </div>
93 </el-dialog> 71 </el-dialog>
94 </div> 72 </div>
95 </div> 73 </div>
@@ -98,197 +76,157 @@ @@ -98,197 +76,157 @@
98 </template> 76 </template>
99 77
100 <script> 78 <script>
101 -import upimg from "@/components/ImageUpload/index"; 79 + import upimg from "@/components/ImageUpload/index";
102 import { 80 import {
103 bannerGet, 81 bannerGet,
104 bannerAdd, 82 bannerAdd,
105 bannerDel 83 bannerDel
106 } from '../../api/banner'; 84 } from '../../api/banner';
107 -export default {  
108 - components: {upimg},  
109 - data () {  
110 - return {  
111 - rules: {},  
112 - currentPage: 1,  
113 - total: 100,  
114 - flag: false,  
115 - pageSize: 10,  
116 - ggXin: false,  
117 - index:1,  
118 - formInline: {  
119 - imageUrl:'',  
120 - jumpUrl:''  
121 - },  
122 - tableData: [],  
123 - formRul:{  
124 - pageNumber: 1,  
125 - pageSize: 10  
126 - }  
127 - }  
128 - },  
129 - computed: {},  
130 - mounted() {  
131 -  
132 - this.getAll() 85 + export default {
  86 + components: {
  87 + upimg
133 }, 88 },
134 -  
135 - methods: {  
136 - addbuss (val,item) {  
137 - if(val == 1){  
138 - this.formInline= {  
139 - imageUrl:'',  
140 - jumpUrl:'' 89 + data() {
  90 + return {
  91 + rules: {},
  92 + currentPage: 1,
  93 + total: 100,
  94 + flag: false,
  95 + pageSize: 10,
  96 + ggXin: false,
  97 + index: 1,
  98 + formInline: {
  99 + imageUrl: '',
  100 + jumpUrl: ''
  101 + },
  102 + tableData: [],
  103 + formRul: {
  104 + pageNumber: 1,
  105 + pageSize: 10
  106 + }
141 } 107 }
142 - }  
143 - this.index = val  
144 - this.ggXin = true  
145 - },  
146 - async getAll(){  
147 - const res = await bannerGet(this.formRul)  
148 - this.tableData = res.data.content  
149 - this.total = res.data.content.length  
150 }, 108 },
151 - onSubmit(){ 109 + computed: {},
  110 + mounted() {
152 111
  112 + this.getAll()
153 }, 113 },
154 - handleSizeChange(){  
155 114
156 - },  
157 - handleCurrentChange(){ 115 + methods: {
  116 + changimg(e, type) {
  117 + this.formInline[type] = e
  118 + },
  119 + addbuss(val, item) {
  120 + if (val == 1) {
  121 + this.formInline = {
  122 + imageUrl: '',
  123 + jumpUrl: ''
  124 + }
  125 + }
  126 + this.index = val
  127 + this.ggXin = true
  128 + },
  129 + async getAll() {
  130 + const res = await bannerGet(this.formRul)
  131 + this.tableData = res.data.content
  132 + this.total = res.data.content.length
  133 + },
  134 + onSubmit() {
158 135
159 - },  
160 - async addCheck(){  
161 - await bannerAdd(this.formInline)  
162 - this.ggXin = false  
163 - this.getAll()  
164 - },  
165 - async handleDelete(row){  
166 - await bannerDel({id:row.id})  
167 - this.getAll()  
168 - },  
169 - closeFn () {  
170 - this.ggXin = false  
171 - this.index = 1 136 + },
  137 + handleSizeChange() {
  138 +
  139 + },
  140 + handleCurrentChange() {
  141 +
  142 + },
  143 + async addCheck() {
  144 + await bannerAdd(this.formInline)
  145 + this.ggXin = false
  146 + this.getAll()
  147 + },
  148 + async handleDelete(row) {
  149 + let that = this
  150 + this.$confirm('确定要删除吗？', '提示', {
  151 + confirmButtonText: '确定',
  152 + cancelButtonText: '取消',
  153 + type: 'warning'
  154 + }).then(() => {
  155 + bannerDel({
  156 + id: row.id
  157 + }).then(res => {
  158 + console.error(res)
  159 + if (res.code == 200) {
  160 + this.$message({
  161 + message:'删除成功',
  162 + type: 'success'
  163 + })
  164 + this.getAll()
  165 + } else {
  166 + this.$message({
  167 + message: res.msg,
  168 + type: 'error'
  169 + })
  170 + }
  171 +
  172 + })
  173 + })
  174 + },
  175 + closeFn() {
  176 + this.ggXin = false
  177 + this.index = 1
  178 + }
172 } 179 }
173 } 180 }
174 -}  
175 </script> 181 </script>
176 182
177 <style scoped> 183 <style scoped>
178 -.zhuti {  
179 - padding: 0 20px 20px 20px;  
180 - background-color: #Fff;  
181 - min-height: calc(100vh - 50px - 20px);  
182 -}  
183 -  
184 -/deep/ .el-form-item__content {  
185 - line-height: 0;  
186 -} 184 + .zhuti {
  185 + padding: 0 20px 20px 20px;
  186 + min-height: calc(100vh - 50px - 20px);
  187 + background-color: #Fff;
187 188
  189 + }
  190 + .chengeXia {
  191 + border-bottom: 6px solid #3F9B6A;
  192 + padding-bottom: 4px;
  193 + color: #3F9B6A;
  194 + }
188 195
189 196
190 -.formSearch { 197 + .formSearch {
191 display: flex; 198 display: flex;
192 width: 100%; 199 width: 100%;
193 font-size: 14px; 200 font-size: 14px;
194 justify-content: space-between; 201 justify-content: space-between;
195 - align-items: center;  
196 } 202 }
197 203
198 -.greens {  
199 - color: #3F9B6A;  
200 -}  
201 -  
202 -  
203 -  
204 -.fenye {  
205 - margin-top: 20px;  
206 - display: flex;  
207 - justify-content: flex-end;  
208 - position: relative;  
209 -}  
210 -  
211 -/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {  
212 - background-color: #3F9B6A;  
213 -}  
214 -  
215 -.el-row {  
216 - margin-bottom: 20px;  
217 -}  
218 -:last-child {  
219 - margin-bottom: 0;  
220 -}  
221 -  
222 -.el-col {  
223 - border-radius: 4px;  
224 -}  
225 -  
226 -.bg-purple-dark {  
227 - background: #99a9bf;  
228 -}  
229 -  
230 -.bg-purple {  
231 - background: #d3dce6;  
232 -}  
233 -  
234 -.bg-purple-light {  
235 - background: #e5e9f2;  
236 -}  
237 -  
238 -.grid-content {  
239 - border-radius: 4px;  
240 - min-height: 36px;  
241 -}  
242 -  
243 -.row-bg {  
244 - padding: 10px 0;  
245 - background-color: #f9fafc;  
246 -}  
247 -  
248 -/deep/ .bg-purple[data-v-0e3fe4ec] {  
249 - background: #fff;  
250 - height: 50px;  
251 -} 204 + .bg-purple-dark {
  205 + background: #99a9bf;
  206 + }
252 207
253 -/deep/ .el-form--label-top .el-form-item__label {  
254 - padding: 0;  
255 -}  
256 -.demo-input-suffix{  
257 - display: flex;  
258 - margin-right: 20px;  
259 -}  
260 -.pagination{  
261 - text-align:right;  
262 - line-height: 20px;  
263 -}  
264 -/deep/ .el-pagination__total{  
265 - margin-top:4px;  
266 -} 208 + .bg-purple {
  209 + background: #d3dce6;
  210 + }
267 211
  212 + .bg-purple-light {
  213 + background: #e5e9f2;
  214 + }
  215 + .grid-content {
  216 + border-radius: 4px;
  217 + min-height: 36px;
  218 + }
268 219
269 - ::v-deep .el-select .el-input.is-focus .el-input__inner{  
270 - border-color:#3F9B6A  
271 - }  
272 - ::v-deep .dialog_css_Xq{  
273 - .el-dialog__header{  
274 - background-color:#fafafa;  
275 220
276 - }  
277 - .el-dialog__title{  
278 - color:#000  
279 - }  
280 - }  
281 </style> 221 </style>
282 <style lang="scss" scoped> 222 <style lang="scss" scoped>
283 - ::v-deep .buttonHover:hover{  
284 - color:#3f9b6a !important;  
285 - border-color: #c5e1d2 !important;  
286 - background-color: #ecf5f0 !important;  
287 - outline: none;  
288 - }  
289 -::v-deep .el-pagination__total {  
290 - position: absolute;  
291 - left: 10px; 223 + ::v-deep .el-dialog__body {
  224 + padding: 0 0 !important;
292 } 225 }
293 226
  227 +
  228 + .el-dialog__header{
  229 + padding: 0;
  230 + display: none;
  231 + }
294 </style> 232 </style>
admin-web-master/src/views/ads/fangAudit/bianform.vue
  View file @9b392fc
@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 <el-row :gutter="20"> 152 <el-row :gutter="20">
153 <el-col :span="24"> 153 <el-col :span="24">
154 <el-form-item label="招商资源管理" class="grid-content bg-purple"> 154 <el-form-item label="招商资源管理" class="grid-content bg-purple">
155 - <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong"> 155 + <div style="border: 1px solid #E5E5E5;" id="huodong">
156 156
157 <div style="padding: 15px;"> 157 <div style="padding: 15px;">
158 <div style="padding: 0px 20px 0px 0px"> 158 <div style="padding: 0px 20px 0px 0px">
@@ -194,21 +194,21 @@ @@ -194,21 +194,21 @@
194 194
195 </el-row> 195 </el-row>
196 196
197 - <el-row :gutter="20"> 197 + <!-- <el-row :gutter="20">
198 <el-col :span="12"> 198 <el-col :span="12">
199 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple"> 199 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
200 <div class="duiqi" style="padding:10px 0;line-height:20px;color:#3F9B6A">{{ruleForm.attachmentInfo.name}}<a style="margin-left:20px;color:#3F9B6A" :href="ruleForm.attachmentInfo.url" target="_blank" v-if="ruleForm.attachmentInfo.name">下载</a></div> 200 <div class="duiqi" style="padding:10px 0;line-height:20px;color:#3F9B6A">{{ruleForm.attachmentInfo.name}}<a style="margin-left:20px;color:#3F9B6A" :href="ruleForm.attachmentInfo.url" target="_blank" v-if="ruleForm.attachmentInfo.name">下载</a></div>
201 </el-form-item> 201 </el-form-item>
202 </el-col> 202 </el-col>
203 203
204 - </el-row> 204 + </el-row> -->
205 205
206 </el-form> 206 </el-form>
207 </div> 207 </div>
208 </div> 208 </div>
209 <el-row :gutter="20"> 209 <el-row :gutter="20">
210 <el-col :span="12"> 210 <el-col :span="12">
211 - <div style="padding-left:160px;margin-top: 30px;"> 211 + <div style="padding-left:160px;margin-top: 70px;">
212 <el-button @click="close" class="buttonHover" 212 <el-button @click="close" class="buttonHover"
213 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消 213 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
214 </el-button> 214 </el-button>
admin-web-master/src/views/ads/fangli/bianform.vue
  View file @9b392fc
@@ -161,9 +161,9 @@ @@ -161,9 +161,9 @@
161 </el-col> 161 </el-col>
162 162
163 </el-row> 163 </el-row>
164 - <el-form-item v-if="steat" label="附件信息" prop="attachmentInfo"> 164 + <!-- <el-form-item v-if="steat" label="附件信息" prop="attachmentInfo">
165 <upfile filePath="cd" :value="ruleForm.attachmentInfo" fileSize="50" :fileType="['doc','pdf']" @changimg="e=>changimg(e,'attachmentInfo')"></upfile> 165 <upfile filePath="cd" :value="ruleForm.attachmentInfo" fileSize="50" :fileType="['doc','pdf']" @changimg="e=>changimg(e,'attachmentInfo')"></upfile>
166 - </el-form-item> 166 + </el-form-item> -->
167 <!-- <el-row :gutter="20"> 167 <!-- <el-row :gutter="20">
168 <el-col :span="12"> 168 <el-col :span="12">
169 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple"> 169 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @9b392fc
@@ -14,19 +14,17 @@ @@ -14,19 +14,17 @@
14 <!-- 搜索 --> 14 <!-- 搜索 -->
15 <div class="formSearch"> 15 <div class="formSearch">
16 <el-form :inline="true" :model="pagequery" style="margin-top: 15px;"> 16 <el-form :inline="true" :model="pagequery" style="margin-top: 15px;">
17 - <el-form-item label="广告位名称" prop="advertisingName">  
18 - <el-input v-model="pagequery.advertisingName" placeholder="请输入" maxlength="50"></el-input> 17 + <el-form-item label="编号" prop="id">
  18 + <el-input v-model="pagequery.id" placeholder="请输入" style="width: 168px;margin-right: 15px" />
19 </el-form-item> 19 </el-form-item>
20 - <el-form-item label="所属端" prop="affiliation" v-if="leixing"> 20 + <el-form-item label="所属端" prop="affiliation" v-if="leixing == 1">
21 <el-select v-model="pagequery.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px"> 21 <el-select v-model="pagequery.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px">
22 - <el-option label="游客小程序" value="游客小程序" />  
23 - <el-option label="商家客户端" value="商家客户端" /> 22 + <el-option label="游客小程序" value="游客小程序"></el-option>
  23 + <el-option label="商家客户端" value="商家客户端"></el-option>
24 </el-select> 24 </el-select>
25 </el-form-item> 25 </el-form-item>
26 - <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false">  
27 - <el-select v-model="pagequery.deviceType" placeholder="请选择" style="width: 168px;margin-right: 15px">  
28 - <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>  
29 - </el-select> 26 + <el-form-item label="申请人" prop="applicant">
  27 + <el-input v-model="pagequery.applicant" placeholder="请输入" style="width: 168px;margin-right: 15px" />
30 </el-form-item> 28 </el-form-item>
31 </el-form> 29 </el-form>
32 30
@@ -53,7 +51,7 @@ @@ -53,7 +51,7 @@
53 {{scope.row.cereAdvertisingInformation.affiliation}} 51 {{scope.row.cereAdvertisingInformation.affiliation}}
54 </template> 52 </template>
55 </el-table-column> 53 </el-table-column>
56 - <el-table-column label="轮播顺序" v-if="leixing == 1"> 54 + <el-table-column label="轮播顺序" v-if="leixing == 1" >
57 <template slot-scope="scope"> 55 <template slot-scope="scope">
58 {{scope.row.cereAdvertisingInformation.rotationOrder}} 56 {{scope.row.cereAdvertisingInformation.rotationOrder}}
59 </template> 57 </template>
@@ -63,25 +61,29 @@ @@ -63,25 +61,29 @@
63 <el-table-column label="申请人" prop="applicant" ></el-table-column> 61 <el-table-column label="申请人" prop="applicant" ></el-table-column>
64 <el-table-column label="投放定价" prop="tenant"> 62 <el-table-column label="投放定价" prop="tenant">
65 <template slot-scope="scope"> 63 <template slot-scope="scope">
66 - {{scope.row.rotationOrde}} 64 + {{scope.row.rotationOrde || '-'}}
67 </template> 65 </template>
68 </el-table-column> 66 </el-table-column>
69 <el-table-column label="投放时间" prop="scheduleTime" > 67 <el-table-column label="投放时间" prop="scheduleTime" >
70 </el-table-column> 68 </el-table-column>
71 <el-table-column prop="applicationTime" label="提交时间" > 69 <el-table-column prop="applicationTime" label="提交时间" >
72 </el-table-column> 70 </el-table-column>
73 - <el-table-column label="状态" prop="auditStatus" > 71 + <el-table-column label="状态" prop="auditStatus" width="80">
74 <template slot-scope="scope"> 72 <template slot-scope="scope">
75 - {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'待签约':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已签约':'已终止'}} 73 + {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'待签约':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已签约':scope.row.auditStatus =='5'?'已终止':scope.row.auditStatus =='6'?'下架':scope.row.auditStatus =='7'?'已投放':'-'}}
76 </template> 74 </template>
77 </el-table-column> 75 </el-table-column>
78 <el-table-column label="操作" fixed="right"> 76 <el-table-column label="操作" fixed="right">
79 <template slot-scope="scope"> 77 <template slot-scope="scope">
80 - <div @click="details(scope.row)" class="tableBtn greens">查看</div>  
81 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑</div>  
82 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2'" @click="closemsg(scope.row)">删除</div>  
83 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2'" @click="opencl(scope.row,'gg')">发布</div>  
84 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" @click="removeinfozz(scope.row,'2','下架')">下架</div> 78 + <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
  79 + <div v-if="scope.row.auditStatus =='1' " @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
  80 + <div v-if="scope.row.auditStatus == '2'" @click="removeonaction('2')" class="tableBtn greens">录入合同</div>
  81 + <div @click="removeinfozz(scope.row,'5','终止')" class="tableBtn greens"
  82 + v-if="(scope.row.auditStatus =='2' || scope.row.auditStatus =='4') && leixing">终止
  83 + </div>
  84 + <div @click="opencl(scope.row,'5','终止')" class="tableBtn greens"
  85 + v-if="(scope.row.auditStatus =='2' || scope.row.auditStatus =='4') && !leixing">更改状态
  86 + </div>
85 </template> 87 </template>
86 </el-table-column> 88 </el-table-column>
87 </el-table> 89 </el-table>
@@ -104,36 +106,67 @@ @@ -104,36 +106,67 @@
104 106
105 <div class="zhuti" v-if="onaction == '2'"> 107 <div class="zhuti" v-if="onaction == '2'">
106 <div style="height:58px;line-height:58px;"> 108 <div style="height:58px;line-height:58px;">
107 - <div style="color:#0006"> <span>广告位基本信息管理</span> <span style="padding:0 5px;">></span> <span 109 + <div style="color:#0006"> <span>广告审核</span> <span style="padding:0 5px;">></span> <span
108 style="color:#000000e6">新增</span></div> 110 style="color:#000000e6">新增</span></div>
109 </div> 111 </div>
110 112
111 <div style="padding: 20px 20px 20px 0;"> 113 <div style="padding: 20px 20px 20px 0;">
112 - <add :info="{}" @removeonaction="removeonaction" :leixing="leixing"></add> 114 + <add @removeonaction="removeonaction"></add>
113 </div> 115 </div>
114 </div> 116 </div>
115 <div class="zhuti" v-if="onaction == '3'"> 117 <div class="zhuti" v-if="onaction == '3'">
116 <div style="height:58px;line-height:58px;"> 118 <div style="height:58px;line-height:58px;">
117 - <div style="color:#0006"> <span>广告位基本信息管理</span> <span style="padding:0 5px;">></span> <span 119 + <div style="color:#0006"> <span>广告审核</span> <span style="padding:0 5px;">></span> <span
118 style="color:#000000e6">查看</span></div> 120 style="color:#000000e6">查看</span></div>
119 </div> 121 </div>
120 <div> 122 <div>
121 - <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"> 123 + <resourceCommodity :issp="issp" :info="detailsinfo" @removeonaction="removeonaction">
122 </resourceCommodity> 124 </resourceCommodity>
123 </div> 125 </div>
124 </div> 126 </div>
125 <div class="zhuti" v-if="onaction == '4'"> 127 <div class="zhuti" v-if="onaction == '4'">
126 <div style="height:58px;line-height:58px;"> 128 <div style="height:58px;line-height:58px;">
127 - <div style="color:#0006"> <span>广告位基本信息管理</span> <span style="padding:0 5px;">></span> <span 129 + <div style="color:#0006"> <span>广告审核</span> <span style="padding:0 5px;">></span> <span
128 style="color:#000000e6">{{contractChangeReason}}</span></div> 130 style="color:#000000e6">{{contractChangeReason}}</span></div>
129 </div> 131 </div>
130 <div style="padding: 20px 20px 20px 0;"> 132 <div style="padding: 20px 20px 20px 0;">
131 <add :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></add> 133 <add :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></add>
132 </div> 134 </div>
133 </div> 135 </div>
134 - <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false" 136 + <el-dialog :visible.sync="addcl" title="更改状态" width="65%" append-to-body center :close-on-click-modal="false"
135 :close-on-press-escape="false" :show-close="false"> 137 :close-on-press-escape="false" :show-close="false">
136 - <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl> 138 + <el-form :model="oninfo" v-if="oninfo.cereAdvertisingInformation" ref="detailsinfo" label-width="130px" class="demo-ruleForm" style="padding-right: 130px;margin-top: 20px">
  139 + <el-form-item label="广告位名称" prop="advertisingName">
  140 + <el-input disabled v-model="oninfo.cereAdvertisingInformation.advertisingName" placeholder="请输入" maxlength="50"></el-input>
  141 + </el-form-item>
  142 + <el-form-item label="编号" prop="advertisingSpaceNumber">
  143 + <el-input disabled v-model="oninfo.cereAdvertisingInformation.advertisingSpaceNumber" placeholder="请输入" maxlength="50"></el-input>
  144 + </el-form-item>
  145 + <el-form-item label="投放时间" prop="scheduleTime">
  146 + <el-input disabled v-model="oninfo.scheduleTime" placeholder="请输入" maxlength="50"></el-input>
  147 + </el-form-item>
  148 + <el-form-item label="状态" prop="auditStatus">
  149 + <el-input disabled :placeholder="oninfo.auditStatus =='1'?'待审核':oninfo.auditStatus =='2'?'待签约':oninfo.auditStatus =='3'?'已驳回':oninfo.auditStatus =='4'?'已签约':oninfo.auditStatus =='5'?'已终止':oninfo.auditStatus =='6'?'下架':oninfo.auditStatus =='7'?'已投放':'-'" maxlength="50"></el-input>
  150 + </el-form-item>
  151 + <el-form-item label="状态更改" prop="auditStatus">
  152 + <el-select v-model="auditStatus" placeholder="请选择" style="width: 100%;">
  153 + <el-option label="已投放" value="7"></el-option>
  154 + <el-option label="已终止" value="5"></el-option>
  155 + <el-option label="下架" value="6"></el-option>
  156 + </el-select>
  157 + </el-form-item>
  158 + <el-row :gutter="20">
  159 + <el-col :span="12">
  160 + <el-form-item>
  161 + <div style="margin-top: 20px">
  162 + <el-button @click="changeauditStatus()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  163 + <el-button @click="addcl = false" class="buttonHover"
  164 + style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
  165 + </div>
  166 + </el-form-item>
  167 + </el-col>
  168 + </el-row>
  169 + </el-form>
137 </el-dialog> 170 </el-dialog>
138 </div> 171 </div>
139 172
@@ -153,9 +186,9 @@ @@ -153,9 +186,9 @@
153 AdvertiserInfoGetAll, 186 AdvertiserInfoGetAll,
154 AdvertiserInfoEdit, 187 AdvertiserInfoEdit,
155 AdvertiserInfoDel 188 AdvertiserInfoDel
156 - } from '../../../api/advertisement.js'  
157 - import add from '../../../components/add/addmap'  
158 - import resourceCommodity from '../../../components/chakan/map' 189 + } from '@/api/advertisement.js'
  190 + import add from '@/components/add/addht.vue'
  191 + import resourceCommodity from '@/components/chakan/ggsh'
159 import { 192 import {
160 cereResourceStrategy, 193 cereResourceStrategy,
161 editStatus 194 editStatus
@@ -164,6 +197,8 @@ @@ -164,6 +197,8 @@
164 export default { 197 export default {
165 data() { 198 data() {
166 return { 199 return {
  200 + auditStatus:'',
  201 + issp:'1',
167 oncetype: '', 202 oncetype: '',
168 addcl: false, 203 addcl: false,
169 oninfo: {}, 204 oninfo: {},
@@ -175,9 +210,12 @@ @@ -175,9 +210,12 @@
175 contractChangeReason: '', 210 contractChangeReason: '',
176 detailsinfo: {}, 211 detailsinfo: {},
177 pagequery: { 212 pagequery: {
178 - pageNumber: 1, 213 + pageNumber: 0,
179 pageSize: 10, 214 pageSize: 10,
180 - advertisingSpaceType: '实体广告位' 215 + advertisingSpaceType: '线上广告位',
  216 + id:'',
  217 + affiliation:'',
  218 + applicant:'',
181 }, 219 },
182 tableData: [], 220 tableData: [],
183 total: 0, 221 total: 0,
@@ -194,6 +232,55 @@ @@ -194,6 +232,55 @@
194 this.getAll() 232 this.getAll()
195 }, 233 },
196 methods: { 234 methods: {
  235 + changeauditStatus() {
  236 + AdvertiserInfoEdit({
  237 + id: this.oninfo.id,
  238 + auditStatus: this.auditStatus
  239 + }).then(res => {
  240 + console.error(res)
  241 + if (res.code == 200) {
  242 + this.$message({
  243 + message: tit + '成功',
  244 + type: 'success'
  245 + })
  246 + this.removeonaction('1')
  247 + } else {
  248 + this.$message({
  249 + message: res.msg,
  250 + type: 'error'
  251 + })
  252 + }
  253 +
  254 + })
  255 + },
  256 + removeinfozz(row, e, tit) {
  257 + let that = this
  258 + this.$confirm('确定要' + tit + '吗？', '提示', {
  259 + confirmButtonText: '确定',
  260 + cancelButtonText: '取消',
  261 + type: 'warning'
  262 + }).then(() => {
  263 + AdvertiserInfoEdit({
  264 + id: row.id,
  265 + auditStatus: e
  266 + }).then(res => {
  267 + console.error(res)
  268 + if (res.code == 200) {
  269 + this.$message({
  270 + message: tit + '成功',
  271 + type: 'success'
  272 + })
  273 + this.removeonaction('1')
  274 + } else {
  275 + this.$message({
  276 + message: res.msg,
  277 + type: 'error'
  278 + })
  279 + }
  280 +
  281 + })
  282 + })
  283 + },
197 minSev(e) { 284 minSev(e) {
198 this.multipleSelection = e 285 this.multipleSelection = e
199 console.error(this.multipleSelection) 286 console.error(this.multipleSelection)
@@ -241,12 +328,12 @@ @@ -241,12 +328,12 @@
241 chenge(val) { 328 chenge(val) {
242 if (val == 1) { 329 if (val == 1) {
243 this.leixing = true 330 this.leixing = true
244 - this.pagequery.advertisingType = '线上广告位'  
245 - this.getAll((this.pagequery)) 331 + this.pagequery.advertisingSpaceType = '线上广告位'
  332 + this.getAll()
246 } else { 333 } else {
247 this.leixing = false 334 this.leixing = false
248 - this.pagequery.advertisingType = '实体广告位'  
249 - this.getAll((this.pagequery)) 335 + this.pagequery.advertisingSpaceType = '实体广告位'
  336 + this.getAll()
250 } 337 }
251 }, 338 },
252 gettime() { 339 gettime() {
@@ -286,36 +373,10 @@ @@ -286,36 +373,10 @@
286 return formattedDateTime 373 return formattedDateTime
287 374
288 }, 375 },
289 - removeinfozz(row, e, tit) {  
290 - let that = this  
291 - this.$confirm('确定要' + tit + '吗？', '提示', {  
292 - confirmButtonText: '确定',  
293 - cancelButtonText: '取消',  
294 - type: 'warning'  
295 - }).then(() => {  
296 - editList({  
297 - ...row,  
298 - publishStatus: e  
299 - }).then(res => {  
300 - console.error(res)  
301 - if (res.code == 200) {  
302 - this.$message({  
303 - message: tit + '成功',  
304 - type: 'success'  
305 - })  
306 - this.removeonaction('1')  
307 - } else {  
308 - this.$message({  
309 - message: res.msg,  
310 - type: 'error'  
311 - })  
312 - }  
313 -  
314 - })  
315 - })  
316 - },  
317 - details(row) { 376 + details(row,type) {
318 this.detailsinfo = row 377 this.detailsinfo = row
  378 + this.issp = type
  379 + // console.error(this.detailsinfo)
319 this.onaction = '3' 380 this.onaction = '3'
320 }, 381 },
321 removeinfo(row, e) { 382 removeinfo(row, e) {
@@ -343,11 +404,12 @@ @@ -343,11 +404,12 @@
343 this.onaction = '4' 404 this.onaction = '4'
344 }, 405 },
345 async getAll() { 406 async getAll() {
  407 + // console.error({...this.pagequery})
346 const res = await AdvertiserInfoGetAll(this.pagequery) 408 const res = await AdvertiserInfoGetAll(this.pagequery)
347 this.tableData = res.data.content 409 this.tableData = res.data.content
348 this.total = res.data.totalElements 410 this.total = res.data.totalElements
349 let obj1 = { 411 let obj1 = {
350 - pageNumber: 1, 412 + pageNumber: 0,
351 pageSize: 10, 413 pageSize: 10,
352 advertisingSpaceType: '线上广告位' 414 advertisingSpaceType: '线上广告位'
353 } 415 }
@@ -355,7 +417,7 @@ @@ -355,7 +417,7 @@
355 this.xsNum = res1.data.totalElements 417 this.xsNum = res1.data.totalElements
356 }) 418 })
357 let obj2 = { 419 let obj2 = {
358 - pageNumber: 1, 420 + pageNumber: 0,
359 pageSize: 10, 421 pageSize: 10,
360 advertisingSpaceType: '实体广告位' 422 advertisingSpaceType: '实体广告位'
361 } 423 }
@@ -384,9 +446,12 @@ @@ -384,9 +446,12 @@
384 //重置按钮 446 //重置按钮
385 resetting() { 447 resetting() {
386 this.pagequery = { 448 this.pagequery = {
387 - pageNumber: 0,  
388 - pageSize: 10,  
389 - advertisingName:'' 449 + pageNumber: 0,
  450 + pageSize: 10,
  451 + advertisingSpaceType: this.pagequery.advertisingSpaceType,
  452 + id:'',
  453 + affiliation:'',
  454 + applicant:'',
390 }, 455 },
391 this.getAll() 456 this.getAll()
392 }, 457 },
admin-web-master/src/views/detect/admap.vue
  View file @9b392fc
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 </div> 44 </div>
45 </div> 45 </div>
46 <!-- 表格 --> 46 <!-- 表格 -->
47 - <el-table v-if="ontype=='1'" :data="tableData" 47 + <el-table v-if="ontype=='1'" :data="tableData"
48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
49 <el-table-column label="序号" width="50"> 49 <el-table-column label="序号" width="50">
50 <template slot-scope="scope"> 50 <template slot-scope="scope">
@@ -59,11 +59,11 @@ @@ -59,11 +59,11 @@
59 </el-table-column> 59 </el-table-column>
60 <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip> 60 <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
61 </el-table-column> 61 </el-table-column>
62 - <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip> 62 + <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
63 </el-table-column> 63 </el-table-column>
64 - <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip> 64 + <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
65 <template slot-scope="scope"> 65 <template slot-scope="scope">
66 - {{scope.row.actualUsableArea || '无'}} 66 + {{scope.row.belongingDepartment || '无'}}
67 </template> 67 </template>
68 </el-table-column> 68 </el-table-column>
69 <el-table-column label="负责人" prop="head" show-overflow-tooltip> 69 <el-table-column label="负责人" prop="head" show-overflow-tooltip>
@@ -71,39 +71,41 @@ @@ -71,39 +71,41 @@
71 {{scope.row.head || '无'}} 71 {{scope.row.head || '无'}}
72 </template> 72 </template>
73 </el-table-column> 73 </el-table-column>
74 - <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>  
75 - </el-table-column> 74 + <el-table-column label="发布时间" prop="createDate"> </el-table-column>
76 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 75 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
77 <template slot-scope="scope"> 76 <template slot-scope="scope">
78 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 77 + {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
79 </template> 78 </template>
80 </el-table-column> 79 </el-table-column>
81 <el-table-column label="操作" min-width="100" fixed="right"> 80 <el-table-column label="操作" min-width="100" fixed="right">
82 <template slot-scope="scope"> 81 <template slot-scope="scope">
83 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 82 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
84 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 83 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  84 + @click="removeinfo(scope.row,'编辑')">编辑
85 </div> 85 </div>
86 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>  
87 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"  
88 - @click="opencl(scope.row,'sp')">发布</div>  
89 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"  
90 - @click="removeinfozz(scope.row,'2','下架')">下架</div> 86 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  87 + @click="closemsg(scope.row)">删除</div>
  88 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  89 + @click="opencl(scope.row,'sp')">发布</div>
  90 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  91 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
91 </template> 92 </template>
92 </el-table-column> 93 </el-table-column>
93 </el-table> 94 </el-table>
94 - <el-table v-if="ontype=='2'" :data="tableData" 95 + <el-table v-if="ontype=='2'" :data="tableData"
95 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 96 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
96 <el-table-column label="序号" width="50"> 97 <el-table-column label="序号" width="50">
97 <template slot-scope="scope"> 98 <template slot-scope="scope">
98 {{scope.$index +1}} 99 {{scope.$index +1}}
99 </template> 100 </template>
100 </el-table-column> 101 </el-table-column>
101 - <el-table-column label="广告位名称" prop="advertisingName"> 102 + <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip>
102 </el-table-column> 103 </el-table-column>
103 - <el-table-column label="广告位类型" prop="advertisingType" > 104 + <el-table-column label="广告位类型" prop="advertisingType" show-overflow-tooltip>
104 </el-table-column> 105 </el-table-column>
105 - <el-table-column label="广告尺寸" prop="dimensions" show-overflow-tooltip></el-table-column>  
106 - <el-table-column prop="publishStatus" label="发布状态" > 106 + <el-table-column label="创建人" prop="createUser"> </el-table-column>
  107 + <el-table-column label="发布时间" prop="createDate"> </el-table-column>
  108 + <!-- <el-table-column prop="publishStatus" label="发布状态" >
107 <template slot-scope="scope"> 109 <template slot-scope="scope">
108 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 110 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
109 </template> 111 </template>
@@ -121,9 +123,28 @@ @@ -121,9 +123,28 @@
121 <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" 123 <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
122 @click="removeinfozz(scope.row,'2','下架')">下架</div> 124 @click="removeinfozz(scope.row,'2','下架')">下架</div>
123 </template> 125 </template>
  126 + </el-table-column> -->
  127 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  128 + <template slot-scope="scope">
  129 + {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
  130 + </template>
  131 + </el-table-column>
  132 + <el-table-column label="操作" min-width="100" fixed="right">
  133 + <template slot-scope="scope">
  134 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  135 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  136 + @click="removeinfo(scope.row,'编辑')">编辑
  137 + </div>
  138 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  139 + @click="closemsg(scope.row)">删除</div>
  140 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  141 + @click="opencl(scope.row,'gg')">发布</div>
  142 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  143 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  144 + </template>
124 </el-table-column> 145 </el-table-column>
125 </el-table> 146 </el-table>
126 - <el-table v-if="ontype=='3'" :data="tableData" 147 + <el-table v-if="ontype=='3'" :data="tableData"
127 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 148 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
128 <el-table-column label="序号" width="50"> 149 <el-table-column label="序号" width="50">
129 <template slot-scope="scope"> 150 <template slot-scope="scope">
@@ -140,7 +161,7 @@ @@ -140,7 +161,7 @@
140 </el-table-column> 161 </el-table-column>
141 <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip> 162 <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>
142 </el-table-column> 163 </el-table-column>
143 - <el-table-column prop="publishStatus" label="发布状态"> 164 + <!-- <el-table-column prop="publishStatus" label="发布状态">
144 <template slot-scope="scope"> 165 <template slot-scope="scope">
145 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 166 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
146 </template> 167 </template>
@@ -151,11 +172,29 @@ @@ -151,11 +172,29 @@
151 <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑 172 <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
152 </div> 173 </div>
153 <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> 174 <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
154 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"  
155 - @click="opencl(scope.row,'cd')">发布</div> 175 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="opencl(scope.row,'cd')">发布</div>
156 <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" 176 <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
157 @click="removeinfozz(scope.row,'2','下架')">下架</div> 177 @click="removeinfozz(scope.row,'2','下架')">下架</div>
158 </template> 178 </template>
  179 + </el-table-column> -->
  180 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  181 + <template slot-scope="scope">
  182 + {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
  183 + </template>
  184 + </el-table-column>
  185 + <el-table-column label="操作" min-width="100" fixed="right">
  186 + <template slot-scope="scope">
  187 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  188 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  189 + @click="removeinfo(scope.row,'编辑')">编辑
  190 + </div>
  191 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  192 + @click="closemsg(scope.row)">删除</div>
  193 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  194 + @click="opencl(scope.row,'cd')">发布</div>
  195 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  196 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  197 + </template>
159 </el-table-column> 198 </el-table-column>
160 </el-table> 199 </el-table>
161 <div style="display: flex;justify-content: space-between;" class="bom"> 200 <div style="display: flex;justify-content: space-between;" class="bom">
@@ -177,8 +216,9 @@ @@ -177,8 +216,9 @@
177 216
178 <div class="zhuti" v-if="onaction == '2'"> 217 <div class="zhuti" v-if="onaction == '2'">
179 <div style="height:58px;line-height:58px;"> 218 <div style="height:58px;line-height:58px;">
180 - <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span  
181 - style="color:#000000e6">新增</span></div> 219 + <div style="color:#0006">
  220 + <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
  221 + style="padding:0 5px;">></span> <span style="color:#000000e6">新增</span></div>
182 </div> 222 </div>
183 <div style="margin: 0 0;"> 223 <div style="margin: 0 0;">
184 <div style="display: flex;font-size: 14px"> 224 <div style="display: flex;font-size: 14px">
@@ -202,8 +242,9 @@ @@ -202,8 +242,9 @@
202 </div> 242 </div>
203 <div class="zhuti" v-if="onaction == '3'"> 243 <div class="zhuti" v-if="onaction == '3'">
204 <div style="height:58px;line-height:58px;"> 244 <div style="height:58px;line-height:58px;">
205 - <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span  
206 - style="color:#000000e6">查看</span></div> 245 + <div style="color:#0006">
  246 + <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
  247 + style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span></div>
207 </div> 248 </div>
208 <div v-if="ontype == '1'"> 249 <div v-if="ontype == '1'">
209 <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity> 250 <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
@@ -217,8 +258,9 @@ @@ -217,8 +258,9 @@
217 </div> 258 </div>
218 <div class="zhuti" v-if="onaction == '4'"> 259 <div class="zhuti" v-if="onaction == '4'">
219 <div style="height:58px;line-height:58px;"> 260 <div style="height:58px;line-height:58px;">
220 - <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span style="padding:0 5px;">></span> <span  
221 - style="color:#000000e6">{{contractChangeReason}}</span></div> 261 + <div style="color:#0006">
  262 + <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-' }}</span> <span
  263 + style="padding:0 5px;">></span> <span style="color:#000000e6">{{contractChangeReason}}</span></div>
222 </div> 264 </div>
223 <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;"> 265 <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
224 <add :info="detailsinfo" @removeonaction="removeonaction"></add> 266 <add :info="detailsinfo" @removeonaction="removeonaction"></add>
@@ -230,8 +272,8 @@ @@ -230,8 +272,8 @@
230 <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd> 272 <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd>
231 </div> 273 </div>
232 </div> 274 </div>
233 - <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center  
234 - :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> 275 + <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
  276 + :close-on-press-escape="false" :show-close="false">
235 <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl> 277 <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
236 </el-dialog> 278 </el-dialog>
237 </div> 279 </div>
@@ -241,7 +283,9 @@ @@ -241,7 +283,9 @@
241 283
242 <script> 284 <script>
243 import { 285 import {
244 - cereResourceStrategy,editStatus 286 + cereResourceStrategy,
  287 + editStatus,
  288 + cereBusinessOperationadd
245 } from '../../api/newly.js' 289 } from '../../api/newly.js'
246 import { 290 import {
247 ceGetAll 291 ceGetAll
@@ -262,12 +306,12 @@ @@ -262,12 +306,12 @@
262 import addcd from '../../components/add/addcd' 306 import addcd from '../../components/add/addcd'
263 import chakanmap from '../../components/chakan/map' 307 import chakanmap from '../../components/chakan/map'
264 import chakancd from '../../components/chakan/cd' 308 import chakancd from '../../components/chakan/cd'
265 - import cl from '@/components/change/cl.vue'  
266 - import mapchakannew from '@/components/newmap/map' 309 + import cl from '@/components/change/cl.vue'
  310 + import mapchakannew from '@/components/newmap/map'
267 export default { 311 export default {
268 data() { 312 data() {
269 return { 313 return {
270 - name:'', 314 + name: '',
271 oninfo: {}, 315 oninfo: {},
272 celueData: [], 316 celueData: [],
273 clData: [], 317 clData: [],
@@ -317,7 +361,7 @@ @@ -317,7 +361,7 @@
317 } 361 }
318 console.error(this.oninfo) 362 console.error(this.oninfo)
319 let c1 = { 363 let c1 = {
320 - resourcesId: this.oncetype+this.oninfo.id, 364 + resourcesId: this.oncetype + this.oninfo.id,
321 rentalPoliciesIds: ids, 365 rentalPoliciesIds: ids,
322 } 366 }
323 console.error(c1) 367 console.error(c1)
@@ -329,11 +373,19 @@ @@ -329,11 +373,19 @@
329 type: 'success' 373 type: 'success'
330 }) 374 })
331 editStatus({ 375 editStatus({
332 - resourcesId: this.oncetype+this.oninfo.id,  
333 - publishStatus: '3' 376 + resourcesId: this.oncetype + this.oninfo.id,
  377 + publishStatus: '1'
334 }).then(res => { 378 }).then(res => {
335 this.onSubmit() 379 this.onSubmit()
336 }) 380 })
  381 + cereBusinessOperationadd({
  382 + type: '发布',
  383 + resourceId: this.oncetype + this.oninfo.id,
  384 + operator: localStorage.getItem('roleName'),
  385 + operationTime: this.gettime()
  386 + }).then(res => {
  387 + console.error(res)
  388 + })
337 } else { 389 } else {
338 this.$message({ 390 this.$message({
339 message: '绑定失败', 391 message: '绑定失败',
@@ -346,7 +398,7 @@ @@ -346,7 +398,7 @@
346 this.multipleSelection = [] 398 this.multipleSelection = []
347 this.addcl = false 399 this.addcl = false
348 }, 400 },
349 - async opencl(row,e) { 401 + async opencl(row, e) {
350 this.oncetype = e 402 this.oncetype = e
351 this.oninfo = row 403 this.oninfo = row
352 this.multipleSelection = [] 404 this.multipleSelection = []
@@ -413,6 +465,14 @@ @@ -413,6 +465,14 @@
413 type: 'success' 465 type: 'success'
414 }) 466 })
415 this.removeonaction('1') 467 this.removeonaction('1')
  468 + cereBusinessOperationadd({
  469 + type: tit,
  470 + resourceId: 'sp' + row.id,
  471 + operator: localStorage.getItem('roleName'),
  472 + operationTime: that.gettime()
  473 + }).then(res => {
  474 + console.error(res)
  475 + })
416 } else { 476 } else {
417 this.$message({ 477 this.$message({
418 message: res.msg, 478 message: res.msg,
@@ -432,6 +492,14 @@ @@ -432,6 +492,14 @@
432 type: 'success' 492 type: 'success'
433 }) 493 })
434 this.removeonaction('1') 494 this.removeonaction('1')
  495 + cereBusinessOperationadd({
  496 + type: tit,
  497 + resourceId: 'gg' + row.id,
  498 + operator: localStorage.getItem('roleName'),
  499 + operationTime: that.gettime()
  500 + }).then(res => {
  501 + console.error(res)
  502 + })
435 } else { 503 } else {
436 this.$message({ 504 this.$message({
437 message: res.msg, 505 message: res.msg,
@@ -451,6 +519,14 @@ @@ -451,6 +519,14 @@
451 type: 'success' 519 type: 'success'
452 }) 520 })
453 this.removeonaction('1') 521 this.removeonaction('1')
  522 + cereBusinessOperationadd({
  523 + type: tit,
  524 + resourceId: 'cd' + row.id,
  525 + operator: localStorage.getItem('roleName'),
  526 + operationTime: that.gettime()
  527 + }).then(res => {
  528 + console.error(res)
  529 + })
454 } else { 530 } else {
455 this.$message({ 531 this.$message({
456 message: res.msg, 532 message: res.msg,
@@ -473,15 +549,24 @@ @@ -473,15 +549,24 @@
473 }, 549 },
474 async getAll() { 550 async getAll() {
475 if (this.ontype == '1') { 551 if (this.ontype == '1') {
476 - const res = await getAlls({...this.pagequery,shopName:this.name}) 552 + const res = await getAlls({
  553 + ...this.pagequery,
  554 + shopName: this.name
  555 + })
477 this.tableData = res.data.content 556 this.tableData = res.data.content
478 this.total = res.data.totalElements 557 this.total = res.data.totalElements
479 } else if (this.ontype == '2') { 558 } else if (this.ontype == '2') {
480 - const res = await likeGet({...this.pagequery,advertisingName:this.name}) 559 + const res = await likeGet({
  560 + ...this.pagequery,
  561 + advertisingName: this.name
  562 + })
481 this.tableData = res.data.content 563 this.tableData = res.data.content
482 this.total = res.data.totalElements 564 this.total = res.data.totalElements
483 } else if (this.ontype == '3') { 565 } else if (this.ontype == '3') {
484 - const res = await changAlls({...this.pagequery,venueName:this.name}) 566 + const res = await changAlls({
  567 + ...this.pagequery,
  568 + venueName: this.name
  569 + })
485 this.tableData = res.data.content 570 this.tableData = res.data.content
486 this.total = res.data.totalElements 571 this.total = res.data.totalElements
487 } 572 }
@@ -515,7 +600,7 @@ @@ -515,7 +600,7 @@
515 pageSize: 10, 600 pageSize: 10,
516 }, 601 },
517 this.name = '' 602 this.name = ''
518 - this.getAll() 603 + this.getAll()
519 }, 604 },
520 //删除 605 //删除
521 closemsg(item) { 606 closemsg(item) {
@@ -625,6 +710,7 @@ @@ -625,6 +710,7 @@
625 font-size: 14px; 710 font-size: 14px;
626 justify-content: space-between; 711 justify-content: space-between;
627 } 712 }
  713 +
628 .zhuti { 714 .zhuti {
629 padding: 0 20px 20px 20px; 715 padding: 0 20px 20px 20px;
630 min-height: calc(100vh - 50px - 20px); 716 min-height: calc(100vh - 50px - 20px);
@@ -637,18 +723,19 @@ @@ -637,18 +723,19 @@
637 padding-bottom: 4px; 723 padding-bottom: 4px;
638 color: #3F9B6A; 724 color: #3F9B6A;
639 } 725 }
  726 +
640 .tableBtn { 727 .tableBtn {
641 display: inline-block; 728 display: inline-block;
642 margin-right: 10px; 729 margin-right: 10px;
643 cursor: pointer; 730 cursor: pointer;
644 } 731 }
  732 +
645 ::v-deep .el-dialog__body { 733 ::v-deep .el-dialog__body {
646 padding: 0 0 !important; 734 padding: 0 0 !important;
647 } 735 }
648 - .el-dialog__header{ 736 +
  737 + .el-dialog__header {
649 padding: 0; 738 padding: 0;
650 display: none; 739 display: none;
651 } 740 }
652 </style> 741 </style>
653 -  
654 -  
admin-web-master/src/views/detect/examine/index.vue
  View file @9b392fc
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <!-- 线上 --> 8 <!-- 线上 -->
9 <div> 9 <div>
10 <!-- 搜索 --> 10 <!-- 搜索 -->
11 - <div class="formSearch"> 11 + <!-- <div class="formSearch">
12 <el-form :inline="true"> 12 <el-form :inline="true">
13 <el-form-item label="资源名称" prop="name"> 13 <el-form-item label="资源名称" prop="name">
14 <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input> 14 <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input>
@@ -17,8 +17,7 @@ @@ -17,8 +17,7 @@
17 <el-input v-model="clName" placeholder="请输入" maxlength="50"></el-input> 17 <el-input v-model="clName" placeholder="请输入" maxlength="50"></el-input>
18 </el-form-item> 18 </el-form-item>
19 <el-form-item label="审核状态" prop="publishStatus"> 19 <el-form-item label="审核状态" prop="publishStatus">
20 - <el-select v-model="publishStatus" placeholder="请选择"  
21 - style="width: 168px;margin-right: 15px"> 20 + <el-select v-model="publishStatus" placeholder="请选择" style="width: 168px;margin-right: 15px">
22 <el-option label="待审核" value="3"></el-option> 21 <el-option label="待审核" value="3"></el-option>
23 </el-select> 22 </el-select>
24 </el-form-item> 23 </el-form-item>
@@ -31,7 +30,7 @@ @@ -31,7 +30,7 @@
31 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置 30 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
32 </el-button> 31 </el-button>
33 </div> 32 </div>
34 - </div> 33 + </div> -->
35 <div style="margin-bottom: 20px;"> 34 <div style="margin-bottom: 20px;">
36 <div style="display: flex;font-size: 14px"> 35 <div style="display: flex;font-size: 14px">
37 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺 36 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
@@ -43,8 +42,7 @@ @@ -43,8 +42,7 @@
43 </div> 42 </div>
44 </div> 43 </div>
45 <!-- 表格 --> 44 <!-- 表格 -->
46 - <!-- -->  
47 - <el-table v-if="ontype=='1'" :span-method="objectSpanMethod" :data="tableData" 45 + <el-table v-if="ontype=='1'" :span-method="tableSpanMethod" :data="tableData"
48 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 46 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
49 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip> 47 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
50 <template slot-scope="scope"> 48 <template slot-scope="scope">
@@ -56,9 +54,11 @@ @@ -56,9 +54,11 @@
56 {{scope.row.cereBasicInformationShop.detailedLocation}} 54 {{scope.row.cereBasicInformationShop.detailedLocation}}
57 </template> 55 </template>
58 </el-table-column> 56 </el-table-column>
59 - <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip> 57 + <el-table-column label="商铺类型" prop="shopType" show-overflow-tooltip>
60 <template slot-scope="scope"> 58 <template slot-scope="scope">
61 - {{scope.row.cereBasicInformationShop.actualUsableArea}} 59 + <div class="duiqi">
  60 + {{scope.row.cereBasicInformationShop.shopType=='1'?'移动铺位':scope.row.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}
  61 + </div>
62 </template> 62 </template>
63 </el-table-column> 63 </el-table-column>
64 <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip> 64 <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
@@ -78,21 +78,18 @@ @@ -78,21 +78,18 @@
78 </el-table-column> 78 </el-table-column>
79 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 79 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
80 <template slot-scope="scope"> 80 <template slot-scope="scope">
81 - {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='2'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='3'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='4'?'驳回':'-'}} 81 + {{scope.row.cereBasicInformationShop.publishStatus=='0'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':'-'}}
82 </template> 82 </template>
83 </el-table-column> 83 </el-table-column>
84 - <el-table-column label="操作" fixed="right"> 84 + <el-table-column label="操作" fixed="right" prop="sh">
85 <template slot-scope="scope"> 85 <template slot-scope="scope">
86 <div @click="details(scope.row.cereBasicInformationShop,'1')" class="tableBtn greens">查看</div> 86 <div @click="details(scope.row.cereBasicInformationShop,'1')" class="tableBtn greens">查看</div>
87 - <div @click="details(scope.row.cereBasicInformationShop,'2')" class="tableBtn greens">审核</div>  
88 - <!-- <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens"  
89 - @click="removeinfozz(scope.row.cereBasicInformationShop,'1','通过')">通过</div>  
90 - <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens"  
91 - @click="removeinfozz(scope.row.cereBasicInformationShop,'4','驳回')">驳回</div> --> 87 + <div v-if="scope.row.cereBasicInformationShop.publishStatus=='1'"
  88 + @click="details(scope.row.cereBasicInformationShop,'2')" class="tableBtn greens">审核</div>
92 </template> 89 </template>
93 </el-table-column> 90 </el-table-column>
94 </el-table> 91 </el-table>
95 - <el-table v-if="ontype=='2'" :span-method="objectSpanMethod" :data="tableData" 92 + <el-table v-if="ontype=='2'" :span-method="tableSpanMethod" :data="tableData"
96 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 93 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
97 <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip> 94 <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip>
98 <template slot-scope="scope"> 95 <template slot-scope="scope">
@@ -126,22 +123,18 @@ @@ -126,22 +123,18 @@
126 </el-table-column> 123 </el-table-column>
127 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 124 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
128 <template slot-scope="scope"> 125 <template slot-scope="scope">
129 - {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'待发布':scope.row.cereAdvertisingInformation.publishStatus=='1'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='2'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='3'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='4'?'驳回':'-'}} 126 + {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':'-'}}
130 </template> 127 </template>
131 </el-table-column> 128 </el-table-column>
132 -  
133 - <el-table-column label="操作" fixed="right"> 129 + <el-table-column label="操作" fixed="right" prop="sh">
134 <template slot-scope="scope"> 130 <template slot-scope="scope">
135 - <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">查看</div>  
136 - <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">审核</div>  
137 - <!-- <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens"  
138 - @click="removeinfozz(scope.row.cereAdvertisingInformation,'1','通过')">通过</div>  
139 - <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens"  
140 - @click="removeinfozz(scope.row.cereAdvertisingInformation,'4','驳回')">驳回</div> --> 131 + <div @click="details(scope.row.cereAdvertisingInformation,'1')" class="tableBtn greens">查看</div>
  132 + <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='1'"
  133 + @click="details(scope.row.cereAdvertisingInformation,'2')" class="tableBtn greens">审核</div>
141 </template> 134 </template>
142 </el-table-column> 135 </el-table-column>
143 </el-table> 136 </el-table>
144 - <el-table v-if="ontype=='3'" :span-method="objectSpanMethod" :data="tableData" 137 + <el-table v-if="ontype=='3'" :span-method="tableSpanMethod" :data="tableData"
145 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"> 138 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
146 <el-table-column label="场地名称" prop="venueName" show-overflow-tooltip> 139 <el-table-column label="场地名称" prop="venueName" show-overflow-tooltip>
147 <template slot-scope="scope"> 140 <template slot-scope="scope">
@@ -175,25 +168,23 @@ @@ -175,25 +168,23 @@
175 </el-table-column> 168 </el-table-column>
176 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 169 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
177 <template slot-scope="scope"> 170 <template slot-scope="scope">
178 - {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'待发布':scope.row.cereBasicInformationVenue.publishStatus=='1'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='2'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='3'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='4'?'驳回':'-'}} 171 + {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':'-'}}
179 </template> 172 </template>
180 </el-table-column> 173 </el-table-column>
181 - <el-table-column label="操作" fixed="right"> 174 + <el-table-column label="操作" fixed="right" prop="sh">
182 <template slot-scope="scope"> 175 <template slot-scope="scope">
183 - <div @click="details(scope.row.cereBasicInformationVenue)" class="tableBtn greens">查看</div>  
184 - <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='3'" class="tableBtn greens"  
185 - @click="removeinfozz(scope.row.cereBasicInformationVenue,'1','通过')">通过</div>  
186 - <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='3'" class="tableBtn greens"  
187 - @click="removeinfozz(scope.row.cereBasicInformationVenue,'4','驳回')">驳回</div> 176 + <div @click="details(scope.row.cereBasicInformationVenue,'1')" class="tableBtn greens">查看</div>
  177 + <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='1'"
  178 + @click="details(scope.row.cereBasicInformationVenue,'2')" class="tableBtn greens">审核</div>
188 </template> 179 </template>
189 </el-table-column> 180 </el-table-column>
190 </el-table> 181 </el-table>
191 - <div v-if="total>0" style="display: flex;justify-content: space-between;" class="bom"> 182 + <div v-if="false" style="display: flex;justify-content: space-between;" class="bom">
192 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div> 183 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
193 - <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10" 184 + <!-- <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
194 background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange" 185 background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
195 @current-change="handleCurrentChange"> 186 @current-change="handleCurrentChange">
196 - </el-pagination> 187 + </el-pagination> -->
197 </div> 188 </div>
198 189
199 </div> 190 </div>
@@ -306,10 +297,10 @@ @@ -306,10 +297,10 @@
306 export default { 297 export default {
307 data() { 298 data() {
308 return { 299 return {
309 - issp:'1',  
310 - publishStatus:'',  
311 - clName:'',  
312 - name:'', 300 + issp: '1',
  301 + publishStatus: '',
  302 + clName: '',
  303 + name: '',
313 oninfo: {}, 304 oninfo: {},
314 celueData: [], 305 celueData: [],
315 clData: [], 306 clData: [],
@@ -322,7 +313,7 @@ @@ -322,7 +313,7 @@
322 contractChangeReason: '', 313 contractChangeReason: '',
323 detailsinfo: {}, 314 detailsinfo: {},
324 pagequery: { 315 pagequery: {
325 - publishStatus: '3', 316 + publishStatus: '1',
326 pageNumber: 0, 317 pageNumber: 0,
327 pageSize: 10, 318 pageSize: 10,
328 }, 319 },
@@ -350,44 +341,33 @@ @@ -350,44 +341,33 @@
350 this.getAll() 341 this.getAll()
351 }, 342 },
352 methods: { 343 methods: {
353 - objectSpanMethod({  
354 - row,  
355 - column,  
356 - rowIndex,  
357 - columnIndex  
358 - }) {  
359 -  
360 - if (columnIndex != 3 && columnIndex != 4 && columnIndex != 5) {  
361 - if (row.num % 2 == 0) {  
362 - if (rowIndex % row.num === 0) {  
363 - return {  
364 - rowspan: row.num,  
365 - colspan: 1  
366 - };  
367 - } else {  
368 - return {  
369 - rowspan: 0,  
370 - colspan: 0  
371 - };  
372 - } 344 + /**
  345 + * 表格行合并逻辑
  346 + */
  347 + tableSpanMethod({ row, column, rowIndex }) {
  348 + if (["shopName", "detailedLocation", "shopType", "publishStatus", "sh","advertisingName","advertisingType","affiliation","venueName","venueType","actualUsableArea"].includes(column.property)) {
  349 + // 判断 num 是否相同，合并行
  350 + const num = row.num;
  351 + const startRowIndex = this.findStartRowIndex(rowIndex, num);
  352 +
  353 + return startRowIndex === rowIndex
  354 + ? { rowspan: num, colspan: 1 }
  355 + : { rowspan: 0, colspan: 0 };
  356 + }
  357 + },
  358 + /**
  359 + * 查找当前行的 num 对应的起始行索引
  360 + */
  361 + findStartRowIndex(rowIndex, num) {
  362 + let startRowIndex = rowIndex;
  363 + for (let i = rowIndex - 1; i >= 0; i--) {
  364 + if (this.tableData[i].num === num) {
  365 + startRowIndex = i;
373 } else { 366 } else {
374 -  
375 - if ((rowIndex+1) % row.num === 0) {  
376 - return {  
377 - rowspan: row.num,  
378 - colspan: 1  
379 - };  
380 - } else {  
381 - console.error(rowIndex)  
382 - return {  
383 - rowspan: 0,  
384 - colspan: 0  
385 - };  
386 - } 367 + break;
387 } 368 }
388 -  
389 } 369 }
390 - 370 + return startRowIndex;
391 }, 371 },
392 minSev(e) { 372 minSev(e) {
393 this.multipleSelection = e 373 this.multipleSelection = e
@@ -543,7 +523,7 @@ @@ -543,7 +523,7 @@
543 523
544 }) 524 })
545 }, 525 },
546 - details(row,e) { 526 + details(row, e) {
547 this.issp = e 527 this.issp = e
548 this.detailsinfo = row 528 this.detailsinfo = row
549 this.onaction = '3' 529 this.onaction = '3'
@@ -554,11 +534,14 @@ @@ -554,11 +534,14 @@
554 this.onaction = '4' 534 this.onaction = '4'
555 }, 535 },
556 async getAll() { 536 async getAll() {
  537 + this.tableData = []
  538 + let list = []
557 if (this.ontype == '1') { 539 if (this.ontype == '1') {
558 const res = await getResourceStrategy({ 540 const res = await getResourceStrategy({
559 ...this.pagequery, 541 ...this.pagequery,
560 resourcesId: 'sp', 542 resourcesId: 'sp',
561 - shopName:this.name 543 + shopName: this.name,
  544 + publishStatus: '1'
562 }) 545 })
563 let c1 = [] 546 let c1 = []
564 for (let index = 0; index < res.data.length; index++) { 547 for (let index = 0; index < res.data.length; index++) {
@@ -566,7 +549,7 @@ @@ -566,7 +549,7 @@
566 if (element.cereBasicInformationShop.id) { 549 if (element.cereBasicInformationShop.id) {
567 for (let i = 0; i < element.cereRentalPolicies.length; i++) { 550 for (let i = 0; i < element.cereRentalPolicies.length; i++) {
568 var element1 = element.cereRentalPolicies[i]; 551 var element1 = element.cereRentalPolicies[i];
569 - 552 +
570 var obj = { 553 var obj = {
571 cereBasicInformationShop: element.cereBasicInformationShop, 554 cereBasicInformationShop: element.cereBasicInformationShop,
572 num: element.cereRentalPolicies.length, 555 num: element.cereRentalPolicies.length,
@@ -576,14 +559,39 @@ @@ -576,14 +559,39 @@
576 } 559 }
577 } 560 }
578 } 561 }
579 - this.tableData = c1  
580 - console.error(this.tableData)  
581 - this.total = res.data.total 562 + list = c1
  563 + // 已审核
  564 + const res1 = await getResourceStrategy({
  565 + ...this.pagequery,
  566 + resourcesId: 'sp',
  567 + shopName: this.name,
  568 + publishStatus: '2',
  569 + })
  570 + let c2 = []
  571 + for (let index = 0; index < res1.data.length; index++) {
  572 + const element = res1.data[index];
  573 + if (element.cereBasicInformationShop.id) {
  574 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  575 + var element1 = element.cereRentalPolicies[i];
  576 +
  577 + var obj = {
  578 + cereBasicInformationShop: element.cereBasicInformationShop,
  579 + num: element.cereRentalPolicies.length,
  580 + shopinfo: element1
  581 + };
  582 + c2.push(obj);
  583 + }
  584 + }
  585 + }
  586 + list = [...list, ...c2]
  587 + this.tableData = list
  588 + console.log(this.tableData);
582 } else if (this.ontype == '2') { 589 } else if (this.ontype == '2') {
583 const res = await getResourceStrategy({ 590 const res = await getResourceStrategy({
584 ...this.pagequery, 591 ...this.pagequery,
585 resourcesId: 'gg', 592 resourcesId: 'gg',
586 - advertisingName:this.name 593 + advertisingName: this.name,
  594 + publishStatus: '1'
587 }) 595 })
588 let c1 = [] 596 let c1 = []
589 for (let index = 0; index < res.data.length; index++) { 597 for (let index = 0; index < res.data.length; index++) {
@@ -591,7 +599,7 @@ @@ -591,7 +599,7 @@
591 if (element.cereAdvertisingInformation.id) { 599 if (element.cereAdvertisingInformation.id) {
592 for (let i = 0; i < element.cereRentalPolicies.length; i++) { 600 for (let i = 0; i < element.cereRentalPolicies.length; i++) {
593 var element1 = element.cereRentalPolicies[i]; 601 var element1 = element.cereRentalPolicies[i];
594 - 602 +
595 var obj = { 603 var obj = {
596 cereAdvertisingInformation: element.cereAdvertisingInformation, 604 cereAdvertisingInformation: element.cereAdvertisingInformation,
597 num: element.cereRentalPolicies.length, 605 num: element.cereRentalPolicies.length,
@@ -601,14 +609,40 @@ @@ -601,14 +609,40 @@
601 } 609 }
602 } 610 }
603 } 611 }
604 - this.tableData = c1  
605 - console.error(this.tableData)  
606 - this.total = res.data.total 612 +
  613 + list = c1
  614 + // 已审核
  615 + const res1 = await getResourceStrategy({
  616 + ...this.pagequery,
  617 + resourcesId: 'gg',
  618 + advertisingName: this.name,
  619 + publishStatus: '2',
  620 + })
  621 + let c2 = []
  622 + for (let index = 0; index < res1.data.length; index++) {
  623 + const element = res1.data[index];
  624 + if (element.cereAdvertisingInformation.id) {
  625 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  626 + var element1 = element.cereRentalPolicies[i];
  627 +
  628 + var obj = {
  629 + cereAdvertisingInformation: element.cereAdvertisingInformation,
  630 + num: element.cereRentalPolicies.length,
  631 + shopinfo: element1
  632 + };
  633 + c2.push(obj);
  634 + }
  635 + }
  636 + }
  637 + list = [...list, ...c2]
  638 + this.tableData = list
  639 + console.log(this.tableData);
607 } else if (this.ontype == '3') { 640 } else if (this.ontype == '3') {
608 const res = await getResourceStrategy({ 641 const res = await getResourceStrategy({
609 ...this.pagequery, 642 ...this.pagequery,
610 resourcesId: 'cd', 643 resourcesId: 'cd',
611 - // venueName:this.name 644 + venueName:this.name,
  645 + publishStatus: '1'
612 }) 646 })
613 let c1 = [] 647 let c1 = []
614 for (let index = 0; index < res.data.length; index++) { 648 for (let index = 0; index < res.data.length; index++) {
@@ -616,7 +650,7 @@ @@ -616,7 +650,7 @@
616 if (element.cereBasicInformationVenue.id) { 650 if (element.cereBasicInformationVenue.id) {
617 for (let i = 0; i < element.cereRentalPolicies.length; i++) { 651 for (let i = 0; i < element.cereRentalPolicies.length; i++) {
618 var element1 = element.cereRentalPolicies[i]; 652 var element1 = element.cereRentalPolicies[i];
619 - 653 +
620 var obj = { 654 var obj = {
621 cereBasicInformationVenue: element.cereBasicInformationVenue, 655 cereBasicInformationVenue: element.cereBasicInformationVenue,
622 num: element.cereRentalPolicies.length, 656 num: element.cereRentalPolicies.length,
@@ -626,9 +660,33 @@ @@ -626,9 +660,33 @@
626 } 660 }
627 } 661 }
628 } 662 }
629 - this.tableData = c1  
630 - console.error(this.tableData)  
631 - this.total = res.data.total 663 + list = c1
  664 + // 已审核
  665 + const res1 = await getResourceStrategy({
  666 + ...this.pagequery,
  667 + resourcesId: 'cd',
  668 + venueName:this.name,
  669 + publishStatus: '2'
  670 + })
  671 + let c2 = []
  672 + for (let index = 0; index < res1.data.length; index++) {
  673 + const element = res1.data[index];
  674 + if (element.cereBasicInformationVenue.id) {
  675 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  676 + var element1 = element.cereRentalPolicies[i];
  677 +
  678 + var obj = {
  679 + cereBasicInformationVenue: element.cereBasicInformationVenue,
  680 + num: element.cereRentalPolicies.length,
  681 + shopinfo: element1
  682 + };
  683 + c2.push(obj);
  684 + }
  685 + }
  686 + }
  687 + list = [...list, ...c2]
  688 + this.tableData = list
  689 + console.log(this.tableData);
632 } 690 }
633 691
634 }, 692 },
admin-web-master/src/views/detect/information/index.vue
  View file @9b392fc
@@ -19,12 +19,6 @@ @@ -19,12 +19,6 @@
19 :key="index" :label="item.label" :value="item.value"></el-option> 19 :key="index" :label="item.label" :value="item.value"></el-option>
20 </el-select> 20 </el-select>
21 </el-form-item> 21 </el-form-item>
22 - <!-- <el-form-item label="所属绿道段" prop="belongingGreenwaySection">  
23 - <el-select v-model="pagequery.belongingGreenwaySection" placeholder="请选择">  
24 - <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"  
25 - :key="index"></el-option>  
26 - </el-select>  
27 - </el-form-item> -->  
28 <el-form-item label="归属部门" prop="belongingDepartment"> 22 <el-form-item label="归属部门" prop="belongingDepartment">
29 <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input> 23 <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
30 </el-form-item> 24 </el-form-item>
@@ -51,9 +45,6 @@ @@ -51,9 +45,6 @@
51 {{scope.$index +1 }} 45 {{scope.$index +1 }}
52 </template> 46 </template>
53 </el-table-column> 47 </el-table-column>
54 - <!-- <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip>  
55 -  
56 - </el-table-column> -->  
57 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column> 48 <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
58 <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip> 49 <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
59 <template slot-scope="scope"> 50 <template slot-scope="scope">
@@ -64,11 +55,6 @@ @@ -64,11 +55,6 @@
64 </el-table-column> 55 </el-table-column>
65 <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip> 56 <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
66 </el-table-column> 57 </el-table-column>
67 - <!-- <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>  
68 - <template slot-scope="scope">  
69 - {{scope.row.actualUsableArea || '无'}}  
70 - </template>  
71 - </el-table-column> -->  
72 <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip> 58 <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
73 <template slot-scope="scope"> 59 <template slot-scope="scope">
74 {{scope.row.belongingDepartment || '无'}} 60 {{scope.row.belongingDepartment || '无'}}
@@ -79,23 +65,22 @@ @@ -79,23 +65,22 @@
79 {{scope.row.head || '无'}} 65 {{scope.row.head || '无'}}
80 </template> 66 </template>
81 </el-table-column> 67 </el-table-column>
82 - <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>  
83 - </el-table-column> 68 + <el-table-column label="发布时间" prop="createDate" > </el-table-column>
84 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 69 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
85 <template slot-scope="scope"> 70 <template slot-scope="scope">
86 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 71 + {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
87 </template> 72 </template>
88 </el-table-column> 73 </el-table-column>
89 <el-table-column label="操作" min-width="100" fixed="right"> 74 <el-table-column label="操作" min-width="100" fixed="right">
90 <template slot-scope="scope"> 75 <template slot-scope="scope">
91 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 76 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
92 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2'" @click="removeinfo(scope.row,'编辑')">编辑 77 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="removeinfo(scope.row,'编辑')">编辑
93 </div> 78 </div>
94 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2' || scope.row.publishStatus=='4'" @click="closemsg(scope.row)">删除</div>  
95 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2' || scope.row.publishStatus=='4'" 79 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="closemsg(scope.row)">删除</div>
  80 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
96 @click="opencl(scope.row,'sp')">发布</div> 81 @click="opencl(scope.row,'sp')">发布</div>
97 - <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"  
98 - @click="removeinfozz(scope.row,'2','下架')">下架</div> 82 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  83 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
99 </template> 84 </template>
100 </el-table-column> 85 </el-table-column>
101 </el-table> 86 </el-table>
@@ -231,7 +216,7 @@ @@ -231,7 +216,7 @@
231 }) 216 })
232 editStatus({ 217 editStatus({
233 resourcesId: this.oncetype+this.oninfo.id, 218 resourcesId: this.oncetype+this.oninfo.id,
234 - publishStatus: '3' 219 + publishStatus: '1'
235 }).then(res => { 220 }).then(res => {
236 this.onSubmit() 221 this.onSubmit()
237 }) 222 })
admin-web-master/src/views/detect/map/index.vue
  View file @9b392fc
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <el-input v-model="pagequery.advertisingName" placeholder="请输入" maxlength="50"></el-input> 18 <el-input v-model="pagequery.advertisingName" placeholder="请输入" maxlength="50"></el-input>
19 </el-form-item> 19 </el-form-item>
20 <el-form-item label="所属端" prop="affiliation" v-if="leixing"> 20 <el-form-item label="所属端" prop="affiliation" v-if="leixing">
21 - <el-select v-model="pagequery.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px"> 21 + <el-select v-model="pagequery.affiliation" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
22 <el-option label="游客小程序" value="游客小程序" /> 22 <el-option label="游客小程序" value="游客小程序" />
23 <el-option label="商家客户端" value="商家客户端" /> 23 <el-option label="商家客户端" value="商家客户端" />
24 </el-select> 24 </el-select>
@@ -57,18 +57,18 @@ @@ -57,18 +57,18 @@
57 </el-table-column> 57 </el-table-column>
58 58
59 59
60 - <el-table-column label="所属端" width="100" prop="affiliation" v-if="leixing" show-overflow-tooltip></el-table-column>  
61 - <el-table-column label="轮播顺序" width="100" prop="rotationOrder" v-if="leixing"> </el-table-column>  
62 - <el-table-column label="广告尺寸" width="120" prop="dimensions" v-if="leixing" show-overflow-tooltip></el-table-column>  
63 - <el-table-column label="上传大小" prop="size" v-if="leixing"></el-table-column> 60 + <el-table-column label="所属端" prop="affiliation" v-if="leixing" show-overflow-tooltip></el-table-column>
  61 + <el-table-column label="轮播顺序" prop="rotationOrder" v-if="leixing"> </el-table-column>
64 62
65 63
66 <el-table-column label="详细位置" prop="detailedLocation" v-if="leixing == false" show-overflow-tooltip></el-table-column> 64 <el-table-column label="详细位置" prop="detailedLocation" v-if="leixing == false" show-overflow-tooltip></el-table-column>
67 - <el-table-column label="设备类型" width="100" prop="deviceType" v-if="leixing == false" show-overflow-tooltip></el-table-column>  
68 - <el-table-column label="广告尺寸" width="120" prop="dimensions" v-if="leixing == false" show-overflow-tooltip></el-table-column>  
69 - <el-table-column label="广告材质" width="100" prop="advertisingMaterial" v-if="leixing == false"></el-table-column> 65 + <el-table-column label="设备类型" prop="deviceType" v-if="leixing == false" show-overflow-tooltip>
  66 + <template slot-scope="scope">
  67 + {{scope.row.deviceType || '-'}}
  68 + </template>
  69 + </el-table-column>
70 70
71 - <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 71 + <!-- <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
72 <template slot-scope="scope"> 72 <template slot-scope="scope">
73 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 73 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
74 </template> 74 </template>
@@ -85,6 +85,25 @@ @@ -85,6 +85,25 @@
85 <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" 85 <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
86 @click="removeinfozz(scope.row,'2','下架')">下架</div> 86 @click="removeinfozz(scope.row,'2','下架')">下架</div>
87 </template> 87 </template>
  88 + </el-table-column> -->
  89 + <el-table-column label="创建人" prop="createUser" > </el-table-column>
  90 + <el-table-column label="发布时间" prop="createDate" > </el-table-column>
  91 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  92 + <template slot-scope="scope">
  93 + {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
  94 + </template>
  95 + </el-table-column>
  96 + <el-table-column label="操作" min-width="100" fixed="right">
  97 + <template slot-scope="scope">
  98 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  99 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="removeinfo(scope.row,'编辑')">编辑
  100 + </div>
  101 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="closemsg(scope.row)">删除</div>
  102 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
  103 + @click="opencl(scope.row,'gg')">发布</div>
  104 + <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
  105 + @click="removeinfozz(scope.row,'0','下架')">下架</div>
  106 + </template>
88 </el-table-column> 107 </el-table-column>
89 </el-table> 108 </el-table>
90 <div style="display: flex;justify-content: space-between;" class="bom"> 109 <div style="display: flex;justify-content: space-between;" class="bom">
@@ -161,7 +180,7 @@ @@ -161,7 +180,7 @@
161 export default { 180 export default {
162 data() { 181 data() {
163 return { 182 return {
164 - oncetype: '', 183 + oncetype: 'gg',
165 addcl: false, 184 addcl: false,
166 oninfo: {}, 185 oninfo: {},
167 multipleSelection: [], 186 multipleSelection: [],
@@ -214,7 +233,7 @@ @@ -214,7 +233,7 @@
214 }) 233 })
215 editStatus({ 234 editStatus({
216 resourcesId: this.oncetype + this.oninfo.id, 235 resourcesId: this.oncetype + this.oninfo.id,
217 - publishStatus: '3' 236 + publishStatus: '1'
218 }).then(res => { 237 }).then(res => {
219 this.onSubmit() 238 this.onSubmit()
220 }) 239 })
admin-web-master/src/views/rent/audit/index.vue
  View file @9b392fc
@@ -10,9 +10,22 @@ @@ -10,9 +10,22 @@
10 <!-- 搜索 --> 10 <!-- 搜索 -->
11 <div class="formSearch"> 11 <div class="formSearch">
12 <el-form :inline="true" :model="pagequery"> 12 <el-form :inline="true" :model="pagequery">
13 - <el-form-item label="合同名称"> 13 + <el-form-item label="资源名称">
14 <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" /> 14 <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
15 </el-form-item> 15 </el-form-item>
  16 + <el-form-item label="资源类型" prop="belongingRegion">
  17 + <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
  18 + <el-option label="广告位" value="广告位"></el-option>
  19 + </el-select>
  20 + </el-form-item>
  21 + <el-form-item label="联系电话">
  22 + <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
  23 + </el-form-item>
  24 + <el-form-item label="状态" prop="belongingRegion">
  25 + <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
  26 + <el-option label="广告位" value="广告位"></el-option>
  27 + </el-select>
  28 + </el-form-item>
16 </el-form> 29 </el-form>
17 30
18 <div> 31 <div>
@@ -75,9 +88,6 @@ @@ -75,9 +88,6 @@
75 <template slot-scope="scope"> 88 <template slot-scope="scope">
76 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 89 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
77 <div @click="details(scope.row)" class="tableBtn greens">审核</div> 90 <div @click="details(scope.row)" class="tableBtn greens">审核</div>
78 - <!-- <div @click="closemsg(scope.row)" class="tableBtn greens">删除</div> -->  
79 - <!-- <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'2')" class="tableBtn greens">同意</div>  
80 - <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'3')" class="tableBtn greens">驳回</div> -->  
81 <div v-if='scope.row.auditStatus == 2' @click="removeonaction('2')" class="tableBtn greens">录入合同</div> 91 <div v-if='scope.row.auditStatus == 2' @click="removeonaction('2')" class="tableBtn greens">录入合同</div>
82 </template> 92 </template>
83 </el-table-column> 93 </el-table-column>
admin-web-master/src/views/shopRental/renewalMan/index.vue
  View file @9b392fc
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 68
69 </template> 69 </template>
70 </el-table-column> 70 </el-table-column>
71 - <el-table-column label="操作" min-width="150" fixed="right"> 71 + <el-table-column label="操作" fixed="right">
72 <template slot-scope="scope"> 72 <template slot-scope="scope">
73 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 73 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
74 <!-- <div @click="addgzd(scope.row)" class="tableBtn greens">发送提醒</div> --> 74 <!-- <div @click="addgzd(scope.row)" class="tableBtn greens">发送提醒</div> -->
@@ -138,8 +138,8 @@ @@ -138,8 +138,8 @@
138 138
139 <script> 139 <script>
140 import { 140 import {
141 - contractGetAllnew,  
142 - } from '../../../api/manage.js' 141 + contractRenewalReminder,
  142 + } from '@/api/newly.js'
143 import { 143 import {
144 cereReminderSet, 144 cereReminderSet,
145 cereReminderSetedit 145 cereReminderSetedit
@@ -234,7 +234,7 @@ @@ -234,7 +234,7 @@
234 alert(`合同终止 - 店铺ID: ${row.id}`); 234 alert(`合同终止 - 店铺ID: ${row.id}`);
235 }, 235 },
236 async getAll() { 236 async getAll() {
237 - const res = await contractGetAllnew(this.pagequery) 237 + const res = await contractRenewalReminder(this.pagequery)
238 this.tableData = res.data.content 238 this.tableData = res.data.content
239 this.total = res.data.totalElements 239 this.total = res.data.totalElements
240 }, 240 },
admin-web-master/src/views/shopRental/rentTermination/index.vue
  View file @9b392fc
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 </template> 63 </template>
64 </el-table-column> 64 </el-table-column>
65 65
66 - <el-table-column label="操作" min-width="150" fixed="right"> 66 + <el-table-column label="操作" fixed="right">
67 <template slot-scope="scope"> 67 <template slot-scope="scope">
68 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 68 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
69 <div @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div> 69 <div @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div>
admin-web-master/src/views/shopRental/rentalMan/index.vue
  View file @9b392fc
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 </template> 71 </template>
72 </el-table-column> 72 </el-table-column>
73 73
74 - <el-table-column label="操作" min-width="150" fixed="right"> 74 + <el-table-column label="操作" fixed="right">
75 <template slot-scope="scope"> 75 <template slot-scope="scope">
76 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 76 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
77 <div @click="addgzd(scope.row)" class="tableBtn greens">生成入驻告知单</div> 77 <div @click="addgzd(scope.row)" class="tableBtn greens">生成入驻告知单</div>
admin-web-master/src/views/shopRental/warning/index.vue
  View file @9b392fc
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 {{ calculateDaysUntilExpiration(scope.row.contractTerminationDate)}} 74 {{ calculateDaysUntilExpiration(scope.row.contractTerminationDate)}}
75 </template> 75 </template>
76 </el-table-column> 76 </el-table-column>
77 - <el-table-column label="操作" min-width="150" fixed="right"> 77 + <el-table-column label="操作" fixed="right">
78 <template slot-scope="scope"> 78 <template slot-scope="scope">
79 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 79 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
80 <!-- <div @click="addgzd(scope.row)" class="tableBtn greens">发送提醒</div> --> 80 <!-- <div @click="addgzd(scope.row)" class="tableBtn greens">发送提醒</div> -->
@@ -144,8 +144,8 @@ @@ -144,8 +144,8 @@
144 144
145 <script> 145 <script>
146 import { 146 import {
147 - contractGetAllnew,  
148 - } from '../../../api/manage.js' 147 + expwarning,
  148 + } from '@/api/newly.js'
149 import { 149 import {
150 cereReminderSet, 150 cereReminderSet,
151 cereReminderSetedit 151 cereReminderSetedit
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 alert(`合同终止 - 店铺ID: ${row.id}`); 238 alert(`合同终止 - 店铺ID: ${row.id}`);
239 }, 239 },
240 async getAll() { 240 async getAll() {
241 - const res = await contractGetAllnew(this.pagequery) 241 + const res = await expwarning(this.pagequery)
242 this.tableData = res.data.content 242 this.tableData = res.data.content
243 this.total = res.data.totalElements 243 this.total = res.data.totalElements
244 }, 244 },
lvdao-miniapp/pages/home/home.vue
  View file @9b392fc
@@ -421,7 +421,7 @@ @@ -421,7 +421,7 @@
421 let pagesize = { 421 let pagesize = {
422 pageNumber: 1, 422 pageNumber: 1,
423 pageSize: 10, 423 pageSize: 10,
424 - publishStatus:'1' 424 + publishStatus:'2'
425 } 425 }
426 this.current = type 426 this.current = type
427 if (type == 0) { 427 if (type == 0) {
lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
  View file @9b392fc
@@ -7176,7 +7176,7 @@ function initData(vueOptions, context) { @@ -7176,7 +7176,7 @@ function initData(vueOptions, context) {
7176 try { 7176 try {
7177 data = data.call(context); // 支持 Vue.prototype 上挂的数据 7177 data = data.call(context); // 支持 Vue.prototype 上挂的数据
7178 } catch (e) { 7178 } catch (e) {
7179 - if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) { 7179 + if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
7180 console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data); 7180 console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
7181 } 7181 }
7182 } 7182 }
@@ -14219,7 +14219,7 @@ function type(obj) { @@ -14219,7 +14219,7 @@ function type(obj) {
14219 14219
14220 function flushCallbacks$1(vm) { 14220 function flushCallbacks$1(vm) {
14221 if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) { 14221 if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
14222 - if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) { 14222 + if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
14223 var mpInstance = vm.$scope; 14223 var mpInstance = vm.$scope;
14224 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid + 14224 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
14225 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']'); 14225 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -14240,14 +14240,14 @@ function nextTick$1(vm, cb) { @@ -14240,14 +14240,14 @@ function nextTick$1(vm, cb) {
14240 //1.nextTick 之前 已 setData 且 setData 还未回调完成 14240 //1.nextTick 之前 已 setData 且 setData 还未回调完成
14241 //2.nextTick 之前存在 render watcher 14241 //2.nextTick 之前存在 render watcher
14242 if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) { 14242 if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
14243 - if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){ 14243 + if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
14244 var mpInstance = vm.$scope; 14244 var mpInstance = vm.$scope;
14245 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid + 14245 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
14246 ']:nextVueTick'); 14246 ']:nextVueTick');
14247 } 14247 }
14248 return nextTick(cb, vm) 14248 return nextTick(cb, vm)
14249 }else{ 14249 }else{
14250 - if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){ 14250 + if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
14251 var mpInstance$1 = vm.$scope; 14251 var mpInstance$1 = vm.$scope;
14252 console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid + 14252 console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
14253 ']:nextMPTick'); 14253 ']:nextMPTick');
@@ -14343,7 +14343,7 @@ var patch = function(oldVnode, vnode) { @@ -14343,7 +14343,7 @@ var patch = function(oldVnode, vnode) {
14343 }); 14343 });
14344 var diffData = this.$shouldDiffData === false ? data : diff(data, mpData); 14344 var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
14345 if (Object.keys(diffData).length) { 14345 if (Object.keys(diffData).length) {
14346 - if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) { 14346 + if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
14347 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid + 14347 console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
14348 ']差量更新', 14348 ']差量更新',
14349 JSON.stringify(diffData)); 14349 JSON.stringify(diffData));
@@ -18651,7 +18651,7 @@ function _extends() { @@ -18651,7 +18651,7 @@ function _extends() {
18651 var formatRegExp = /%[sdj%]/g; 18651 var formatRegExp = /%[sdj%]/g;
18652 var warning = function warning() {}; // don't print warning message when in production env or node runtime 18652 var warning = function warning() {}; // don't print warning message when in production env or node runtime
18653 18653
18654 -if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') { 18654 +if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
18655 warning = function warning(type, errors) { 18655 warning = function warning(type, errors) {
18656 if (typeof console !== 'undefined' && console.warn) { 18656 if (typeof console !== 'undefined' && console.warn) {
18657 if (errors.every(function (e) { 18657 if (errors.every(function (e) {
lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
  View file @9b392fc
1 { 1 {
2 - "usingComponents": {},  
3 - "component": true 2 + "component": true,
  3 + "usingComponents": {}
4 } 4 }
5 \ No newline at end of file 5 \ No newline at end of file
lvdao-miniapp/unpackage/dist/dev/mp-weixin/pages/home/home.js
  View file @9b392fc
@@ -322,7 +322,7 @@ var _default = { @@ -322,7 +322,7 @@ var _default = {
322 var pagesize = { 322 var pagesize = {
323 pageNumber: 1, 323 pageNumber: 1,
324 pageSize: 10, 324 pageSize: 10,
325 - publishStatus: '1' 325 + publishStatus: '2'
326 }; 326 };
327 this.current = type; 327 this.current = type;
328 if (type == 0) { 328 if (type == 0) {