webapp / GreenwayWeb

Commit c3f8e431a57081cf12813c18bab2fce959c7a657

Authored by wesley88
1 parent c7a00a3c

1

Inline Side-by-side
Showing 19 changed files with 259 additions and 97 deletions
admin-web-master/src/api/newly.js
  View file @c3f8e43
1 1 import request from '@/utils/request'
2 2 // import request from '@/utils/request2'
  3 +// oa
  4 +export function general(data) {
  5 + return request({
  6 + url: '/oaInterconnection/general',
  7 + method: 'post',
  8 + data,
  9 + // headers: {
  10 + // 'Content-Type': 'Multipart/form-data'
  11 + // }
  12 + })
  13 +}
3 14 // 生成合同附件
4 15 export function dataInprotDocument(data) {
5 16 return request({
6   - url: '/cereContractTemplate/dataInprotDocument ',
  17 + url: '/cereContractTemplate/dataInprotDocument',
7 18 method: 'post',
8 19 data
9 20 })
... ...
admin-web-master/src/components/ImageUpload/index.vue
  View file @c3f8e43
... ... @@ -212,7 +212,7 @@
212 212  
213 213 // 更新当前文件的上传状态
214 214 this.reactiveData.filesIng[i].status = 'uploading';
215   -
  215 + console.error(fd)
216 216 // 调用 miniioupload 方法并等待响应
217 217 const res = await miniioupload(fd);
218 218 list.push(res.data)
... ...
admin-web-master/src/components/add/addcd.vue
  View file @c3f8e43
... ... @@ -65,7 +65,7 @@
65 65 <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" maxlength="100">
66 66 </el-input>
67 67 </el-form-item> -->
68   - <el-form-item label="地图标点" prop="mapMarker">
  68 + <el-form-item label="地图标点" prop="detailedLocation">
69 69 <div style="width: 100%;height: 300px;">
70 70 <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
71 71 </div>
... ... @@ -192,7 +192,7 @@
192 192 }],
193 193 detailedLocation: [{
194 194 required: true,
195   - message: '请输入详细位置',
  195 + message: '请地图标点选择位置',
196 196 trigger: 'blur'
197 197 }, ],
198 198 mapMarker: [{
... ...
admin-web-master/src/components/add/addht.vue
  View file @c3f8e43
... ... @@ -229,6 +229,8 @@ import {
229 229 tenantTelephone: this.info.tenantTelephone,
230 230 shopNumber: this.info.shopNumber,
231 231 templateInformationUrl:this.templateAttachment,
  232 + createDate:this.updateCurrentTime(),
  233 + createUser: localStorage.getItem('roleName'),
232 234 }
233 235 console.error(from)
234 236 let info = await this.culfj()
... ... @@ -354,31 +356,31 @@ import {
354 356 }).then(res => {
355 357 console.error(res)
356 358 })
357   - // if(this.info.id) {
358   - // if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) {
359   - // msgedit({
360   - // auditStatus: '4',
361   - // id: this.info.id,
362   - // contractNumber: this.formInline.contractNumber
363   - // })
364   - // }
365   - // if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) {
366   - // AdvertiserInfoEdit({
367   - // auditStatus: '4',
368   - // id: this.info.id,
369   - // contractId: this.formInline.contractNumber
370   - // }).then(item => {
371   - // this.getAll()
372   - // })
373   - // }
374   - // if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
375   - // msgedit({
376   - // auditStatus: '4',
377   - // id: this.info.id,
378   - // contractNumber: this.formInline.contractNumber
379   - // })
380   - // }
381   - // }
  359 + if(this.info.id) {
  360 + if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) {
  361 + msgedit({
  362 + auditStatus: '4',
  363 + id: this.info.id,
  364 + contractNumber: this.formInline.contractNumber
  365 + })
  366 + }
  367 + if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) {
  368 + AdvertiserInfoEdit({
  369 + auditStatus: '4',
  370 + id: this.info.id,
  371 + contractId: this.formInline.contractNumber
  372 + }).then(item => {
  373 + this.getAll()
  374 + })
  375 + }
  376 + if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
  377 + msgedit({
  378 + auditStatus: '4',
  379 + id: this.info.id,
  380 + contractNumber: this.formInline.contractNumber
  381 + })
  382 + }
  383 + }
382 384 this.$emit('removeonaction', '1')
383 385 } else {
384 386 this.$message({
... ...
admin-web-master/src/components/add/addinformation.vue
  View file @c3f8e43
... ... @@ -50,7 +50,23 @@
50 50 </el-form-item>
51 51 </el-col>
52 52 </el-row>
53   -
  53 + <el-row :gutter="20">
  54 + <el-col :span="12">
  55 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  56 + <el-select v-model="ruleForm.belongingGreenwaySection" placeholder="请选择"
  57 + style="margin-top:5px;width: 100%;" @change="lvdaoSel">
  58 + <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
  59 + :key="index"></el-option>
  60 + </el-select>
  61 + </el-form-item>
  62 + </el-col>
  63 + <el-col :span="12">
  64 + <el-form-item label="门牌号" prop="houseNumber">
  65 + <el-input v-model="ruleForm.houseNumber" placeholder="请输入"
  66 + maxlength="20"></el-input>
  67 + </el-form-item>
  68 + </el-col>
  69 + </el-row>
54 70  
55 71 <el-row :gutter="20">
56 72 <el-col :span="12">
... ... @@ -81,13 +97,8 @@
81 97 </el-form-item>
82 98 </el-col>
83 99 </el-row>
84   -
85   - <el-form-item label="门牌号" prop="houseNumber">
86   - <el-input v-model="ruleForm.houseNumber" placeholder="请输入"
87   - maxlength="20"></el-input>
88   - </el-form-item>
89 100 <el-form-item label="详细位置" prop="detailedLocation">
90   - <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" maxlength="100">
  101 + <el-input :disabled="true" v-model="ruleForm.detailedLocation" placeholder="请地图标点选择位置" maxlength="100">
91 102 </el-input>
92 103 </el-form-item>
93 104 <el-form-item label="地图标点" prop="mapPunctuation">
... ... @@ -205,6 +216,11 @@
205 216 message: '请选择商铺类型',
206 217 trigger: 'blur'
207 218 }, ],
  219 + belongingGreenwaySection: [{
  220 + required: true,
  221 + message: '请填写所属绿道段',
  222 + trigger: 'blur'
  223 + }, ],
208 224 belongingRegion: [{
209 225 required: true,
210 226 message: '请选择所属区域',
... ... @@ -212,7 +228,7 @@
212 228 }],
213 229 detailedLocation: [{
214 230 required: true,
215   - message: '请输入详细位置',
  231 + message: '请地图标点选择位置',
216 232 trigger: 'blur'
217 233 }, ],
218 234 mapPunctuation: [{
... ...
admin-web-master/src/components/add/addmap.vue
  View file @c3f8e43
... ... @@ -67,7 +67,7 @@
67 67 <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input>
68 68 </el-form-item>
69 69 <el-form-item label="详细位置" prop="detailedLocation">
70   - <el-input v-model="formInline.detailedLocation" placeholder="请输入" maxlength="50"></el-input>
  70 + <el-input v-model="formInline.detailedLocation" :disabled="true" placeholder="请地图标点选择位置" maxlength="100"></el-input>
71 71 </el-form-item>
72 72 <el-form-item label="地图标点" prop="mapPunctuation" >
73 73 <!-- <div style="width: 100%;height: 300px;">
... ... @@ -228,7 +228,7 @@
228 228 }],
229 229 detailedLocation: [{
230 230 required: true,
231   - message: '请输入详细位置',
  231 + message: '请地图标点选择位置',
232 232 trigger: ['change']
233 233 }],
234 234 mapPunctuation: [{
... ...
admin-web-master/src/components/add/addsam.vue
  View file @c3f8e43
... ... @@ -487,6 +487,10 @@
487 487 ceDel({
488 488 id: ids
489 489 }).then(res => {
  490 + this.$message({
  491 + message: '删除成功',
  492 + type: 'success'
  493 + })
490 494 this.getmb()
491 495 done();
492 496 })
... ...
admin-web-master/src/components/buscha/busCha.vue
  View file @c3f8e43
... ... @@ -97,7 +97,7 @@
97 97 <div class="duiqi greens" @click ="item.value?openfile(item.value):''">{{item.value?'查看详情':'暂无文件'}}</div>
98 98 </el-form-item>
99 99 <el-form-item :label="item.name" prop="paymentDay" v-else-if="item.type != '资源' && item.type != '商家'">
100   - <div class="duiqi">{{item.value}}</div>
  100 + <div class="duiqi">{{item.value}}<span v-if="item.key == 'earnestMoney' || item.key == 'contractAmount'"> 元</span></div>
101 101 </el-form-item>
102 102 </el-col>
103 103 </el-row>
... ...
admin-web-master/src/components/chakan/ggsh.vue
  View file @c3f8e43
... ... @@ -239,17 +239,20 @@
239 239 </el-tab-pane>
240 240 </el-tabs>
241 241 </div>
242   - <div v-if="info.auditStatus == 1 && issp == '2'" style="border-top: 2px solid #eee;">
243   - <div style="padding-left: 130px;margin: 25px 0;">
244   - <el-radio v-model="radio" label="2">同意</el-radio>
245   - <el-radio v-model="radio" label="3">拒绝</el-radio>
  242 + <div v-if="info.auditStatus == 1 && issp == '2'" >
  243 + <TitleWithCircle title="审核情况"/>
  244 + <div style="padding: 20px;">
  245 + <el-form :model="info" label-width="130px" class="demo-ruleForm">
  246 + <el-form-item label="状态">
  247 + <el-radio v-model="radio" label="2">同意</el-radio>
  248 + <el-radio v-model="radio" label="3">拒绝</el-radio>
  249 + </el-form-item>
  250 + <el-form-item label="审核意见">
  251 + <el-input maxlength="200" show-word-limit rows="4" v-model="auditComments" placeholder="请输入审核意见"
  252 + type="textarea" />
  253 + </el-form-item>
  254 + </el-form>
246 255 </div>
247   - <el-form :model="info" label-width="130px" class="demo-ruleForm">
248   - <el-form-item label="审核意见">
249   - <el-input maxlength="200" show-word-limit rows="4" v-model="auditComments" placeholder="请输入审核意见"
250   - type="textarea" />
251   - </el-form-item>
252   - </el-form>
253 256 </div>
254 257 <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'">
255 258 <TitleWithCircle title="审核结果"/>
... ...
admin-web-master/src/components/chakan/zl.vue
  View file @c3f8e43
... ... @@ -217,6 +217,16 @@
217 217 </el-form-item>
218 218 </el-col>
219 219 <el-col :span="8">
  220 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  221 + <div class="duiqi">{{info.cereBasicInformationShop.belongingGreenwaySection || '无'}}</div>
  222 + </el-form-item>
  223 + </el-col>
  224 + <el-col :span="8">
  225 + <el-form-item label="门牌号" prop="houseNumber">
  226 + <div class="duiqi">{{info.cereBasicInformationShop.houseNumber || '无'}}</div>
  227 + </el-form-item>
  228 + </el-col>
  229 + <el-col :span="8">
220 230 <el-form-item label="归属部门" prop="belongingDepartment">
221 231 <div class="duiqi">{{info.cereBasicInformationShop.belongingDepartment || '无'}}</div>
222 232 </el-form-item>
... ... @@ -226,8 +236,6 @@
226 236 <div class="duiqi">{{info.cereBasicInformationShop.head || '无'}}</div>
227 237 </el-form-item>
228 238 </el-col>
229   - </el-row>
230   - <el-row :gutter="20">
231 239 <el-col :span="8">
232 240 <el-form-item label="联系人" prop="contacts">
233 241 <div class="duiqi">{{info.cereBasicInformationShop.contacts || '无'}}</div>
... ... @@ -238,13 +246,9 @@
238 246 <div class="duiqi">{{info.cereBasicInformationShop.telephone || '无'}}</div>
239 247 </el-form-item>
240 248 </el-col>
241   - <el-col :span="8">
242   -
243   - </el-col>
244 249 </el-row>
245   - <el-form-item label="门牌号" prop="houseNumber">
246   - <div class="duiqi">{{info.cereBasicInformationShop.houseNumber || '无'}}</div>
247   - </el-form-item>
  250 +
  251 +
248 252 <el-form-item label="详细位置" prop="detailedLocation">
249 253 <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation || '无'}}</div>
250 254 </el-form-item>
... ... @@ -387,7 +391,7 @@
387 391 <el-radio v-model="radio" label="3">拒绝</el-radio>
388 392 </el-form-item>
389 393 <el-form-item label="审核意见">
390   - <el-input maxlength="200" show-word-limit rows="4" v-model="info.reviewComments" placeholder="请输入审核意见"
  394 + <el-input maxlength="200" show-word-limit rows="4" v-model="info.auditSuggestions" placeholder="请输入审核意见"
391 395 type="textarea" />
392 396 </el-form-item>
393 397 </el-form>
... ... @@ -401,7 +405,7 @@
401 405 <div class="duiqi">{{info.auditStatus=='2'?'已通过':info.auditStatus=='3'?'不通过':'无'}}</div>
402 406 </el-form-item>
403 407 <el-form-item label="审核意见">
404   - <div class="duiqi">{{info.reviewComments || '无'}}</div>
  408 + <div class="duiqi">{{info.auditSuggestions || '无'}}</div>
405 409 </el-form-item>
406 410 </el-form>
407 411 </div>
... ... @@ -503,7 +507,7 @@
503 507 msgedit({
504 508 id: this.info.id,
505 509 'auditStatus': this.radio,
506   - reviewComments: this.info.reviewComments
  510 + auditSuggestions: this.info.auditSuggestions
507 511 }).then(res => {
508 512 console.error(res)
509 513 if (res.code == 200) {
... ...
admin-web-master/src/components/resourceCommodity/index.vue
  View file @c3f8e43
... ... @@ -48,6 +48,16 @@
48 48 </el-form-item>
49 49 </el-col>
50 50 <el-col :span="8">
  51 + <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
  52 + <div class="duiqi">{{editbgid.belongingGreenwaySection || '无'}}</div>
  53 + </el-form-item>
  54 + </el-col>
  55 + <el-col :span="8">
  56 + <el-form-item label="门牌号" prop="houseNumber">
  57 + <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
  58 + </el-form-item>
  59 + </el-col>
  60 + <el-col :span="8">
51 61 <el-form-item label="归属部门" prop="belongingDepartment">
52 62 <div class="duiqi">{{editbgid.belongingDepartment || '无'}}</div>
53 63 </el-form-item>
... ... @@ -57,8 +67,6 @@
57 67 <div class="duiqi">{{editbgid.head || '无'}}</div>
58 68 </el-form-item>
59 69 </el-col>
60   - </el-row>
61   - <el-row :gutter="20">
62 70 <el-col :span="8">
63 71 <el-form-item label="联系人" prop="contacts">
64 72 <div class="duiqi">{{editbgid.contacts || '无'}}</div>
... ... @@ -69,13 +77,8 @@
69 77 <div class="duiqi">{{editbgid.telephone || '无'}}</div>
70 78 </el-form-item>
71 79 </el-col>
72   - <el-col :span="8">
73   -
74   - </el-col>
75 80 </el-row>
76   - <el-form-item label="门牌号" prop="houseNumber">
77   - <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
78   - </el-form-item>
  81 +
79 82 <el-form-item label="详细位置" prop="detailedLocation">
80 83 <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div>
81 84 </el-form-item>
... ...
admin-web-master/src/utils/request.js
  View file @c3f8e43
... ... @@ -17,13 +17,13 @@ let baseURL = &#39;&#39;
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19 19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20   - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
21 21 // baseURL = 'http://172.16.61.125:9003';
22 22  
23 23 // baseURL = 'http://128.10.249.206:9003';
24 24  
25 25  
26   - // baseURL = 'http://10.0.0.51:9003';
  26 + baseURL = 'http://128.10.250.204:9003';
27 27  
28 28 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
29 29 // baseURL = 'http://192.168.2.225:9003';
... ...
admin-web-master/src/views/customer/rsaManagement/genjin.vue
  View file @c3f8e43
... ... @@ -139,7 +139,7 @@
139 139  
140 140 <el-form-item label="现场照片" >
141 141 <div style="display:flex;flex-wrap: wrap;" v-if="msgEit" >
142   - <el-image
  142 + <!-- <el-image
143 143 style="width: 100px; height: 100px;margin-right: 10px;"
144 144 fit="fill"
145 145 :src="$baseURL+item"
... ... @@ -147,7 +147,10 @@
147 147 >
148 148 <div slot="error" class="image-slot">
149 149  
150   - </div></el-image>
  150 + </div></el-image> -->
  151 + <div style="display: flex;">
  152 + <allimg v-if="item" :src="item" fit="contain" v-for="item in imgList" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
  153 + </div>
151 154 </div>
152 155 <upimg filePath="yixiang" inputtype="onSitePhotos" :value="formInline.onSitePhotos"
153 156 @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" ></upimg>
... ... @@ -266,9 +269,10 @@
266 269 import {
267 270 getAlls as map1
268 271 } from '../../../api/map1'
  272 + import allimg from '@/components/chakan/allimg.vue';
269 273 export default {
270 274 components: {
271   - upimg
  275 + upimg,allimg
272 276 },
273 277 props: {
274 278 message: {
... ...
admin-web-master/src/views/customer/rsaManagement/tanpan.vue
  View file @c3f8e43
... ... @@ -102,7 +102,7 @@
102 102 </el-form-item>
103 103 <el-form-item label="现场照片" >
104 104 <div v-if="msgEit" style="display:flex;flex-wrap: wrap">
105   - <el-image
  105 + <!-- <el-image
106 106 style="width: 100px; height: 100px;margin-right: 10px;"
107 107 fit="fill"
108 108 :src="$baseURL+item"
... ... @@ -110,7 +110,10 @@
110 110 >
111 111 <div slot="error" class="image-slot">
112 112 </div>
113   - </el-image>
  113 + </el-image> -->
  114 + <div style="display: flex;">
  115 + <allimg v-if="item" :src="item" fit="contain" v-for="item in imgList" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
  116 + </div>
114 117 </div>
115 118 <upimg filePath="yixiang" inputtype="onSitePhotos" :value="formInline.onSitePhotos"
116 119 @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" ></upimg>
... ... @@ -142,6 +145,7 @@
142 145 } from '../../../api/inr.js'
143 146 import upimg from "@/components/ImageUpload/index"
144 147 import upfile from "@/components/fujianUpload/fujianList"
  148 + import allimg from '@/components/chakan/allimg.vue';
145 149 import {
146 150 getAlls
147 151 } from '../../../api/information.js'
... ... @@ -151,7 +155,8 @@
151 155 export default {
152 156 components: {
153 157 upimg,
154   - upfile
  158 + upfile,
  159 + allimg
155 160 },
156 161 props: {
157 162 message: {
... ...
admin-web-master/src/views/detect/analyse.vue
  View file @c3f8e43
... ... @@ -18,9 +18,9 @@
18 18 <el-option label="2" value="2" />
19 19 </el-select> -->
20 20 <el-date-picker v-model="FormTime" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期"
21   - end-placeholder="结束日期" style="width: 200px;margin-right: 10px;ma" prefix-icon="none">
  21 + end-placeholder="结束日期" style="width: 300px;margin-right: 10px;" prefix-icon="none">
22 22 </el-date-picker>
23   - <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
  23 + <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;">检索
24 24 </el-button>
25 25 <el-button @click="resetting" class="buttonHover"
26 26 style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
... ... @@ -85,7 +85,7 @@
85 85 </div> -->
86 86 </div>
87 87 <div style="display:flex;margin-top:10px;">
88   - <div style="width:48%;height: 400px;marigin-right:20px;">
  88 + <div style="width:48%;height: 400px;margin-right:20px;">
89 89 <div style="display: flex;justify-content: space-between;">
90 90 <div style="line-height:35px;">租赁意向人群统计</div>
91 91 <!-- <div>
... ... @@ -97,7 +97,7 @@
97 97 </div>
98 98 <div ref="shop2BT" style="width:100%;height: 400px;"></div>
99 99 </div>
100   - <div style="width:48%;height: 400px;marigin-right:20px;">
  100 + <div style="width:48%;height: 400px;margin-right:20px;">
101 101 <div style="display: flex;justify-content: space-between;">
102 102 <div style="line-height:35px;">意向申请数量</div>
103 103 <!-- <div>
... ... @@ -351,6 +351,18 @@
351 351 },
352 352 computed: {},
353 353 created() {
  354 + //获取今天日期和一个月前的日期
  355 + let today = new Date();
  356 + let monthAgo = new Date();
  357 + monthAgo.setMonth(monthAgo.getMonth() - 1);
  358 + monthAgo.setDate(monthAgo.getDate() + 1);
  359 + this.pageindex.startTime = monthAgo.toISOString().slice(0, 10);
  360 + this.pageindex.endTime = today.toISOString().slice(0, 10);
  361 + this.FormTime = [
  362 + this.pageindex.startTime,
  363 + this.pageindex.endTime
  364 + ]
  365 + console.error(this.pageindex)
354 366 this.getAll()
355 367  
356 368 },
... ...
admin-web-master/src/views/detect/examine/index.vue
  View file @c3f8e43
... ... @@ -146,9 +146,9 @@
146 146 {{scope.row.cereBasicInformationVenue.venueType}}
147 147 </template>
148 148 </el-table-column>
149   - <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
  149 + <el-table-column label="实际使用面积" prop="actualArea" show-overflow-tooltip>
150 150 <template slot-scope="scope">
151   - {{scope.row.cereBasicInformationVenue.actualUsableArea}}
  151 + {{scope.row.cereBasicInformationVenue.actualArea}}
152 152 </template>
153 153 </el-table-column>
154 154 <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
... ...
admin-web-master/src/views/rent/audit/index.vue
  View file @c3f8e43
... ... @@ -11,17 +11,17 @@
11 11 <div class="formSearch">
12 12 <el-form :inline="true" :model="pagequery">
13 13 <el-form-item label="资源名称">
14   - <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
  14 + <el-input v-model="pagequery.cereBasicInformationShop.shopName" placeholder="请输入" style="width:168px;" />
15 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-option label="场地" value="场地"></el-option>
  16 + <el-form-item label="资源类型" prop="rentalResourcesId">
  17 + <el-select v-model="pagequery.rentalResourcesId" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
  18 + <el-option label="商铺" value="sp"></el-option>
  19 + <el-option label="场地" value="cd"></el-option>
20 20  
21 21 </el-select>
22 22 </el-form-item>
23 23 <el-form-item label="联系电话">
24   - <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
  24 + <el-input v-model="pagequery.applicant" placeholder="请输入" style="width:168px;" />
25 25 </el-form-item>
26 26 <el-form-item label="状态" prop="auditStatus">
27 27 <el-select v-model="pagequery.auditStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
... ... @@ -174,7 +174,11 @@
174 174 dataStatus:'1',
175 175 pageNumber: 0,
176 176 pageSize: 10,
177   - contractName: ''
  177 + applicant: '',
  178 + rentalResourcesId:"",
  179 + cereBasicInformationShop: {
  180 + shopName: ""
  181 + }
178 182 },
179 183 tableData: [],
180 184 total: 0,
... ... @@ -295,10 +299,14 @@
295 299 //重置按钮
296 300 resetting() {
297 301 this.pagequery = {
  302 + dataStatus:'1',
298 303 pageNumber: 0,
299 304 pageSize: 10,
300   - dataStatus:'1',
301   - contractName: ''
  305 + applicant: '',
  306 + rentalResourcesId:"",
  307 + cereBasicInformationShop: {
  308 + shopName: ""
  309 + }
302 310 },
303 311 this.getAll()
304 312 },
... ...
admin-web-master/src/views/scheme/sam.vue
  View file @c3f8e43
... ... @@ -76,7 +76,7 @@
76 76 <template slot-scope="scope">
77 77 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
78 78 <div @click="removeinfo(scope.row)" class="tableBtn greens">编辑</div>
79   - <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
  79 + <!-- <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div> -->
80 80 </template>
81 81 </el-table-column>
82 82 </el-table>
... ...
admin-web-master/src/views/shopRental/manage/index.vue
  View file @c3f8e43
... ... @@ -13,8 +13,16 @@
13 13 <el-form-item label="合同名称">
14 14 <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
15 15 </el-form-item>
  16 + <el-form-item label="合同状态" prop="dataStatus">
  17 + <el-select v-model="pagequery.dataStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
  18 + <el-option label="使用中" value="1"></el-option>
  19 + <el-option label="往期合同" value="2"></el-option>
  20 + <el-option label="已终止" value="3"></el-option>
  21 +
  22 + </el-select>
  23 + </el-form-item>
16 24 </el-form>
17   -
  25 +
18 26 <div>
19 27 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
20 28 </el-button>
... ... @@ -86,6 +94,7 @@
86 94 <el-table-column label="操作" min-width="150" fixed="right">
87 95 <template slot-scope="scope">
88 96 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  97 + <div @click="OA(scope.row)" class="tableBtn greens">OA</div>
89 98 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
90 99 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
91 100 <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
... ... @@ -162,15 +171,16 @@
162 171 cereContractInformation
163 172 } from '@/api/commodityLease.js'
164 173 import {
165   - modifyResourceStatus
  174 + modifyResourceStatus,general
166 175 } from '@/api/newly.js'
  176 + import axios from 'axios'
167 177 export default {
168 178 data() {
169 179 return {
170 180 contractChangeReason: '',
171 181 detailsinfo: {},
172 182 pagequery: {
173   - dataStatus:'1',
  183 + // dataStatus:'1',
174 184 pageNumber: 0,
175 185 pageSize: 10,
176 186 contractName: ''
... ... @@ -190,6 +200,86 @@
190 200 this.getAll()
191 201 },
192 202 methods: {
  203 + async OA(row){
  204 + const response = await axios.get(this.$baseURL+row.appendicesContract);
  205 +
  206 + // 处理二进制数据
  207 + const blob = response.data;
  208 + console.log(blob);
  209 + // return
  210 + const base64Data = Buffer.from(blob, 'binary').toString('base64');
  211 + console.log(base64Data);
  212 + // return
  213 + const file = new File([blob], 'filename.txt', { type: 'text/plain' });
  214 + console.log(file);
  215 + let fd = new FormData();
  216 + fd.append('fileBytes', file); // 假设 formData 包含文件
  217 + fd.append('fileName', '"合同.txt"');
  218 + console.log(fd);
  219 + let c1 = {
  220 + "title":"这是一个流程",
  221 + "files": [
  222 + {
  223 + fileName:'合同.txt',
  224 + fileBytes:base64Data
  225 + // fileBytes:'Y4EdWbGGg6gsD4eHlUR3aUmr0Xz050KI'
  226 + }
  227 + ],
  228 + "reviewers": ["1768540680428331008"],
  229 + // "account":"zsfu-test",
  230 + // "password":"000009",
  231 + // "accessKey":"HfHJ1cDCX4PuwSC5hox0cvJCdvnNFGOC",
  232 + // "secretAccessKey":"t05ebUtKp06004E90bfUBv1145R49Zg4",
  233 + // "sponsor":"1858710592190291968",
  234 + // // "id":"5c19f869063e57766b127177143e5c5d",
  235 + // "isonData":"这里是外部系统需要传递数据集合",
  236 + // "messageId":"外部系统唯一id",
  237 + // "reviewers":['1768540680428331008','1768539930201563136']
  238 + }
  239 + // c1.files.push(fd)
  240 + console.log(c1);
  241 + general(c1).then(res => {
  242 +
  243 + })
  244 + return
  245 + // URL.createObjectURL(this.$baseURL+row.appendicesContract)
  246 + const xhr = new XMLHttpRequest();
  247 + xhr.open('GET', this.$baseURL+row.appendicesContract, true);
  248 + xhr.responseType = 'blob'; // 设置响应类型为 blob
  249 +
  250 + xhr.onload = () => {
  251 + if (xhr.status === 200) {
  252 + const blob = xhr.response;
  253 + console.log(blob);
  254 + // general({
  255 + // "title":"这是一个流程",
  256 + // "files": [{
  257 + // "fileBytes":blob,
  258 + // "fileName":"合同.txt"
  259 + // }]
  260 + // }).then(res => {
  261 +
  262 + // })
  263 + // 如果需要保存文件，可以创建一个 URL 对象并下载
  264 + const url = window.URL.createObjectURL(blob);
  265 + const link = document.createElement('a');
  266 + link.href = url;
  267 + console.log(link);
  268 + link.setAttribute('download', 'filename.ext'); // 设置下载的文件名
  269 + document.body.appendChild(link);
  270 + link.click();
  271 + document.body.removeChild(link);
  272 + } else {
  273 + console.error('下载文件时出错:', xhr.status);
  274 + }
  275 + };
  276 +
  277 + xhr.onerror = () => {
  278 + console.error('下载文件时出错');
  279 + };
  280 +
  281 + xhr.send();
  282 + },
193 283 gettime() {
194 284 // 获取当前时间
195 285 let currentTime = new Date();
... ... @@ -307,7 +397,7 @@
307 397 this.pagequery = {
308 398 pageNumber: 0,
309 399 pageSize: 10,
310   - dataStatus:'1',
  400 + dataStatus:'',
311 401 contractName: ''
312 402 },
313 403 this.getAll()
... ...