webapp / GreenwayWeb

Commit 8ff9d2586ccce7cbeda3f9e8c849829e6683db0c

Authored by wesley88
2 parents 9d8bcb26 a9a27e05

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 5 changed files with 334 additions and 289 deletions
admin-web-master/src/views/ads/fangAudit/bianform.vue
  View file @8ff9d25
... ... @@ -150,10 +150,9 @@
150 150 </el-row>
151 151 <el-row :gutter="20">
152 152 <el-col :span="24">
  153 + <el-form-item label="招商资源管理" class="grid-content bg-purple">
153 154 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
154   - <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
155   - <div><span style="color:red;margin-right:3px;">*</span>招商资源管理</div>
156   - </div>
  155 +
157 156 <div style="padding: 15px;">
158 157 <div style="padding: 0px 20px 0px 0px">
159 158 <el-table :data="ruleForm.cereResourceStrategy"
... ... @@ -188,6 +187,8 @@
188 187 </div>
189 188 </div>
190 189 </div>
  190 + </el-form-item>
  191 +
191 192 </el-col>
192 193  
193 194 </el-row>
... ...
admin-web-master/src/views/ads/fangAudit/index.vue
  View file @8ff9d25
... ... @@ -39,115 +39,92 @@
39 39  
40 40 </div>
41 41 <!-- 表格 -->
42   - <el-table
43   - :data="
44   - tableData.slice(
45   - (currentPage - 1) * pageSize,
46   - currentPage * pageSize
47   - )
48   - "
49   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
50   - >
51   - <el-table-column
52   - label="序号"
53   - min-width="60"
54   - >
55   - <template slot-scope="scope">
56   - {{scope.$index+1}}
57   - </template>
58   - </el-table-column>
59   - <el-table-column
60   - label="招商方案名称"
61   - prop="planName"
62   - min-width="300"
63   - />
64   - <el-table-column
65   - label="规划方案名称"
66   -
67   - min-width="300"
68   - >
69   - <template slot-scope="scope">
70   - {{scope.row.cereInvestmentPlanningManagement.planningName}}
71   - </template>
72   - </el-table-column>
73   - <el-table-column
74   - label="计划实施时间"
75   -
76   - min-width="250"
77   - >
78   - <template slot-scope="scope">
79   - {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
80   - </template>
81   - </el-table-column>
82   - <el-table-column
83   - label="涵盖资源数"
84   - min-width="120"
85   - >
86   - <template slot-scope="scope">
87   - {{ scope.row.cereResourceStrategy.length }}
88   - </template>
89   - </el-table-column>
90   - <el-table-column
91   - label="资源编号"
92   - prop="founder"
93   - min-width="200">
94   - <template slot-scope="scope">
95   - {{ scope.row.cereResourceStrategy.resourcesId }}
96   - </template>
97   - </el-table-column>
98   - <el-table-column
99   - label="资源类型"
100   - prop="contactInformation"
101   - min-width="150"
102   - >
103   - <template slot-scope="scope">
104   - {{ scope.row.cereResourceStrategy.id }}
105   - </template>
106   - </el-table-column>
107   - <el-table-column
108   - label="租金"
109   -
110   - min-width="150"
111   - >
112   - <template slot-scope="scope">
113   -
114   - </template>
115   - </el-table-column>
116   - <el-table-column
117   - label="免租期"
118   -
119   - min-width="150"
  42 + <el-table
  43 + :data="
  44 + tableData.slice(
  45 + (currentPage - 1) * pageSize,
  46 + currentPage * pageSize
  47 + )
  48 + "
  49 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  50 + >
  51 + <el-table-column
  52 + label="序号"
  53 + min-width="60"
  54 + >
  55 + <template slot-scope="scope">
  56 + {{scope.$index+1}}
  57 + </template>
  58 + </el-table-column>
  59 + <el-table-column
  60 + label="招商方案名称"
  61 + prop="planName"
  62 + min-width="300"
  63 + />
  64 + <!-- <el-table-column
  65 + label="规划方案名称"
  66 +
  67 + min-width="300"
120 68 >
121 69 <template slot-scope="scope">
  70 + {{scope.row.cereInvestmentPlanningManagement.planningName}}
  71 + </template>
  72 + </el-table-column> -->
  73 + <!-- <el-table-column
  74 + label="计划实施时间"
122 75  
123   - </template>
124   - </el-table-column>
125   - <el-table-column
126   - label="付款方式"
  76 + min-width="250"
  77 + >
  78 + <template slot-scope="scope">
  79 + {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
  80 + </template>
  81 + </el-table-column> -->
  82 + <el-table-column
  83 + label="涵盖资源数"
  84 + min-width="120"
  85 + >
  86 + <template slot-scope="scope">
  87 + {{ scope.row.cereResourceStrategy.length }}
  88 + </template>
  89 + </el-table-column>
  90 +
  91 + <el-table-column
  92 + label="资源类型"
  93 + prop="contactInformation"
  94 + min-width="150"
  95 + >
  96 + <template slot-scope="scope">
  97 + {{ scope.row.cereResourceStrategy.id }}
  98 + </template>
  99 + </el-table-column>
  100 + <el-table-column
  101 + label="租金/周期"
  102 +
  103 + min-width="150"
  104 + >
  105 + <template slot-scope="scope">
  106 +
  107 + </template>
  108 + </el-table-column>
  109 + <el-table-column
  110 + label="付款日"
  111 +
  112 + min-width="150"
  113 + >
  114 + <template slot-scope="scope">
127 115  
128   - min-width="150"
129   - >
130   - <template slot-scope="scope">
  116 + </template>
  117 + </el-table-column>
  118 +
  119 + <el-table-column
  120 + label="状态"
  121 + min-width="150"
  122 + >
  123 + <template slot-scope="scope">
  124 + {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
  125 + </template>
  126 + </el-table-column>
131 127  
132   - </template>
133   - </el-table-column>
134   - <el-table-column
135   - label="当前节点"
136   - min-width="150"
137   - >
138   - <template slot-scope="scope">
139   - {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
140   - </template>
141   - </el-table-column>
142   - <!-- <el-table-column
143   - label="启用状态"
144   - prop="auditStatus"
145   - min-width="150"
146   - >
147   - <template slot-scope="scope">
148   - 未启用
149   - </template>
150   - </el-table-column> -->
151 128 <el-table-column label="操作" width="180" fixed="right">
152 129 <template slot-scope="scope">
153 130 <div class="tableBtn greens" @click="handleEditForm(scope.row,false)">
... ...
admin-web-master/src/views/ads/fangli/addform.vue
  View file @8ff9d25
... ... @@ -57,52 +57,57 @@
57 57 </el-col>
58 58  
59 59 </el-row>
  60 +<el-row :gutter="20">
  61 + <el-col :span="24">
  62 + <el-form-item label="招商资源管理" class="grid-content bg-purple">
  63 + <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
  64 + <div style="padding: 0px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: flex-end;">
60 65  
61   - <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
62   - <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
63   - <div><span style="color:red;margin-right:3px;">*</span>招商资源管理</div>
64   - <div style="color: #3F9B6A;margin-left: 10px;" @click="mingShow">
65   - 添加
66   - </div>
67   - </div>
68   - <div style="padding: 15px;">
69   - <div style="padding: 0px 20px 0px 0px">
70   - <el-table :data="tableData"
71   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
72   - >
73   - <el-table-column label="序号" min-width="5%" >
74   - <template slot-scope="scope">
75   - {{scope.$index + 1}}
76   - </template>
77   - </el-table-column>
78   - <!-- <el-table-column label="资源编号" prop="id" width="100">
79   -
80   - </el-table-column> -->
81   - <el-table-column label="资源名称" min-width="20%" show-overflow-tooltip>
82   - <template slot-scope="scope">
83   - {{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
84   - </template>
85   - </el-table-column>
86   - <el-table-column label="资源类型" min-width="10%">
87   - <template slot-scope="scope">
88   - {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
89   - </template>
90   - </el-table-column>
91   - <el-table-column prop="notes" label="策略描述" min-width="25%" show-overflow-tooltip>
92   - </el-table-column>
93   - <el-table-column prop="policyName" label="策略名称" min-width="25%" show-overflow-tooltip>
94   - </el-table-column>
95   - <el-table-column label="操作" min-width="15%">
96   - <template slot-scope="scope">
97   - <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div>
98   - <!-- <div @click="MingEd(scope.row)" class="tableBtn greens">编辑</div> -->
99   - <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
100   - </template>
101   - </el-table-column>
102   - </el-table>
  66 + <div style="color: #3F9B6A;margin-left: 10px;" @click="mingShow">
  67 + 添加
  68 + </div>
  69 + </div>
  70 + <div style="padding: 15px;">
  71 + <div style="padding: 0px 20px 0px 0px">
  72 + <el-table :data="tableData"
  73 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  74 + >
  75 + <el-table-column label="序号" min-width="5%" >
  76 + <template slot-scope="scope">
  77 + {{scope.$index + 1}}
  78 + </template>
  79 + </el-table-column>
  80 + <el-table-column label="资源名称" min-width="20%" show-overflow-tooltip>
  81 + <template slot-scope="scope">
  82 + {{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
  83 + </template>
  84 + </el-table-column>
  85 + <el-table-column label="资源类型" min-width="10%">
  86 + <template slot-scope="scope">
  87 + {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
  88 + </template>
  89 + </el-table-column>
  90 + <el-table-column prop="policyName" label="策略名称" min-width="25%" show-overflow-tooltip>
  91 + </el-table-column>
  92 + <el-table-column prop="notes" label="策略描述" min-width="25%" show-overflow-tooltip>
  93 + </el-table-column>
  94 +
  95 + <el-table-column label="操作" min-width="15%">
  96 + <template slot-scope="scope">
  97 + <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div>
  98 + <!-- <div @click="MingEd(scope.row)" class="tableBtn greens">编辑</div> -->
  99 + <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
  100 + </template>
  101 + </el-table-column>
  102 + </el-table>
  103 + </div>
  104 + </div>
103 105 </div>
104   - </div>
105   - </div>
  106 + </el-form-item>
  107 + </el-col>
  108 +
  109 + </el-row>
  110 +
106 111 <el-row :gutter="20">
107 112 <el-col :span="24">
108 113 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
... ... @@ -137,17 +142,27 @@
137 142  
138 143  
139 144  
140   - <el-dialog :visible.sync="addMing" title="添加" style="padding: 0;" width="65%"
  145 + <el-dialog :visible.sync="addMing" title="添加" style="padding: 0;" width="65%" custom-class='tian_dialog'
141 146 append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
142 147  
143 148 <div style="padding:20px;max-height: calc(100vh - 200px);
144 149 overflow-y: auto;">
145 150 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
146 151 <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
147   - <div>选择资源</div>
148   - <!-- <div style="color: #2d8a58;margin-left: 10px;" @click="addMing = true">
149   - 添加
150   - </div> -->
  152 + <div style="line-height:200%">选择资源</div>
  153 + <div style="display: flex">
  154 + <el-input
  155 + placeholder="请输入"
  156 + suffix-icon="el-icon-search"
  157 + style="wdith:40%;margin-right:15px;"
  158 + v-model="pageindex.findLike">
  159 + </el-input>
  160 + <el-button @click="onSearch" style="background-color: #3F9B6A;color: #fff">查询
  161 + </el-button>
  162 + <el-button @click="resetting" class="buttonHover"
  163 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
  164 + </el-button>
  165 + </div>
151 166 </div>
152 167 <div style="padding: 15px;">
153 168 <div style="padding: 0px 20px 0px 0px">
... ... @@ -448,6 +463,7 @@ multipleSelection:[],
448 463 pageindex: {
449 464 pageNumber: 1,
450 465 pageSize: 10,
  466 + findLike:'',
451 467 },
452 468 ziyuanData:[],
453 469 celueSel:null,
... ... @@ -456,7 +472,8 @@ multipleSelection:[],
456 472 newAdd:{
457 473 resourcesId:'',//资源ID
458 474 rentalPoliciesId:'',//策略ID
459   - }
  475 + },
  476 +
460 477 }
461 478 },
462 479 created() {
... ... @@ -489,13 +506,19 @@ multipleSelection:[],
489 506 this.celueData = celue.data.content
490 507 },
491 508 async mingShow(){
  509 + this.pageindex.findLike =''
492 510 const ziyuan = await getAlls(this.pageindex)
493 511 const ggw = await map1(this.pageindex)
494 512 const changdi = await changAlls(this.pageindex)
495 513 this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
496 514 this.addMing = true
497 515 },
498   -
  516 +async ziyuan(){
  517 + const ziyuan = await getAlls(this.pageindex)
  518 + const ggw = await map1(this.pageindex)
  519 + const changdi = await changAlls(this.pageindex)
  520 + this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
  521 +},
499 522 //上传
500 523 submitUpload() {
501 524 this.$refs.upload.submit();
... ... @@ -662,7 +685,19 @@ multipleSelection:[],
662 685 },
663 686 seveMode(){
664 687  
665   - }
  688 + },
  689 + onSearch(){
  690 + this.ziyuan()
  691 + },
  692 + resetting(){
  693 +
  694 + this.pageindex={
  695 + pageNumber: 1,
  696 + pageSize: 10,
  697 + findLike:'',
  698 + }
  699 + this.ziyuan()
  700 + },
666 701 }
667 702 }
668 703 </script>
... ... @@ -770,4 +805,11 @@ multipleSelection:[],
770 805 border-bottom :0px;
771 806 }
772 807 }
  808 + ::v-deep .tian_dialog {
  809 + .el-dialog__body{
  810 + padding:0px;
  811 +
  812 + }
  813 +}
  814 +
773 815 </style>
... ...
admin-web-master/src/views/ads/fangli/bianform.vue
  View file @8ff9d25
... ... @@ -101,54 +101,56 @@
101 101 </el-row>
102 102 <el-row :gutter="20">
103 103 <el-col :span="24">
  104 + <el-form-item label="招商资源管理" class="grid-content bg-purple">
104 105 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
105   - <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
106   - <div><span style="color:red;margin-right:3px;">*</span>招商资源管理</div>
107   - <!-- <div style="color: #2d8a58;margin-left: 10px;" @click="addziyuan" v-if="steat">
108   - 添加
109   - </div> -->
110   - </div>
111   - <div style="padding: 15px;">
112   - <div style="padding: 0px 20px 0px 0px">
113   - <el-table :data="ruleForm.cereResourceStrategy"
114   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
115   - style="width: 100%">
116   - <el-table-column label="序号" width="auto" min-width="8%" >
117   - <template slot-scope="scope">
118   - {{scope.$index + 1}}
119   - </template>
120   - </el-table-column>
121   - <el-table-column label="资源编号" prop="id" width="auto" min-width="22%">
122   -
123   - </el-table-column>
124   - <el-table-column label="资源名称" width="auto" min-width="15%">
125   - <template slot-scope="scope">
126   - {{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}}
127   - </template>
128   - </el-table-column>
129   - <el-table-column label="资源类型" width="auto" min-width="15%">
130   - <template slot-scope="scope">
131   - {{scope.row.resources.shopIds[0]?'商铺':scope.row.resources.siteIds[0]?'场地':'广告位'}}
132   - </template>
133   - </el-table-column>
134   - <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
135   - </el-table-column>
136   - <el-table-column label="策略名称" width="auto" min-width="15%">
137   - <template slot-scope="scope">
138   - {{scope.row.resources.cereRentalPolicies.policyName}}
139   - </template>
140   - </el-table-column>
141   - <!-- <el-table-column label="操作" width="auto" min-width="18%" v-if="steat">
142   - <template slot-scope="scope">
143   - <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div>
144   -
145   - <div @click="MingDelete(scope.row.id,scope.$index)" class="tableBtn greens">删除</div>
146   - </template>
147   - </el-table-column> -->
148   - </el-table>
149   - </div>
150   - </div>
151   - </div>
  106 + <div style="padding: 0px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: flex-end;">
  107 + <div style="color: #2d8a58;margin-left: 10px;" @click="addziyuan" v-if="steat">
  108 + 添加
  109 + </div>
  110 + </div>
  111 + <div style="padding: 15px;">
  112 + <div style="padding: 0px 20px 0px 0px">
  113 + <el-table :data="ruleForm.cereResourceStrategy"
  114 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  115 + style="width: 100%">
  116 + <el-table-column label="序号" width="auto" min-width="8%" >
  117 + <template slot-scope="scope">
  118 + {{scope.$index + 1}}
  119 + </template>
  120 + </el-table-column>
  121 + <el-table-column label="资源编号" prop="id" width="auto" min-width="22%">
  122 +
  123 + </el-table-column>
  124 + <el-table-column label="资源名称" width="auto" min-width="15%">
  125 + <template slot-scope="scope">
  126 + {{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}}
  127 + </template>
  128 + </el-table-column>
  129 + <el-table-column label="资源类型" width="auto" min-width="15%">
  130 + <template slot-scope="scope">
  131 + {{scope.row.resources.shopIds[0]?'商铺':scope.row.resources.siteIds[0]?'场地':'广告位'}}
  132 + </template>
  133 + </el-table-column>
  134 + <el-table-column prop="notes" label="策略描述" width="auto" min-width="15%">
  135 + </el-table-column>
  136 + <el-table-column label="策略名称" width="auto" min-width="15%">
  137 + <template slot-scope="scope">
  138 + {{scope.row.resources.cereRentalPolicies.policyName}}
  139 + </template>
  140 + </el-table-column>
  141 + <!-- <el-table-column label="操作" width="auto" min-width="18%" v-if="steat">
  142 + <template slot-scope="scope">
  143 + <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div>
  144 +
  145 + <div @click="MingDelete(scope.row.id,scope.$index)" class="tableBtn greens">删除</div>
  146 + </template>
  147 + </el-table-column> -->
  148 + </el-table>
  149 + </div>
  150 + </div>
  151 + </div>
  152 + </el-form-item>
  153 +
152 154 </el-col>
153 155  
154 156 </el-row>
... ... @@ -186,62 +188,76 @@
186 188  
187 189 </el-col>
188 190 </el-row>
189   - <el-dialog title="添加" :visible.sync="addMing" custom-class='XDD_css' style="padding: 0;" width="50%"
  191 + <el-dialog :visible.sync="addMing" title="添加" style="padding: 0;" width="65%" custom-class='tian_dialog'
190 192 append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
191 193  
192   - <div style="padding: 15px;width:100%">
  194 + <div style="padding:20px;max-height: calc(100vh - 200px);
  195 + overflow-y: auto;">
193 196 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
194 197 <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
195   - <div>选择资源</div>
196   - <!-- <div style="color: #2d8a58;margin-left: 10px;" @click="addMing = true">
197   - 添加
198   - </div> -->
  198 + <div style="line-height:200%">选择资源</div>
  199 + <div style="display: flex">
  200 + <el-input
  201 + placeholder="请输入"
  202 + suffix-icon="el-icon-search"
  203 + style="wdith:40%;margin-right:15px;"
  204 + v-model="pageziyuan.findLike">
  205 + </el-input>
  206 + <el-button @click="onSearch" style="background-color: #3F9B6A;color: #fff">查询
  207 + </el-button>
  208 + <el-button @click="resetting" class="buttonHover"
  209 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
  210 + </el-button>
  211 + </div>
199 212 </div>
200 213 <div style="padding: 15px;">
201 214 <div style="padding: 0px 20px 0px 0px">
202   - <el-table :data="tableData"
203   - @selection-change="handleSelectionChange" tooltip-effect="dark"
  215 + <el-table :data="ziyuanData"
  216 + tooltip-effect="dark"
  217 + @selection-change="handleSelectionChange"
204 218 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
205   - style="width: 100%">
206   - <el-table-column
207   - label="选择"
208   - type="selection"
209   - width="55">
210   - </el-table-column>
211   - <el-table-column label="序号" min-width="8%" >
212   - <template slot-scope="scope">
213   - {{scope.$index + 1}}
214   - </template>
215   - </el-table-column>
216   - <el-table-column label="编号" prop="id" min-width="8%">
217   -
218   - </el-table-column>
219   - <el-table-column label="资源名称" min-width="25%">
220   - <template slot-scope="scope">
221   - {{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
222   - </template>
223   - </el-table-column>
224   - <el-table-column label="资源类型" min-width="12%">
225   - <template slot-scope="scope">
226   - {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
227   - </template>
228   - </el-table-column>
229   - <el-table-column prop="notes" label="对应策略" min-width="15%">
230   - </el-table-column>
  219 + >
  220 + <el-table-column
  221 + label="选择"
  222 + type="selection"
  223 + width="55">
  224 + </el-table-column>
  225 + <el-table-column label="序号" min-width="8%" >
  226 + <template slot-scope="scope">
  227 + {{scope.$index + 1}}
  228 + </template>
  229 + </el-table-column>
  230 + <el-table-column label="编号" prop="id" min-width="8%">
  231 +
  232 + </el-table-column>
  233 + <el-table-column label="资源名称" min-width="25%">
  234 + <template slot-scope="scope">
  235 + {{scope.row.shopName ? scope.row.shopName : scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
  236 + </template>
  237 + </el-table-column>
  238 + <el-table-column label="资源类型" min-width="12%">
  239 + <template slot-scope="scope">
  240 + {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
  241 + </template>
  242 + </el-table-column>
  243 + <el-table-column prop="notes" label="对应策略" min-width="15%">
  244 + </el-table-column>
231 245 </el-table>
232 246 </div>
233 247 </div>
234 248 </div>
235   -
236 249 </div>
237   - <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
238   - <el-button @click="mingClose()" class="buttonHover"
239   - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
240   - </el-button>
241   - <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
242   - </el-button>
  250 + <template #footer>
  251 + <div style="display: flex; justify-content: flex-end; align-items: center;">
  252 + <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
  253 + </el-button>
  254 + <el-button @click="mingClose" class="buttonHover"
  255 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
  256 + </el-button>
  257 +
  258 + </div>
  259 + </template>
243 260  
244   - </div>
245 261 </el-dialog>
246 262 <!-- 策略选择 -->
247 263 <el-dialog :visible.sync="celueMing" custom-class='XDD_css' style="padding: 0;" width="50%"
... ... @@ -396,8 +412,13 @@ guihuaDate:[],
396 412 trigger: 'change'
397 413 }],
398 414 },
399   - xiangTab:'first'
400   -
  415 + xiangTab:'first',
  416 + pageziyuan:{
  417 + pageNumber: 1,
  418 + pageSize: 10,
  419 + findLike:''
  420 + },
  421 + ziyuanData:[]
401 422 }
402 423 },
403 424 watch: {
... ... @@ -519,11 +540,20 @@ guihuaDate:[],
519 540  
520 541 },
521 542 minSev() {
522   - this.tableData = this.multipleSelection
  543 + console.log(this.ruleForm.cereResourceStrategy,this.multipleSelection)
  544 + const existingIds = new Set(this.ruleForm.cereResourceStrategy.map(item => item.id));
  545 +
  546 + // 过滤出 multipleSelection 中 id 不在 existingIds 中的元素
  547 + const newElements = this.multipleSelection.filter(item =>
  548 + !existingIds.has(item.id)
  549 + );
  550 +
  551 + // 将新元素添加到 cereResourceStrategy 数组中
  552 + this.ruleForm.cereResourceStrategy.push(...newElements);
  553 + // this.tableData = this.multipleSelection
523 554 this.addMing = false
524 555 this.multipleSelection =[]
525 556  
526   -
527 557 },
528 558 MingDelete(items,index) {
529 559  
... ... @@ -563,9 +593,9 @@ guihuaDate:[],
563 593 fenleiChange(value){
564 594 this.ruleForm.classificationCode = value[value.length - 1]
565 595 },
566   - handleSelectionChange(val) {
567   - this.multipleSelection = val;
568   - },
  596 + handleSelectionChange(val) {
  597 + this.multipleSelection = val
  598 + },
569 599 mingClose(){
570 600 this.addMing = false
571 601 },
... ... @@ -593,10 +623,28 @@ guihuaDate:[],
593 623 const ziyuan = await getAlls(this.pageindex)
594 624 const ggw = await map1(this.pageindex)
595 625 const changdi = await changAlls(this.pageindex)
596   - this.tableData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
  626 + this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
597 627 this.addMing = true
  628 + },
  629 + async ziyuan(){
  630 + const ziyuan = await getAlls(this.pageindex)
  631 + const ggw = await map1(this.pageindex)
  632 + const changdi = await changAlls(this.pageindex)
  633 + this.ziyuanData = [...ziyuan.data.content,...ggw.data.content,...changdi.data.content]
  634 + },
  635 + onSearch(){
  636 + this.ziyuan()
  637 + },
  638 + resetting(){
  639 +
  640 + this.pageindex={
  641 + pageNumber: 1,
  642 + pageSize: 10,
  643 + findLike:'',
  644 + }
  645 + this.ziyuan()
  646 + },
598 647  
599   - }
600 648 }
601 649 }
602 650 </script>
... ...
admin-web-master/src/views/ads/fangli/index.vue
  View file @8ff9d25
... ... @@ -68,7 +68,7 @@
68 68 prop="planName"
69 69 min-width="300"
70 70 />
71   - <el-table-column
  71 + <!-- <el-table-column
72 72 label="规划方案名称"
73 73  
74 74 min-width="300"
... ... @@ -76,8 +76,8 @@
76 76 <template slot-scope="scope">
77 77 {{scope.row.cereInvestmentPlanningManagement.planningName}}
78 78 </template>
79   - </el-table-column>
80   - <el-table-column
  79 + </el-table-column> -->
  80 + <!-- <el-table-column
81 81 label="计划实施时间"
82 82  
83 83 min-width="250"
... ... @@ -85,7 +85,7 @@
85 85 <template slot-scope="scope">
86 86 {{scope.row.cereInvestmentPlanningManagement.implementationStartTime}} - {{scope.row.cereInvestmentPlanningManagement.implementationEndTime}}
87 87 </template>
88   - </el-table-column>
  88 + </el-table-column> -->
89 89 <el-table-column
90 90 label="涵盖资源数"
91 91 min-width="120"
... ... @@ -94,14 +94,7 @@
94 94 {{ scope.row.cereResourceStrategy.length }}
95 95 </template>
96 96 </el-table-column>
97   - <el-table-column
98   - label="资源编号"
99   - prop="founder"
100   - min-width="200">
101   - <template slot-scope="scope">
102   - {{ scope.row.cereResourceStrategy.resourcesId }}
103   - </template>
104   - </el-table-column>
  97 +
105 98 <el-table-column
106 99 label="资源类型"
107 100 prop="contactInformation"
... ... @@ -112,7 +105,7 @@
112 105 </template>
113 106 </el-table-column>
114 107 <el-table-column
115   - label="租金"
  108 + label="租金/周期"
116 109  
117 110 min-width="150"
118 111 >
... ... @@ -121,7 +114,7 @@
121 114 </template>
122 115 </el-table-column>
123 116 <el-table-column
124   - label="免租期"
  117 + label="付款日"
125 118  
126 119 min-width="150"
127 120 >
... ... @@ -129,32 +122,16 @@
129 122  
130 123 </template>
131 124 </el-table-column>
132   - <el-table-column
133   - label="付款方式"
134 125  
135   - min-width="150"
136   - >
137   - <template slot-scope="scope">
138   -
139   - </template>
140   - </el-table-column>
141 126 <el-table-column
142   - label="当前节点"
  127 + label="状态"
143 128 min-width="150"
144 129 >
145 130 <template slot-scope="scope">
146 131 {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'审核通过':scope.row.auditStatus =='3'?'已驳回':''}}
147 132 </template>
148 133 </el-table-column>
149   - <!-- <el-table-column
150   - label="启用状态"
151   - prop="auditStatus"
152   - min-width="150"
153   - >
154   - <template slot-scope="scope">
155   - 未启用
156   - </template>
157   - </el-table-column> -->
  134 +
158 135 <el-table-column label="操作" width="180" fixed="right">
159 136 <template slot-scope="scope">
160 137 <div class="tableBtn greens" @click="handleEditForm(scope.row,false)">
... ...