Commit a4bfb5fa7b283b80ce3336f4761d0f1ce5d82769

Authored by 杨鑫
1 parent 2dce567b

'最新'

admin-web-master/src/api/rsaManagement.js
... ... @@ -35,3 +35,28 @@ export function ziyuanduiy(data) {
35 35 data
36 36 })
37 37 }
  38 +
  39 +// 招商意向管理
  40 + // 匹配记录查询
  41 +export function recordGetAll(data) {
  42 + return request({
  43 + url: '/resourceStrategyMatchingRecord/getAll',
  44 + method: 'post',
  45 + data
  46 + })
  47 +}
  48 +// 匹配记录新增
  49 +export function recordInsert(data) {
  50 + return request({
  51 + url: '/resourceStrategyMatchingRecord/insert',
  52 + method: 'post',
  53 + data
  54 + })
  55 +}
  56 +// 匹配记录删除
  57 +export function recordEdit(data) {
  58 + return request({
  59 + url: `/resourceStrategyMatchingRecord/edit/${data.id}`,
  60 + method: 'get'
  61 + })
  62 +}
... ...
admin-web-master/src/layout/index.vue
... ... @@ -199,8 +199,8 @@
199 199 return {
200 200 // msg: [],
201 201 // list: [],
202   - msg: ['招商服务系统'],
203   - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  202 + // msg: ['招商服务系统'],
  203 + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
204 204 list: [
205 205 ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '客服服务管理', '系统设置'],
206 206 ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
... ...
admin-web-master/src/views/customer/yixiang/index.vue
... ... @@ -8,30 +8,6 @@
8 8 <div>
9 9 <!-- 搜索 -->
10 10 <div class="formSearch">
11   - <!-- <el-form :inline="true" :model="formSel">
12   - <el-form-item label="意向客户名称">
13   - <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" />
14   - </el-form-item>
15   - <el-form-item label="意向资源名称">
16   - <el-input v-model="formSel.intentionalStoreName" placeholder="请输入" class="moren" style="width:168px" />
17   - </el-form-item>
18   - <el-form-item label="意向资源类型">
19   - <el-select v-model="formSel.intentionalBusinessType" placeholder="请选择" style="width:168px">
20   - <el-option label="商铺" value="商铺" />
21   - <el-option label="广告位" value="广告位" />
22   - <el-option label="场地" value="场地" />
23   - </el-select>
24   - </el-form-item>
25   -
26   -
27   - </el-form> -->
28   - <!-- <div>
29   - <el-button style="background-color: #3F9B6A;color: #fff" @click="onSubmit">查询
30   - </el-button>
31   - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
32   - @click="resetting">重置
33   - </el-button>
34   - </div> -->
35 11  
36 12 </div>
37 13 <div style="margin-bottom:20px;">
... ... @@ -40,25 +16,40 @@
40 16 </div>
41 17 <!-- 表格 -->
42 18 <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
43   - <el-table-column label="序号" min-width="60">
44   - <template slot-scope="scope">
45   - {{scope.$index+1}}
46   - </template>
47   - </el-table-column>
48   - <el-table-column label="意向客户名称" prop="intentCustomerName" min-width="150" />
49   - <el-table-column label="手机号" prop="phone" min-width="150" />
50   - <el-table-column label="意向租赁类型" prop="leaseType" min-width="120" />
51   - <el-table-column label="意向租赁周期" prop="leaseCycle" min-width="120" />
52   - <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" />
53   - <el-table-column label="意向区域" prop="intentionRegion" min-width="150" />
54   -
  19 + <el-table-column label="序号" width="50">
  20 + <template slot-scope="scope">
  21 + {{scope.$index +1 }}
  22 + </template>
  23 + </el-table-column>
  24 + <el-table-column label="资源名称" show-overflow-tooltip>
  25 +
  26 + </el-table-column>
  27 + <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
  28 + <template slot-scope="scope">
  29 + {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
  30 + </template>
  31 + </el-table-column>
  32 + <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
  33 + </el-table-column>
  34 + <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
  35 + </el-table-column>
  36 + <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
  37 + <template slot-scope="scope">
  38 + {{scope.row.belongingDepartment || '无'}}
  39 + </template>
  40 + </el-table-column>
  41 + <el-table-column label="负责人" prop="head" show-overflow-tooltip>
  42 + <template slot-scope="scope">
  43 + {{scope.row.head || '无'}}
  44 + </template>
  45 + </el-table-column>
55 46 <el-table-column label="操作" min-width="100" fixed="right">
56 47 <template slot-scope="scope">
57 48 <div class="tableBtn greens" @click="handleEditForm(scope.row)">
58 49 查看
59 50 </div>
60   - <div class="tableBtn greens" @click="bianjilist(scope.row)" >
61   - 编辑
  51 + <div class="tableBtn greens" @click="delGuan(scope.row.id)" >
  52 + 删除
62 53 </div>
63 54 <!-- <div class="tableBtn greens" @click="pipei(scope.row)" >
64 55 一键匹配
... ... @@ -74,226 +65,11 @@
74 65 </div>
75 66  
76 67  
77   - <!-- 详情框 :visible.sync="detbox" -->
78   - <!-- <div v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> -->
79   - <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center
80   - :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
81   - <div style="
82   - background-color: #fafafa;
83   - border: 1px solid #eaeaea;
84   - height: 42px;
85   - width: 100%;
86   - padding: 0 20px;
87   - line-height: 42px;
88   - ">
89   - {{edit==true?'详情':'编辑'}}
90   - </div>
91   - <div style="padding: 0 20px">
92   - <div style="
93   - display: flex;
94   - justify-content: space-between;
95   - font-size: 14px;
96   - margin-bottom: 20px;
97   - ">
98   - <el-tabs v-model="card" >
99   - <el-tab-pane label="意向信息" name="first">
100   - <el-form ref="form" label-width="150px">
101   - <el-form-item label="租用时段">
102   - <el-date-picker style="width: 100%;" v-model="rentalPeriodTime"
103   - value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
104   - start-placeholder="开始日期" end-placeholder="结束日期" align="right" :disabled="edit?true:false">
105   - </el-date-picker>
106   - </el-form-item>
107   - <el-form-item label="租期">
108   - <el-select v-model="secondData.leaseTerm" :disabled="edit?true:false">
109   - <el-option label="年" value="年" />
110   - <el-option label="月" value="月" />
111   - <el-option label="日" value="日" />
112   - </el-select>
113   - </el-form-item>
114   - <el-form-item label="租金">
115   - <el-input v-model="secondData.rent" :disabled="edit?true:false"></el-input>
116   - </el-form-item>
117   - <el-form-item label="意向经营类型">
118   - <el-select v-model="secondData.intentionalBusinessType" placeholder="请选择" :disabled="edit?true:false">
119   - <el-option label="商铺" value="商铺" />
120   - <el-option label="场地" value="场地" />
121   - <el-option label="广告位" value="广告位" />
122   - </el-select>
123   - </el-form-item>
124   - <el-form-item label="意向区域(如有)">
125   - <el-input v-model="secondData.intendedArea" :disabled="edit?true:false"></el-input>
126   - </el-form-item>
127   - <el-form-item label="意向商铺位置(如有)">
128   - <el-input v-model="secondData.intentionalStoreLocation" :disabled="edit?true:false"></el-input>
129   - </el-form-item>
130   - <el-form-item label="意向商铺名称(如有)">
131   - <el-input v-model="secondData.intentionalStoreName" :disabled="edit?true:false"></el-input>
132   - </el-form-item>
133   -
134   - </el-form>
135   -
136   - </el-tab-pane>
137   - <el-tab-pane label="主体信息" name="second">
138   - <el-form ref="form" label-width="140px">
139   - <el-form-item label="主体名称">
140   - <el-input v-model="secondData.subjectName" :disabled="edit?true:false"></el-input>
141   - </el-form-item>
142   - <el-form-item label="统一社会信用代码">
143   - <el-input v-model="secondData.unifiedSocialCreditCode" :disabled="edit?true:false"></el-input>
144   - </el-form-item>
145   - <el-form-item label="类型">
146   - <el-select v-model="secondData.type" placeholder="请选择" :disabled="edit?true:false">
147   - <el-option label="个人" value="个人" />
148   - <el-option label="企业" value="企业" />
149   - </el-select>
150   - </el-form-item>
151   - <el-form-item label="法定代表人">
152   - <el-input v-model="secondData.legalRepresentative" :disabled="edit?true:false"></el-input>
153   - </el-form-item>
154   - <el-form-item label="经营范围">
155   - <el-input type="textarea" v-model="secondData.businessScope" :rows="4"
156   - :disabled="edit?true:false"></el-input>
157   - </el-form-item>
158   - <el-form-item label="注册资本">
159   - <el-input v-model="secondData.registeredCapital" :disabled="edit?true:false"></el-input>
160   - </el-form-item>
161   - <el-form-item label="成立日期">
162   - <el-input v-model="secondData.establishmentDate" :disabled="edit?true:false"></el-input>
163   - </el-form-item>
164   - <el-form-item label="住所">
165   - <el-input v-model="secondData.address" :disabled="edit?true:false"></el-input>
166   - </el-form-item>
167   - <el-form-item label="邮箱地址">
168   - <el-input v-model="secondData.emailAddress" :disabled="edit?true:false"></el-input>
169   - </el-form-item>
170   - <el-form-item label="营业期限">
171   - <el-date-picker style="width: 100%;" v-model="businessStartTime"
172   - value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
173   - start-placeholder="开始日期" end-placeholder="结束日期" align="right" :disabled="edit?true:false">
174   - </el-date-picker>
175   - </el-form-item>
176   - <el-form-item label="营业执照">
177   - <upimg v-model="secondData.businessLicense" :limit="1" :fileSize="1" :isShowTip="false"
178   - v-if="edit==false"></upimg>
179   - <img :src="secondData.businessLicense" alt="" v-else>
180   - </el-form-item>
181   - </el-form>
182   -
183   - </el-tab-pane>
184   -
185   - <el-tab-pane label="申请人信息" name="there">
186   - <el-form ref="form" label-width="140px">
187   - <el-form-item label="申请人">
188   - <el-input v-model="secondData.intentCustomerName" :disabled="edit?true:false"></el-input>
189   - </el-form-item>
190   - <el-form-item label="联系电话">
191   - <el-input v-model="secondData.contactPhone" :disabled="edit?true:false"></el-input>
192   - </el-form-item>
193   - <el-form-item label="证件类型">
194   - <el-select v-model="ruleForm.idCardType" placeholder="请选择" :disabled="edit?true:false">
195   - <el-option label="身份证" value="身份证" />
196   - </el-select>
197   - </el-form-item>
198   - <el-form-item label="身份证号码">
199   - <el-input v-model="secondData.idCardNumber" :disabled="edit?true:false"></el-input>
200   - </el-form-item>
201   - <el-form-item label="身份证有效期">
202   - <el-date-picker style="width: 100%;" v-model="idCardValidStart" value-format="yyyy-MM-dd"
203   - type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
204   - align="right" :disabled="edit?true:false">
205   - </el-date-picker>
206   - </el-form-item>
207   - <el-form-item label="身份证照片(正面)">
208   - <upimg v-model="secondData.idCardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false"
209   - v-if="edit==false"></upimg>
210   - <img :src="secondData.idCardPhotoFront" alt="" v-else style="width:150px;height:150px">
211   - </el-form-item>
212   - <el-form-item label="身份证照片(反面)">
213   - <upimg v-model="secondData.idCardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false"
214   - v-if="edit==false"></upimg>
215   - <img :src="secondData.idCardPhotoBack" alt="" v-else style="width:150px;height:150px">
216   - </el-form-item>
217   - <el-form-item label="是否为法人">
218   - <el-select v-model="ruleForm.isLegalPerson" placeholder="请选择" :disabled="edit?true:false">
219   - <el-option label="否" value="0" />
220   - <el-option label="是" value="1" />
221   -
222   - </el-select>
223   - </el-form-item>
224   - <el-form-item label="企业授权书">
225   - <upimg v-model="secondData.enterpriseAuthorization" :limit="1" :fileSize="1" :isShowTip="false"
226   - v-if="edit==false"></upimg>
227   - <img :src="secondData.enterpriseAuthorization" alt="" style="width:150px;height:150px" v-else>
228   - </el-form-item>
229   - </el-form>
230   - <!-- <div style="padding: 0 20px 20px 20px">
231   - <div style="margin-top: 20px;">
232   - <div style="width: 100%;border:1px solid #EAEAEA;">
233   - <div
234   - style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 10px 10px;width: 100%;border-top:1px solid #EAEAEA;background-color: #FAFAFA;border-right:1px solid #EAEAEA;border-left:1px solid #EAEAEA;">
235   - <div style="line-height: 28px;">意向资源</div>
236   - <div style="" class="leixingSel" v-if="edit == false">
237   - <div class="tableBtn greens" >添加</div>
238   -
239   - </div>
240   - </div>
241   - <div style="padding:15px">
242   - <el-table :data="selshop"
243   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
244   - :border="true" style="width: 100%">
245   - <el-table-column label="序号" prop="id" min-width="6%" />
246   - <el-table-column label="资源名称" prop="shopName" min-width="10%" />
247   - <el-table-column label="资源编号" prop="detailedLocation" min-width="10%" />
248   - <el-table-column label="资源类型" prop="actualUsableArea" min-width="10%" />
249   - <el-table-column label="意向租期" prop="belongingRegion" min-width="10%" />
250   - <el-table-column label="意向租金(元)" prop="belongingDepartment" min-width="10%" />
251   - <el-table-column label="操作" prop="head" min-width="10%">
252   - <template slot-scope="scope" v-if="edit == false">
253   - <div class="tableBtn greens" @click="bianjilist(scope.row)">
254   - 编辑
255   - </div>
256   - <div class="tableBtn greens" @click="delGuan(scope.row)">
257   - 删除
258   - </div>
259   - </template>
260   - </el-table-column>
261   - </el-table>
262   - </div>
263   - </div>
264   - </div>
265   -
266   - </div>-->
267   - </el-tab-pane>
268   - </el-tabs>
269   - </div>
270   -
271   - <div style="
272   - width: 99%;
273   - padding: 10px;
274   - display: flex;
275   - justify-content: flex-end;
276   - ">
277   - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
278   - @click="closeFn(1)">取消</el-button>
279   - <!-- <el-button
280   - style="background-color: #3F9B6A;color: #fff"
281   - @click="bianji"
282   - v-if="edit"
283   - >编辑</el-button
284   - > -->
285   -
286   - <el-button style="background-color: #3F9B6A;color: #fff" @click="msgeditS"
287   - v-if="edit == false">确定</el-button>
288   - </div>
289   - </div>
290   - </el-dialog>
291   -
292 68  
293 69 </div>
294 70 </div>
295 71 <!-- 一键匹配 -->
296   - <el-dialog :visible.sync="pip" style="padding: 0" width="55%" center
  72 + <el-dialog :visible.sync="pip" style="padding: 0" width="70%" center
297 73 :close-on-click-modal="false">
298 74 <div style="
299 75 background-color: #fafafa;
... ... @@ -306,25 +82,50 @@
306 82 匹配记录
307 83 </div>
308 84 <div style="padding: 0 20px">
309   - <div>
310   - <el-form ref="form" :model="pipeiSel" style="padding-top: 10px;" label-width="100px">
  85 + <div style="
  86 + display: flex;
  87 + justify-content: space-between;
  88 + font-size: 14px;
  89 +
  90 + ">
  91 + <el-form ref="form" :model="pipeiSel" style="padding-top: 10px;" label-width="100px" >
311 92 <el-form-item label="意向资源类型">
312   - <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择" style="width: 90%;">
  93 + <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择" style="width: 168px;">
313 94 <el-option label="商铺" value="sp" />
314 95 <el-option label="广告位" value="gg" />
315 96 <el-option label="场地" value="cd" />
316 97 </el-select>
317   -
318 98 </el-form-item>
319   - <el-form-item label="租期">
320   - <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm" style="width: 90%;">
321   - <el-option label="年" value="年" />
322   - <el-option label="月" value="月" />
323   - <el-option label="日" value="日" />
  99 + <el-form-item label="意向区域">
  100 + <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择" style="width: 168px;">
  101 + <el-option label="成华区" value="成华区" />
  102 + <el-option label="武侯区" value="武侯区" />
  103 + <el-option label="锦江区" value="锦江区" />
  104 + <el-option label="青羊区" value="青羊区" />
  105 + <el-option label="金牛区" value="金牛区" />
  106 + <el-option label="双流区" value="双流区" />
  107 + <el-option label="郫都区" value="郫都区" />
  108 + <el-option label="龙泉驿区" value="龙泉驿区" />
  109 + <el-option label="温江区" value="温江区" />
  110 + </el-select>
  111 + </el-form-item>
  112 + <el-form-item label="意向面积">
  113 + <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm" style="width: 168px;">
  114 + <el-option label="0-100" value="0-100" />
  115 + <el-option label="100-200" value="100-200" />
  116 + <el-option label="100-300" value="100-300" />
324 117 </el-select>
325 118 </el-form-item>
  119 + <el-form-item label="租金周期">
  120 + <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm" style="width: 168px;">
  121 + <el-option label="年" value="年" />
  122 + <el-option label="季" value="季" />
  123 + <el-option label="月" value="月" />
  124 + <el-option label="日" value="日" />
  125 + </el-select>
  126 + </el-form-item>
326 127 <el-form-item label="租金范围">
327   - <el-select v-model="pipeiSel.resources.cereRentalPolicies.rentalPrice" placeholder="请选择" style="width: 90%;">
  128 + <el-select v-model="pipeiSel.resources.cereRentalPolicies.rentalPrice" placeholder="请选择" style="width: 168px;">
328 129 <el-option label="0-10000" value="0-10000" />
329 130 <el-option label="10000-20000" value="10000-20000" />
330 131 <el-option label="20000-50000" value="20000-50000" />
... ... @@ -332,15 +133,40 @@
332 133 </el-select>
333 134 </el-form-item>
334 135 </el-form>
  136 + </div>
  137 + <el-table :data="
  138 + pipData.slice(
  139 + (currentPage - 1) * pageSize,
  140 + currentPage * pageSize
  141 + )
  142 + " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  143 + <el-table-column label="序号" min-width="80">
  144 + <template slot-scope="scope">
  145 + {{scope.$index+1}}
  146 + </template>
  147 + </el-table-column>
  148 + <el-table-column label="资源名称" prop="intentCustomerName" min-width="150" />
  149 + <el-table-column label="编号" prop="resourcesId" min-width="150" />
  150 + <el-table-column label="意向资源类型" prop="shopName" min-width="150" />
  151 + <el-table-column label="最近释放日期" prop="businessStartTime" min-width="150" />
  152 + <el-table-column label="最短租期" prop="contactInformation" min-width="150" />
  153 + <el-table-column label="意向租金单价(元/平方)" prop="contactInformation" min-width="250" />
  154 + <el-table-column prop="auditStatus" label="资源状态" min-width="150">
  155 + <template slot-scope="scope">
  156 +
  157 + </template>
  158 + </el-table-column>
  159 +
  160 + </el-table>
335 161 <div style="
336 162 padding: 15px 0;
337 163 ">
338 164 <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
339   - @click="pipeiClose">重置</el-button>
  165 + @click="pipeiClose">返回</el-button>
340 166 <el-button style="background-color: #3F9B6A;color: #fff"
341   - @click="pipeiBtn">查询</el-button>
  167 + @click="pipeiBtn">确定</el-button>
342 168  
343   - </div>
  169 +
344 170 </div>
345 171 </div>
346 172 </el-dialog>
... ... @@ -353,18 +179,10 @@
353 179 token
354 180 } from '@/utils/request'
355 181 import {
356   - rsaManAll,
357   - rsaManAdd,
358   - rsaManEdit,
359   - rsaManDel,
360   - ziyuanduiy,
  182 + recordGetAll,
  183 + recordInsert,
  184 + recordEdit,
361 185 } from '../../../api/rsaManagement'
362   - import {
363   - getAlls
364   - } from '../../../api/information.js'
365   - import {
366   - getAlls as map1
367   - } from '../../../api/map1'
368 186 import upimg from "@/components/ImageUpload/index"
369 187 export default {
370 188 components: {
... ... @@ -374,80 +192,20 @@
374 192 data() {
375 193 return {
376 194 detbox: false, // 详情
377   - edit: true, // 编辑
378   - addMing: false,//资源
379   - selshop: [], //意向资源列表
380 195 action: uploadUrl, // 上传图片
381   - myHeaders: {
382   - 'Authorization-admin': token
383   - },
384   - ggXin: false, // 新增
385   - sel: [], // 选择资源
386   - stepNum: 0, // 切换
387   - linShop: [], // 临铺列表
388   - isAdd: false, //添加铺位弹框
389   - formSel: {
390   - intentCustomerName:'',
391   - region:'',
392   - id:'',
393   - auditStatus:'',
394   - pageNumber: 1,
395   - pageSize: 10,
396   - },
397   - ruleForm: {
398   - intentCustomerName: '', //意向客户名称
399   - contactPhone: '', //联系电话
400   - entityType: '', //主体类型
401   - customerLevel: '', //客户级别
402   - isLegalPerson: '', //是否为法人(0:否,1:是)
403   - enterpriseAuthorization: '', //企业授权书
404   - idCardNumber: '', //身份证号
405   - idCardType: '', //证件类型
406   - idCardValidStart: '', //身份证有效开始时间
407   - idCardValidEnd: '', //身份证有效结束时间
408   - idCardPhotoFront: '', //身份证照片(正面)
409   - idCardPhotoBack: '', //身份证照片(反面)
410   - subjectName: '', //主体名称
411   - unifiedSocialCreditCode: '', //统一社会信用代码
412   - type: '', //类型(可能是企业类型等)
413   - legalRepresentative: '', //法定代表人
414   - businessScope: '', //经营范围
415   - registeredCapital: '', //注册资本
416   - establishmentDate: '', //成立日期
417   - address: '', //住所
418   - emailAddress: '', //邮箱地址
419   - businessStartTime: '', //营业开始时间(如果为全天,则可为NULL或指定默认时
420   - businessEndTime: '', //营业结束时间(如果为全天,则可为NULL或指定默认时
421   - businessLicense: '', //营业执照(存储路径或URL)
422   - intendedResources: '', //意向资源
423   - auditStatus:'1',
424   - rentalPeriodStartTime:'',
425   - rentalPeriodEndTime:'',
426   - leaseTerm:'',
427   - rent:'',
428   - intentionalBusinessType:'',
429   - intendedArea:'',
430   - intentionalStoreLocation:'',
431   - intentionalStoreName:'',
432   - },
433   - idCardValidStart: [],
434   - businessStartTime: [],
435   - rentalPeriodTime:[],
436   - card: 'first', // 切换
437 196 secondData: {},
  197 + tableData:[],
  198 + pipData:[],
438 199 currentPage: 1,
439 200 total: 10,
440 201 flag: false,
441 202 pageSize: 10,
442 203 msgid: '',
443 204 pageindex: {
444   - pageNumber: 1,
  205 + pageNumber: 0,
445 206 pageSize: 10,
446 207 },
447   - ziyuanData:[],
448   - multipleSelection:[],
449 208 pip:false,
450   - pipData:[],
451 209 pipeiSel:{
452 210 resources:{
453 211         cereRentalPolicies:{
... ... @@ -458,12 +216,7 @@
458 216     },
459 217 pageNumber:1,
460 218 pageSize:10,
461   - },
462   - peiPing:{
463   - customerLevel:'',
464   - id:''
465   - },
466   - peiPingShow:false,
  219 + },
467 220 }
468 221 },
469 222  
... ... @@ -492,158 +245,24 @@
492 245 handleSelectionChange(val) {
493 246 this.multipleSelection = val;
494 247 },
495   - lextStep(val) {
496   - if (val == 0) {
497   - this.stepNum = this.stepNum - 1;
498   - } else {
499   - this.stepNum = this.stepNum + 1;
500   - }
501   - },
502 248 // 查询全数据
503 249 async getAll() {
504   - const res = await rsaManAll(this.pageindex);
505   - this.tableData = res.data.content;
506   - this.total = res.data.content.length
507   -
508   - const ziyuan = await getAlls(this.pageindex)
509   - const ggw = await map1(this.pageindex)
510   - this.ziyuanData = [...ziyuan.data.content,...ggw.data.content]
511   - },
512   - // 编辑确认
513   - async msgeditS() {
514   - this.secondData.id = this.msgid
515   - if (this.idCardValidStart.length != 0) {
516   - this.secondData.idCardValidStart = this.idCardValidStart[0]
517   - this.secondData.idCardValidEnd = this.idCardValidStart[1]
518   - }
519   - if (this.businessStartTime.length != 0) {
520   - this.secondData.businessStartTime = this.businessStartTime[0]
521   - this.secondData.businessEndTime = this.businessStartTime[1]
522   - }
523   - if (this.rentalPeriodTime.length != 0) {
524   - this.secondData.rentalPeriodStartTime = this.rentalPeriodTime[0]
525   - this.secondData.rentalPeriodEndTime = this.rentalPeriodTime[1]
526   - }
527   -
528   - const res = await rsaManEdit(this.secondData)
529   - this.detbox = false;
530   - this.getAll();
531   - },
532   - bianji() {
533   - if (this.edit) {
534   - this.edit = false;
535   - }
536   -
537   - },
538   - // 编辑
539   - bianjilist(item) {
540   - this.secondData = item
541   - this.$set(this.idCardValidStart, 0, item.idCardValidStart)
542   - this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
543   - this.$set(this.businessStartTime, 0, item.businessStartTime)
544   - this.$set(this.businessStartTime, 1, item.businessEndTime)
545   - this.$set(this.rentalPeriodTime, 0, item.rentalPeriodStartTime)
546   - this.$set(this.rentalPeriodTime, 1, item.rentalPeriodEndTime)
547   - this.msgid = item.id;
548   - this.detbox = true
549   - if (this.edit) {
550   - this.edit = false;
551   - }
552   - },
553   - async chehui(item){
554   - await rsaManEdit({id:item.id,auditStatus:'1'})
555   - this.getAll()
  250 + const res = await recordGetAll(this.pageindex);
  251 + this.tableData = res.data.content
  252 + this.total = res.data.totalElements
  253 + this.tableData.map(item =>{
  254 + item.matchingRecord = JSON.parse(item.matchingRecord)
  255 + })
  256 +
  257 + console.log (this.tableData)
556 258 },
557   -async getshen(item){
558   - await rsaManEdit({id:item.id,auditStatus:'2'})
559   - this.getAll()
560   -},
561 259  
562 260  
563 261 // 详情点击
564 262 handleEditForm(item) {
565   - console.log(item.rentalPeriodEndTime)
566   - this.secondData = item
567   - this.$set(this.idCardValidStart, 0, item.idCardValidStart)
568   - this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
569   - this.$set(this.businessStartTime, 0, item.businessStartTime)
570   - this.$set(this.businessStartTime, 1, item.businessEndTime)
571   - this.$set(this.rentalPeriodTime, 0, item.rentalPeriodStartTime)
572   - this.$set(this.rentalPeriodTime, 1, item.rentalPeriodEndTime)
573   - this.card = 'first'
574   - this.detbox = true;
575   - this.msgid = item.id;
576   - },
577   - // 新增
578   - addbuss() {
579   - this.ruleForm = {
580   - intentCustomerName: '', //意向客户名称
581   - contactPhone: '', //联系电话
582   - entityType: '', //主体类型
583   - customerLevel: '', //客户级别
584   - isLegalPerson: '', //是否为法人(0:否,1:是)
585   - enterpriseAuthorization: '', //企业授权书
586   - idCardNumber: '', //身份证号
587   - idCardType: '', //证件类型
588   - idCardValidStart: '', //身份证有效开始时间
589   - idCardValidEnd: '', //身份证有效结束时间
590   - idCardPhotoFront: '', //身份证照片(正面)
591   - idCardPhotoBack: '', //身份证照片(反面)
592   - subjectName: '', //主体名称
593   - unifiedSocialCreditCode: '', //统一社会信用代码
594   - type: '', //类型(可能是企业类型等)
595   - legalRepresentative: '', //法定代表人
596   - businessScope: '', //经营范围
597   - registeredCapital: '', //注册资本
598   - establishmentDate: '', //成立日期
599   - address: '', //住所
600   - emailAddress: '', //邮箱地址
601   - businessStartTime: '', //营业开始时间(如果为全天,则可为NULL或指定默认时
602   - businessEndTime: '', //营业结束时间(如果为全天,则可为NULL或指定默认时
603   - businessLicense: '', //营业执照(存储路径或URL)
604   - intendedResources: '', //意向资源
605   - auditStatus:'1',
606   - rentalPeriodStartTime:'',
607   - rentalPeriodEndTime:'',
608   - leaseTerm:'',
609   - rent:'',
610   - intentionalBusinessType:'',
611   - intendedArea:'',
612   - intentionalStoreLocation:'',
613   - intentionalStoreName:'',
614   -
615   - }
616   - this.rentalPeriodTime = []
617   - this.ggXin = true;
618   - this.getAll();
619   - },
620   -
621   - // 新增确定
622   - async addCheck() {
623   - if (this.idCardValidStart.length != 0) {
624   - this.ruleForm.idCardValidStart = this.idCardValidStart[0]
625   - this.ruleForm.idCardValidEnd = this.idCardValidStart[1]
626   - }
627   - if (this.businessStartTime.length != 0) {
628   - this.ruleForm.businessStartTime = this.businessStartTime[0]
629   - this.ruleForm.businessEndTime = this.businessStartTime[1]
630   - }
631   - if (this.rentalPeriodTime.length != 0) {
632   - this.ruleForm.rentalPeriodStartTime = this.rentalPeriodTime[0]
633   - this.ruleForm.rentalPeriodEndTime = this.rentalPeriodTime[1]
634   - }
  263 +
  264 + },
635 265  
636   - if(this.ziyuanData.length !=0){
637   - this.ruleForm.intendedResources = this.ziyuanData[0].id
638   - }
639   - await rsaManAdd(this.ruleForm)
640   - this.idCardValidStart = []
641   - this.businessStartTime = []
642   - this.rentalPeriodTime = []
643   - this.getAll();
644   - this.stepNum = 0;
645   - this.ggXin = false;
646   - },
647 266 handleCurrentChange(val) {
648 267 this.currentPage = val;
649 268 },
... ... @@ -655,9 +274,6 @@ async getshen(item){
655 274 if (val == 1) {
656 275 this.detbox = false;
657 276 this.edit = true;
658   - } else {
659   - this.ggXin = false;
660   - this.stepNum = 0;
661 277 }
662 278 },
663 279 //删除管理列表
... ... @@ -675,8 +291,8 @@ async getshen(item){
675 291 customClass: 'oe-dialog-btn',
676 292 beforeClose: (action, instance, done) => {
677 293 if (action === 'confirm') {
678   - rsaManDel({
679   - id: item.id
  294 + recordEdit({
  295 + id: item
680 296 }).then(res => {
681 297 this.getAll()
682 298 done();
... ... @@ -689,42 +305,6 @@ async getshen(item){
689 305  
690 306 },
691 307  
692   - handlePreview(file) {
693   - console.log(file);
694   - },
695   - handleRemove(file, fileList) {
696   - console.log(file, fileList);
697   - },
698   -
699   - // 重置按钮
700   - resetting() {
701   - this.formSel = {
702   - intentCustomerName:'',
703   - region:'',
704   - id:'',
705   - auditStatus:'',
706   - pageNumber: 1,
707   - pageSize: 10,
708   - };
709   - this.getAll()
710   - },
711   - // 查询
712   - async onSubmit() {
713   - const res = await rsaManAll(this.formSel)
714   - this.tableData = res.data.content
715   - this.total = res.data.content.length
716   -
717   - },
718   - mingClose(){
719   - this.multipleSelection =[]
720   - this.addMing = false
721   -
722   - },
723   - minSev() {
724   - this.selshop = this.multipleSelection
725   - this.addMing = false
726   - this.multipleSelection =[]
727   - },
728 308 pipei(item){
729 309 this.pip = true
730 310 this.pipData = []
... ... @@ -737,9 +317,7 @@ async getshen(item){
737 317 }else{
738 318 this.pipeiSel.resourcesId = 'gg'
739 319 }
740   - ziyuanduiy(this.pipeiSel).then(res=>{
741   - this.pipData = res.data.content
742   - })
  320 +
743 321 },
744 322 pipeiClose(){
745 323 this.pipeiSel ={
... ... @@ -754,19 +332,9 @@ async getshen(item){
754 332 pageNumber:1,
755 333 pageSize:10,
756 334 },
  335 + this.pip = false
757 336 this.pipData = []
758 337 },
759   - pingji(item){
760   - this.peiPing.id = item.id
761   - this.peiPing.customerLevel = item.customerLevel
762   - this.peiPingShow = true
763   - },
764   - async peiPingChenk(){
765   - await rsaManEdit(this.peiPing)
766   - this.getAll()
767   - this.peiPingShow = false
768   -
769   - },
770 338 }
771 339 }
772 340 </script>
... ...
lvdao-miniapp/main.js
... ... @@ -6,9 +6,9 @@ import uView from &quot;uview-ui&quot;;
6 6  
7 7 // 弹出框
8 8 import DialogBox from './components/DialogBox/DialogBox';
9   - let hostall = window.location.href;
10   -let c1 = hostall.split('cdwlMall')[0];
11   -//let c1 = 'https://jy.scjysm.asia:18086/'
  9 +// let hostall = window.location.href;
  10 +// let c1 = hostall.split('cdwlMall')[0];
  11 +let c1 = 'https://jy.scjysm.asia:18086/'
12 12 Vue.config.productionTip = false
13 13 Vue.prototype.$http = http
14 14 Vue.prototype.$imgUrl = (url) => {
... ...
lvdao-miniapp/pages/shops/shops.vue
... ... @@ -79,7 +79,14 @@
79 79 </view>
80 80 </view>
81 81 <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
82   - <text class="sc" style="color: #979797;font-size: 30rpx;">意向租金(月)</text>
  82 + <text class="sc" style="color: #979797;font-size: 30rpx;">租金周期</text>
  83 + <view @click="showS(3)">
  84 + <text class="mc" style="margin-right: 10rpx;"> {{formList.zhouqi ==''?'请选择':formList.zhouqi}}</text>
  85 + <u-icon name="arrow-down"></u-icon>
  86 + </view>
  87 + </view>
  88 + <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
  89 + <text class="sc" style="color: #979797;font-size: 30rpx;">意向租金</text>
83 90 <view @click="showS(4)">
84 91 <text class="mc" style="margin-right: 10rpx;"> {{formList.zujin ==''?'请选择':formList.zujin}}</text>
85 92 <u-icon name="arrow-down"></u-icon>
... ... @@ -157,6 +164,7 @@
157 164 mianji:'',
158 165 name:'',
159 166 phone:'',
  167 + zhouqi:'',
160 168 pageNumber: 0,
161 169 pageSize: 10,
162 170 publishStatus:2
... ... @@ -199,6 +207,7 @@
199 207 this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', query, 1).then(res => {
200 208 //成功回调
201 209 this.tableData = res.data.data.content
  210 +
202 211 }).catch(err => {
203 212 console.log(err)
204 213 //请求失败
... ... @@ -290,11 +299,19 @@
290 299 this.companys = [
291 300 {
292 301 value: '1',
293   - label: '1年'
  302 + label: '年'
294 303 },
295 304 {
296 305 value: '2',
297   - label: '2年'
  306 + label: '季'
  307 + },
  308 + {
  309 + value: '3',
  310 + label: '月'
  311 + },
  312 + {
  313 + value: '4',
  314 + label: '日'
298 315 }
299 316 ]
300 317 }else if(val == 4){
... ... @@ -336,7 +353,7 @@
336 353 }else if(this.index == 2){
337 354 this.formList.belongingRegion = e[0].label
338 355 }else if(this.index == 3){
339   - this.formList.zuqi = e[0].label
  356 + this.formList.zhouqi = e[0].label
340 357 }else if(this.index == 4){
341 358 this.formList.zujin = e[0].label
342 359 if(e[0].value == 1){
... ... @@ -406,6 +423,15 @@
406 423 this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.formList, 1).then(res => {
407 424 //成功回调
408 425 this.tableData = res.data.data.content
  426 + if(res.data.data.content.length!=0){
  427 + let obj={
  428 + type:2,
  429 + matchingRecord:JSON.stringify(res.data.data.content)
  430 + }
  431 + this.$http.sendRequest('/resourceStrategyMatchingRecord/insert', 'POST', obj, 1).then(res => {
  432 + })
  433 + }
  434 +
409 435 })
410 436 this.formList = {
411 437 zulei: '',
... ...
lvdao-miniapp/utils/request.js
1 1  
2   - let hostall = window.location.href;
3   -let c1 = hostall.split('cdwlMall')[0];
4   -//let c1 = 'https://jy.scjysm.asia:18086/'
  2 +// let hostall = window.location.href;
  3 +// let c1 = hostall.split('cdwlMall')[0];
  4 +let c1 = 'https://jy.scjysm.asia:18086/'
5 5 //封装request请求
6 6 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
7 7 //判断header提交数据类型
... ... @@ -20,10 +20,10 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
20 20 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
21 21 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
22 22  
23   - // bases = 'http://192.168.2.230:9003' + url;
  23 + bases = 'http://128.10.249.21:9003'+ url;
24 24 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
25 25  
26   - bases = c1 + 'cdwlMall/meserver/admin-server' + url;
  26 + // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
27 27  
28 28 }else if(baseUrl == 3){
29 29 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
... ...
yanshouban/src/views/customer/yixiang/index.vue
... ... @@ -348,13 +348,8 @@
348 348 匹配记录
349 349 </div>
350 350 <div style="padding: 0 20px">
351   - <div style="
352   - display: flex;
353   - justify-content: space-between;
354   - font-size: 14px;
355   -
356   - ">
357   - <el-form ref="form" :inline="true" :model="pipeiSel" style="padding-top: 10px;">
  351 + <div style="">
  352 + <el-form ref="form" :inline="true" :model="pipeiSel" style="padding-top: 10px;" class="formcontainer">
358 353 <el-form-item label="意向资源类型">
359 354 <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择" style="width:168px">
360 355 <el-option label="商铺" value="sp" />
... ... @@ -1131,6 +1126,11 @@ async getshen(item){
1131 1126 </script>
1132 1127 <style src="@wangeditor/editor/dist/css/style.css"></style>
1133 1128 <style scoped>
  1129 + .formcontainer{
  1130 + display: grid;
  1131 + grid-template-columns: repeat(2, 1fr);
  1132 + grid-gap: 10px; /* 可选,设置列之间的间隙 */
  1133 + }
1134 1134 /deep/ .first-column-bg {
1135 1135 background-color: #f4f4f5 !important;
1136 1136 }
... ...