webapp / GreenwayWeb

Commit 09d4e1dcd20df522c5f92f97ae2bed5858680594

Authored by wesley88
1 parent eeb2763c

1

Inline Side-by-side
Showing 10 changed files with 915 additions and 958 deletions
admin-web-master/.env.development
  View file @09d4e1d
... ... @@ -6,7 +6,7 @@ VUE_APP_BASE_API = '/dev-api'
6 6  
7 7 # VUE_APP_DOMAIN_PREFIX_1 = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server"
8 8 # VUE_APP_DOMAIN_PREFIX_1 = "https://jy.scjysm.asia:18086/cdwlMall/atmosphere/atmosphereSp"
9   -VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.125:9003'
  9 +VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/cdwlMall/admin-server'
10 10 # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.245:49013'
11 11 # VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
12 12 VUE_APP_DOMAIN_PREFIX_2='https://zhld.028wlkj.com:49008/cdwlMall/business-server'
... ...
admin-web-master/.env.production
  View file @09d4e1d
... ... @@ -5,7 +5,7 @@ ENV = 'production'
5 5 VUE_APP_BASE_API = '/prod-api'
6 6 # VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
7 7 # VUE_APP_DOMAIN_PREFIX_1 = "https://jy.scjysm.asia:18086/cdwlMall/atmosphere/atmosphereSp"
8   -VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.123:9003'
  8 +VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/cdwlMall/admin-server'
9 9 # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
10 10 # VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
11 11 # VUE_APP_DOMAIN_PREFIX_2='https://zhld.028wlkj.com:49008/cdwlMall/business-server'
... ...
admin-web-master/package-lock.json
  View file @09d4e1d
... ... @@ -34,7 +34,7 @@
34 34 "swiper": "^5.4.5",
35 35 "vue": "^2.6.14",
36 36 "vue-awesome-swiper": "^4.1.1",
37   - "vue-jsonp": "^2.0.0",
  37 + "vue-jsonp": "^2.1.0",
38 38 "vue-lang": "^0.2.5",
39 39 "vue-quill-editor": "^3.0.6",
40 40 "vue-router": "3.0.6",
... ... @@ -23597,9 +23597,9 @@
23597 23597 }
23598 23598 },
23599 23599 "node_modules/vue-jsonp": {
23600   - "version": "2.0.0",
23601   - "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
23602   - "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
  23600 + "version": "2.1.0",
  23601 + "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.1.0.tgz",
  23602 + "integrity": "sha512-kezmjaAcMWdieO3tWxniC+82DitYUYjR1e2GsWIKHCTf+zhWUt2nPhN3dnmnAVhDQ+po3BspM7sKjiQaIhijUg=="
23603 23603 },
23604 23604 "node_modules/vue-lang": {
23605 23605 "version": "0.2.5",
... ... @@ -43735,9 +43735,9 @@
43735 43735 }
43736 43736 },
43737 43737 "vue-jsonp": {
43738   - "version": "2.0.0",
43739   - "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.0.0.tgz",
43740   - "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA=="
  43738 + "version": "2.1.0",
  43739 + "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.1.0.tgz",
  43740 + "integrity": "sha512-kezmjaAcMWdieO3tWxniC+82DitYUYjR1e2GsWIKHCTf+zhWUt2nPhN3dnmnAVhDQ+po3BspM7sKjiQaIhijUg=="
43741 43741 },
43742 43742 "vue-lang": {
43743 43743 "version": "0.2.5",
... ...
admin-web-master/package.json
  View file @09d4e1d
... ... @@ -39,7 +39,7 @@
39 39 "swiper": "^5.4.5",
40 40 "vue": "^2.6.14",
41 41 "vue-awesome-swiper": "^4.1.1",
42   - "vue-jsonp": "^2.0.0",
  42 + "vue-jsonp": "^2.1.0",
43 43 "vue-lang": "^0.2.5",
44 44 "vue-quill-editor": "^3.0.6",
45 45 "vue-router": "3.0.6",
... ...
admin-web-master/src/api/newly.js
  View file @09d4e1d
1 1 import request from '@/utils/request'
2 2 import requestnew from '@/utils/request2'
  3 +// 获取方案资源
  4 +export function cereBusinessPlanqueryById(data) {
  5 + return request({
  6 + url: '/cereBusinessPlan/queryById',
  7 + method: 'post',
  8 + data
  9 + })
  10 +}
  11 +// 获取方案
  12 +export function queryAllByLimit(data) {
  13 + return request({
  14 + url: '/cereBusinessPlan/queryAllByLimit',
  15 + method: 'post',
  16 + data
  17 + })
  18 +}
3 19 // 批量修改资源状态
4 20 export function modifyResourceStatus(data) {
5 21 return request({
... ...
admin-web-master/src/components/add/addfa.vue
  View file @09d4e1d
... ... @@ -64,8 +64,8 @@
64 64 </el-form-item>
65 65 </el-col>
66 66 </el-row>
67   - <el-form-item label="附件信息" prop="mainPurpose">
68   - <upfile :accept="'.docx,.doc'" filePath="fa" inputtype="mainPurpose" :value="formInline.mainPurpose" @changimg="e=>changimg(e,'mainPurpose')"></upfile>
  67 + <el-form-item label="附件信息" prop="attachmentInfo">
  68 + <upfile :accept="'.docx,.doc'" filePath="fa" inputtype="attachmentInfo" :value="formInline.attachmentInfo" @changimg="e=>changimg(e,'attachmentInfo')"></upfile>
69 69 </el-form-item>
70 70 <el-row :gutter="20">
71 71 <el-col :span="12">
... ... @@ -122,7 +122,8 @@
122 122 import {
123 123 cereResourceStrategy,
124 124 cereBusinessOperationadd,
125   - modifyResourceStatus
  125 + modifyResourceStatus,
  126 + cereBusinessPlanqueryById
126 127 } from '@/api/newly.js'
127 128 export default {
128 129 components: {
... ... @@ -172,7 +173,56 @@
172 173 }
173 174 },
174 175 async created() {
  176 + if (this.info && this.info.id) {
  177 + this.formInline = this.info
  178 + console.error({...this.formInline})
  179 + cereBusinessPlanqueryById({id:this.formInline.id}).then(res => {
  180 + let c1 = []
  181 + for (let index = 0; index < res.data.resourceList.length; index++) {
  182 + const element = res.data.resourceList[index];
  183 + if (element.cereBasicInformationShop.id) {
  184 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  185 + var element1 = element.cereRentalPolicies[i];
  186 + let info = {
  187 + cnet:'sp'+element.cereBasicInformationShop.id,
  188 + zyinfo:element.cereBasicInformationShop,
  189 + num:element.cereRentalPolicies.length,
  190 + clinfo:element1
  191 + }
  192 + c1.push(info);
  193 + }
  194 + }
  195 + if (element.cereAdvertisingInformation.id) {
  196 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  197 + var element1 = element.cereRentalPolicies[i];
  198 + let info = {
  199 + cnet:'gg'+element.cereAdvertisingInformation.id,
  200 + zyinfo:element.cereAdvertisingInformation,
  201 + num:element.cereRentalPolicies.length,
  202 + clinfo:element1
  203 + }
  204 + c1.push(info);
  205 + }
  206 + }
  207 + if (element.cereBasicInformationVenue.id) {
  208 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  209 + var element1 = element.cereRentalPolicies[i];
  210 + let info = {
  211 + cnet:'cd'+element.cereBasicInformationVenue.id,
  212 + zyinfo:element.cereBasicInformationVenue,
  213 + num:element.cereRentalPolicies.length,
  214 + clinfo:element1
  215 + }
  216 + c1.push(info);
  217 + }
  218 + }
  219 + }
  220 + console.error(c1)
  221 + this.AddData = c1
  222 + })
  223 + } else {
175 224  
  225 + }
176 226 },
177 227 methods: {
178 228 minSevcl(e) {
... ... @@ -263,7 +313,9 @@
263 313 //判断alllist是不是数组
264 314 if (Array.isArray(alllist)) {
265 315 for (let i = 0; i < alllist.length; i++) {
  316 + console.error(alllist[i])
266 317 let cnet = alllist[i].id
  318 + alllist[i].clids = alllist[i].clids +''
267 319 await this.addclall(alllist[i].id,alllist[i].clids.split(","))
268 320 if (i == 0) {
269 321 c2 = cnet
... ... @@ -276,6 +328,7 @@
276 328 return
277 329 }
278 330 console.error(c2)
  331 +
279 332 await cereBusinessOperationadd({
280 333 type: '发布',
281 334 resourceId: c2,
... ... @@ -288,42 +341,63 @@
288 341 console.error({
289 342 ...this.formInline
290 343 })
291   - fangAdd({
292   - ...this.formInline
293   - }).then(res => {
294   - console.error(res)
295   - this.$message({
296   - message: '添加成功',
297   - type: 'success'
298   - })
299   - modifyResourceStatus({
300   - resourcesId: c2,
301   - status:"1"
302   - }).then(res => {
303   - console.error(res)
304   - })
305   - this.$emit('removeonaction', '1')
306   - return
307   - if (res.code == 200) {
308   - this.$message({
309   - message: '添加成功',
310   - type: 'success'
311   - })
312   - modifyResourceStatus({
313   - resourcesId: c2,
314   - status:"1"
315   - }).then(res => {
316   - console.error(res)
317   - })
318   - this.$emit('removeonaction', '1')
319   - } else {
320   - this.$message({
321   - message: res.msg,
322   - type: 'error'
323   - })
324   - }
  344 +
  345 + // return
  346 + if(this.formInline.id) {
  347 + this.formInline.updateTime = this.updateCurrentTime()
  348 + this.formInline.updateUser = localStorage.getItem('roleName')
  349 + fangEdit({
  350 + ...this.formInline
  351 + }).then(res => {
  352 + console.error(res)
  353 + if (res.code == 200) {
  354 + this.$message({
  355 + message: '修改成功',
  356 + type: 'success'
  357 + })
  358 + modifyResourceStatus({
  359 + resourcesId: c2,
  360 + status:"1"
  361 + }).then(res => {
  362 + console.error(res)
  363 + })
  364 + this.$emit('removeonaction', '1')
  365 + } else {
  366 + this.$message({
  367 + message: res.msg,
  368 + type: 'error'
  369 + })
  370 + }
325 371  
326   - })
  372 + })
  373 + } else {
  374 + this.formInline.createTime = this.updateCurrentTime()
  375 + this.formInline.createUser = localStorage.getItem('roleName')
  376 + fangAdd({
  377 + ...this.formInline
  378 + }).then(res => {
  379 + console.error(res)
  380 + if (res.code == 200) {
  381 + this.$message({
  382 + message: '添加成功',
  383 + type: 'success'
  384 + })
  385 + modifyResourceStatus({
  386 + resourcesId: c2,
  387 + status:"1"
  388 + }).then(res => {
  389 + console.error(res)
  390 + })
  391 + this.$emit('removeonaction', '1')
  392 + } else {
  393 + this.$message({
  394 + message: res.msg,
  395 + type: 'error'
  396 + })
  397 + }
  398 +
  399 + })
  400 + }
327 401 },
328 402 async add() {
329 403 this.$refs.heForm.validate((valid) => {
... ... @@ -346,6 +420,19 @@
346 420 }
347 421 })
348 422 },
  423 + //获取当前时间
  424 + updateCurrentTime() {
  425 + const now = new Date();
  426 + const year = now.getFullYear();
  427 + const month = (now.getMonth() + 1).toString().padStart(2, '0');
  428 + const day = now.getDate().toString().padStart(2, '0');
  429 + const hours = now.getHours().toString().padStart(2, '0');
  430 + const minutes = now.getMinutes().toString().padStart(2, '0');
  431 + const seconds = now.getSeconds().toString().padStart(2, '0');
  432 +
  433 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  434 + },
  435 +
349 436 close() {
350 437 this.$emit('removeonaction', '1')
351 438 },
... ... @@ -459,7 +546,7 @@
459 546 info.children.push(elementnew)
460 547 if(elementnew.clinfo && elementnew.clinfo.id) {
461 548 if(i == 0) {
462   - info.clids = elementnew.clinfo.id
  549 + info.clids = elementnew.clinfo.id+''
463 550 } else {
464 551 info.clids = info.clids + ','+elementnew.clinfo.id
465 552 }
... ...
admin-web-master/src/components/chakan/fa.vue 0 → 100644
  View file @09d4e1d
  1 +<template>
  2 + <div>
  3 + <div v-show="type == '1'">
  4 + <div style="height:58px;line-height:58px;">
  5 + <div style="color:#0006">
  6 + <span>招商方案管理</span> <span
  7 + style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span>
  8 + </div>
  9 + </div>
  10 + <el-tabs v-model="xiangTab">
  11 + <el-tab-pane label="方案信息" name="first">
  12 + <div style="margin-top: 30px;" class="editcss">
  13 + <TitleWithCircle title="基础信息" />
  14 + <div style="padding: 20px;">
  15 + <el-form :model="editbgid" ref="formInline" label-width="120px" class="demo-ruleForm">
  16 + <el-form-item label="招商方案名称" prop="planName">
  17 + <div class="duiqi">{{editbgid.planName || '无'}}</div>
  18 + </el-form-item>
  19 + <el-form-item label="招商政策与条件" prop="investmentPolicy">
  20 + <div class="duiqi" v-if="editbgid.investmentPolicy" v-html="editbgid.investmentPolicy"></div>
  21 + <div class="duiqi" v-else>无</div>
  22 + </el-form-item>
  23 + <el-form-item label="方案概述" prop="summary">
  24 + <div class="duiqi" v-if="editbgid.summary" v-html="editbgid.summary"></div>
  25 + <div class="duiqi" v-else>无</div>
  26 + </el-form-item>
  27 + <el-form-item label="附件信息" prop="mainPurpose" >
  28 + <div class="duiqi" :class="editbgid.mainPurpose?'greens':''" @click ="editbgid.mainPurpose?openfile($baseURL+editbgid.mainPurpose):''">{{editbgid.mainPurpose?'查看详情':'无'}}</div>
  29 + </el-form-item>
  30 + </el-form>
  31 + </div>
  32 + <TitleWithCircle title="资源策略" />
  33 + <div style="padding: 20px;">
  34 + <el-table :data="datalistzy" :span-method="tableSpanMethod"
  35 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  36 + tooltip-effect="dark custom-tooltip-effect">
  37 + <el-table-column label="资源名称" prop="name" show-overflow-tooltip>
  38 + <template slot-scope="scope">
  39 + {{(scope.row.type == '商铺'?scope.row.info.shopName:scope.row.type == '广告位'?scope.row.info.advertisingName:scope.row.type == '场地'?scope.row.info.venueName:null) || '-'}}
  40 + </template>
  41 + </el-table-column>
  42 + <el-table-column prop="type" label="资源类型" show-overflow-tooltip>
  43 + <template slot-scope="scope">
  44 + {{scope.row.type}}
  45 + </template>
  46 + </el-table-column>
  47 + <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
  48 + <template slot-scope="scope">
  49 + {{scope.row.shopinfo.policyName}}
  50 + </template>
  51 + </el-table-column>
  52 + <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
  53 + <template slot-scope="scope">
  54 + {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
  55 + </template>
  56 + </el-table-column>
  57 + <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
  58 + <template slot-scope="scope">
  59 + {{scope.row.shopinfo.payDay || '-'}}
  60 + </template>
  61 + </el-table-column>
  62 + <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  63 + <template slot-scope="scope">
  64 + {{scope.row.info.publishStatus=='0'?'空置中':scope.row.info.publishStatus=='1'?'待审核':scope.row.info.publishStatus=='2'?'已发布':scope.row.info.publishStatus=='3'?'不通过':'-'}}
  65 + </template>
  66 + </el-table-column>
  67 + <el-table-column label="操作" fixed="right" prop="sh">
  68 + <template slot-scope="scope">
  69 + <div @click="details(scope.row)" class="tableBtn greens">查看</div>
  70 + </template>
  71 + </el-table-column>
  72 + </el-table>
  73 + </div>
  74 + </div>
  75 + </el-tab-pane>
  76 +
  77 + </el-tabs>
  78 + <div v-if="editbgid.auditStatus == '1' && issp == '2'">
  79 + <TitleWithCircle title="审核情况"/>
  80 + <div style="padding: 20px;">
  81 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  82 + <el-form-item label="状态">
  83 + <el-radio v-model="radio" label="2">通过</el-radio>
  84 + <el-radio v-model="radio" label="3">不通过</el-radio>
  85 + </el-form-item>
  86 + <el-form-item label="审核意见">
  87 + <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见"
  88 + type="textarea" />
  89 + </el-form-item>
  90 + </el-form>
  91 + </div>
  92 + </div>
  93 + <div v-if="editbgid.auditStatus == '2' || editbgid.auditStatus == '3'">
  94 + <TitleWithCircle title="审核结果"/>
  95 + <div style="padding: 20px;">
  96 + <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
  97 + <el-form-item label="状态">
  98 + <div class="duiqi">{{editbgid.auditStatus=='2'?'通过':editbgid.auditStatus=='3'?'不通过':'无'}}</div>
  99 + </el-form-item>
  100 + <el-form-item label="审核意见">
  101 + <div class="duiqi">{{editbgid.reviewComments || '无'}}</div>
  102 + </el-form-item>
  103 + </el-form>
  104 + </div>
  105 + </div>
  106 + <div>
  107 + <el-button v-if="editbgid.auditStatus == '1' && issp == '2'" @click="minSev"
  108 + style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  109 + <el-button class="buttonHover"
  110 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
  111 + @click="changetype">返回</el-button>
  112 + </div>
  113 + </div>
  114 + <div v-show="type == '2'">
  115 + <div style="height:58px;line-height:58px;">
  116 + <div style="color:#0006">
  117 + <span>{{detailstype == '商铺'?'商铺基本信息':detailstype == '广告位'?'广告位基本信息管理':detailstype == '场地'?'场地基本信息管理':'-' }}</span> <span
  118 + style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span>
  119 + </div>
  120 + </div>
  121 + <div v-if="detailstype == '商铺'">
  122 + <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
  123 + </div>
  124 + <div v-if="detailstype == '广告位'">
  125 + <chakanmap :editbgid="detailsinfo" @removeonaction="removeonaction"></chakanmap>
  126 + </div>
  127 + <div v-if="detailstype == '场地'">
  128 + <chakancd :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd>
  129 + </div>
  130 + </div>
  131 +
  132 + </div>
  133 +</template>
  134 +
  135 +<script>
  136 + import MapXian from "@/components/MapContainer/MapXian";
  137 + import TitleWithCircle from '@/components/top/index';
  138 + import {
  139 + cereResourceStrategylist,
  140 + cereBusinessPlan,
  141 + cereBusinessOperationqueryByPage,
  142 + cereContractInformation,
  143 + modifyResourceStatus,
  144 + cereBusinessPlanqueryById
  145 + } from '@/api/newly';
  146 + import newmap from "@/components/newmap/index";
  147 + import {
  148 + fangEdit
  149 + } from '@/api/fangli'
  150 + import resourceCommodity from '@/components/resourceCommodity/index'
  151 + import chakanmap from '@/components/chakan/map'
  152 + import chakancd from '@/components/chakan/cd'
  153 + export default {
  154 + components: {
  155 + TitleWithCircle,
  156 + newmap,
  157 + MapXian,
  158 + chakancd,
  159 + chakanmap,
  160 + resourceCommodity,
  161 + },
  162 + props: {
  163 + leixing: {
  164 + type: Boolean,
  165 + default: true
  166 + },
  167 + editbgid: {
  168 + type: Object,
  169 + default: function() {
  170 + return {};
  171 + },
  172 + },
  173 + issp: {
  174 + type: String,
  175 + default: function() {
  176 + return '1';
  177 + },
  178 + },
  179 + },
  180 + data() {
  181 + return {
  182 + type: '1',
  183 + totalzl:0,
  184 + pagequeryzl:{
  185 + pageNumber: 0,
  186 + pageSize: 10,
  187 + shopNumber: 'cd' + this.editbgid.id
  188 + },
  189 + datalistzl:[],
  190 + reviewComments:'',
  191 + radio: '2',
  192 + datalistzy:[],
  193 + totalsxj:0,
  194 + pagequerysxj:{
  195 + pageNumber: 0,
  196 + pageSize: 10,
  197 + resourceId: 'cd' + this.editbgid.id
  198 + },
  199 + xiangTab: 'first',
  200 + list: [],
  201 + parentMessage: {},
  202 + datalist: [],
  203 + datalist1:[],
  204 + detailsinfo:{},
  205 + detailstype:''
  206 + }
  207 + },
  208 + created() {
  209 + if (this.editbgid.id) {
  210 + cereBusinessPlanqueryById({id:this.editbgid.id}).then(res => {
  211 + console.error(res)
  212 + let c1 = []
  213 + for (let index = 0; index < res.data.resourceList.length; index++) {
  214 + const element = res.data.resourceList[index];
  215 + console.error(element)
  216 + if (element.cereBasicInformationShop.id) {
  217 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  218 + var element1 = element.cereRentalPolicies[i];
  219 + var obj = {
  220 + info: element.cereBasicInformationShop,
  221 + num: element.cereRentalPolicies.length,
  222 + shopinfo: element1,
  223 + type:'商铺',
  224 + typeid:'sp'+element.cereBasicInformationShop.id
  225 + };
  226 + c1.push(obj);
  227 + }
  228 + }
  229 + if (element.cereAdvertisingInformation.id) {
  230 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  231 + var element1 = element.cereRentalPolicies[i];
  232 +
  233 + var obj = {
  234 + info: element.cereAdvertisingInformation,
  235 + num: element.cereRentalPolicies.length,
  236 + shopinfo: element1,
  237 + type:'广告位',
  238 + typeid:'gg'+element.cereAdvertisingInformation.id
  239 + };
  240 + c1.push(obj);
  241 + }
  242 + }
  243 + if (element.cereBasicInformationVenue.id) {
  244 + for (let i = 0; i < element.cereRentalPolicies.length; i++) {
  245 + var element1 = element.cereRentalPolicies[i];
  246 +
  247 + var obj = {
  248 + info: element.cereBasicInformationVenue,
  249 + num: element.cereRentalPolicies.length,
  250 + shopinfo: element1,
  251 + type:'场地',
  252 + typeid:'cd'+element.cereBasicInformationVenue.id
  253 + };
  254 + c1.push(obj);
  255 + }
  256 + }
  257 + }
  258 + console.error(c1)
  259 + this.datalistzy = c1
  260 + })
  261 + // let c1 = {
  262 + // pageNumber: 0,
  263 + // pageSize: 10,
  264 + // resourcesId: 'cd' + this.editbgid.id
  265 + // }
  266 + // cereResourceStrategylist(c1).then(res => {
  267 + // console.error(res)
  268 + // this.datalist = res.data
  269 + // })
  270 + // cereBusinessPlan(c1).then(res => {
  271 + // console.error(res)
  272 + // this.datalist1 = res.data
  273 + // })
  274 + // this.getAllxsj()
  275 + // this.getAllzl()
  276 + }
  277 +
  278 + },
  279 + computed: {
  280 +
  281 + },
  282 + methods: {
  283 + removeonaction() {
  284 + this.type = '1'
  285 + },
  286 + details(row) {
  287 + this.detailstype = row.type
  288 + this.detailsinfo = row.info
  289 + this.type = '2'
  290 + },
  291 + tableSpanMethod({row, column, rowIndex }) {
  292 + if (['name','type','publishStatus','sh'].includes(column.property)) {
  293 + // 判断 num 是否相同，合并行
  294 + const num = row.num;
  295 + const typeid = row.typeid;
  296 +
  297 + const startRowIndex = this.findStartRowIndex(rowIndex, num,typeid);
  298 +
  299 + return startRowIndex === rowIndex
  300 + ? { rowspan: num, colspan: 1 }
  301 + : { rowspan: 0, colspan: 0 };
  302 + }
  303 + },
  304 + /**
  305 + * 查找当前行的 num 对应的起始行索引
  306 + */
  307 + findStartRowIndex(rowIndex, num,typeid) {
  308 + let startRowIndex = rowIndex;
  309 + for (let i = rowIndex - 1; i >= 0; i--) {
  310 + if (this.datalistzy[i].num === num && this.datalistzy[i].typeid === typeid) {
  311 + startRowIndex = i;
  312 + } else {
  313 + break;
  314 + }
  315 + }
  316 + return startRowIndex;
  317 + },
  318 + open(row) {
  319 + console.error(row)
  320 + this.xiangTab= 'first'
  321 + this.type = '2'
  322 + this.$refs.onhet.open(row)
  323 + },
  324 + minSev() {
  325 + console.error({
  326 + ...this.editbgid,
  327 + })
  328 + // return
  329 + fangEdit({
  330 + id:this.editbgid.id,
  331 + 'auditStatus': this.radio,
  332 + reviewComments: this.reviewComments?this.reviewComments:null
  333 + }).then(res => {
  334 + console.error(res)
  335 + if (res.code == 200) {
  336 + this.$message({
  337 + message: '处理成功',
  338 + type: 'success'
  339 + })
  340 + modifyResourceStatus({
  341 + resourcesId: this.editbgid.resourceManagement,
  342 + status:"2"
  343 + }).then(res => {
  344 + console.error(res)
  345 + })
  346 + this.editbgid.publishStatus = this.radio
  347 + this.$emit('removeonaction', '1')
  348 + } else {
  349 + this.$message({
  350 + message: '处理失败',
  351 + type: 'error'
  352 + })
  353 + }
  354 + })
  355 + },
  356 + handleCurrentChange(val,type) {
  357 + this[type].pageNumber = val - 1
  358 + if(type == 'pagequeryzl') {
  359 + this.getAllzl()
  360 + } else if(type == 'pagequerysxj') {
  361 + this.getAllsxj()
  362 + }
  363 +
  364 + },
  365 + handleSizeChange(val,type) {
  366 + this[type].pageSize = val
  367 + this[type].pageNumber = 0
  368 + if(type == 'pagequeryzl') {
  369 + this.getAllzl()
  370 + } else if(type == 'pagequerysxj') {
  371 + this.getAllsxj()
  372 + }
  373 + },
  374 + getAllzl() {
  375 + cereContractInformation(this.pagequeryzl).then(res => {
  376 + console.error(res)
  377 + if (!Array.isArray(res.data.content)) {
  378 + this.datalistzl = [];
  379 + return;
  380 + }
  381 + this.datalistzl = res.data.content
  382 + this.totalzl = res.data.totalElements
  383 + })
  384 + },
  385 + openfile(e) {
  386 + if (e) {
  387 + const fullUrl = e;
  388 + try {
  389 + window.open(fullUrl, '_blank'); // 在新标签页中打开文件
  390 + } catch (error) {
  391 + console.error('打开文件失败:', error);
  392 + }
  393 + } else {
  394 + console.error('无文件可查看');
  395 + }
  396 + },
  397 + changetype() {
  398 + this.xiangTab= 'first'
  399 + if(this.type == '1'){
  400 + this.$emit('removeonaction', '1')
  401 + }else{
  402 + this.type = '1'
  403 + }
  404 + },
  405 + }
  406 + }
  407 +</script>
  408 +<style>
  409 + .el-form-item__label {
  410 + color: #a2a2a2;
  411 + }
  412 +
  413 + .greens {
  414 + color: #3F9B6A;
  415 + }
  416 +</style>
... ...
admin-web-master/src/utils/request2.js
  View file @09d4e1d
... ... @@ -16,8 +16,8 @@ let hostall = window.location.href;
16 16 let baseURL = ''
17 17 // || host === 'localhost:9528'
18 18 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
19   - // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_2;
20   - baseURL = 'http://172.16.61.125:9004';
  19 + baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
  20 + // baseURL = 'http://172.16.61.125:9004';
21 21 // baseURL = 'https://jy.scjysm.asia:18086/merchant-business';
22 22 } else {
23 23 console.error('---------------------')
... ...
admin-web-master/src/views/ads/fangAudit/index.vue
  View file @09d4e1d
1 1 <template>
2 2 <div style="background-color:#f7f7f7;padding:10px 10px;">
3   - <div class="zhuti" v-if="banAct ==false">
  3 + <div class="zhuti" v-if="onaction == '1'">
4 4 <div style="height:58px;line-height:58px;">
5 5 <div style="color:#0006"> <span>招商方案管理</span> <span style="padding:0 5px;">></span> <span
6 6 style="color:#000000e6">招商方案审核</span></div>
7 7 </div>
  8 + <!-- 线上 -->
8 9 <div>
9 10 <!-- 搜索 -->
10 11 <div class="formSearch">
11   - <div>
12   - <el-form :model="formSel" :inline="true">
13   - <el-form-item label="方案名称">
14   - <el-input v-model="formSel.planName" placeholder="请输入" style="width:168px;">
15   - </el-input>
16   - </el-form-item>
17   - <el-form-item label="计划实施时间">
18   - <el-date-picker style="width:200px;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
19   - prefix-icon="none" type="datetimerange" range-separator="-" start-placeholder="开始日期"
20   - end-placeholder="结束日期">
21   - </el-date-picker>
22   - </el-form-item>
23   - </el-form>
24   - </div>
  12 + <el-form :inline="true" :model="pagequery">
  13 + <el-form-item label="方案名称">
  14 + <el-input v-model="pagequery.planName" placeholder="请输入" style="width:168px;">
  15 + </el-input>
  16 + </el-form-item>
  17 + <!-- <el-form-item label="状态" prop="auditStatus">
  18 + <el-select v-model="pagequery.auditStatus" clearable placeholder="请选择" style="margin-right: 15px">
  19 + <el-option label="待审核" value="1"></el-option>
  20 + <el-option label="审核通过" value="2"></el-option>
  21 + <el-option label="已驳回" value="3"></el-option>
  22 + </el-select>
  23 + </el-form-item> -->
  24 + </el-form>
  25 +
25 26 <div>
26 27 <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
27 28 </el-button>
... ... @@ -29,925 +30,379 @@
29 30 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
30 31 </el-button>
31 32 </div>
32   -
33 33 </div>
34 34 <!-- 表格 -->
35   - <el-table :data="
36   - tableData.slice(
37   - (currentPage - 1) * pageSize,
38   - currentPage * pageSize
39   - )
40   - "
41   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
42   - <el-table-column label="序号" min-width="60">
  35 +
  36 + <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  37 + <el-table-column label="序号" width="50">
43 38 <template slot-scope="scope">
44   - {{scope.$index+1}}
  39 + {{scope.$index +1 }}
45 40 </template>
46 41 </el-table-column>
47   - <el-table-column label="招商方案名称" prop="planName" min-width="300" />
48   - <!-- <el-table-column
49   - label="规划方案名称"
50   -
51   - min-width="300"
52   - >
53   - <template slot-scope="scope">
54   - {{scope.row.cereInvestmentPlanningManagement.planningName}}
55   - </template>
56   - </el-table-column> -->
57   - <!-- <el-table-column
58   - label="计划实施时间"
59   -
60   - min-width="250"
61   - >
62   - <template slot-scope="scope">
63   - {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
64   - </template>
65   - </el-table-column> -->
66   - <el-table-column label="涵盖资源数" min-width="120">
  42 + <el-table-column label="招商方案名称" prop="planName" show-overflow-tooltip max-width="200"/>
  43 + <el-table-column label="涵盖资源数" prop="createTime">
67 44 <template slot-scope="scope">
68   - {{ scope.row.cereResourceStrategy.length }}
  45 + {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
69 46 </template>
70 47 </el-table-column>
71   -
72   - <!-- <el-table-column label="资源类型" prop="contactInformation" min-width="150">
  48 + <el-table-column label="创建时间" prop="createTime">
73 49 <template slot-scope="scope">
74   - {{ scope.row.cereResourceStrategy.id }}
  50 + {{scope.row.createTime || '-' }}
75 51 </template>
76 52 </el-table-column>
77   - <el-table-column label="租金/周期" min-width="150">
  53 + <el-table-column label="创建人" prop="createUser">
78 54 <template slot-scope="scope">
79   -
  55 + {{scope.row.createUser || '-' }}
80 56 </template>
81 57 </el-table-column>
82   - <el-table-column label="付款日" min-width="150">
  58 + <el-table-column label="状态">
83 59 <template slot-scope="scope">
84   -
85   - </template>
86   - </el-table-column> -->
87   -
88   - <el-table-column label="状态" min-width="150">
89   - <template slot-scope="scope">
90   - {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
  60 + {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已撤回':''}}
91 61 </template>
92 62 </el-table-column>
93   -
94   - <el-table-column label="操作" width="180" fixed="right">
  63 + <el-table-column label="操作" fixed="right">
95 64 <template slot-scope="scope">
96   - <div class="tableBtn greens" @click="handleEditForm(scope.row,false)">
97   - 查看
98   - </div>
99   - <div class="tableBtn greens" @click="handleEditForm(scope.row,true)" v-if="scope.row.auditStatus =='1'">
100   - 审核
101   - </div>
102   - <!-- <div class="tableBtn greens" @click="geng()">
103   - 执行过程跟踪
104   - </div> -->
  65 + <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
  66 + <div class="tableBtn greens" @click="details(scope.row,'2')">审核</div>
105 67 </template>
106 68 </el-table-column>
107 69 </el-table>
108   - <div class="fenye">
109   - <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
110   - :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total"
111   - @size-change="handleSizeChange" @current-change="handleCurrentChange" />
  70 + <div style="display: flex;justify-content: space-between;" class="bom">
  71 + <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
  72 + <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequery.pageSize"
  73 + background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
  74 + @current-change="handleCurrentChange">
  75 + </el-pagination>
112 76 </div>
  77 +
113 78 </div>
  79 +
114 80 </div>
115   - <el-dialog :close-on-click-modal="false" title="执行过程新增" :visible.sync="zhixing" custom-class='XDD_css' width="65%">
116   - <div style="padding:20px;">
117   - <el-form ref="form" :model="form" label-width="120px">
118   - <el-form-item label="关键节点" prop="name">
119   - <el-input v-model="form.name" />
120   - </el-form-item>
121   - <el-form-item label="进展描述" prop="name">
122   - <wang-editor v-model="form.solutionEditor" ref="editor"></wang-editor>
123   - </el-form-item>
124   -
125   - </el-form>
126   - </div>
127   - <div slot="footer" class="dialog-footer">
128   - <el-button @click="doCancel" class="buttonHover"
129   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
130   - <el-button @click="doSubmit" style="background-color: #3F9B6A;color: #fff">确认</el-button>
  81 +
  82 +
  83 +
  84 +
  85 +
  86 +
  87 + <div class="zhuti" v-if="onaction == '2'">
  88 + <div style="height:58px;line-height:58px;">
  89 + <div style="color:#0006"> <span>招商方案审核</span> <span style="padding:0 5px;">></span> <span
  90 + style="color:#000000e6">新增</span></div>
131 91 </div>
132   - </el-dialog>
133   - <!-- 审核 -->
134   - <el-dialog :visible.sync="actSpye" custom-class='actSpye_dialog' style="padding: 0;" width="70%" center
135   - :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false">
136   - <div style="padding:10px 20px;">
137   - <div style="display: flex;justify-content: space-between;border-bottom: 1px solid #E5E5E5;padding: 0 0 10px 0;">
138   - <div style="display: flex;align-items: center;">
139   - <div style="margin-right: 10px;">代办任务</div>
140   - <div
141   - style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">
142   - 发起人：</div>
143   - <div
144   - style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">
145   - 任务节点：部门领导审批</div>
146   - </div>
147   - <div style="margin-right:20px ">
148   - <el-button style="background-color: #3F9B6A;color: #fff;" @click="actSpye=false">关闭</el-button>
149   - </div>
150   - </div>
151   - <div style="padding:20px 15px 15px 15px;">
152   - <el-tabs v-model="actCard" @tab-click="handleClick">
153   - <el-tab-pane label="表单信息" name='1'>
154   - <div style="margin:0 0 10px 30%">方案名称 {{itemXiang.planName}}</div>
155   - <div style="margin:15px 0;padding:0 20%; padding-bottom:20px;border-bottom: 1px solid #E1EEEF;">
156   - <el-button @click="MsgShen(1)" style="background-color: #3F9B6A;color: #fff;">基本信息查看</el-button>
157   - </div>
158   - <div style="padding:20px 0;display:flex;justify-content:flex-end;" v-if="itemXiang.state != '5'">
159   - <el-button icon="el-icon-edit" @click="LiuYes(1)"
160   - style="background-color: #3F9B6A;color: #fff;">同意</el-button>
161   - <!-- <el-button icon="el-icon-refresh-left" @click="Liunie=true"
162   - style="background-color: #3F9B6A;color: #fff;">退回</el-button> -->
163   - <el-button icon="el-icon-circle-close" @click="LiuYes(2)"
164   - style="background-color: #3F9B6A;color: #fff;">驳回</el-button>
165   - </div>
166   - <el-dialog width="60%" title="审批信息" custom-class='liucheng_css' :visible.sync="MsgSp" append-to-body
167   - :show-close="false" :close-on-press-escape="false" :close-on-click-modal="false">
168   - <div style="padding:30px 20px 0 20px">
169   - <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 1">
170   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;">
171   - 基本信息
172   - </div>
173   - <div style="padding: 15px;">
174   - <el-form label-position="right" :model="itemXiang" label-width="140px" style="position: relative">
175   - <el-form-item label="招商方案名称" class="grid-content bg-purple device-from" prop="planName">
176   - <el-input v-model="itemXiang.planName" placeholder="请输入" disabled />
177   - </el-form-item>
178   - <el-form-item label="规划方案" class="grid-content bg-purple device-from" prop="planningScheme">
179   - <el-select v-model="itemXiang.planningScheme" style="width: 100%" disabled>
180   - <el-option :label="item.planningName" :value="item.id"
181   - v-for="(item,index) in guihuaDate "></el-option>
182   - </el-select>
183   - </el-form-item>
184   -
185   - <el-form-item label="招商政策与条件" class="grid-content bg-purple" prop="investmentPolicy">
186   -
187   - <div style="border: 1px solid #dddfe5;padding:20px;" v-html="itemXiang.investmentPolicy">
188   - </div>
189   - </el-form-item>
190   - <el-form-item label="方案概述" prop="summary" class="grid-content bg-purple">
191   -
192   - <div style="border: 1px solid #dddfe5;padding:20px;" v-html="itemXiang.summary"></div>
193   - </el-form-item>
194   - <el-form-item label="财务分析与投资回报" prop="financialAnalysis" class="grid-content bg-purple">
195   -
196   - <div style="border: 1px solid #dddfe5;padding:20px;" v-html="itemXiang.financialAnalysis">
197   - </div>
198   - </el-form-item>
199   - <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
200   - <div
201   - style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
202   - <div>招商内容</div>
203   - <!-- <div style="color: #2d8a58;margin-left: 10px;" @click="addMing = true">
204   - 添加
205   - </div> -->
206   - </div>
207   - <div style="padding: 15px;">
208   - <div style="padding: 0px 20px 0px 0px">
209   - <el-table :data="itemXiang.cereResourceStrategy"
210   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
211   - style="width: 100%">
212   - <el-table-column label="序号" width="auto" min-width="8%">
213   - <template slot-scope="scope">
214   - {{scope.$index + 1}}
215   - </template>
216   - </el-table-column>
217   - <el-table-column label="资源编号" prop="id" width="auto" min-width="22%">
218   -
219   - </el-table-column>
220   - <el-table-column label="资源名称" width="auto" min-width="15%">
221   - <template slot-scope="scope">
222   - {{scope.row.resources.shopIds[0]?scope.row.resources.shopIds[0].shopName:scope.row.resources.siteIds[0]?scope.row.resources.siteIds[0].venueName:scope.row.resources.advIds[0].advertisingName}}
223   - </template>
224   - </el-table-column>
225   - <el-table-column label="资源类型" width="auto" min-width="15%">
226   - <template slot-scope="scope">
227   - {{scope.row.resources.shopIds[0]?'商铺':scope.row.resources.siteIds[0]?'场地':'广告位'}}
228   - </template>
229   - </el-table-column>
230   - <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
231   - </el-table-column>
232   - <el-table-column label="策略名称" width="auto" min-width="15%">
233   - <template slot-scope="scope">
234   - {{scope.row.resources.cereRentalPolicies.policyName}}
235   - </template>
236   - </el-table-column>
237   - </el-table>
238   - </div>
239   - </div>
240   - </div>
241   - <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
242   -
243   - <div style="padding:10px 0;line-height:20px;color:#3F9B6A" v-if="shenhe.attachmentInfo.name">
244   - {{shenhe.attachmentInfo.name}}</div>
245   - </el-form-item>
246   -
247   -
248   - </el-form>
249   - </div>
250   - </div>
251   -
252   -
253   - </div>
254   - <div style="display:flex;justify-content: flex-end;padding:20px;">
255   - <el-button @click="MsgSp=false" class="buttonHover"
256   - style="background-color: #3F9B6A;color: #fff;">返回</el-button>
257   - </div>
258   - </el-dialog>
259   - <el-dialog width="40%" title="流程审批" custom-class='liucheng_css' :visible.sync="Liunie"
260   - :close-on-click-modal="false" :close-on-press-escape="false" :show-close='false' append-to-body>
261   - <div style="padding:30px 20px 0 20px">
262   - <el-form ref="ruleFormInfo" :model="shenhe" label-width="120px" style="position: relative">
263   - <el-form-item label="处理意见" class="grid-content bg-purple" prop="name">
264   - <el-input type="textarea" v-model="shenhe.yijian" placeholder="请输入处理意见" />
265   - </el-form-item>
266   -
267   - </el-form>
268   - </div>
269   - <div style="display:flex;justify-content: flex-end;padding:20px;">
270   - <el-button @click="Liunie=false" style="background-color: #3F9B6A;color: #fff;">取消</el-button>
271   - <el-button @click="OAshen" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
272   - </div>
273   - </el-dialog>
274   - </el-tab-pane>
275   - <el-tab-pane label="流转记录" name="2">
276   - <div style="">
277   - <el-steps direction="vertical" :active="shenhe.state!=5? shenhe.state - 1: 1" class="shen_steps1">
278   - <el-step>
279   - <template slot="title">
280   - <div style="font-size: 12px;font-weight: 600;">部门领导审批</div>
281   - </template>
282   - <template slot="description">
283   - <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
284   - <div>
285   - <el-descriptions class="margin-top" :column="1" border>
286   - <el-descriptions-item>
287   - <template slot="label">
288   - <i class="el-icon-user"></i>
289   - 办理人
290   - </template>
291   -
292   - </el-descriptions-item>
293   - <el-descriptions-item>
294   - <template slot="label">
295   - <i class="el-icon-mobile-phone"></i>
296   - 接收时间
297   - </template>
298   -
299   - </el-descriptions-item>
300   - <el-descriptions-item>
301   - <template slot="label">
302   - <i class="el-icon-mobile-phone"></i>
303   - 处理时间
304   - </template>
305   -
306   - </el-descriptions-item>
307   - <el-descriptions-item>
308   - <template slot="label">
309   - <i class="el-icon-mobile-phone"></i>
310   - 处理意见
311   - </template>
312   -
313   - </el-descriptions-item>
314   - </el-descriptions>
315   - </div>
316   - </div>
317   - </template>
318   - </el-step>
319   - <el-step>
320   - <template slot="title">
321   - <div style="font-size: 12px;font-weight: 600;">公司领导审批</div>
322   - </template>
323   - <template slot="description">
324   - <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
325   - <div>
326   - <el-descriptions class="margin-top" :column="1" border>
327   - <el-descriptions-item>
328   - <template slot="label">
329   - <i class="el-icon-user"></i>
330   - 办理人
331   - </template>
332   -
333   - </el-descriptions-item>
334   - <el-descriptions-item>
335   - <template slot="label">
336   - <i class="el-icon-mobile-phone"></i>
337   - 接收时间
338   - </template>
339   -
340   - </el-descriptions-item>
341   - <el-descriptions-item>
342   - <template slot="label">
343   - <i class="el-icon-mobile-phone"></i>
344   - 处理时间
345   - </template>
346   -
347   - </el-descriptions-item>
348   - <el-descriptions-item>
349   - <template slot="label">
350   - <i class="el-icon-mobile-phone"></i>
351   - 处理意见
352   - </template>
353   -
354   - </el-descriptions-item>
355   - </el-descriptions>
356   - </div>
357   - </div>
358   - </template>
359   - </el-step>
360   - <el-step>
361   - <template slot="title">
362   - <div style="font-size: 12px;font-weight: 600;">其他审批</div>
363   - </template>
364   - <template slot="description">
365   - <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
366   - <div>
367   - <el-descriptions class="margin-top" :column="1" border>
368   - <el-descriptions-item>
369   - <template slot="label">
370   - <i class="el-icon-user"></i>
371   - 办理人
372   - </template>
373   -
374   - </el-descriptions-item>
375   - <el-descriptions-item>
376   - <template slot="label">
377   - <i class="el-icon-mobile-phone"></i>
378   - 接收时间
379   - </template>
380   -
381   - </el-descriptions-item>
382   - </el-descriptions>
383   - </div>
384   -
385   - </div>
386   - </template>
387   - </el-step>
388   - </el-steps>
389   - </div>
390   - </el-tab-pane>
391   - <el-tab-pane label="流程图" name="3">
392   - <div style="height:120px;width:70%;margin-left:18%;margin-top: 78px;">
393   - <el-steps :active="secondData.state!=5? secondData.state: 1" class="liu_steps">
394   - <el-step class="step_start">
395   - <template slot="icon">
396   - <!-- <div style="background:green;width:150px;height:100px;">
397   - </div> -->
398   - </template>
399   - </el-step>
400   - <el-step class="step_buen">
401   - <template slot="icon">
402   - <div>
403   - <div>部门领导审批</div>
404   - </div>
405   - </template>
406   - </el-step>
407   - <el-step class="step_buen">
408   - <template slot="icon">
409   - <div>
410   - <div>公司领导审批</div>
411   - </div>
412   - </template>
413   - </el-step>
414   - <el-step class="step_buen">
415   - <template slot="icon">
416   - <div>
417   - <div>其他审批</div>
418   - </div>
419   - </template>
420   - </el-step>
421   - <el-step class="step_start">
422   - <template slot="icon">
423   -
424   - </template>
425   - </el-step>
426   - </el-steps>
427   - </div>
428   - </el-tab-pane>
429   - </el-tabs>
430   - </div>
  92 +
  93 + <div style="padding: 20px 20px 20px 0;">
  94 + <add @removeonaction="removeonaction"></add>
431 95 </div>
432   - </el-dialog>
433   - <xiang :showBian="banAct" :steat='steatqie' :list='itemXiang' @bianClose='bianClose' v-if="banAct"></xiang>
434   - <el-dialog title="审核" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
  96 + </div>
  97 + <div class="zhuti" v-if="onaction == '3'">
  98 + <!-- <div style="height:58px;line-height:58px;">
  99 + <div style="color:#0006"> <span>招商方案审核</span> <span style="padding:0 5px;">></span> <span
  100 + style="color:#000000e6">查看</span></div>
  101 + </div> -->
435 102 <div>
436   - <div style="margin-bottom: 20px;">
437   - <el-form ref="form" :model="detailsinfo" label-width="120px">
438   - <el-form-item label="审核状态" prop="auditStatus">
439   - <el-select v-model="auditStatus" placeholder="请选择" style="width: 100%;">
440   - <!-- <el-option label="待审核" value="1"></el-option> -->
441   - <el-option label="同意" value="2"></el-option>
442   - <el-option label="拒绝" value="3"></el-option>
443   - </el-select>
444   - </el-form-item>
445   - <el-form-item label="审核意见">
446   - <el-input maxlength="200" show-word-limit rows="4" v-model="detailsinfo.checkOpinion" placeholder="请输入审核意见" type="textarea" />
447   - </el-form-item>
448   - </el-form>
449   -
450   - </div>
451   - <div style="display: flex;justify-content: flex-end;">
452   - <el-button @click="yuclose" class="buttonHover"
453   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
454   - <el-button @click="yuChenk" style="background-color: #3F9B6A;color: #fff">确定</el-button>
455   - </div>
  103 + <fa :issp="issp" :editbgid="detailsinfo" @removeonaction="removeonaction"></fa>
  104 + </div>
  105 + </div>
  106 + <div class="zhuti" v-if="onaction == '4'">
  107 + <div style="height:58px;line-height:58px;">
  108 + <div style="color:#0006"> <span>招商方案审核</span> <span style="padding:0 5px;">></span> <span
  109 + style="color:#000000e6">{{contractChangeReason}}</span></div>
  110 + </div>
  111 + <div style="padding: 20px 20px 20px 0;">
  112 + <add :info="detailsinfo" @removeonaction="removeonaction"></add>
456 113 </div>
  114 + </div>
  115 +
  116 +
  117 +
  118 + <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center
  119 + :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
  120 + <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
457 121 </el-dialog>
458 122 </div>
  123 +
  124 +
459 125 </template>
460 126  
461 127 <script>
462 128 import {
463   - uploadUrl,
464   - token
465   - } from '@/utils/request'
  129 + delList,
  130 + editList,
  131 + lvdaoduan,
  132 + getAlls
  133 + } from '@/api/information';
  134 + import add from '@/components/add/addfa'
  135 + import fa from '@/components/chakan/fa'
466 136 import {
467 137 fangGetAll,
468   - fangGetId,
469   - fangAdd,
470   - fangEdit,
471 138 fangDel,
472   - } from '../../../api/fangli';
473   - import {
474   - contractGetAll
475   - } from '../../../api/planningBz.js'
476   - import upimg from "@/components/ImageUpload/index";
477   - import xiang from "./bianform"
478   - import wangEditor from "@/components/editor/index";
  139 + fangEdit
  140 + } from '@/api/fangli'
  141 + import cl from '@/components/change/cl.vue'
  142 + import {
  143 + cereResourceStrategy,
  144 + editStatus,
  145 + cereBusinessOperationadd,
  146 + queryAllByLimit
  147 + } from '@/api/newly.js'
479 148 export default {
480   - components: {
481   - upimg,
482   - xiang,
483   - wangEditor
484   - },
485 149 data() {
486 150 return {
487   - auditStatus:'2',
488   - detailsinfo:{},
489   - yujingSet:false,
490   - detbox: false, // 详情
491   - edit: true, // 编辑
492   - formInline: {
493   - shopName: '',
494   - positionInformation: '',
495   - shopArea: '',
496   - useTo: '',
497   - rent: '',
498   - locationImage: '',
499   - locationDescription: '',
500   - temporaryPavingId: ''
501   - }, // 临铺新增数据
502   - action: uploadUrl, // 上传图片
503   - ggXin: false, // 新增
504   - formSel: {
505   - planName: '',
506   - },
507   - secondData: {
508   - card: 'first', // 切换
509   - },
510   - currentPage: 1,
511   - total: 0,
512   - flag: false,
513   - pageSize: 10,
514   - tableData: [],
515   - msgid: '',
516   - pageindex: {
  151 + issp:'1',
  152 + lvdaoList:[],
  153 + oncetype:'',
  154 + addcl:false,
  155 + oninfo:{},
  156 + multipleSelection:[],
  157 + contractChangeReason: '',
  158 + detailsinfo: {},
  159 + pagequery: {
517 160 pageNumber: 0,
518 161 pageSize: 10,
  162 + auditStatus:'1'
519 163 },
520   - chart: null,
521   - chart1: null,
522   - editor: null,
523   - shenhe: {},
524   - banAct: false, //详情
525   - steatqie: false, //编辑详情切换
526   - itemXiang: {},
527   - form: {
528   -
  164 + tableData: [],
  165 + total: 0,
  166 + onaction: '1',
  167 + formInline: {
529 168 },
530   - zhixing: false,
531   - actSpye: false, //审核框
532   - actCard: '1',
533   - MsgSp: false,
534   - index: 0,
535   - MsgSp: false,
536   - liuYe: 1, //通过or驳回
537   - Liunie: false,
538   - ziyaunData: [],
539   - guihuaDate: [],
540   - fileData: [],
541   - plan_Time: [],
542   - };
  169 + }
543 170 },
544   -
545   - created() {
546   - this.getAll();
  171 + computed: {
  172 + regionOptions() {
  173 + return this.$store.state.app.regionOptions;
  174 + }
  175 + },
  176 + components: {
  177 + cl,
  178 + add,
  179 + fa,
  180 + },
  181 + async created() {
  182 + this.getAll()
  183 + // const lvdao = await lvdaoduan()
  184 + // this.lvdaoList = lvdao.data
547 185 },
548   - mounted() {},
549   - // beforeDestroy() {
550   - // const editor = this.editor
551   - // if (editor == null) return
552   - // editor.destroy() // 组件销毁时，及时销毁编辑器
553   - // },
554 186 methods: {
555   - yuclose() {
556   - this.yujingSet = false
557   - },
558   - yuChenk() {
559   - console.error(this.detailsinfo)
560   - fangEdit({
561   - id: this.detailsinfo.id,
562   - auditStatus: this.auditStatus
563   - }).then(res => {
564   - console.error(res)
565   - this.$message({
566   - message: '处理成功',
  187 + minSev(e) {
  188 + this.multipleSelection = e
  189 + console.error(this.multipleSelection)
  190 + let ids = []
  191 + for (let index = 0; index < this.multipleSelection.length; index++) {
  192 + ids.push(this.multipleSelection[index].id)
  193 + }
  194 + console.error(ids)
  195 + let c1 = {
  196 + resourcesId: this.oncetype+this.oninfo.id,
  197 + rentalPoliciesIds: ids,
  198 + }
  199 + console.error(c1)
  200 + cereResourceStrategy(c1).then(res => {
  201 + if (res.code == 200) {
  202 + this.addcl = false
  203 + this.$message({
  204 + message: '绑定成功',
567 205 type: 'success'
568 206 })
569   - this.auditStatus = '2'
570   - this.getAll()
571   - this.yujingSet = false
  207 + editStatus({
  208 + resourcesId: this.oncetype+this.oninfo.id,
  209 + publishStatus: '1'
  210 + }).then(res => {
  211 + this.onSubmit()
  212 + })
  213 + cereBusinessOperationadd({
  214 + type:'发布',
  215 + resourceId: this.oncetype+this.oninfo.id,
  216 + operator: localStorage.getItem('roleName'),
  217 + operationTime: this.gettime()
  218 + }).then(res => {
  219 + console.error(res)
  220 + })
  221 + } else {
  222 + this.$message({
  223 + message: '绑定失败',
  224 + type: 'error'
  225 + })
  226 + }
572 227 })
573   -
574 228 },
575   - // 获取当前时间
576   - updateCurrentTime() {
577   - const now = new Date();
578   - const year = now.getFullYear();
579   - const month = (now.getMonth() + 1).toString().padStart(2, '0');
580   - const day = now.getDate().toString().padStart(2, '0');
581   - const hours = now.getHours().toString().padStart(2, '0');
582   - const minutes = now.getMinutes().toString().padStart(2, '0');
583   - const seconds = now.getSeconds().toString().padStart(2, '0');
584   -
585   - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  229 + mingClose() {
  230 + this.multipleSelection = []
  231 + this.addcl = false
586 232 },
587   - handleSelectionChange(val) {
588   - this.multipleSelection = val;
  233 + async opencl(row,e) {
  234 + this.oncetype = e
  235 + this.oninfo = row
  236 + this.multipleSelection = []
  237 + this.addcl = true
589 238 },
590   - lextStep(val) {
591   - this.stepNum = val;
592   - },
593   - onCreated(editor) {
594   - this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
595   - },
596   - // 查询全数据
597   - async getAll() {
598   - const res = await fangGetAll({...this.pageindex,auditStatus:'1'});
599   - this.tableData = res.data.content
600   - this.total = res.data.content.length
601   - const ziyuan = await contractGetAll(this.pageindex)
602   - this.guihuaDate = ziyuan.data.content
603   - },
604   - // 查询
605   - async onSubmit() {
606   - let forms = {
607   - pageNumber: 0,
608   - pageSize: 10,
609   - }
610   - if (this.formSel.planName != '') {
611   - forms.planName = this.formSel.planName
612   - }
613   - if (this.plan_Time.length != 0) {
614   - this.tableData = []
615   - this.total = 0
616   - return
617   - }
618   - const res = await fangGetAll({...forms,auditStatus:'1'})
619   - this.tableData = res.data.content
620   - this.total = res.data.content.length
  239 + gettime() {
  240 + // 获取当前时间
  241 + let currentTime = new Date();
621 242  
622   - },
623   - // 执行过程跟踪
624   - geng() {
625   - this.zhixing = true
626   - },
627   - doCancel() {
628   - this.zhixing = false
629   - },
630   - doSubmit() {
  243 + // 获取年份
  244 + let year = currentTime.getFullYear();
631 245  
632   - },
633   - // 详情点击
634   - handleEditForm(item, ste) {
635   -
636   - if (ste) {
637   - // this.steatqie = true
638   - // this.actSpye = true
639   - this.detailsinfo = item
640   - this.yujingSet = true
641   - } else {
642   - this.steatqie = false
643   - this.banAct = true
644   - }
645   - this.itemXiang = item
  246 + // 获取月份（注意月份是从0开始计数的，所以需要加1）
  247 + let month = currentTime.getMonth() + 1;
646 248  
647   - if (item.attachmentInfo != '') {
648   - item.attachmentInfo = JSON.parse(item.attachmentInfo)
649   - this.fileData.push(item.attachmentInfo)
650   - }
  249 + // 获取日期
  250 + let day = currentTime.getDate();
651 251  
652   - this.shenhe = item
  252 + // 获取小时
  253 + let hours = currentTime.getHours();
  254 +
  255 + // 获取分钟
  256 + let minutes = currentTime.getMinutes();
  257 +
  258 + // 获取秒数
  259 + let seconds = currentTime.getSeconds();
  260 +
  261 + // 获取毫秒数
  262 + let milliseconds = currentTime.getMilliseconds();
  263 +
  264 + // 格式化时间为 YYYY-MM-DD
  265 + let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
  266 +
  267 + // 格式化时间为 HH:MM:SS
  268 + let formattedTime =
  269 + `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
  270 +
  271 + // 格式化时间为 YYYY-MM-DD HH:MM:SS
  272 + let formattedDateTime = `${formattedDate} ${formattedTime}`;
  273 + return formattedDateTime
653 274  
654 275 },
655   - bianClose(msg) {
656   - this.banAct = msg
657   - this.steatqie = false
658   - this.getAll()
659   - },
660   - handleCurrentChange(val) {
661   - this.currentPage = val;
  276 + removeinfozz(row, e, tit) {
  277 + let that = this
  278 + this.$confirm('确定要' + tit + '吗？', '提示', {
  279 + confirmButtonText: '确定',
  280 + cancelButtonText: '取消',
  281 + type: 'warning'
  282 + }).then(() => {
  283 + fangEdit({
  284 + id: row.id,
  285 + auditStatus: e
  286 + }).then(res => {
  287 + if (res.code == 200) {
  288 + this.$message({
  289 + message: tit + '成功',
  290 + type: 'success'
  291 + })
  292 + this.removeonaction('1')
  293 + } else {
  294 + this.$message({
  295 + message: res.msg,
  296 + type: 'error'
  297 + })
  298 + }
  299 + })
  300 + })
662 301 },
663   - handleSizeChange(val) {
664   - this.pageSize = val;
  302 + details(row,type) {
  303 + this.issp = type
  304 + this.detailsinfo = row
  305 + this.onaction = '3'
665 306 },
666   -
667   - handleClick() {},
668   - // 上传
669   - handlePreview(file) {
670   - console.log(file);
  307 + removeinfo(row, e) {
  308 + this.contractChangeReason = e
  309 + this.detailsinfo = row
  310 + this.onaction = '4'
671 311 },
672   - handleRemove(file, fileList) {
673   - console.log(file, fileList);
  312 + async getAll() {
  313 + const res = await queryAllByLimit(this.pagequery)
  314 + this.tableData = res.data.content
  315 + this.total = res.data.totalElements
674 316 },
675   -
676   - // 重置按钮
677   - resetting() {
678   - this.formSel = {
679   - planName: ''
680   - }
681   - this.plan_Time = []
  317 + removeonaction(e) {
  318 + console.error(e)
  319 + this.onaction = e
  320 + this.pagequery.pageNumber = 0
682 321 this.getAll()
683 322 },
684   - MsgShen(val) {
685   - this.index = val
686   - this.MsgSp = true
  323 + handleCurrentChange(val) {
  324 + this.pagequery.pageNumber = val - 1
  325 + this.getAll()
687 326 },
688   - LiuYes(val) {
689   - this.liuYe = val
690   - this.Liunie = true
  327 + handleSizeChange(val) {
  328 + this.pagequery.pageSize = val
  329 + this.pagequery.pageNumber = 0
  330 + this.getAll()
691 331 },
692   - async OAshen() {
693   - if (this.liuYe == '1') {
694   - await fangEdit({
695   - id: this.itemXiang.id,
696   - auditStatus: '2'
697   - })
698   - } else {
699   - await fangEdit({
700   - id: this.itemXiang.id,
701   - auditStatus: '3'
702   - })
703   - }
704   - this.Liunie = false
705   - this.actSpye = false
  332 + // 查询按钮
  333 + async onSubmit() {
  334 + this.pagequery.pageNumber = 0
706 335 this.getAll()
707   -
  336 + },
  337 + //重置按钮
  338 + resetting() {
  339 + this.pagequery = {
  340 + pageNumber: 0,
  341 + pageSize: 10,
  342 + auditStatus:'1'
  343 + },
  344 + this.getAll()
  345 + },
  346 + //删除
  347 + closemsg(item) {
  348 + const h = this.$createElement;
  349 + this.$msgbox({
  350 + title: '消息',
  351 + message: h('p', null, [
  352 + h('span', null, '是否删除 '),
  353 + ]),
  354 + showCancelButton: true,
  355 + showClose: false,
  356 + confirmButtonText: '确定',
  357 + cancelButtonText: '取消',
  358 + customClass: 'oe-dialog-btn',
  359 + beforeClose: (action, instance, done) => {
  360 + if (action === 'confirm') {
  361 + fangDel({
  362 + id: item.id
  363 + }).then(res => {
  364 + this.$message({
  365 + message: '删除成功',
  366 + type: 'success'
  367 + })
  368 + this.getAll()
  369 + done();
  370 + })
  371 + } else {
  372 + done();
  373 + }
  374 + }
  375 + })
708 376 },
709 377 }
710   - };
711   -</script>
712 378  
713   -<style scoped>
714   - .zhuti {
715   - padding: 0 20px 20px 20px;
716   - min-height: calc(100vh - 50px - 20px);
717   - background-color: #Fff;
718   -
719   - }
720   - .chengeXia{
721   - border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
722 379 }
  380 +</script>
723 381  
724   - /deep/ .el-form-item__content {
725   - line-height: 0;
726   - }
727   -
728   -
729   -
  382 +<style lang="scss" scoped>
730 383 .formSearch {
731 384 display: flex;
732 385 width: 100%;
733 386 font-size: 14px;
734 387 justify-content: space-between;
735   - padding-bottom: 10px;
736   -
737 388 }
738 389  
739   - .greens {
740   - color: #3F9B6A;
741   - }
742   -
743   - /deep/ .el-table__row {
744   - font-size: 14px;
745   - color:#000000e6;
746   - height:42px;
747   - }
748   -
749   - .fenye {
750   - margin-top: 20px;
751   - display: flex;
752   - justify-content: flex-end;
753   - }
754   -
755   - /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
756   - background-color: #3F9B6A;
757   - }
758   -
759   - .el-row {
760   - margin-bottom: 20px;
761   -
762   - &:last-child {
763   - margin-bottom: 0;
764   - }
765   - }
766   -
767   - .el-col {
768   - border-radius: 4px;
769   - }
770   -
771   - .bg-purple-dark {
772   - background: #99a9bf;
773   - }
774   -
775   - .bg-purple {
776   - background: #d3dce6;
777   - }
778   -
779   - .bg-purple-light {
780   - background: #e5e9f2;
781   - }
782   -
783   - .grid-content {
784   - border-radius: 4px;
785   - min-height: 36px;
786   - }
787   -
788   - .row-bg {
789   - padding: 10px 0;
790   - background-color: #f9fafc;
791   - }
792   -
793   - /deep/ .bg-purple[data-v-0e3fe4ec] {
794   - background: #fff;
795   - height: 50px;
796   - }
797   - /deep/ .bg-purple[data-v-3bebae82]{
798   - background: #fff;
799   - height: 50px;
800   - }
  390 + .zhuti {
  391 + padding: 0 20px 20px 20px;
  392 + min-height: calc(100vh - 50px - 20px);
  393 + background-color: #Fff;
801 394  
802   -::v-deep .bg-purple{
803   - background: #fff;
804   - height: 50px;
805   - }
806   - /deep/ .el-form--label-top .el-form-item__label {
807   - padding: 0;
808   - }
809   -::v-deep .el-form-item{
810   - margin-bottom:16px;
811   -}
812   - .device-form .el-form-item__label::after {
813   - content: "*";
814   - color: #1A1A1A;
815   - margin-left: 5px;
816   - font-size: 16px;
817 395 }
818 396  
819   -
820   - ::v-deep .el-dialog__wrapper {
821   - .el-dialog__header {
822   - background-color: #FAFAFA;
823   - }
824   - }
825   - ::v-deep .el-input__inner:focus {
826   - border: #3F9B6A 1px solid;
827   - }
828   - .dialog-footer {
829   - display: flex;
830   - justify-content: flex-end;
831   - border-top: solid rgba(209, 209, 209, 0.2) 2px;
832   - padding-top: 20px;
833   - }
834   - ::v-deep .el-input__inner:focus {
835   - border: #3F9B6A 1px solid;
836   - }
837   - ::v-deep .el-input__inner:hover {
838   - border: #3F9B6A 1px solid;
839   - }
840   - ::v-deep .el-select .el-input.is-focus .el-input__inner{
841   - border-color:#3F9B6A
842   - }
843   -::v-deep .btn .el-button:focus,
844   -.el-button:hover {
845   - border: 1px solid #3F9B6A;
846   -}
847   -.el-select-dropdown__item.selected{
  397 + .chengeXia {
  398 + border-bottom: 6px solid #3F9B6A;
  399 + padding-bottom: 4px;
848 400 color: #3F9B6A;
849   -}
850   -
851   -.el-pagination__sizes .el-input .el-input__inner:hover{
852   - border-color: #3F9B6A;
853   -}
854   -::v-deep .el-dialog__wrapper{
855   -
856   - .dialog_css{
857   - margin-right: 12px;
858   - margin-top:61px !important;
859   - .el-dialog__title {
860   - font-size: 16px !important;
861   - font-weight: 600;
862   - color: #000;
863   - }
864   - }
865   - .diaslog_zhong{
866   - margin-left: 20%;
867   - margin-top:61px !important;
868   - }
869   -
870   -}
871   - ::v-deep .diaslog_zhong{
872   - margin-left: 20%;
873   - margin-top:61px !important;
874   - .el-dialog__header{
875   - background-color:#fff;
876   - border-bottom:1px solid #EFEFEF;
877   - .el-dialog__title{
878   - font-size: 14px;
879   - color: #000000e6;
880   - }
881   - }
882   - .el-dialog__body{
883   - padding:10px 20px 30px 20px
884   - }
885   - }
886   -
887   - /deep/ .el-table_1_column_8 .hetong{
888   - color:#7DBB9A;
889   - text-decoration: underline;
890   -}
891   -/deep/ .first-column-bg {
892   - background-color: #FAFAFA !important;
893   - }
894   -
895   -.el-table tr{
896   - height:56px;
897   -}
898   -
899   -::v-deep .table3{
900   - .el-table__empty-block{
901   - display:none;
902   - }
903   -}
904   -::v-deep .textarea{
905   - width: 85%;
906   - .el-textarea__inner{
907   - width: 100%;
908   - }
909   -}
910   -::v-deep .el-button--mini{
911   - padding: 7px 10px;
912   -}
913   -::v-deep .pass_input{
914   - width: 100%;
915   - .el-input__inner {
916   - border: none;
917   - padding:0;
918   - }
919 401 }
920   -::v-deep .pass_select{
921   - width: 100%;
922   - .el-input__inner {
923   - border: none;
924   - padding:0;
925   - }
926   - .el-icon-arrow-up:before{
927   - content:''
928   - }
929   -
930   -}
931   - /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
932   - background-color: #fff;
933   -}
934 402  
935   -
936   -</style>
937   -<style lang="scss" scoped>
938   - ::v-deep .bian_css{
939   - .el-dialog__header{
940   - padding:0px;
941   - }
942   - }
943   - ::v-deep .buttonHover:hover{
944   - color:#3f9b6a !important;
945   - border-color: #c5e1d2 !important;
946   - background-color: #ecf5f0 !important;
947   - outline: none;
948   - }
949   - ::v-deep .el-pagination__total{
950   - position: absolute;
951   - left: 33px;
  403 + .tableBtn {
  404 + display: inline-block;
  405 + margin-right: 10px;
  406 + cursor: pointer;
952 407 }
953 408 </style>
... ...
admin-web-master/src/views/ads/fangli/index.vue
  View file @09d4e1d
... ... @@ -2,26 +2,25 @@
2 2 <div style="background-color:#f7f7f7;padding:10px 10px;">
3 3 <div class="zhuti" v-if="onaction == '1'">
4 4 <div style="height:58px;line-height:58px;">
5   - <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
6   - 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>
7 7 </div>
8 8 <!-- 线上 -->
9 9 <div>
10 10 <!-- 搜索 -->
11 11 <div class="formSearch">
12 12 <el-form :inline="true" :model="pagequery">
13   - <el-form-item label="商铺名称" prop="shopName">
14   - <el-input v-model="pagequery.shopName" placeholder="请输入" maxlength="50"></el-input>
  13 + <el-form-item label="方案名称">
  14 + <el-input v-model="pagequery.planName" placeholder="请输入" style="width:168px;">
  15 + </el-input>
15 16 </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 v-for="(item,index) in regionOptions"
19   - :key="index" :label="item.label" :value="item.value"></el-option>
  17 + <el-form-item label="状态" prop="auditStatus">
  18 + <el-select v-model="pagequery.auditStatus" clearable placeholder="请选择" style="margin-right: 15px">
  19 + <el-option label="待审核" value="1"></el-option>
  20 + <el-option label="审核通过" value="2"></el-option>
  21 + <el-option label="已驳回" value="3"></el-option>
20 22 </el-select>
21 23 </el-form-item>
22   - <el-form-item label="归属部门" prop="belongingDepartment">
23   - <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
24   - </el-form-item>
25 24 </el-form>
26 25  
27 26 <div>
... ... @@ -45,42 +44,35 @@
45 44 {{scope.$index +1 }}
46 45 </template>
47 46 </el-table-column>
48   - <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
49   - <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
  47 + <el-table-column label="招商方案名称" prop="planName" show-overflow-tooltip max-width="200"/>
  48 + <el-table-column label="涵盖资源数" prop="createTime">
50 49 <template slot-scope="scope">
51   - {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
  50 + {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
52 51 </template>
53 52 </el-table-column>
54   - <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
55   - </el-table-column>
56   - <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
57   - </el-table-column>
58   - <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
  53 + <el-table-column label="创建时间" prop="createTime">
59 54 <template slot-scope="scope">
60   - {{scope.row.belongingDepartment || '无'}}
  55 + {{scope.row.createTime || '-' }}
61 56 </template>
62 57 </el-table-column>
63   - <el-table-column label="负责人" prop="head" show-overflow-tooltip>
  58 + <el-table-column label="创建人" prop="createUser">
64 59 <template slot-scope="scope">
65   - {{scope.row.head || '无'}}
  60 + {{scope.row.createUser || '-' }}
66 61 </template>
67 62 </el-table-column>
68   - <el-table-column label="发布时间" prop="createDate" > </el-table-column>
69   - <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
  63 + <el-table-column label="状态">
70 64 <template slot-scope="scope">
71   - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
  65 + {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已撤回':''}}
72 66 </template>
73 67 </el-table-column>
74   - <el-table-column label="操作" min-width="100" fixed="right">
  68 + <el-table-column label="操作" fixed="right">
75 69 <template slot-scope="scope">
76 70 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
77   - <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="removeinfo(scope.row,'编辑')">编辑
78   - </div>
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'"
81   - @click="opencl(scope.row,'sp')">发布</div>
82   - <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
83   - @click="removeinfozz(scope.row,'0','下架')">下架</div>
  71 + <!-- v-if="scope.row.auditStatus == '4'" -->
  72 + <div class="tableBtn greens" v-if="scope.row.auditStatus == '4'" @click="removeinfo(scope.row,'编辑')">编辑</div>
  73 + <div class="tableBtn greens" v-if="scope.row.auditStatus == '4'" @click="closemsg(scope.row)">删除</div>
  74 + <div class="tableBtn greens" v-if="scope.row.auditStatus == '4'" @click="removeinfozz(scope.row,'1','提交审核')">提交审核</div>
  75 + <div class="tableBtn greens" v-if="scope.row.auditStatus == '1'" @click="removeinfozz(scope.row,'4',' 撤回')">撤回</div>
84 76 </template>
85 77 </el-table-column>
86 78 </el-table>
... ... @@ -103,7 +95,7 @@
103 95  
104 96 <div class="zhuti" v-if="onaction == '2'">
105 97 <div style="height:58px;line-height:58px;">
106   - <div style="color:#0006"> <span>商铺基本信息</span> <span style="padding:0 5px;">></span> <span
  98 + <div style="color:#0006"> <span>招商方案管理</span> <span style="padding:0 5px;">></span> <span
107 99 style="color:#000000e6">新增</span></div>
108 100 </div>
109 101  
... ... @@ -112,17 +104,17 @@
112 104 </div>
113 105 </div>
114 106 <div class="zhuti" v-if="onaction == '3'">
115   - <div style="height:58px;line-height:58px;">
116   - <div style="color:#0006"> <span>商铺基本信息</span> <span style="padding:0 5px;">></span> <span
  107 + <!-- <div style="height:58px;line-height:58px;">
  108 + <div style="color:#0006"> <span>招商方案管理</span> <span style="padding:0 5px;">></span> <span
117 109 style="color:#000000e6">查看</span></div>
118   - </div>
  110 + </div> -->
119 111 <div>
120   - <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
  112 + <fa :editbgid="detailsinfo" @removeonaction="removeonaction"></fa>
121 113 </div>
122 114 </div>
123 115 <div class="zhuti" v-if="onaction == '4'">
124 116 <div style="height:58px;line-height:58px;">
125   - <div style="color:#0006"> <span>商铺基本信息</span> <span style="padding:0 5px;">></span> <span
  117 + <div style="color:#0006"> <span>招商方案管理</span> <span style="padding:0 5px;">></span> <span
126 118 style="color:#000000e6">{{contractChangeReason}}</span></div>
127 119 </div>
128 120 <div style="padding: 20px 20px 20px 0;">
... ... @@ -149,16 +141,18 @@
149 141 getAlls
150 142 } from '@/api/information';
151 143 import add from '@/components/add/addfa'
152   - import resourceCommodity from '@/components/resourceCommodity/index'
  144 + import fa from '@/components/chakan/fa'
153 145 import {
154 146 fangGetAll,
155 147 fangDel,
  148 + fangEdit
156 149 } from '@/api/fangli'
157 150 import cl from '@/components/change/cl.vue'
158 151 import {
159 152 cereResourceStrategy,
160 153 editStatus,
161 154 cereBusinessOperationadd,
  155 + queryAllByLimit
162 156 } from '@/api/newly.js'
163 157 export default {
164 158 data() {
... ... @@ -173,7 +167,7 @@
173 167 pagequery: {
174 168 // belongingRegion:'',
175 169 // shopName:'',
176   - pageNumber: 1,
  170 + pageNumber: 0,
177 171 pageSize: 10,
178 172 // belongingGreenwaySection:'',
179 173 // belongingDepartment:''
... ... @@ -193,7 +187,7 @@
193 187 components: {
194 188 cl,
195 189 add,
196   - resourceCommodity,
  190 + fa,
197 191 },
198 192 async created() {
199 193 this.getAll()
... ... @@ -297,25 +291,15 @@
297 291 cancelButtonText: '取消',
298 292 type: 'warning'
299 293 }).then(() => {
300   - editList({
301   - ...row,
302   - publishStatus: e
  294 + fangEdit({
  295 + id: row.id,
  296 + auditStatus: e
303 297 }).then(res => {
304   - console.error(res)
305 298 if (res.code == 200) {
306 299 this.$message({
307 300 message: tit + '成功',
308 301 type: 'success'
309 302 })
310   - cereBusinessOperationadd({
311   - type:tit,
312   - resourceId: 'sp'+row.id,
313   - operator: localStorage.getItem('roleName'),
314   - operationTime: that.gettime()
315   - }).then(res => {
316   - console.error(res)
317   - })
318   -
319 303 this.removeonaction('1')
320 304 } else {
321 305 this.$message({
... ... @@ -323,7 +307,6 @@
323 307 type: 'error'
324 308 })
325 309 }
326   -
327 310 })
328 311 })
329 312 },
... ... @@ -337,7 +320,7 @@
337 320 this.onaction = '4'
338 321 },
339 322 async getAll() {
340   - const res = await fangGetAll(this.pagequery)
  323 + const res = await queryAllByLimit(this.pagequery)
341 324 this.tableData = res.data.content
342 325 this.total = res.data.totalElements
343 326 },
... ... @@ -388,7 +371,7 @@
388 371 customClass: 'oe-dialog-btn',
389 372 beforeClose: (action, instance, done) => {
390 373 if (action === 'confirm') {
391   - delList({
  374 + fangDel({
392 375 id: item.id
393 376 }).then(res => {
394 377 this.$message({
... ...