webapp / GreenwayWeb

Commit 0e38abb3047a1bdf6e15cc1a7de4c459feec23df

Authored by 杨鑫
1 parent 94594e39

'最新'

Inline Side-by-side
Showing 19 changed files with 631 additions and 553 deletions
admin-web-master/src/main.js
  View file @0e38abb
... ... @@ -37,15 +37,15 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd
37 37  
38 38 let host = window.location.host;
39 39 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
40   - // Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
41   - // Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
42   - // Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
43   - // Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api`
  40 + Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
  41 + Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
  42 + Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
  43 + Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api`
44 44  
45   - Vue.prototype.$baseURL ='https://zhgw-uat.028wlkj.com/cdwlMall'
46   - Vue.prototype.$fontBold = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
47   - Vue.prototype.$fontRegular = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
48   - Vue.prototype.$API = `https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api`
  45 + // Vue.prototype.$baseURL ='https://zhgw-uat.028wlkj.com/cdwlMall'
  46 + // Vue.prototype.$fontBold = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
  47 + // Vue.prototype.$fontRegular = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
  48 + // Vue.prototype.$API = `https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api`
49 49 } else {
50 50 Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api`
51 51 Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
... ...
admin-web-master/src/utils/request.js
  View file @0e38abb
... ... @@ -16,8 +16,8 @@ let hostall = window.location.href;
16 16 let baseURL = ''
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19   - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20   - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
  19 + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
... ...
admin-web-master/src/views/activity/activityBian.vue
  View file @0e38abb
... ... @@ -3,7 +3,7 @@
3 3 <div style="height:58px;line-height:58px;background:#fff;padding-left:20px;">
4 4 <div style="color:#0006"> <span>品牌策划</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">活动方案编辑</span></div>
5 5 </div>
6   - <div style="font-size: 12px;background:#fff;">
  6 + <div style="font-size: 14px;background:#fff;">
7 7 <div style="padding: 20px">
8 8 <div style="border: solid 1px #E5E5E5;border-radius: 5px">
9 9 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
... ... @@ -107,7 +107,7 @@
107 107 </div>
108 108 <div style="padding: 20px 20px 20px 20px">
109 109 <el-table :data="tableDa"
110   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  110 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
111 111 style="width: 100%">
112 112 <el-table-column label="序号" width="auto" min-width="5%" prop="date" align="center">
113 113 <template slot-scope="scope">
... ... @@ -120,7 +120,7 @@
120 120 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
121 121  
122 122 </el-table-column>
123   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  123 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
124 124 </el-table-column>
125 125 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
126 126 </el-table-column>
... ... @@ -146,12 +146,12 @@
146 146 style="position: relative">
147 147 <el-row :gutter="20">
148 148 <el-col :span="12">
149   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from" prop="name">
  149 + <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from" prop="name">
150 150 <el-input v-model="secondData.internalLaborCostEstimation" placeholder="请输入" />
151 151 </el-form-item>
152 152 </el-col>
153 153 <el-col :span="12">
154   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple" prop="name">
  154 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" prop="name">
155 155 <el-input v-model="secondData.externalLaborCostEstimation" placeholder="请输入" />
156 156 </el-form-item>
157 157 </el-col>
... ... @@ -161,12 +161,12 @@
161 161  
162 162 <el-row :gutter="20">
163 163 <el-col :span="12">
164   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  164 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
165 165 <el-input v-model="secondData.costEstimationGoods" placeholder="请输入" />
166 166 </el-form-item>
167 167 </el-col>
168 168 <el-col :span="12">
169   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  169 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
170 170 <el-input v-model="secondData.setCostEstimate" placeholder="请输入" />
171 171 </el-form-item>
172 172 </el-col>
... ... @@ -174,19 +174,19 @@
174 174 </el-row>
175 175 <el-row :gutter="20">
176 176 <el-col :span="12">
177   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  177 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
178 178 <el-input v-model="secondData.estimatedPromotionalExpenses" placeholder="请输入" />
179 179 </el-form-item>
180 180 </el-col>
181 181 <el-col :span="12">
182   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  182 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
183 183 <el-input v-model="secondData.otherNecessaryEstimates" placeholder="请输入" />
184 184 </el-form-item>
185 185 </el-col>
186 186 </el-row>
187 187 <el-row :gutter="20">
188 188 <el-col :span="12">
189   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  189 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
190 190 <el-input v-model="secondData.totalCostEstimation" placeholder="请输入" />
191 191 </el-form-item>
192 192 </el-col>
... ... @@ -225,12 +225,12 @@
225 225 </el-row>
226 226 <el-row :gutter="20">
227 227 <el-col :span="12">
228   - <el-form-item label="预估直接收益" class="grid-content bg-purple" prop="name">
  228 + <el-form-item label="预估直接收益(/元)" class="grid-content bg-purple" prop="name">
229 229 <el-input v-model="secondData.expectedDirectBenefits" placeholder="请输入" />
230 230 </el-form-item>
231 231 </el-col>
232 232 <el-col :span="12">
233   - <el-form-item label="预估间接收益" class="grid-content bg-purple" prop="name">
  233 + <el-form-item label="预估间接收益(/元)" class="grid-content bg-purple" prop="name">
234 234 <el-input v-model="secondData.expectedIndirectBenefits" placeholder="请输入" />
235 235 </el-form-item>
236 236 </el-col>
... ... @@ -261,7 +261,7 @@
261 261 </div>
262 262 <div style="padding: 20px 40px 0px 20px">
263 263 <el-table :data="dataList"
264   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  264 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
265 265 style="width: 100%">
266 266 <el-table-column label="序号" width="auto" min-width="7%" prop="date" align="center">
267 267 <template slot-scope="scope">
... ... @@ -303,7 +303,7 @@
303 303 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
304 304 </el-form-item>
305 305  
306   - <el-form-item label="预估费用" class="grid-content bg-purple" prop="eventAddrs">
  306 + <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs">
307 307 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
308 308 </el-form-item>
309 309 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
... ... @@ -314,7 +314,7 @@
314 314 </div>
315 315  
316 316 </div>
317   - <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
  317 + <div style="display: flex;justify-content: flex-end;padding: 10px 20px 0 0">
318 318 <el-button plain @click="addMing=false" style="background-color: #3F9B6A;color: #fff;">取消
319 319 </el-button>
320 320 <el-button plain @click="addming" style="background-color: #3F9B6A;color: #fff;">保存
... ... @@ -528,13 +528,14 @@ this.fucha(this.secondData.id)
528 528 bianji() {
529 529 this.secondData.pageNumber = 1
530 530 this.secondData.pageSize = 10
  531 + this.secondData.updateDate = this.updateCurrentTime()
  532 + this.secondData.updateUser = localStorage.getItem('roleName')
531 533 let that = this
532 534 Vue.delete(that.secondData,'createDate')
533 535 let newobj = this.removeEmptyValues(this.secondData)
534 536 this.$refs.jibenFrom.validate((valid) => {
535 537 if (valid) {
536   - this.secondData.updateDate = this.updateCurrentTime()
537   -
  538 +
538 539 xiangedit(newobj).then(res=>{
539 540 this.$emit('BianchildClose', false)
540 541 })
... ...
admin-web-master/src/views/activity/activityBz.vue
  View file @0e38abb
... ... @@ -9,7 +9,7 @@
9 9 <el-tabs :before-leave="beforeTabLeave">
10 10 <!-- <el-tab-pane label="方案编辑">
11 11 <div style="border: 1px solid #E5E5E5;padding: 1px" id="bian">
12   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;">
  12 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;">
13 13 方案编辑器
14 14 </div>
15 15 <div style="padding: 15px;width:100%">
... ... @@ -19,12 +19,12 @@
19 19 </el-tab-pane> -->
20 20 <el-tab-pane label="基本信息">
21 21 <div style="border: 1px solid #E5E5E5;padding: 1px" id="jiben">
22   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;">
  22 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;">
23 23 基本信息
24 24 </div>
25 25 <div style="padding:10px 15px;">
26 26 <el-form label-position="right" ref="jibenFrom" :model="ruleForm" :rules="rules"
27   - label-width="120px" style="position: relative">
  27 + label-width="150px" style="position: relative">
28 28 <el-row :gutter="20">
29 29 <el-col :span="12">
30 30 <el-form-item label="方案分类" class="grid-content bg-purple device-from"
... ... @@ -105,7 +105,7 @@
105 105 <el-select v-model="lishiList" placeholder="请选择" style="width:100%"
106 106 @change="lichange">
107 107 <el-option v-for="(item,index) in fenxiData" :key="item.id"
108   - :label="item.operationType" :value="index">
  108 + :label="item.planName" :value="index">
109 109 </el-option>
110 110 </el-select>
111 111 </el-form-item>
... ... @@ -133,7 +133,7 @@
133 133 </el-tab-pane>
134 134 <el-tab-pane label="活动明细">
135 135 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
136   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  136 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
137 137 <div>活动明细</div>
138 138 <div style="color: #2d8a58;margin-left: 10px;" @click="addMing = true">
139 139 添加明细
... ... @@ -142,7 +142,7 @@
142 142 <div style="padding: 15px;">
143 143 <div style="padding: 0px 20px 0px 0px">
144 144 <el-table :data="tableData"
145   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  145 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
146 146 style="width: 100%">
147 147 <el-table-column label="序号" width="auto" min-width="5%" align="center">
148 148 <template slot-scope="scope">
... ... @@ -155,7 +155,8 @@
155 155 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
156 156  
157 157 </el-table-column>
158   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  158 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
  159 +
159 160 </el-table-column>
160 161 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
161 162 </el-table-column>
... ... @@ -172,23 +173,23 @@
172 173 </el-tab-pane>
173 174 <el-tab-pane label="活动成本">
174 175 <div style="border: 1px solid #E5E5E5;padding: 1px" id="cheng">
175   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  176 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
176 177 <div>活动成本</div>
177 178 </div>
178 179 <div style="padding: 15px;">
179 180 <div style="">
180   - <el-form label-position="right" ref="ruleFormInfo" :model="ruleForm" label-width="130px"
  181 + <el-form label-position="right" ref="ruleFormInfo" :model="ruleForm" label-width="180px"
181 182 style="position: relative">
182 183 <el-row :gutter="20">
183 184 <el-col :span="12">
184   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from"
  185 + <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from"
185 186 prop="internalLaborCostEstimation">
186 187 <el-input v-model="ruleForm.internalLaborCostEstimation"
187 188 placeholder="请输入" />
188 189 </el-form-item>
189 190 </el-col>
190 191 <el-col :span="12">
191   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple"
  192 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple"
192 193 prop="externalLaborCostEstimation">
193 194 <el-input v-model="ruleForm.externalLaborCostEstimation"
194 195 placeholder="请输入" />
... ... @@ -200,13 +201,13 @@
200 201  
201 202 <el-row :gutter="20">
202 203 <el-col :span="12">
203   - <el-form-item label="商品成本预估" class="grid-content bg-purple"
  204 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple"
204 205 prop="costEstimationGoods">
205 206 <el-input v-model="ruleForm.costEstimationGoods" placeholder="请输入" />
206 207 </el-form-item>
207 208 </el-col>
208 209 <el-col :span="12">
209   - <el-form-item label="设备成本预估" class="grid-content bg-purple"
  210 + <el-form-item label="设备成本预估(/元)" class="grid-content bg-purple"
210 211 prop="setCostEstimate">
211 212 <el-input v-model="ruleForm.setCostEstimate" placeholder="请输入" />
212 213 </el-form-item>
... ... @@ -216,14 +217,14 @@
216 217  
217 218 <el-row :gutter="20">
218 219 <el-col :span="12">
219   - <el-form-item label="宣传费用预估" class="grid-content bg-purple"
  220 + <el-form-item label="宣传费用预估(/元)" class="grid-content bg-purple"
220 221 prop="estimatedPromotionalExpenses">
221 222 <el-input v-model="ruleForm.estimatedPromotionalExpenses"
222 223 placeholder="请输入" />
223 224 </el-form-item>
224 225 </el-col>
225 226 <el-col :span="12">
226   - <el-form-item label="其他必要成本预估" class="grid-content bg-purple"
  227 + <el-form-item label="其他必要成本预估(/元)" class="grid-content bg-purple"
227 228 prop="otherNecessaryEstimates">
228 229 <el-input v-model="ruleForm.otherNecessaryEstimates"
229 230 placeholder="请输入" />
... ... @@ -232,7 +233,7 @@
232 233 </el-row>
233 234 <el-row :gutter="20">
234 235 <el-col :span="12">
235   - <el-form-item label="总成本预估" prop="totalCostEstimation"
  236 + <el-form-item label="总成本预估(/元)" prop="totalCostEstimation"
236 237 class="grid-content bg-purple">
237 238 <el-input v-model="ruleForm.totalCostEstimation" placeholder="请输入" />
238 239 </el-form-item>
... ... @@ -250,12 +251,12 @@
250 251 </el-tab-pane>
251 252 <el-tab-pane label="预估效果信息">
252 253 <div style="border: 1px solid #E5E5E5;padding: 1px" id="yugu">
253   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  254 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
254 255 <div>预估效果信息</div>
255 256 </div>
256 257 <div style="padding: 15px;">
257 258 <div>
258   - <el-form label-position="right" ref="ruleFormInfo" :model="ruleForm" label-width="120px"
  259 + <el-form label-position="right" ref="ruleFormInfo" :model="ruleForm" label-width="150px"
259 260 style="position: relative">
260 261 <el-row :gutter="20">
261 262 <el-col :span="12">
... ... @@ -273,13 +274,13 @@
273 274 </el-row>
274 275 <el-row :gutter="20">
275 276 <el-col :span="12">
276   - <el-form-item label="预计直接收益" class="grid-content bg-purple"
  277 + <el-form-item label="预计直接收益(/元)" class="grid-content bg-purple"
277 278 prop="expectedDirectBenefits">
278 279 <el-input v-model="ruleForm.expectedDirectBenefits" placeholder="请输入" />
279 280 </el-form-item>
280 281 </el-col>
281 282 <el-col :span="12">
282   - <el-form-item label="预计间接收益" class="grid-content bg-purple"
  283 + <el-form-item label="预计间接收益(/元)" class="grid-content bg-purple"
283 284 prop="expectedIndirectBenefits">
284 285 <el-input v-model="ruleForm.expectedIndirectBenefits"
285 286 placeholder="请输入" />
... ... @@ -294,7 +295,7 @@
294 295 </el-tab-pane>
295 296 <el-tab-pane label="相关附件">
296 297 <div style="border: 1px solid #E5E5E5;padding: 1px" id="fu">
297   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  298 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
298 299 <div style="line-height:38px;">相关附件</div>
299 300 <div>
300 301 <upfile filePath="act" inputtype="otherImageVideos" :limit="10" :islist="false"
... ... @@ -313,7 +314,7 @@
313 314 <div style="padding: 15px;">
314 315 <div style="padding: 0px 20px 0px 0px">
315 316 <el-table :data="dataList"
316   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  317 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
317 318 style="width: 100%">
318 319 <el-table-column label="序号" width="auto" min-width="7%" align="center">
319 320 <template slot-scope="scope">
... ... @@ -350,7 +351,7 @@
350 351 append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
351 352 <div style="padding: 15px;width:100%">
352 353 <div>
353   - <el-form label-position="rgiht" ref="ruleFormInfo" :model="mingFrom" label-width="120px"
  354 + <el-form label-position="rgiht" ref="ruleFormInfo" :model="mingFrom" label-width="150px"
354 355 style="position: relative">
355 356 <el-form-item label="明细项名称" class="grid-content bg-purple device-from" prop="planName">
356 357 <el-input v-model="mingFrom.detailLtemName" placeholder="请输入" />
... ... @@ -359,7 +360,7 @@
359 360 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
360 361 </el-form-item>
361 362  
362   - <el-form-item label="预估费用" class="grid-content bg-purple" prop="eventAddrs">
  363 + <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs">
363 364 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
364 365 </el-form-item>
365 366 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
... ... @@ -392,7 +393,8 @@
392 393 MingDel,
393 394 fujiaAdd,
394 395 imgUp,
395   - lishiDeta
  396 + lishiDeta,
  397 + queryByPage
396 398 } from '../../api/activityBz'
397 399 // import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
398 400 import wangEditor from "@/components/editor/index";
... ... @@ -557,22 +559,55 @@
557 559 this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
558 560 },
559 561 lishi() {
560   - lishiDeta({
561   - eventDetailsType: '1'
  562 + queryByPage({
  563 + pageNumber: 1,
  564 + pageSize: 10,
  565 + dataOwnership: '1',
  566 + isDraft: 0,
  567 + state:'5'
  568 +
562 569 }).then(res => {
563   - this.fenxiData = res.data
  570 + this.fenxiData = res.data.content
564 571 })
  572 +
565 573 },
566 574 lichange(e) {
567   -
  575 +
568 576 let msg = this.fenxiData[e]
569   - let obj = JSON.parse(msg.originalData)
570   -
571   - for (let key in obj) {
572   - if (this.ruleForm.hasOwnProperty(key)) {
573   - this.ruleForm[key] = obj[key];
574   - }
  577 + console.log(msg)
  578 + // let obj = msg.originalData
  579 + this.ruleForm={
  580 + // classificationCode: msg.classificationCode,
  581 + plan_Time: [msg.eventStartTime,msg.eventEndTime],
  582 + planName: msg.planName, //方案名称
  583 + planType: '活动策划', //类型
  584 + eventAddrs: msg.eventAddrs, //活动地点
  585 + eventStartTime: msg.eventStartTime, //活动开始时间
  586 + eventEndTime: msg.eventEndTime, //活动结束时间
  587 + eventTheme:msg.eventTheme, //活动主题
  588 + sponsor: msg.sponsor, //活动主办方
  589 + participants: msg.participants, //活动参与方
  590 + rangeSetting: msg.rangeSetting,
  591 + mainPurpose: msg.mainPurpose, //活动主要目的
  592 + coverPoster: msg.coverPoster, //封面海报
  593 + internalLaborCostEstimation: msg.internalLaborCostEstimation, //内部人工成本预估
  594 + externalLaborCostEstimation: msg.externalLaborCostEstimation, //外部人工成本预估
  595 + costEstimationGoods: msg.costEstimationGoods, //商品成本预估
  596 + setCostEstimate: msg.setCostEstimate, //设置成本预估
  597 + estimatedPromotionalExpenses: msg.estimatedPromotionalExpenses, //宣传费用预估
  598 + otherNecessaryEstimates:msg.otherNecessaryEstimates, //其他成本预估
  599 + totalCostEstimation: msg.totalCostEstimation, //总成本预估
  600 + notes: msg.notes, //备注
  601 + expectedAttractTraffic: msg.expectedAttractTraffic, //预计吸引流量
  602 + expectedParticipation: msg.expectedParticipation, //预计参与人数
  603 + expectedDirectBenefits: msg.expectedDirectBenefits, //预计直接收益
  604 + expectedIndirectBenefits: msg.expectedIndirectBenefits, //预计间接收益
575 605 }
  606 + // for (let key in obj) {
  607 + // if (this.ruleForm.hasOwnProperty(key)) {
  608 + // this.ruleForm[key] = obj[key];
  609 + // }
  610 + // }
576 611 },
577 612 zancun() {},
578 613 //上传
... ... @@ -669,6 +704,7 @@
669 704 let FlieName = this.ruleForm.planName
670 705 this.updateCurrentTime();
671 706 this.ruleForm.createDate = this.currentTime
  707 + this.ruleForm.createUser = localStorage.getItem('roleName')
672 708 this.ruleForm.dataOwnership = '1'
673 709 // this.$nextTick(() => {
674 710 // var bian = document.getElementById('bian')
... ... @@ -1023,7 +1059,7 @@
1023 1059 border: none;
1024 1060 margin-right: 10px;
1025 1061 background-color: #F2F2F2;
1026   - font-size: 12px;
  1062 + font-size: 14px;
1027 1063 border-top-left-radius: 8px;
1028 1064 border-top-right-radius: 8px;
1029 1065 padding: 0 15px;
... ...
admin-web-master/src/views/activity/activityHis.vue
  View file @0e38abb
... ... @@ -156,7 +156,7 @@
156 156 <div style="width: 100%;background-color: #fff;">
157 157 <el-tabs v-model="activeName" @tab-click="handleClick" style="padding-left:20px;">
158 158 <el-tab-pane label="方案概况" name="first"></el-tab-pane>
159   - <el-tab-pane label="执行效果" name="second"></el-tab-pane>
  159 + <el-tab-pane label="方案调整" name="second"></el-tab-pane>
160 160 <el-tab-pane label="历史记录列表" name="fourd"></el-tab-pane>
161 161 <!-- <el-tab-pane label="执行情况" name="five"></el-tab-pane> -->
162 162 </el-tabs>
... ... @@ -203,7 +203,7 @@
203 203 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
204 204  
205 205 </el-table-column>
206   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  206 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
207 207  
208 208 </el-table-column>
209 209 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -217,14 +217,14 @@
217 217 <el-table :data="tableData3"
218 218 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
219 219 style="width: 100%;margin: auto;">
220   - <el-table-column class-name="first-column-bg" label="内部人力成本预估" prop="name"
  220 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name"
221 221 min-width="15%">
222 222 </el-table-column>
223 223 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
224 224 min-width="35%">
225 225  
226 226 </el-table-column>
227   - <el-table-column class-name="first-column-bg" label="外部人力成本预估" prop="text"
  227 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text"
228 228 min-width="15%">
229 229  
230 230 </el-table-column>
... ... @@ -394,7 +394,7 @@
394 394 min-width="15%">
395 395  
396 396 </el-table-column>
397   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  397 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
398 398 </el-table-column>
399 399 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
400 400 </el-table-column>
... ... @@ -423,14 +423,14 @@
423 423 label-width="120px" style="position: relative">
424 424 <el-row :gutter="20">
425 425 <el-col :span="8">
426   - <el-form-item label="内部人力成本预估"
  426 + <el-form-item label="内部人力成本预估(/元)"
427 427 class="grid-content bg-purple device-from" prop="name">
428 428 <el-input v-model="zhixingList.internalLaborCostEstimation"
429 429 placeholder="请输入" :disabled="!zhixingBian" />
430 430 </el-form-item>
431 431 </el-col>
432 432 <el-col :span="8">
433   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple"
  433 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple"
434 434 prop="name">
435 435 <el-input v-model="zhixingList.externalLaborCostEstimation"
436 436 placeholder="请输入" :disabled="!zhixingBian" />
... ... @@ -438,7 +438,7 @@
438 438 </el-col>
439 439  
440 440 <el-col :span="8">
441   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  441 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
442 442 <el-input v-model="zhixingList.costEstimationGoods"
443 443 placeholder="请输入" :disabled="!zhixingBian" />
444 444 </el-form-item>
... ... @@ -447,19 +447,19 @@
447 447  
448 448 <el-row :gutter="20">
449 449 <el-col :span="8">
450   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  450 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
451 451 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
452 452 :disabled="!zhixingBian" />
453 453 </el-form-item>
454 454 </el-col>
455 455 <el-col :span="8">
456   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  456 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
457 457 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
458 458 placeholder="请输入" :disabled="!zhixingBian" />
459 459 </el-form-item>
460 460 </el-col>
461 461 <el-col :span="8">
462   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  462 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
463 463 <el-input v-model="zhixingList.otherNecessaryEstimates"
464 464 placeholder="请输入" :disabled="!zhixingBian" />
465 465 </el-form-item>
... ... @@ -468,7 +468,7 @@
468 468  
469 469 <el-row :gutter="20">
470 470 <el-col :span="8">
471   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  471 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
472 472 <el-input v-model="zhixingList.totalCostEstimation"
473 473 placeholder="请输入" :disabled="!zhixingBian" />
474 474 </el-form-item>
... ... @@ -511,7 +511,7 @@
511 511 </el-col>
512 512  
513 513 <el-col :span="8">
514   - <el-form-item label="直接收益" class="grid-content bg-purple" prop="name">
  514 + <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name">
515 515 <el-input v-model="zhixingList.expectedDirectBenefits"
516 516 placeholder="请输入" :disabled="!zhixingBian" />
517 517 </el-form-item>
... ... @@ -519,7 +519,7 @@
519 519 </el-row>
520 520 <el-row :gutter="20">
521 521 <el-col :span="8">
522   - <el-form-item label="间接收益" class="grid-content bg-purple" prop="name">
  522 + <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name">
523 523 <el-input v-model="zhixingList.expectedIndirectBenefits"
524 524 placeholder="请输入" :disabled="!zhixingBian" />
525 525 </el-form-item>
... ... @@ -679,7 +679,7 @@
679 679 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
680 680  
681 681 </el-table-column>
682   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  682 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
683 683  
684 684 </el-table-column>
685 685 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -693,7 +693,7 @@
693 693 :labelStyle="labelStyle">
694 694 <el-descriptions-item>
695 695 <template slot="label">
696   - 内部人力成本预估
  696 + 内部人力成本预估(/元)
697 697 </template>
698 698  
699 699 <span
... ... @@ -701,7 +701,7 @@
701 701 </el-descriptions-item>
702 702 <el-descriptions-item>
703 703 <template slot="label">
704   - 外部人力成本预估
  704 + 外部人力成本预估(/元)
705 705 </template>
706 706  
707 707 <span
... ... @@ -709,7 +709,7 @@
709 709 </el-descriptions-item>
710 710 <el-descriptions-item>
711 711 <template slot="label">
712   - 商品成本预估
  712 + 商品成本预估(/元)
713 713 </template>
714 714  
715 715 <span
... ... @@ -717,7 +717,7 @@
717 717 </el-descriptions-item>
718 718 <el-descriptions-item>
719 719 <template slot="label">
720   - 设备成本预估
  720 + 设备成本预估(/元)
721 721 </template>
722 722  
723 723 <span
... ... @@ -725,7 +725,7 @@
725 725 </el-descriptions-item>
726 726 <el-descriptions-item>
727 727 <template slot="label">
728   - 宣传费用预估
  728 + 宣传费用预估(/元)
729 729 </template>
730 730  
731 731 <span
... ... @@ -733,7 +733,7 @@
733 733 </el-descriptions-item>
734 734 <el-descriptions-item>
735 735 <template slot="label">
736   - 其他必要成本预估
  736 + 其他必要成本预估(/元)
737 737 </template>
738 738  
739 739 <span
... ... @@ -741,7 +741,7 @@
741 741 </el-descriptions-item>
742 742 <el-descriptions-item>
743 743 <template slot="label">
744   - 总成本预估
  744 + 总成本预估(/元)
745 745 </template>
746 746  
747 747 <span
... ... @@ -781,7 +781,7 @@
781 781 </el-descriptions-item>
782 782 <el-descriptions-item>
783 783 <template slot="label">
784   - 预计直接收益
  784 + 预计直接收益(/元)
785 785 </template>
786 786  
787 787 <span
... ... @@ -789,7 +789,7 @@
789 789 </el-descriptions-item>
790 790 <el-descriptions-item>
791 791 <template slot="label">
792   - 预计间接收益
  792 + 预计间接收益(/元)
793 793 </template>
794 794  
795 795 <span
... ... @@ -922,7 +922,7 @@
922 922 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
923 923  
924 924 </el-table-column>
925   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  925 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
926 926  
927 927 </el-table-column>
928 928 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -936,14 +936,14 @@
936 936 <el-table :data="tableData3"
937 937 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
938 938 style="width: 100%;margin: auto;">
939   - <el-table-column class-name="first-column-bg" label="内部人力成本预估" prop="name"
  939 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name"
940 940 min-width="15%">
941 941 </el-table-column>
942 942 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
943 943 min-width="35%">
944 944  
945 945 </el-table-column>
946   - <el-table-column class-name="first-column-bg" label="外部人力成本预估" prop="text"
  946 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text"
947 947 min-width="15%">
948 948  
949 949 </el-table-column>
... ... @@ -1123,7 +1123,7 @@
1123 1123 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
1124 1124  
1125 1125 </el-table-column>
1126   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  1126 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
1127 1127  
1128 1128 </el-table-column>
1129 1129 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -1137,43 +1137,43 @@
1137 1137 <el-descriptions class="margin-top" :column="2" border :labelStyle="labelStyleOne">
1138 1138 <el-descriptions-item>
1139 1139 <template slot="label">
1140   - 内部人力成本预估
  1140 + 内部人力成本预估(/元)
1141 1141 </template>
1142 1142 {{lixiang.internalLaborCostEstimation}}
1143 1143 </el-descriptions-item>
1144 1144 <el-descriptions-item>
1145 1145 <template slot="label">
1146   - 外部人力成本预估
  1146 + 外部人力成本预估(/元)
1147 1147 </template>
1148 1148 {{lixiang.externalLaborCostEstimation}}
1149 1149 </el-descriptions-item>
1150 1150 <el-descriptions-item>
1151 1151 <template slot="label">
1152   - 商品成本预估
  1152 + 商品成本预估(/元)
1153 1153 </template>
1154 1154 {{lixiang.costEstimationGoods}}
1155 1155 </el-descriptions-item>
1156 1156 <el-descriptions-item>
1157 1157 <template slot="label">
1158   - 设备成本预估
  1158 + 设备成本预估(/元)
1159 1159 </template>
1160 1160 {{lixiang.setCostEstimate}}
1161 1161 </el-descriptions-item>
1162 1162 <el-descriptions-item>
1163 1163 <template slot="label">
1164   - 宣传费用预估
  1164 + 宣传费用预估(/元)
1165 1165 </template>
1166 1166 {{lixiang.estimatedPromotionalExpenses}}
1167 1167 </el-descriptions-item>
1168 1168 <el-descriptions-item>
1169 1169 <template slot="label">
1170   - 其他必要成本预估
  1170 + 其他必要成本预估(/元)
1171 1171 </template>
1172 1172 {{lixiang.otherNecessaryEstimates}}
1173 1173 </el-descriptions-item>
1174 1174 <el-descriptions-item>
1175 1175 <template slot="label">
1176   - 总成本预估
  1176 + 总成本预估(/元)
1177 1177 </template>
1178 1178 {{lixiang.totalCostEstimation}}
1179 1179 </el-descriptions-item>
... ... @@ -1204,13 +1204,13 @@
1204 1204 </el-descriptions-item>
1205 1205 <el-descriptions-item>
1206 1206 <template slot="label">
1207   - 预计直接收益
  1207 + 预计直接收益(/元)
1208 1208 </template>
1209 1209 {{lixiang.expectedDirectBenefits}}
1210 1210 </el-descriptions-item>
1211 1211 <el-descriptions-item>
1212 1212 <template slot="label">
1213   - 预计间接收益
  1213 + 预计间接收益(/元)
1214 1214 </template>
1215 1215 {{lixiang.expectedIndirectBenefits}}
1216 1216 </el-descriptions-item>
... ... @@ -1286,7 +1286,7 @@
1286 1286 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
1287 1287 </el-form-item>
1288 1288  
1289   - <el-form-item label="预估费用" class="grid-content bg-purple" prop="eventAddrs">
  1289 + <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs">
1290 1290 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
1291 1291 </el-form-item>
1292 1292 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
... ... @@ -1616,19 +1616,19 @@
1616 1616 externalLaborCostEstimation: '',
1617 1617 tableData3: [{
1618 1618 id: 0,
1619   - name: '商品成本预估',
  1619 + name: '商品成本预估(/元)',
1620 1620 planName: '',
1621   - text: '设备成本预估',
  1621 + text: '设备成本预估(/元)',
1622 1622 eventTheme: ''
1623 1623 }, {
1624 1624 id: 0,
1625   - name: '宣传费用预估',
  1625 + name: '宣传费用预估(/元)',
1626 1626 planName: '',
1627   - text: '其他必要成本预估',
  1627 + text: '其他必要成本预估(/元)',
1628 1628 eventTheme: ''
1629 1629 }, {
1630 1630 id: 0,
1631   - name: '总成本预估',
  1631 + name: '总成本预估(/元)',
1632 1632 planName: '',
1633 1633 text: '备注',
1634 1634 eventTheme: ''
... ... @@ -1637,9 +1637,9 @@
1637 1637 expectedParticipation: '',
1638 1638 tableData4: [{
1639 1639 id: 0,
1640   - name: '预计直接收益',
  1640 + name: '预计直接收益(/元)',
1641 1641 planName: '',
1642   - text: '预计间接收益',
  1642 + text: '预计间接收益(/元)',
1643 1643 eventTheme: '-'
1644 1644 }],
1645 1645 createUser: '',
... ... @@ -1972,7 +1972,7 @@
1972 1972 }).then(res => {
1973 1973 this.secondData = res.data.content[0]
1974 1974 //基本信息
1975   - // that.id=res.data.content[0].id
  1975 + that.id=res.data.content[0].id
1976 1976 that.text = res.data.content[0].planName
1977 1977 that.tableData1[0].eventTheme = res.data.content[0].planType
1978 1978 that.tableData1[0].planName = res.data.content[0].eventAddrs
... ... @@ -1999,11 +1999,10 @@
1999 1999 that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits
2000 2000 that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
2001 2001 //系统信息
2002   - that.createUser = res.data.content[0].createUser
2003   - that.createDate = res.data.content[0].createDate
2004   -
2005   - that.tableData5[0].planName = '-'
2006   - that.tableData5[0].eventTheme = res.data.content[0].updateUser
  2002 + that.createUser = res.data.content[0].createUser
  2003 + that.createDate = res.data.content[0].createDate
  2004 + that.tableData5[0].planName = res.data.content[0].updateDate
  2005 + that.tableData5[0].eventTheme = res.data.content[0].updateUser
2007 2006  
2008 2007 }).catch(err => {
2009 2008 console.log(err)
... ... @@ -2230,7 +2229,7 @@
2230 2229 console.log(item)
2231 2230 let that = this
2232 2231 actPage({
2233   - detailsId: titem.id,
  2232 + detailsId: item.id,
2234 2233 pageNumber: 1,
2235 2234 pageSize: 10,
2236 2235 }).then(res => {
... ...
admin-web-master/src/views/activity/activitySp.vue
  View file @0e38abb
... ... @@ -657,7 +657,7 @@
657 657 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
658 658  
659 659 </el-table-column>
660   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  660 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
661 661  
662 662 </el-table-column>
663 663 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -671,14 +671,14 @@
671 671 <el-table :data="tableData3"
672 672 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
673 673 style="width: 100%;margin: auto;">
674   - <el-table-column class-name="first-column-bg" label="内部人力成本预估" prop="name"
  674 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name"
675 675 min-width="15%">
676 676 </el-table-column>
677 677 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
678 678 min-width="35%">
679 679  
680 680 </el-table-column>
681   - <el-table-column class-name="first-column-bg" label="外部人力成本预估" prop="text"
  681 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text"
682 682 min-width="15%">
683 683  
684 684 </el-table-column>
... ... @@ -852,7 +852,7 @@
852 852 min-width="15%">
853 853  
854 854 </el-table-column>
855   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  855 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
856 856 </el-table-column>
857 857 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
858 858 </el-table-column>
... ... @@ -880,7 +880,7 @@
880 880 label-width="120px" style="position: relative">
881 881 <el-row :gutter="20">
882 882 <el-col :span="8">
883   - <el-form-item label="内部人力成本预估"
  883 + <el-form-item label="内部人力成本预估(/元)"
884 884 class="grid-content bg-purple device-from" prop="name">
885 885 <el-input v-model="zhixingList.internalLaborCostEstimation"
886 886 placeholder="请输入" v-if="zhixingBian" />
... ... @@ -888,7 +888,7 @@
888 888 </el-form-item>
889 889 </el-col>
890 890 <el-col :span="8">
891   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple"
  891 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple"
892 892 prop="name">
893 893 <el-input v-model="zhixingList.externalLaborCostEstimation"
894 894 placeholder="请输入" v-if="zhixingBian" />
... ... @@ -897,7 +897,7 @@
897 897 </el-col>
898 898  
899 899 <el-col :span="8">
900   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  900 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
901 901 <el-input v-model="zhixingList.costEstimationGoods"
902 902 placeholder="请输入" v-if="zhixingBian" />
903 903 <div v-else>{{ zhixingList.costEstimationGoods }}</div>
... ... @@ -907,21 +907,21 @@
907 907  
908 908 <el-row :gutter="20">
909 909 <el-col :span="8">
910   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  910 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
911 911 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
912 912 v-if="zhixingBian" />
913 913 <div v-else>{{ zhixingList.setCostEstimate }}</div>
914 914 </el-form-item>
915 915 </el-col>
916 916 <el-col :span="8">
917   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  917 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
918 918 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
919 919 placeholder="请输入" v-if="zhixingBian" />
920 920 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div>
921 921 </el-form-item>
922 922 </el-col>
923 923 <el-col :span="8">
924   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  924 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
925 925 <el-input v-model="zhixingList.otherNecessaryEstimates"
926 926 placeholder="请输入" v-if="zhixingBian" />
927 927 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div>
... ... @@ -931,7 +931,7 @@
931 931  
932 932 <el-row :gutter="20">
933 933 <el-col :span="8">
934   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  934 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
935 935 <el-input v-model="zhixingList.totalCostEstimation"
936 936 placeholder="请输入" v-if="zhixingBian" />
937 937 <div v-else>{{ zhixingList.totalCostEstimation }}</div>
... ... @@ -978,7 +978,7 @@
978 978 </el-col>
979 979  
980 980 <el-col :span="8">
981   - <el-form-item label="直接收益" class="grid-content bg-purple" prop="name">
  981 + <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name">
982 982 <el-input v-model="zhixingList.expectedDirectBenefits"
983 983 placeholder="请输入" v-if="zhixingBian" />
984 984 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div>
... ... @@ -987,7 +987,7 @@
987 987 </el-row>
988 988 <el-row :gutter="20">
989 989 <el-col :span="8">
990   - <el-form-item label="间接收益" class="grid-content bg-purple" prop="name">
  990 + <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name">
991 991 <el-input v-model="zhixingList.expectedIndirectBenefits"
992 992 placeholder="请输入" v-if="zhixingBian" />
993 993 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div>
... ... @@ -1149,19 +1149,19 @@
1149 1149 externalLaborCostEstimation: '',
1150 1150 tableData3: [{
1151 1151 id: 0,
1152   - name: '商品成本预估',
  1152 + name: '商品成本预估(/元)',
1153 1153 planName: '',
1154   - text: '设备成本预估',
  1154 + text: '设备成本预估(/元)',
1155 1155 eventTheme: ''
1156 1156 }, {
1157 1157 id: 0,
1158   - name: '宣传费用预估',
  1158 + name: '宣传费用预估(/元)',
1159 1159 planName: '',
1160   - text: '其他必要成本预估',
  1160 + text: '其他必要成本预估(/元)',
1161 1161 eventTheme: ''
1162 1162 }, {
1163 1163 id: 0,
1164   - name: '总成本预估',
  1164 + name: '总成本预估(/元)',
1165 1165 planName: '',
1166 1166 text: '备注',
1167 1167 eventTheme: ''
... ... @@ -1170,9 +1170,9 @@
1170 1170 expectedParticipation: '',
1171 1171 tableData4: [{
1172 1172 id: 0,
1173   - name: '预计直接收益',
  1173 + name: '预计直接收益(/元)',
1174 1174 planName: '',
1175   - text: '预计间接收益',
  1175 + text: '预计间接收益(/元)',
1176 1176 eventTheme: '-'
1177 1177 }],
1178 1178 createUser: '',
... ... @@ -1582,7 +1582,7 @@
1582 1582 }).then(res => {
1583 1583 this.secondData = res.data.content[0]
1584 1584 //基本信息
1585   - // that.id=res.data.content[0].id
  1585 + that.id=res.data.content[0].id
1586 1586 that.text = res.data.content[0].planName
1587 1587 that.tableData1[0].eventTheme = res.data.content[0].planType
1588 1588 that.tableData1[0].planName = res.data.content[0].eventAddrs
... ... @@ -1609,11 +1609,10 @@
1609 1609 that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits
1610 1610 that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
1611 1611 //系统信息
1612   - that.createUser = res.data.content[0].createUser
1613   - that.createDate = res.data.content[0].createDate
1614   -
1615   - that.tableData5[0].planName = '-'
1616   - that.tableData5[0].eventTheme = res.data.content[0].updateUser
  1612 + that.createUser = res.data.content[0].createUser
  1613 + that.createDate = res.data.content[0].createDate
  1614 + that.tableData5[0].planName = res.data.content[0].updateDate
  1615 + that.tableData5[0].eventTheme = res.data.content[0].updateUser
1617 1616  
1618 1617 }).catch(err => {
1619 1618 console.log(err)
... ...
admin-web-master/src/views/activity/index.vue
  View file @0e38abb
... ... @@ -157,7 +157,7 @@
157 157 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
158 158 </el-form-item>
159 159  
160   - <el-form-item label="预估费用" class="grid-content bg-purple" prop="eventAddrs">
  160 + <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs">
161 161 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
162 162 </el-form-item>
163 163 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
... ... @@ -305,7 +305,7 @@
305 305 活动效果分析
306 306 </div>
307 307 <div style="padding:0 20px;">
308   - <div style="font-size:12px;margin-bottom:10px;">成本分析</div>
  308 + <div style="font-size:14px;margin-bottom:10px;">成本分析</div>
309 309 <div style="display:flex;padding:10px 0;">
310 310 <div style="margin-right:40px;width:17%">
311 311 <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
... ... @@ -351,7 +351,7 @@
351 351 <div style="height:5px;background-color:#8167F5;"></div>
352 352 </div>
353 353 </div>
354   - <!-- <div style="font-size:12px;margin:10px 0;">效果分析</div> -->
  354 + <!-- <div style="font-size:14px;margin:10px 0;">效果分析</div> -->
355 355 <!-- <div style="display:flex;padding:10px 0;">
356 356 <div style="margin-right:40px;width:17%">
357 357 <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
... ... @@ -604,7 +604,7 @@
604 604 <img :src="$baseURL+secondData.coverPoster" alt="" style="height: 80px;" />
605 605 </div>
606 606 <div
607   - style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
  607 + style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 14px;">
608 608 <span style="margin-bottom: 10px;">{{text}}</span>
609 609 <span>活动时间：{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}</span>
610 610 <span>活动地点:{{tableData1[0].planName}}</span>
... ... @@ -627,13 +627,13 @@
627 627 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
628 628 style="width: 100%;margin: auto;">
629 629 <el-table-column class-name="first-column-bg" label="方案编号" prop="name"
630   - min-width="15%">
  630 + min-width="18%">
631 631 </el-table-column>
632 632 <el-table-column :label="id" prop="eventTheme" min-width="35%">
633 633  
634 634 </el-table-column>
635 635 <el-table-column class-name="first-column-bg" label="方案名称" prop="text"
636   - min-width="15%">
  636 + min-width="18%">
637 637  
638 638 </el-table-column>
639 639 <el-table-column :label="text" prop="planName" min-width="35%">
... ... @@ -660,7 +660,7 @@
660 660 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
661 661  
662 662 </el-table-column>
663   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  663 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
664 664  
665 665 </el-table-column>
666 666 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -674,15 +674,15 @@
674 674 <el-table :data="tableData3"
675 675 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
676 676 style="width: 100%;margin: auto;">
677   - <el-table-column class-name="first-column-bg" label="内部人力成本预估" prop="name"
678   - min-width="15%">
  677 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name"
  678 + min-width="18%">
679 679 </el-table-column>
680 680 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
681 681 min-width="35%">
682 682  
683 683 </el-table-column>
684   - <el-table-column class-name="first-column-bg" label="外部人力成本预估" prop="text"
685   - min-width="15%">
  684 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text"
  685 + min-width="18%">
686 686  
687 687 </el-table-column>
688 688 <el-table-column :label="externalLaborCostEstimation" prop="planName"
... ... @@ -699,13 +699,13 @@
699 699 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
700 700 style="width: 100%;margin: auto;">
701 701 <el-table-column class-name="first-column-bg" label="预计吸引流量" prop="name"
702   - min-width="15%">
  702 + min-width="18%">
703 703 </el-table-column>
704 704 <el-table-column :label="expectedAttractTraffic" prop="eventTheme" min-width="35%">
705 705  
706 706 </el-table-column>
707 707 <el-table-column class-name="first-column-bg" label="预计参与人数" prop="text"
708   - min-width="15%">
  708 + min-width="18%">
709 709  
710 710 </el-table-column>
711 711 <el-table-column :label="expectedParticipation" prop="planName" min-width="35%">
... ... @@ -851,7 +851,7 @@
851 851 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
852 852  
853 853 </el-table-column>
854   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  854 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
855 855 </el-table-column>
856 856 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
857 857 </el-table-column>
... ... @@ -879,7 +879,7 @@
879 879 label-width="120px" style="position: relative">
880 880 <el-row :gutter="20">
881 881 <el-col :span="8">
882   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from"
  882 + <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from"
883 883 prop="name">
884 884  
885 885 <el-input v-model="zhixingList.internalLaborCostEstimation"
... ... @@ -888,7 +888,7 @@
888 888 </el-form-item>
889 889 </el-col>
890 890 <el-col :span="8">
891   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple" prop="name">
  891 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" prop="name">
892 892 <el-input v-model="zhixingList.externalLaborCostEstimation"
893 893 placeholder="请输入" v-if="zhixingBian" />
894 894 <div v-else>{{ zhixingList.externalLaborCostEstimation }}</div>
... ... @@ -896,7 +896,7 @@
896 896 </el-col>
897 897  
898 898 <el-col :span="8">
899   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  899 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
900 900 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
901 901 v-if="zhixingBian" />
902 902 <div v-else>{{ zhixingList.costEstimationGoods }}</div>
... ... @@ -906,21 +906,21 @@
906 906  
907 907 <el-row :gutter="20">
908 908 <el-col :span="8">
909   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  909 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
910 910 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
911 911 v-if="zhixingBian" />
912 912 <div v-else>{{ zhixingList.setCostEstimate }}</div>
913 913 </el-form-item>
914 914 </el-col>
915 915 <el-col :span="8">
916   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  916 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
917 917 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
918 918 placeholder="请输入" v-if="zhixingBian" />
919 919 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div>
920 920 </el-form-item>
921 921 </el-col>
922 922 <el-col :span="8">
923   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  923 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
924 924 <el-input v-model="zhixingList.otherNecessaryEstimates"
925 925 placeholder="请输入" v-if="zhixingBian" />
926 926 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div>
... ... @@ -930,7 +930,7 @@
930 930  
931 931 <el-row :gutter="20">
932 932 <el-col :span="8">
933   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  933 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
934 934 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
935 935 v-if="zhixingBian" />
936 936 <div v-else>{{ zhixingList.totalCostEstimation }}</div>
... ... @@ -977,7 +977,7 @@
977 977 </el-col>
978 978  
979 979 <el-col :span="8">
980   - <el-form-item label="直接收益" class="grid-content bg-purple" prop="name">
  980 + <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name">
981 981 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
982 982 v-if="zhixingBian" />
983 983 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div>
... ... @@ -986,7 +986,7 @@
986 986 </el-row>
987 987 <el-row :gutter="20">
988 988 <el-col :span="8">
989   - <el-form-item label="间接收益" class="grid-content bg-purple" prop="name">
  989 + <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name">
990 990 <el-input v-model="zhixingList.expectedIndirectBenefits"
991 991 placeholder="请输入" v-if="zhixingBian" />
992 992 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div>
... ... @@ -1169,19 +1169,19 @@
1169 1169 externalLaborCostEstimation: '',
1170 1170 tableData3: [{
1171 1171 id: 0,
1172   - name: '商品成本预估',
  1172 + name: '商品成本预估(/元)',
1173 1173 planName: '',
1174   - text: '设备成本预估',
  1174 + text: '设备成本预估(/元)',
1175 1175 eventTheme: ''
1176 1176 }, {
1177 1177 id: 0,
1178   - name: '宣传费用预估',
  1178 + name: '宣传费用预估(/元)',
1179 1179 planName: '',
1180   - text: '其他必要成本预估',
  1180 + text: '其他必要成本预估(/元)',
1181 1181 eventTheme: ''
1182 1182 }, {
1183 1183 id: 0,
1184   - name: '总成本预估',
  1184 + name: '总成本预估(/元)',
1185 1185 planName: '',
1186 1186 text: '备注',
1187 1187 eventTheme: ''
... ... @@ -1190,9 +1190,9 @@
1190 1190 expectedParticipation: '',
1191 1191 tableData4: [{
1192 1192 id: 0,
1193   - name: '预计直接收益',
  1193 + name: '预计直接收益(/元)',
1194 1194 planName: '',
1195   - text: '预计间接收益',
  1195 + text: '预计间接收益(/元)',
1196 1196 eventTheme: '-'
1197 1197 }],
1198 1198 createUser: '',
... ... @@ -1538,6 +1538,7 @@
1538 1538 //基本信息
1539 1539 // that.id=res.data.content[0].id
1540 1540 that.text = res.data.content[0].planName
  1541 + that.id = res.data.content[0].id
1541 1542 that.tableData1[0].eventTheme = res.data.content[0].planType
1542 1543 that.tableData1[0].planName = res.data.content[0].eventAddrs
1543 1544 that.tableData1[1].eventTheme = res.data.content[0].eventStartTime
... ... @@ -1566,7 +1567,7 @@
1566 1567 that.createUser = res.data.content[0].createUser
1567 1568 that.createDate = res.data.content[0].createDate
1568 1569  
1569   - that.tableData5[0].planName = '-'
  1570 + that.tableData5[0].planName = res.data.content[0].updateDate
1570 1571 that.tableData5[0].eventTheme = res.data.content[0].updateUser
1571 1572  
1572 1573 }).catch(err => {
... ... @@ -2696,7 +2697,7 @@
2696 2697 border: none;
2697 2698 margin-right: 10px;
2698 2699 background-color: #F2F2F2;
2699   - font-size: 12px;
  2700 + font-size: 14px;
2700 2701 border-top-left-radius: 8px;
2701 2702 border-top-right-radius: 8px;
2702 2703 padding: 0 15px;
... ... @@ -2745,7 +2746,7 @@
2745 2746 border: none;
2746 2747 margin-right: 10px;
2747 2748 background-color: #F2F2F2;
2748   - font-size: 12px;
  2749 + font-size: 14px;
2749 2750 border-top-left-radius: 8px;
2750 2751 border-top-right-radius: 8px;
2751 2752 padding: 0 15px;
... ...
admin-web-master/src/views/atmosphere/atmosphereBian.vue
  View file @0e38abb
... ... @@ -3,7 +3,7 @@
3 3 <div style="height:58px;line-height:58px;background:#fff;padding-left:20px;">
4 4 <div style="color:#0006"> <span>品牌策划</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">氛围方案编辑</span></div>
5 5 </div>
6   - <div style="font-size: 12px;background:#fff;">
  6 + <div style="font-size: 14px;background:#fff;">
7 7 <div style="padding: 20px">
8 8 <div style="border: solid 1px #E5E5E5;border-radius: 5px">
9 9 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
... ... @@ -104,7 +104,7 @@
104 104 </div>
105 105 <div style="padding: 20px 20px 20px 20px">
106 106 <el-table :data="tableDa"
107   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  107 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
108 108 style="width: 100%">
109 109 <el-table-column label="序号" width="auto" min-width="5%" align="center">
110 110 <template slot-scope="scope">
... ... @@ -117,7 +117,7 @@
117 117 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
118 118  
119 119 </el-table-column>
120   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  120 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
121 121 </el-table-column>
122 122 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
123 123 </el-table-column>
... ... @@ -142,18 +142,18 @@
142 142 style="position: relative">
143 143 <el-row :gutter="20">
144 144 <el-col :span="8">
145   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from" prop="name">
  145 + <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from" prop="name">
146 146 <el-input v-model="secondData.internalLaborCostEstimation" placeholder="请输入" />
147 147 </el-form-item>
148 148 </el-col>
149 149 <el-col :span="8">
150   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple" prop="name">
  150 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" prop="name">
151 151 <el-input v-model="secondData.externalLaborCostEstimation" placeholder="请输入" />
152 152 </el-form-item>
153 153 </el-col>
154 154  
155 155 <el-col :span="8">
156   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  156 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
157 157 <el-input v-model="secondData.costEstimationGoods" placeholder="请输入" />
158 158 </el-form-item>
159 159 </el-col>
... ... @@ -161,17 +161,17 @@
161 161  
162 162 <el-row :gutter="20">
163 163 <el-col :span="8">
164   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  164 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
165 165 <el-input v-model="secondData.setCostEstimate" placeholder="请输入" />
166 166 </el-form-item>
167 167 </el-col>
168 168 <el-col :span="8">
169   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  169 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
170 170 <el-input v-model="secondData.estimatedPromotionalExpenses" placeholder="请输入" />
171 171 </el-form-item>
172 172 </el-col>
173 173 <el-col :span="8">
174   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  174 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
175 175 <el-input v-model="secondData.otherNecessaryEstimates" placeholder="请输入" />
176 176 </el-form-item>
177 177 </el-col>
... ... @@ -179,7 +179,7 @@
179 179  
180 180 <el-row :gutter="20">
181 181 <el-col :span="8">
182   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  182 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
183 183 <el-input v-model="secondData.totalCostEstimation" placeholder="请输入" />
184 184 </el-form-item>
185 185 </el-col>
... ... @@ -217,14 +217,14 @@
217 217 </el-col>
218 218  
219 219 <el-col :span="8">
220   - <el-form-item label="预估直接收益" class="grid-content bg-purple" prop="name">
  220 + <el-form-item label="预估直接收益(/元)" class="grid-content bg-purple" prop="name">
221 221 <el-input v-model="secondData.expectedDirectBenefits" placeholder="请输入" />
222 222 </el-form-item>
223 223 </el-col>
224 224 </el-row>
225 225 <el-row :gutter="20">
226 226 <el-col :span="8">
227   - <el-form-item label="预估间接收益" class="grid-content bg-purple" prop="name">
  227 + <el-form-item label="预估间接收益(/元)" class="grid-content bg-purple" prop="name">
228 228 <el-input v-model="secondData.expectedIndirectBenefits" placeholder="请输入" />
229 229 </el-form-item>
230 230 </el-col>
... ... @@ -296,7 +296,7 @@
296 296 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
297 297 </el-form-item>
298 298  
299   - <el-form-item label="预估费用" class="grid-content bg-purple" prop="eventAddrs">
  299 + <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs">
300 300 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
301 301 </el-form-item>
302 302 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
... ... @@ -520,12 +520,13 @@
520 520 bianji() {
521 521 this.secondData.pageNumber = 1
522 522 this.secondData.pageSize = 10
  523 + this.secondData.updateDate = this.updateCurrentTime()
  524 + this.secondData.updateUser = localStorage.getItem('roleName')
523 525 let that = this
524 526 Vue.delete(that.secondData,'createDate')
525 527 let newobj = this.removeEmptyValues(this.secondData)
526 528 this.$refs.jibenFrom.validate((valid) => {
527 529 if (valid) {
528   - this.secondData.updateDate = this.updateCurrentTime()
529 530 xiangedit(newobj).then(res=>{
530 531 this.$emit('BianchildClose', false)
531 532 })
... ... @@ -581,7 +582,7 @@
581 582 }
582 583  
583 584 .el-dialog__title {
584   - font-size:12px;
  585 + font-size:14px;
585 586 color: #000;
586 587 }
587 588 }
... ...
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @0e38abb
... ... @@ -8,7 +8,7 @@
8 8 <el-tabs :before-leave="beforeTabLeave">
9 9 <!-- <el-tab-pane label="方案编辑">
10 10 <div style="border: 1px solid #E5E5E5;padding: 1px" id="bian">
11   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;">
  11 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;">
12 12 方案编辑器
13 13 </div>
14 14 <div style="padding: 15px;width:100%">
... ... @@ -18,12 +18,12 @@
18 18 </el-tab-pane> -->
19 19 <el-tab-pane label="基本信息">
20 20 <div style="border: 1px solid #E5E5E5;padding: 1px" id="jiben">
21   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;">
  21 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;">
22 22 基本信息
23 23 </div>
24 24 <div style="padding: 15px;">
25 25 <el-form label-position="right" ref="jibenFrom" :model="ruleForm" :rules="rules"
26   - label-width="120px" style="position: relative">
  26 + label-width="150px" style="position: relative">
27 27 <el-row :gutter="20">
28 28 <el-col :span="12">
29 29 <el-form-item label="方案分类" class="grid-content bg-purple device-from"
... ... @@ -103,7 +103,7 @@
103 103 <el-select v-model="lishiList" placeholder="请选择" style="width:100%"
104 104 @change="lichange">
105 105 <el-option v-for="(item,index) in fenxiData" :key="item.id"
106   - :label="item.operationType" :value="index">
  106 + :label="item.planName" :value="index">
107 107 </el-option>
108 108 </el-select>
109 109 </el-form-item>
... ... @@ -132,7 +132,7 @@
132 132 </el-tab-pane>
133 133 <el-tab-pane label="活动明细">
134 134 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
135   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  135 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
136 136 <div>活动明细</div>
137 137 <div style="color: #2d8a58;margin-left: 10px;" @click="addMing = true">
138 138 添加明细
... ... @@ -141,7 +141,7 @@
141 141 <div style="padding: 15px;">
142 142 <div style="padding: 0px 20px 0px 0px">
143 143 <el-table :data="tableData"
144   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  144 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
145 145 style="width: 100%">
146 146 <el-table-column label="序号" width="auto" min-width="5%" align="center">
147 147 <template slot-scope="scope">
... ... @@ -154,7 +154,8 @@
154 154 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
155 155  
156 156 </el-table-column>
157   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  157 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
  158 +
158 159 </el-table-column>
159 160 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
160 161 </el-table-column>
... ... @@ -171,23 +172,23 @@
171 172 </el-tab-pane>
172 173 <el-tab-pane label="活动成本">
173 174 <div style="border: 1px solid #E5E5E5;padding: 1px" id="cheng">
174   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  175 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
175 176 <div>活动成本</div>
176 177 </div>
177 178 <div style="padding: 15px;">
178 179 <div style="">
179 180 <el-form size="mini" label-position="right" ref="ruleFormInfo" :model="ruleForm"
180   - label-width="130px" style="position: relative">
  181 + label-width="180px" style="position: relative">
181 182 <el-row :gutter="20">
182 183 <el-col :span="12">
183   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from"
  184 + <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from"
184 185 prop="internalLaborCostEstimation">
185 186 <el-input v-model="ruleForm.internalLaborCostEstimation"
186 187 placeholder="请输入" />
187 188 </el-form-item>
188 189 </el-col>
189 190 <el-col :span="12">
190   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple"
  191 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple"
191 192 prop="externalLaborCostEstimation">
192 193 <el-input v-model="ruleForm.externalLaborCostEstimation"
193 194 placeholder="请输入" />
... ... @@ -199,13 +200,13 @@
199 200  
200 201 <el-row :gutter="20">
201 202 <el-col :span="12">
202   - <el-form-item label="商品成本预估" class="grid-content bg-purple"
  203 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple"
203 204 prop="costEstimationGoods">
204 205 <el-input v-model="ruleForm.costEstimationGoods" placeholder="请输入" />
205 206 </el-form-item>
206 207 </el-col>
207 208 <el-col :span="12">
208   - <el-form-item label="设备成本预估" class="grid-content bg-purple"
  209 + <el-form-item label="设备成本预估(/元)" class="grid-content bg-purple"
209 210 prop="setCostEstimate">
210 211 <el-input v-model="ruleForm.setCostEstimate" placeholder="请输入" />
211 212 </el-form-item>
... ... @@ -217,14 +218,14 @@
217 218  
218 219  
219 220 <el-col :span="12">
220   - <el-form-item label="宣传费用预估" class="grid-content bg-purple"
  221 + <el-form-item label="宣传费用预估(/元)" class="grid-content bg-purple"
221 222 prop="estimatedPromotionalExpenses">
222 223 <el-input v-model="ruleForm.estimatedPromotionalExpenses"
223 224 placeholder="请输入" />
224 225 </el-form-item>
225 226 </el-col>
226 227 <el-col :span="12">
227   - <el-form-item label="其他必要成本预估" class="grid-content bg-purple"
  228 + <el-form-item label="其他必要成本预估(/元)" class="grid-content bg-purple"
228 229 prop="otherNecessaryEstimates">
229 230 <el-input v-model="ruleForm.otherNecessaryEstimates"
230 231 placeholder="请输入" />
... ... @@ -233,7 +234,7 @@
233 234 </el-row>
234 235 <el-row :gutter="20">
235 236 <el-col :span="12">
236   - <el-form-item label="总成本预估" prop="totalCostEstimation"
  237 + <el-form-item label="总成本预估(/元)" prop="totalCostEstimation"
237 238 class="grid-content bg-purple">
238 239 <el-input v-model="ruleForm.totalCostEstimation" placeholder="请输入" />
239 240 </el-form-item>
... ... @@ -251,13 +252,13 @@
251 252 </el-tab-pane>
252 253 <el-tab-pane label="预估效果信息">
253 254 <div style="border: 1px solid #E5E5E5;padding: 1px" id="yugu">
254   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  255 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
255 256 <div>预估效果信息</div>
256 257 </div>
257 258 <div style="padding: 15px;">
258 259 <div>
259 260 <el-form size="mini" label-position="right" ref="ruleFormInfo" :model="ruleForm"
260   - label-width="130px" style="position: relative">
  261 + label-width="150px" style="position: relative">
261 262 <el-row :gutter="20">
262 263 <el-col :span="12">
263 264 <el-form-item label="预计吸引流量" class="grid-content bg-purple device-from"
... ... @@ -276,13 +277,13 @@
276 277 </el-row>
277 278 <el-row :gutter="20">
278 279 <el-col :span="12">
279   - <el-form-item label="预计直接收益" class="grid-content bg-purple"
  280 + <el-form-item label="预计直接收益(/元)" class="grid-content bg-purple"
280 281 prop="expectedDirectBenefits">
281 282 <el-input v-model="ruleForm.expectedDirectBenefits" placeholder="请输入" />
282 283 </el-form-item>
283 284 </el-col>
284 285 <el-col :span="12">
285   - <el-form-item label="预计间接收益" class="grid-content bg-purple"
  286 + <el-form-item label="预计间接收益(/元)" class="grid-content bg-purple"
286 287 prop="expectedIndirectBenefits">
287 288 <el-input v-model="ruleForm.expectedIndirectBenefits"
288 289 placeholder="请输入" />
... ... @@ -297,7 +298,7 @@
297 298 </el-tab-pane>
298 299 <el-tab-pane label="相关附件">
299 300 <div style="border: 1px solid #E5E5E5;padding: 1px" id="fu">
300   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  301 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
301 302 <div style="line-height:38px;">相关附件</div>
302 303 <div>
303 304 <upfile filePath="act" inputtype="otherImageVideos" :limit="10" :islist="false"
... ... @@ -308,7 +309,7 @@
308 309 <div style="padding: 15px;">
309 310 <div style="padding: 0px 20px 0px 0px">
310 311 <el-table :data="dataList"
311   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  312 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
312 313 style="width: 100%">
313 314 <el-table-column label="序号" width="auto" min-width="7%" align="center">
314 315 <template slot-scope="scope">
... ... @@ -338,8 +339,6 @@
338 339 </el-button>
339 340 <el-button plain @click="onSubmit(0)" size="mini" style="background-color: #3F9B6A;color: #fff;">保存
340 341 </el-button>
341   -
342   -
343 342 </div>
344 343 </div>
345 344  
... ... @@ -352,7 +351,7 @@
352 351 <div style="">
353 352 <div style="padding: 15px;">
354 353 <el-form size="mini" label-position="right" ref="ruleFormInfo" :model="mingFrom"
355   - label-width="120px" style="position: relative">
  354 + label-width="150px" style="position: relative">
356 355 <el-form-item label="明细项名称" class="grid-content bg-purple device-from" prop="planName">
357 356 <el-input v-model="mingFrom.detailLtemName" placeholder="请输入" />
358 357 </el-form-item>
... ... @@ -360,7 +359,7 @@
360 359 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
361 360 </el-form-item>
362 361  
363   - <el-form-item label="预估费用" class="grid-content bg-purple" prop="eventAddrs">
  362 + <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs">
364 363 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
365 364 </el-form-item>
366 365 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
... ... @@ -394,7 +393,8 @@
394 393 MingEdit,
395 394 MingDel,
396 395 fujiaAdd,
397   - lishiDeta
  396 + lishiDeta,
  397 + queryByPage
398 398 } from '../../api/activityBz'
399 399 import wangEditor from "@/components/editor/index";
400 400 import upimg from "@/components/ImageUpload/index"
... ... @@ -547,22 +547,57 @@
547 547 this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
548 548 },
549 549 lishi() {
550   - lishiDeta({
551   - eventDetailsType: '2'
552   - }).then(res => {
553   - this.fenxiData = res.data
554   - })
  550 + queryByPage({
  551 + pageNumber: 1,
  552 + pageSize: 10,
  553 + dataOwnership: '2',
  554 + isDraft: 0,
  555 + state:'5'
  556 +
  557 + }).then(res => {
  558 + this.fenxiData = res.data.content
  559 + })
  560 +
555 561 },
556 562 lichange(e) {
557   -
558   - let msg = this.fenxiData[e]
559   - let obj = JSON.parse(msg.originalData)
560   -
561   - for (let key in obj) {
562   - if (this.ruleForm.hasOwnProperty(key)) {
563   - this.ruleForm[key] = obj[key];
564   - }
  563 + let msg = this.fenxiData[e]
  564 +
  565 + // let obj = msg.originalData
  566 + this.ruleForm={
  567 + // classificationCode: msg.classificationCode,
  568 + plan_Time: [msg.eventStartTime,msg.eventEndTime],
  569 + planName: msg.planName, //方案名称
  570 + planType: '活动策划', //类型
  571 + eventAddrs: msg.eventAddrs, //活动地点
  572 + eventStartTime: msg.eventStartTime, //活动开始时间
  573 + eventEndTime: msg.eventEndTime, //活动结束时间
  574 + eventTheme:msg.eventTheme, //活动主题
  575 + sponsor: msg.sponsor, //活动主办方
  576 + participants: msg.participants, //活动参与方
  577 + rangeSetting: msg.rangeSetting,
  578 + mainPurpose: msg.mainPurpose, //活动主要目的
  579 + coverPoster: msg.coverPoster, //封面海报
  580 + internalLaborCostEstimation: msg.internalLaborCostEstimation, //内部人工成本预估
  581 + externalLaborCostEstimation: msg.externalLaborCostEstimation, //外部人工成本预估
  582 + costEstimationGoods: msg.costEstimationGoods, //商品成本预估
  583 + setCostEstimate: msg.setCostEstimate, //设置成本预估
  584 + estimatedPromotionalExpenses: msg.estimatedPromotionalExpenses, //宣传费用预估
  585 + otherNecessaryEstimates:msg.otherNecessaryEstimates, //其他成本预估
  586 + totalCostEstimation: msg.totalCostEstimation, //总成本预估
  587 + notes: msg.notes, //备注
  588 + expectedAttractTraffic: msg.expectedAttractTraffic, //预计吸引流量
  589 + expectedParticipation: msg.expectedParticipation, //预计参与人数
  590 + expectedDirectBenefits: msg.expectedDirectBenefits, //预计直接收益
  591 + expectedIndirectBenefits: msg.expectedIndirectBenefits, //预计间接收益
565 592 }
  593 + // let msg = this.fenxiData[e]
  594 + // let obj = JSON.parse(msg.originalData)
  595 +
  596 + // for (let key in obj) {
  597 + // if (this.ruleForm.hasOwnProperty(key)) {
  598 + // this.ruleForm[key] = obj[key];
  599 + // }
  600 + // }
566 601 },
567 602 // 切换事件
568 603 beforeTabLeave(activeName, oldActiveName) {
... ... @@ -619,6 +654,7 @@
619 654 let that = this
620 655 let FlieName = this.ruleForm.planName
621 656 this.ruleForm.createDate = this.currentTime
  657 + this.ruleForm.createUser = localStorage.getItem('roleName')
622 658 this.ruleForm.dataOwnership = '2'
623 659 // this.$nextTick(() => {
624 660 // var bian = document.getElementById('bian')
... ... @@ -994,7 +1030,7 @@
994 1030 border: none;
995 1031 margin-right: 10px;
996 1032 background-color: #F2F2F2;
997   - font-size: 12px;
  1033 + font-size: 14px;
998 1034 border-top-left-radius: 8px;
999 1035 border-top-right-radius: 8px;
1000 1036 padding: 0 15px;
... ...
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @0e38abb
... ... @@ -67,8 +67,8 @@
67 67 <span style="font-size: 15px !important;">
68 68 <i class="el-icon-circle-plus" v-if="node.level!=2"
69 69 @click="xinFenlei(node,data)" style="padding-right: 7px;"></i>
70   - <i class="el-icon-edit" @click="editFenlei(node, data)"
71   - style="padding-right: 7px;"></i>
  70 + <i class="el-icon-edit" @click="editFenlei(node, data)"
  71 + style="padding-right: 7px;"></i>
72 72 <i class="el-icon-delete-solid" @click="() => fenDelete(node, data)"></i>
73 73 </span>
74 74 </div>
... ... @@ -84,7 +84,7 @@
84 84 @selection-change="handleSelectionChange" tooltip-effect="dark"
85 85 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
86 86 ref="mulTable">
87   - <!-- <el-table-column type="selection" min-width="80">
  87 + <!-- <el-table-column type="selection" min-width="80">
88 88 </el-table-column> -->
89 89 <el-table-column label="方案名称" min-width="300" prop="planName">
90 90 </el-table-column>
... ... @@ -167,11 +167,11 @@
167 167  
168 168 </div>
169 169 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
170   - <el-button plain @click="addMing=false" style="background-color: #3F9B6A;color: #fff;">取消
171   - </el-button>
  170 + <el-button plain @click="addMing=false" style="background-color: #3F9B6A;color: #fff;">取消
  171 + </el-button>
172 172 <el-button plain @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
173 173 </el-button>
174   -
  174 +
175 175 </div>
176 176 </el-dialog>
177 177 <!-- 氛围效果分析 -->
... ... @@ -182,7 +182,7 @@
182 182 氛围效果分析
183 183 </div>
184 184 <div style="padding:0 20px;">
185   - <div style="font-size:12px;margin-bottom:10px;">成本分析</div>
  185 + <div style="font-size:14px;margin-bottom:10px;">成本分析</div>
186 186 <div style="display:flex;padding:10px 0;">
187 187 <div style="margin-right:40px;width:17%">
188 188 <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
... ... @@ -190,7 +190,8 @@
190 190 style="font-size:20px;font-weight:600;">{{fenxiData.expectedAttractTraffic}}</span>人
191 191 </div>
192 192 <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">
193   - {{fenxiData.expectedAttractTrafficAnalyse}}%</div>
  193 + {{fenxiData.expectedAttractTrafficAnalyse}}%
  194 + </div>
194 195 <div style="height:5px;background-color:#FEC03D;"></div>
195 196 </div>
196 197 <div style="margin-right:40px;width:17%">
... ... @@ -199,7 +200,8 @@
199 200 style="font-size:20px;font-weight:600;">{{fenxiData.expectedParticipation}}</span>人
200 201 </div>
201 202 <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">
202   - {{fenxiData.expectedParticipationAnalyse}}%</div>
  203 + {{fenxiData.expectedParticipationAnalyse}}%
  204 + </div>
203 205 <div style="height:5px;background-color:#58A3F7;"></div>
204 206 </div>
205 207 <div style="margin-right:40px;width:17%">
... ... @@ -208,7 +210,8 @@
208 210 style="font-size:20px;font-weight:600;">{{fenxiData.expectedDirectBenefits?fenxiData.expectedDirectBenefits:'暂无'}}</span>
209 211 </div>
210 212 <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">
211   - {{fenxiData.expectedDirectBenefitsAnalysis}}%</div>
  213 + {{fenxiData.expectedDirectBenefitsAnalysis}}%
  214 + </div>
212 215 <div style="height:5px;background-color:#4BCED0;"></div>
213 216 </div>
214 217 <div style="margin-right:40px;width:17%">
... ... @@ -217,7 +220,8 @@
217 220 style="font-size:20px;font-weight:600;">{{fenxiData.expectedIndirectBenefits?fenxiData.expectedIndirectBenefits:'暂无'}}</span>
218 221 </div>
219 222 <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">
220   - {{fenxiData.expectedIndirectBenefitsAnalysis}}%</div>
  223 + {{fenxiData.expectedIndirectBenefitsAnalysis}}%
  224 + </div>
221 225 <div style="height:5px;background-color:#3F9B6A;"></div>
222 226 </div>
223 227 <div style="margin-right:40px;width:17%">
... ... @@ -228,7 +232,7 @@
228 232 <div style="height:5px;background-color:#8167F5;"></div>
229 233 </div>
230 234 </div>
231   - <!-- <div style="font-size:12px;margin:10px 0;">效果分析</div> -->
  235 + <!-- <div style="font-size:14px;margin:10px 0;">效果分析</div> -->
232 236 <!-- <div style="display:flex;padding:10px 0;">
233 237 <div style="margin-right:40px;width:17%">
234 238 <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
... ... @@ -269,24 +273,24 @@
269 273 <div>活动主题</div>
270 274 <div style="margin-top:20px;">
271 275 <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
272   - <div style="font-size:12px;color:#BBBBBB">主题1</div>
  276 + <div style="font-size:14px;color:#BBBBBB">主题1</div>
273 277 <div>300/100家</div>
274 278 </div>
275 279 <el-progress :text-inside="true" :stroke-width="15" :percentage="70"></el-progress>
276 280 <div style="display:flex;justify-content: space-between;margin:10px 0;">
277   - <div style="font-size:12px;color:#BBBBBB">主题2</div>
  281 + <div style="font-size:14px;color:#BBBBBB">主题2</div>
278 282 <div>300/100家</div>
279 283 </div>
280 284 <el-progress :text-inside="true" :stroke-width="15" :percentage="100"
281 285 status="success"></el-progress>
282 286 <div style="display:flex;justify-content: space-between;margin:10px 0;">
283   - <div style="font-size:12px;color:#BBBBBB">主题3</div>
  287 + <div style="font-size:14px;color:#BBBBBB">主题3</div>
284 288 <div>300/100家</div>
285 289 </div>
286 290 <el-progress :text-inside="true" :stroke-width="15" :percentage="80"
287 291 status="warning"></el-progress>
288 292 <div style="display:flex;justify-content: space-between;margin:10px 0;">
289   - <div style="font-size:12px;color:#BBBBBB">主题4</div>
  293 + <div style="font-size:14px;color:#BBBBBB">主题4</div>
290 294 <div>300/100家</div>
291 295 </div>
292 296 <el-progress :text-inside="true" :stroke-width="15" :percentage="50"
... ... @@ -360,8 +364,7 @@
360 364 style="position: relative">
361 365 <el-form-item label="上级分类" class="grid-content bg-purple device-from" prop="parentId">
362 366 <el-cascader v-model="xinADD.parentId" :options="cascaderList" @change="fenleiChange"
363   - :props="{ checkStrictly: true }" :show-all-levels="false" clearable
364   - ref="cascaderRef"
  367 + :props="{ checkStrictly: true }" :show-all-levels="false" clearable ref="cascaderRef"
365 368 style="width: 100%;"></el-cascader>
366 369 </el-form-item>
367 370 <el-form-item label="分类名称" class="grid-content bg-purple device-from" prop="classificationName">
... ... @@ -386,7 +389,8 @@
386 389 <div style="margin-right: 10px;padding: 10px 0;">
387 390 <div>调整前方案</div>
388 391 <div style="font-size: 22px;color: #3F9B6A;font-weight: 600;margin: 10px 0;">
389   - {{xiaoduiObj.biliOne}}</div>
  392 + {{xiaoduiObj.biliOne}}
  393 + </div>
390 394 <div style="font-size: 16px;color: #3F9B6A;font-weight: 600;">投入产出比</div>
391 395 </div>
392 396 <el-progress type="circle" :percentage="xiaoduiObj.bilis" :show-text="false" :width="100">
... ... @@ -441,7 +445,8 @@
441 445 <div style="margin-right: 10px;padding: 10px 0;">
442 446 <div>调整后方案</div>
443 447 <div style="font-size: 22px;color: #3F9B6A;font-weight: 600;margin: 10px 0;">
444   - {{xiaoduiObj.biliTwo}}</div>
  448 + {{xiaoduiObj.biliTwo}}
  449 + </div>
445 450 <div style="font-size: 16px;color: #3F9B6A;font-weight: 600;">投入产出比</div>
446 451 </div>
447 452 <el-progress type="circle" :percentage="xiaoduiObj.biliT" :show-text="false" :width="100">
... ... @@ -501,7 +506,8 @@
501 506 <div>复制页</div>
502 507 </div>
503 508 <div style="padding:0 36px;">
504   - <el-form label-position="right" :model="copy" ref="copyfrom" :rules="copyRules" label-width="120px" style="position: relative">
  509 + <el-form label-position="right" :model="copy" ref="copyfrom" :rules="copyRules" label-width="120px"
  510 + style="position: relative">
505 511 <el-form-item label="新方案名称" class="grid-content bg-purple device-from" prop="planName">
506 512 <el-input v-model="copy.planName" placeholder="请输入" />
507 513 </el-form-item>
... ... @@ -522,11 +528,11 @@
522 528 <el-table :data="caoList.slice((caogaoPage - 1) * pageSize, caogaoPage * pageSize)"
523 529 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
524 530 align="left">
525   - <el-table-column label="方案名称" min-width="300" prop="planName">
526   - </el-table-column>
527   - <el-table-column label="类型" prop="planType" min-width="80">
528   - </el-table-column>
529   -
  531 + <el-table-column label="方案名称" min-width="300" prop="planName">
  532 + </el-table-column>
  533 + <el-table-column label="类型" prop="planType" min-width="80">
  534 + </el-table-column>
  535 +
530 536 <el-table-column label="创建时间" prop="createDate" min-width="250">
531 537 </el-table-column>
532 538 <el-table-column label="操作" min-width="120" fixed="right">
... ... @@ -539,13 +545,10 @@
539 545 </el-table>
540 546 <div class="fenye">
541 547 <div>
542   - 共{{caoList.length || 0}}条
  548 + 共{{caoList.length || 0}}条
543 549 </div>
544   - <el-pagination :hide-on-single-page="flag" background
545   - :current-page="caogaoPage"
546   - layout="prev,pager,next"
547   - :total="caoList.length"
548   - @current-change="caogaoCurrentChange" />
  550 + <el-pagination :hide-on-single-page="flag" background :current-page="caogaoPage"
  551 + layout="prev,pager,next" :total="caoList.length" @current-change="caogaoCurrentChange" />
549 552 </div>
550 553 </div>
551 554 <div style="display: flex;justify-content: flex-end;">
... ... @@ -582,11 +585,11 @@
582 585 </el-dialog>
583 586  
584 587 <!-- 详情活动方案 -->
585   - <div v-if="ggXin" style="background-color:#fff;">
586   - <div style="height:58px;line-height:58px;background-color:#fff;padding-left:20px;">
587   - <div style="color:#0006"> <span>品牌策划</span> <span style="padding:0 5px;">></span> <span
588   - style="color:#000000e6">活动方案详情</span></div>
589   - </div>
  588 + <div v-if="ggXin" style="background-color:#fff;">
  589 + <div style="height:58px;line-height:58px;background-color:#fff;padding-left:20px;">
  590 + <div style="color:#0006"> <span>品牌策划</span> <span style="padding:0 5px;">></span> <span
  591 + style="color:#000000e6">活动方案详情</span></div>
  592 + </div>
590 593 <div ref="actXiang">
591 594 <div style="width: 100%;">
592 595 <div style="display: flex;padding:0px 20px 20px 20px; ">
... ... @@ -594,7 +597,7 @@
594 597 <img :src="$baseURL+secondData.coverPoster" alt="" style="height: 80px;" />
595 598 </div>
596 599 <div
597   - style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
  600 + style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 14px;">
598 601 <span style="margin-bottom: 10px;">{{text}}</span>
599 602 <span>活动时间：{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}</span>
600 603 <span>活动地点:{{tableData1[0].planName}}</span>
... ... @@ -611,10 +614,10 @@
611 614 <div v-if="activeName=='first'" style="display: flex;">
612 615 <div style="width: 100%;">
613 616 <div style="width: 100%;">
614   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">基本信息</div>
  617 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">基本信息</div>
615 618 <div style="padding: 10px 20px;">
616 619 <el-table :data="tableData1"
617   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  620 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
618 621 style="width: 100%;margin: auto;">
619 622 <el-table-column class-name="first-column-bg" label="方案编号" prop="name"
620 623 min-width="15%">
... ... @@ -635,10 +638,10 @@
635 638 </div>
636 639 </div>
637 640 <div style="width: 100%;">
638   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">活动明细信息</div>
  641 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
639 642 <div style="padding: 10px 20px;">
640 643 <el-table :data="tableData2"
641   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  644 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
642 645 style="width: 100%;margin: auto;">
643 646 <el-table-column label="序号" min-width="5%" align='center'>
644 647 <template slot-scope="scope">
... ... @@ -650,7 +653,7 @@
650 653 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
651 654  
652 655 </el-table-column>
653   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  656 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
654 657  
655 658 </el-table-column>
656 659 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -659,19 +662,19 @@
659 662 </div>
660 663 </div>
661 664 <div style="width: 100%;">
662   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">活动成本信息</div>
  665 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动成本信息</div>
663 666 <div style="padding:10px 20px;">
664 667 <el-table :data="tableData3"
665   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  668 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
666 669 style="width: 100%;margin: auto;">
667   - <el-table-column class-name="first-column-bg" label="内部人力成本预估" prop="name"
  670 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name"
668 671 min-width="15%">
669 672 </el-table-column>
670 673 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
671 674 min-width="35%">
672 675  
673 676 </el-table-column>
674   - <el-table-column class-name="first-column-bg" label="外部人力成本预估" prop="text"
  677 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text"
675 678 min-width="15%">
676 679  
677 680 </el-table-column>
... ... @@ -683,10 +686,10 @@
683 686 </div>
684 687 </div>
685 688 <div style="width: 100%;">
686   - <div style="font-size: 12px;padding:10px 20px 0px 20px;">预估效果</div>
  689 + <div style="font-size: 14px;padding:10px 20px 0px 20px;">预估效果</div>
687 690 <div style="padding:10px 20px;">
688 691 <el-table :data="tableData4"
689   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  692 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
690 693 style="width: 100%;margin: auto;">
691 694 <el-table-column class-name="first-column-bg" label="预计吸引流量" prop="name"
692 695 min-width="15%">
... ... @@ -706,10 +709,10 @@
706 709 </div>
707 710 </div>
708 711 <div style="width: 100%;">
709   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">相关附件信息</div>
  712 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
710 713 <div style="padding:10px 20px;">
711 714 <el-table :data="tableData6"
712   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  715 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
713 716 style="width: 100%;margin: auto;">
714 717 <el-table-column label="序号" min-width="5%" align='center'>
715 718 <template slot-scope="scope">
... ... @@ -730,10 +733,10 @@
730 733 </div>
731 734 </div>
732 735 <div style="width: 100%;">
733   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">系统信息</div>
  736 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">系统信息</div>
734 737 <div style="padding:10px 20px;">
735 738 <el-table :data="tableData5"
736   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  739 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
737 740 style="width: 100%;margin: auto;">
738 741 <el-table-column class-name="first-column-bg" label="创建人" prop="name"
739 742 min-width="15%">
... ... @@ -829,7 +832,7 @@
829 832 <div style="padding: 20px">
830 833 <div style="border: solid 1px #E5E5E5;border-radius: 5px">
831 834 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
832   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  835 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
833 836 基本信息
834 837 </div>
835 838 </div>
... ... @@ -884,17 +887,17 @@
884 887 <div style="padding: 0px 20px 20px 20px">
885 888 <div style="border: solid 1px #E5E5E5;border-radius: 5px">
886 889 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px;display: flex">
887   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  890 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
888 891 活动明细信息
889 892 </div>
890   - <div style="color: #2d8a58;margin-top: 10px;font-size: 12px;" @click="tianMing">
  893 + <div style="color: #2d8a58;margin-top: 10px;font-size: 14px;" @click="tianMing">
891 894 添加明细
892 895 </div>
893 896 </div>
894 897 <!-- 表格-->
895 898 <div style="padding: 20px 20px 20px 20px">
896 899 <el-table :data="tableDa"
897   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  900 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
898 901 style="width: 100%">
899 902 <el-table-column label="序号" width="auto" min-width="5%" align="center">
900 903 <template slot-scope="scope">
... ... @@ -907,7 +910,7 @@
907 910 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
908 911  
909 912 </el-table-column>
910   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  913 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
911 914 </el-table-column>
912 915 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
913 916 </el-table-column>
... ... @@ -925,7 +928,7 @@
925 928 <div style="padding: 20px">
926 929 <div style="border: solid 1px #E5E5E5;border-radius: 5px;padding-bottom: 20px;">
927 930 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
928   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  931 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
929 932 实际花费成本
930 933 </div>
931 934 </div>
... ... @@ -934,21 +937,22 @@
934 937 label-width="120px" style="position: relative">
935 938 <el-row :gutter="20">
936 939 <el-col :span="8">
937   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from"
938   - prop="name">
  940 + <el-form-item label="内部人力成本预估(/元)"
  941 + class="grid-content bg-purple device-from" prop="name">
939 942 <el-input v-model="zhixingList.internalLaborCostEstimation"
940 943 placeholder="请输入" :disabled="!zhixingBian" />
941 944 </el-form-item>
942 945 </el-col>
943 946 <el-col :span="8">
944   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple" prop="name">
  947 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple"
  948 + prop="name">
945 949 <el-input v-model="zhixingList.externalLaborCostEstimation"
946 950 placeholder="请输入" :disabled="!zhixingBian" />
947 951 </el-form-item>
948 952 </el-col>
949 953  
950 954 <el-col :span="8">
951   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  955 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
952 956 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
953 957 :disabled="!zhixingBian" />
954 958 </el-form-item>
... ... @@ -957,19 +961,19 @@
957 961  
958 962 <el-row :gutter="20">
959 963 <el-col :span="8">
960   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  964 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
961 965 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
962 966 :disabled="!zhixingBian" />
963 967 </el-form-item>
964 968 </el-col>
965 969 <el-col :span="8">
966   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  970 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
967 971 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
968 972 placeholder="请输入" :disabled="!zhixingBian" />
969 973 </el-form-item>
970 974 </el-col>
971 975 <el-col :span="8">
972   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  976 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
973 977 <el-input v-model="zhixingList.otherNecessaryEstimates"
974 978 placeholder="请输入" :disabled="!zhixingBian" />
975 979 </el-form-item>
... ... @@ -978,7 +982,7 @@
978 982  
979 983 <el-row :gutter="20">
980 984 <el-col :span="8">
981   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  985 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
982 986 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
983 987 :disabled="!zhixingBian" />
984 988 </el-form-item>
... ... @@ -998,7 +1002,7 @@
998 1002 <div style="padding: 20px">
999 1003 <div style="border: solid 1px #E5E5E5;border-radius: 5px;padding-bottom: 20px;">
1000 1004 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
1001   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  1005 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
1002 1006 活动执行效果
1003 1007 </div>
1004 1008 </div>
... ... @@ -1021,7 +1025,7 @@
1021 1025 </el-col>
1022 1026  
1023 1027 <el-col :span="8">
1024   - <el-form-item label="直接收益" class="grid-content bg-purple" prop="name">
  1028 + <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name">
1025 1029 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
1026 1030 :disabled="!zhixingBian" />
1027 1031 </el-form-item>
... ... @@ -1029,7 +1033,7 @@
1029 1033 </el-row>
1030 1034 <el-row :gutter="20">
1031 1035 <el-col :span="8">
1032   - <el-form-item label="间接收益" class="grid-content bg-purple" prop="name">
  1036 + <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name">
1033 1037 <el-input v-model="zhixingList.expectedIndirectBenefits"
1034 1038 placeholder="请输入" :disabled="!zhixingBian" />
1035 1039 </el-form-item>
... ... @@ -1059,7 +1063,7 @@
1059 1063  
1060 1064 </div>
1061 1065 </div>
1062   -
  1066 +
1063 1067 </div>
1064 1068 </div>
1065 1069 <div style="padding: 0px 20px 20px 20px;display:flex;justify-content: flex-end;">
... ... @@ -1067,7 +1071,8 @@
1067 1071 </el-button>
1068 1072 <el-button @click="zhixingBian = true" style="background-color: #3F9B6A;color: #fff;"
1069 1073 v-if="zhixingBian==false&& activeName=='second'">编辑</el-button>
1070   - <el-button @click="bianji" style="background-color: #3F9B6A;color: #fff" v-if="zhixingBian && activeName=='second'">保存
  1074 + <el-button @click="bianji" style="background-color: #3F9B6A;color: #fff"
  1075 + v-if="zhixingBian && activeName=='second'">保存
1071 1076 </el-button>
1072 1077 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff"
1073 1078 v-if="activeName=='first'">下载
... ... @@ -1075,8 +1080,8 @@
1075 1080 <el-button @click="fivebian" style="background-color: #3F9B6A;color: #fff" v-if="activeName=='five'">保存
1076 1081 </el-button>
1077 1082 </div>
1078   -
1079   -
  1083 +
  1084 +
1080 1085 </div>
1081 1086 <addAct v-if="addAct" @childClose='childClose' :fenleiName="cascaderList"></addAct>
1082 1087 <atmbians v-if="bianshow" :showBian="atmbianMsg" @BianchildClose='BianchildClose'></atmbians>
... ... @@ -1134,7 +1139,7 @@
1134 1139 planFen: '',
1135 1140 eventTheme: '',
1136 1141 currentPage: 1,
1137   - caogaoPage:1,
  1142 + caogaoPage: 1,
1138 1143 total: 0,
1139 1144 flag: false,
1140 1145 pageSize: 10,
... ... @@ -1149,7 +1154,7 @@
1149 1154 message: '请输入分类名称',
1150 1155 trigger: 'blur'
1151 1156 },
1152   -
  1157 +
1153 1158 ],
1154 1159 },
1155 1160 copyRules: {
... ... @@ -1158,7 +1163,7 @@
1158 1163 message: '请输入新方案名称',
1159 1164 trigger: 'blur'
1160 1165 },
1161   -
  1166 +
1162 1167 ],
1163 1168 },
1164 1169 fenlei: [],
... ... @@ -1208,19 +1213,19 @@
1208 1213 externalLaborCostEstimation: '',
1209 1214 tableData3: [{
1210 1215 id: 0,
1211   - name: '商品成本预估',
  1216 + name: '商品成本预估(/元)',
1212 1217 planName: '',
1213   - text: '设备成本预估',
  1218 + text: '设备成本预估(/元)',
1214 1219 eventTheme: ''
1215 1220 }, {
1216 1221 id: 0,
1217   - name: '宣传费用预估',
  1222 + name: '宣传费用预估(/元)',
1218 1223 planName: '',
1219   - text: '其他必要成本预估',
  1224 + text: '其他必要成本预估(/元)',
1220 1225 eventTheme: ''
1221 1226 }, {
1222 1227 id: 0,
1223   - name: '总成本预估',
  1228 + name: '总成本预估(/元)',
1224 1229 planName: '',
1225 1230 text: '备注',
1226 1231 eventTheme: ''
... ... @@ -1229,9 +1234,9 @@
1229 1234 expectedParticipation: '',
1230 1235 tableData4: [{
1231 1236 id: 0,
1232   - name: '预计直接收益',
  1237 + name: '预计直接收益(/元)',
1233 1238 planName: '',
1234   - text: '预计间接收益',
  1239 + text: '预计间接收益(/元)',
1235 1240 eventTheme: '-'
1236 1241 }],
1237 1242 createDate: '',
... ... @@ -1332,7 +1337,7 @@
1332 1337 peiShow: false,
1333 1338 peiId: '',
1334 1339 zhixingqingk: '',
1335   - editFen:0
  1340 + editFen: 0
1336 1341  
1337 1342 }
1338 1343 },
... ... @@ -1418,32 +1423,32 @@
1418 1423 },
1419 1424 //删除记录按钮
1420 1425 handleDelete(val) {
1421   - const h = this.$createElement;
1422   - this.$msgbox({
1423   - title: '消息',
1424   - message: h('p', null, [
1425   - h('span', null, '是否删除 '),
1426   - ]),
1427   - showCancelButton: true,
1428   - showClose: false,
1429   - confirmButtonText: '确定',
1430   - cancelButtonText: '取消',
1431   - customClass: 'oe-dialog-btn',
1432   - beforeClose: (action, instance, done) => {
1433   - if (action === 'confirm') {
1434   - deleteById({
1435   - id: val
1436   - }).then(res => {
1437   - this.getAll()
1438   - done();
1439   - })
1440   - } else {
  1426 + const h = this.$createElement;
  1427 + this.$msgbox({
  1428 + title: '消息',
  1429 + message: h('p', null, [
  1430 + h('span', null, '是否删除 '),
  1431 + ]),
  1432 + showCancelButton: true,
  1433 + showClose: false,
  1434 + confirmButtonText: '确定',
  1435 + cancelButtonText: '取消',
  1436 + customClass: 'oe-dialog-btn',
  1437 + beforeClose: (action, instance, done) => {
  1438 + if (action === 'confirm') {
  1439 + deleteById({
  1440 + id: val
  1441 + }).then(res => {
  1442 + this.getAll()
1441 1443 done();
1442   - }
  1444 + })
  1445 + } else {
  1446 + done();
1443 1447 }
1444   - })
1445   -
1446   -
  1448 + }
  1449 + })
  1450 +
  1451 +
1447 1452 // if (this.multipleSelection.length == 1) {} else {
1448 1453 // this.$message({
1449 1454 // message: '请选择一个文件删除',
... ... @@ -1612,7 +1617,7 @@
1612 1617 }).then(res => {
1613 1618 this.secondData = res.data.content[0]
1614 1619 //基本信息
1615   - // that.id=res.data.content[0].id
  1620 + that.id = res.data.content[0].id
1616 1621 that.text = res.data.content[0].planName
1617 1622 that.tableData1[0].eventTheme = res.data.content[0].planType
1618 1623 that.tableData1[0].planName = res.data.content[0].eventAddrs
... ... @@ -1641,7 +1646,7 @@
1641 1646 //系统信息
1642 1647 that.createUser = res.data.content[0].createUser
1643 1648 that.createDate = res.data.content[0].createDate
1644   - that.tableData5[0].planName = '-'
  1649 + that.tableData5[0].planName = res.data.content[0].updateDate
1645 1650 that.tableData5[0].eventTheme = res.data.content[0].updateUser
1646 1651  
1647 1652  
... ... @@ -1852,7 +1857,7 @@
1852 1857 this.fenxiData = res.data
1853 1858 this.xiaoguoBox = true
1854 1859 this.$nextTick(() => {
1855   - this.jiaoLiu(this.$refs.jiaoL,this.fenxiData);
  1860 + this.jiaoLiu(this.$refs.jiaoL, this.fenxiData);
1856 1861 // this.shopLiu(this.$refs.shopL);
1857 1862 this.resizeChart = () => {
1858 1863 try {
... ... @@ -1865,7 +1870,7 @@
1865 1870 window.addEventListener('resize', this.resizeChart, false); // false代表事件句柄在冒泡阶段执行
1866 1871 })
1867 1872 })
1868   -
  1873 +
1869 1874 },
1870 1875 shopLiu(Dom) {
1871 1876 this.chart = echarts.init(Dom)
... ... @@ -1931,7 +1936,7 @@
1931 1936 }
1932 1937 this.chart.setOption(option)
1933 1938 },
1934   - jiaoLiu(Dom,list) {
  1939 + jiaoLiu(Dom, list) {
1935 1940 this.chart1 = echarts.init(Dom)
1936 1941 let option = {
1937 1942 tooltip: {
... ... @@ -1971,7 +1976,7 @@
1971 1976 }
1972 1977 },
1973 1978 color: ['#50B5FF', '#5AD8A6', '#5D7092', '#F6BD16', '#f2d2f6'],
1974   - data: [{
  1979 + data: [{
1975 1980 value: list.expectedAttractTrafficAnalyse,
1976 1981 name: '吸引游客流量'
1977 1982 },
... ... @@ -2010,60 +2015,60 @@
2010 2015 }
2011 2016 this.xinlei = true
2012 2017 },
2013   - sevLei() {
  2018 + sevLei() {
2014 2019 this.$refs.fenFrom.validate((valid) => {
2015   - if (valid) {
2016   - if (this.editFen == 0) {
2017   - this.xinADD.classificationCode = this.xinADD.classificationName
2018   -
2019   - cereAdd(this.xinADD).then(res=>{
2020   - this.xinlei = false
2021   - this.xinADD = {
2022   - classificationName: '',
2023   - classificationCode: '',
2024   - parentId: '',
2025   - classificationType: '1'
2026   - }
2027   - this.$message({
2028   - message: '保存成功',
2029   - type: 'success',
2030   - offset: 100
2031   - })
2032   - this.getAll()
2033   - })
2034   - } else {
2035   - cereEdit({
2036   - id: this.xinADD.parentId,
2037   - classificationName: this.xinADD.classificationName
2038   - }).then(res=>{
2039   - this.xinlei = false
2040   - this.xinADD = {
2041   - classificationName: '',
2042   - classificationCode: '',
2043   - parentId: '',
2044   - classificationType: '1'
2045   - }
2046   - this.$message({
2047   - message: '保存成功',
2048   - type: 'success',
2049   - offset: 100
2050   - })
2051   - this.getAll()
2052   - })
2053   - }
2054   -
2055   - }else{
  2020 + if (valid) {
  2021 + if (this.editFen == 0) {
  2022 + this.xinADD.classificationCode = this.xinADD.classificationName
  2023 +
  2024 + cereAdd(this.xinADD).then(res => {
  2025 + this.xinlei = false
  2026 + this.xinADD = {
  2027 + classificationName: '',
  2028 + classificationCode: '',
  2029 + parentId: '',
  2030 + classificationType: '1'
  2031 + }
  2032 + this.$message({
  2033 + message: '保存成功',
  2034 + type: 'success',
  2035 + offset: 100
  2036 + })
  2037 + this.getAll()
  2038 + })
  2039 + } else {
  2040 + cereEdit({
  2041 + id: this.xinADD.parentId,
  2042 + classificationName: this.xinADD.classificationName
  2043 + }).then(res => {
  2044 + this.xinlei = false
  2045 + this.xinADD = {
  2046 + classificationName: '',
  2047 + classificationCode: '',
  2048 + parentId: '',
  2049 + classificationType: '1'
  2050 + }
  2051 + this.$message({
  2052 + message: '保存成功',
  2053 + type: 'success',
  2054 + offset: 100
  2055 + })
  2056 + this.getAll()
  2057 + })
  2058 + }
  2059 +
  2060 + } else {
2056 2061 this.$message({
2057   - message: '请填写数据',
2058   - type: 'error',
2059   - offset: 100
  2062 + message: '请填写数据',
  2063 + type: 'error',
  2064 + offset: 100
2060 2065 })
2061   - return false;
2062   - }
2063   -
  2066 + return false;
  2067 + }
  2068 +
2064 2069 })
2065 2070  
2066   -
  2071 +
2067 2072 },
2068 2073 fenDelete(node, data) {
2069 2074 const h = this.$createElement;
... ... @@ -2160,21 +2165,21 @@
2160 2165 this.copy.planName = ''
2161 2166 },
2162 2167 copysev() {
2163   - this.$refs.copyfrom.validate((valid) => {
2164   - if (valid) {
2165   - copy(this.copy).then(res => {
2166   - this.copyShow = false
2167   - this.getAll()
2168   - })
2169   - }else{
2170   - this.$message({
2171   - message: '请填写数据',
2172   - type: 'error',
2173   - offset: 100
2174   - })
2175   - return false;
2176   - }
2177   - })
  2168 + this.$refs.copyfrom.validate((valid) => {
  2169 + if (valid) {
  2170 + copy(this.copy).then(res => {
  2171 + this.copyShow = false
  2172 + this.getAll()
  2173 + })
  2174 + } else {
  2175 + this.$message({
  2176 + message: '请填写数据',
  2177 + type: 'error',
  2178 + offset: 100
  2179 + })
  2180 + return false;
  2181 + }
  2182 + })
2178 2183 },
2179 2184 customFormat(percentage) {
2180 2185 let zong
... ...
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @0e38abb
... ... @@ -155,7 +155,7 @@
155 155 <div style="width: 100%;background-color: #fff;">
156 156 <el-tabs v-model="activeName" @tab-click="handleClick" style="padding-left:20px;">
157 157 <el-tab-pane label="方案概况" name="first"></el-tab-pane>
158   - <el-tab-pane label="执行效果" name="second"></el-tab-pane>
  158 + <el-tab-pane label="方案调整" name="second"></el-tab-pane>
159 159 <el-tab-pane label="历史记录列表" name="fourd"></el-tab-pane>
160 160 <!-- <el-tab-pane label="执行情况" name="five"></el-tab-pane> -->
161 161 </el-tabs>
... ... @@ -387,7 +387,7 @@
387 387 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
388 388  
389 389 </el-table-column>
390   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  390 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
391 391 </el-table-column>
392 392 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
393 393 </el-table-column>
... ... @@ -415,21 +415,21 @@
415 415 label-width="120px" style="position: relative">
416 416 <el-row :gutter="20">
417 417 <el-col :span="8">
418   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from"
  418 + <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from"
419 419 prop="name">
420 420 <el-input v-model="zhixingList.internalLaborCostEstimation"
421 421 placeholder="请输入" :disabled="!zhixingBian" />
422 422 </el-form-item>
423 423 </el-col>
424 424 <el-col :span="8">
425   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple" prop="name">
  425 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" prop="name">
426 426 <el-input v-model="zhixingList.externalLaborCostEstimation"
427 427 placeholder="请输入" :disabled="!zhixingBian" />
428 428 </el-form-item>
429 429 </el-col>
430 430  
431 431 <el-col :span="8">
432   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  432 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
433 433 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
434 434 :disabled="!zhixingBian" />
435 435 </el-form-item>
... ... @@ -438,19 +438,19 @@
438 438  
439 439 <el-row :gutter="20">
440 440 <el-col :span="8">
441   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  441 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
442 442 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
443 443 :disabled="!zhixingBian" />
444 444 </el-form-item>
445 445 </el-col>
446 446 <el-col :span="8">
447   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  447 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
448 448 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
449 449 placeholder="请输入" :disabled="!zhixingBian" />
450 450 </el-form-item>
451 451 </el-col>
452 452 <el-col :span="8">
453   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  453 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
454 454 <el-input v-model="zhixingList.otherNecessaryEstimates"
455 455 placeholder="请输入" :disabled="!zhixingBian" />
456 456 </el-form-item>
... ... @@ -459,7 +459,7 @@
459 459  
460 460 <el-row :gutter="20">
461 461 <el-col :span="8">
462   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  462 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
463 463 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
464 464 :disabled="!zhixingBian" />
465 465 </el-form-item>
... ... @@ -502,7 +502,7 @@
502 502 </el-col>
503 503  
504 504 <el-col :span="8">
505   - <el-form-item label="直接收益" class="grid-content bg-purple" prop="name">
  505 + <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name">
506 506 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
507 507 :disabled="!zhixingBian" />
508 508 </el-form-item>
... ... @@ -510,7 +510,7 @@
510 510 </el-row>
511 511 <el-row :gutter="20">
512 512 <el-col :span="8">
513   - <el-form-item label="间接收益" class="grid-content bg-purple" prop="name">
  513 + <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name">
514 514 <el-input v-model="zhixingList.expectedIndirectBenefits"
515 515 placeholder="请输入" :disabled="!zhixingBian" />
516 516 </el-form-item>
... ... @@ -668,7 +668,7 @@
668 668 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
669 669  
670 670 </el-table-column>
671   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  671 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
672 672  
673 673 </el-table-column>
674 674 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -682,7 +682,7 @@
682 682 :labelStyle="labelStyle">
683 683 <el-descriptions-item>
684 684 <template slot="label">
685   - 内部人力成本预估
  685 + 内部人力成本预估(/元)
686 686 </template>
687 687  
688 688 <span
... ... @@ -690,7 +690,7 @@
690 690 </el-descriptions-item>
691 691 <el-descriptions-item>
692 692 <template slot="label">
693   - 外部人力成本预估
  693 + 外部人力成本预估(/元)
694 694 </template>
695 695  
696 696 <span
... ... @@ -698,7 +698,7 @@
698 698 </el-descriptions-item>
699 699 <el-descriptions-item>
700 700 <template slot="label">
701   - 商品成本预估
  701 + 商品成本预估(/元)
702 702 </template>
703 703  
704 704 <span
... ... @@ -706,7 +706,7 @@
706 706 </el-descriptions-item>
707 707 <el-descriptions-item>
708 708 <template slot="label">
709   - 设备成本预估
  709 + 设备成本预估(/元)
710 710 </template>
711 711  
712 712 <span
... ... @@ -714,7 +714,7 @@
714 714 </el-descriptions-item>
715 715 <el-descriptions-item>
716 716 <template slot="label">
717   - 宣传费用预估
  717 + 宣传费用预估(/元)
718 718 </template>
719 719  
720 720 <span
... ... @@ -722,7 +722,7 @@
722 722 </el-descriptions-item>
723 723 <el-descriptions-item>
724 724 <template slot="label">
725   - 其他必要成本预估
  725 + 其他必要成本预估(/元)
726 726 </template>
727 727  
728 728 <span
... ... @@ -730,7 +730,7 @@
730 730 </el-descriptions-item>
731 731 <el-descriptions-item>
732 732 <template slot="label">
733   - 总成本预估
  733 + 总成本预估(/元)
734 734 </template>
735 735  
736 736 <span
... ... @@ -770,7 +770,7 @@
770 770 </el-descriptions-item>
771 771 <el-descriptions-item>
772 772 <template slot="label">
773   - 预计直接收益
  773 + 预计直接收益(/元)
774 774 </template>
775 775  
776 776 <span
... ... @@ -778,7 +778,7 @@
778 778 </el-descriptions-item>
779 779 <el-descriptions-item>
780 780 <template slot="label">
781   - 预计间接收益
  781 + 预计间接收益(/元)
782 782 </template>
783 783  
784 784 <span
... ... @@ -909,7 +909,7 @@
909 909 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
910 910  
911 911 </el-table-column>
912   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  912 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
913 913  
914 914 </el-table-column>
915 915 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -923,14 +923,14 @@
923 923 <el-table :data="tableData3"
924 924 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
925 925 style="width: 100%;margin: auto;">
926   - <el-table-column class-name="first-column-bg" label="内部人力成本预估" prop="name"
  926 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name"
927 927 min-width="15%">
928 928 </el-table-column>
929 929 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
930 930 min-width="35%">
931 931  
932 932 </el-table-column>
933   - <el-table-column class-name="first-column-bg" label="外部人力成本预估" prop="text"
  933 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text"
934 934 min-width="15%">
935 935  
936 936 </el-table-column>
... ... @@ -1110,7 +1110,7 @@
1110 1110 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
1111 1111  
1112 1112 </el-table-column>
1113   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  1113 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
1114 1114  
1115 1115 </el-table-column>
1116 1116 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -1124,43 +1124,43 @@
1124 1124 <el-descriptions class="margin-top" :column="2" border :labelStyle="labelStyleOne">
1125 1125 <el-descriptions-item>
1126 1126 <template slot="label">
1127   - 内部人力成本预估
  1127 + 内部人力成本预估(/元)
1128 1128 </template>
1129 1129 {{lixiang.internalLaborCostEstimation}}
1130 1130 </el-descriptions-item>
1131 1131 <el-descriptions-item>
1132 1132 <template slot="label">
1133   - 外部人力成本预估
  1133 + 外部人力成本预估(/元)
1134 1134 </template>
1135 1135 {{lixiang.externalLaborCostEstimation}}
1136 1136 </el-descriptions-item>
1137 1137 <el-descriptions-item>
1138 1138 <template slot="label">
1139   - 商品成本预估
  1139 + 商品成本预估(/元)
1140 1140 </template>
1141 1141 {{lixiang.costEstimationGoods}}
1142 1142 </el-descriptions-item>
1143 1143 <el-descriptions-item>
1144 1144 <template slot="label">
1145   - 设备成本预估
  1145 + 设备成本预估(/元)
1146 1146 </template>
1147 1147 {{lixiang.setCostEstimate}}
1148 1148 </el-descriptions-item>
1149 1149 <el-descriptions-item>
1150 1150 <template slot="label">
1151   - 宣传费用预估
  1151 + 宣传费用预估(/元)
1152 1152 </template>
1153 1153 {{lixiang.estimatedPromotionalExpenses}}
1154 1154 </el-descriptions-item>
1155 1155 <el-descriptions-item>
1156 1156 <template slot="label">
1157   - 其他必要成本预估
  1157 + 其他必要成本预估(/元)
1158 1158 </template>
1159 1159 {{lixiang.otherNecessaryEstimates}}
1160 1160 </el-descriptions-item>
1161 1161 <el-descriptions-item>
1162 1162 <template slot="label">
1163   - 总成本预估
  1163 + 总成本预估(/元)
1164 1164 </template>
1165 1165 {{lixiang.totalCostEstimation}}
1166 1166 </el-descriptions-item>
... ... @@ -1191,13 +1191,13 @@
1191 1191 </el-descriptions-item>
1192 1192 <el-descriptions-item>
1193 1193 <template slot="label">
1194   - 预计直接收益
  1194 + 预计直接收益(/元)
1195 1195 </template>
1196 1196 {{lixiang.expectedDirectBenefits}}
1197 1197 </el-descriptions-item>
1198 1198 <el-descriptions-item>
1199 1199 <template slot="label">
1200   - 预计间接收益
  1200 + 预计间接收益(/元)
1201 1201 </template>
1202 1202 {{lixiang.expectedIndirectBenefits}}
1203 1203 </el-descriptions-item>
... ... @@ -1273,7 +1273,7 @@
1273 1273 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
1274 1274 </el-form-item>
1275 1275  
1276   - <el-form-item label="预估费用" class="grid-content bg-purple" prop="eventAddrs">
  1276 + <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs">
1277 1277 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
1278 1278 </el-form-item>
1279 1279 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
... ... @@ -1600,19 +1600,19 @@
1600 1600 externalLaborCostEstimation: '',
1601 1601 tableData3: [{
1602 1602 id: 0,
1603   - name: '商品成本预估',
  1603 + name: '商品成本预估(/元)',
1604 1604 planName: '',
1605   - text: '设备成本预估',
  1605 + text: '设备成本预估(/元)',
1606 1606 eventTheme: ''
1607 1607 }, {
1608 1608 id: 0,
1609   - name: '宣传费用预估',
  1609 + name: '宣传费用预估(/元)',
1610 1610 planName: '',
1611   - text: '其他必要成本预估',
  1611 + text: '其他必要成本预估(/元)',
1612 1612 eventTheme: ''
1613 1613 }, {
1614 1614 id: 0,
1615   - name: '总成本预估',
  1615 + name: '总成本预估(/元)',
1616 1616 planName: '',
1617 1617 text: '备注',
1618 1618 eventTheme: ''
... ... @@ -1621,9 +1621,9 @@
1621 1621 expectedParticipation: '',
1622 1622 tableData4: [{
1623 1623 id: 0,
1624   - name: '预计直接收益',
  1624 + name: '预计直接收益(/元)',
1625 1625 planName: '',
1626   - text: '预计间接收益',
  1626 + text: '预计间接收益(/元)',
1627 1627 eventTheme: '-'
1628 1628 }],
1629 1629 createUser: '',
... ... @@ -1956,7 +1956,7 @@
1956 1956 }).then(res => {
1957 1957 this.secondData = res.data.content[0]
1958 1958 //基本信息
1959   - // that.id=res.data.content[0].id
  1959 + that.id=res.data.content[0].id
1960 1960 that.text = res.data.content[0].planName
1961 1961 that.tableData1[0].eventTheme = res.data.content[0].planType
1962 1962 that.tableData1[0].planName = res.data.content[0].eventAddrs
... ... @@ -1985,8 +1985,7 @@
1985 1985 //系统信息
1986 1986 that.createUser = res.data.content[0].createUser
1987 1987 that.createDate = res.data.content[0].createDate
1988   -
1989   - that.tableData5[0].planName = '-'
  1988 + that.tableData5[0].planName = res.data.content[0].updateDate
1990 1989 that.tableData5[0].eventTheme = res.data.content[0].updateUser
1991 1990  
1992 1991 }).catch(err => {
... ... @@ -2208,7 +2207,7 @@
2208 2207 console.log(item)
2209 2208 let that = this
2210 2209 actPage({
2211   - detailsId: titem.id,
  2210 + detailsId: item.id,
2212 2211 pageNumber: 1,
2213 2212 pageSize: 10,
2214 2213 }).then(res => {
... ...
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @0e38abb
... ... @@ -84,11 +84,11 @@
84 84 <!-- 活动效果分析 -->
85 85 <el-dialog :visible.sync="ggXin" custom-class='dialog_css' style="padding: 0;" width="88%"
86 86 center :close-on-click-modal="false" :close-on-press-escape="false">
87   - <div style="padding:15px;background-color:#F9F9F9;font-size:12px;border:1px solid #ECECEC;margin-bottom:20px">
  87 + <div style="padding:15px;background-color:#F9F9F9;font-size:14px;border:1px solid #ECECEC;margin-bottom:20px">
88 88 活动效果分析
89 89 </div>
90 90 <div style="padding:0 20px;">
91   - <div style="font-size:12px;margin-bottom:10px;">成本分析</div>
  91 + <div style="font-size:14px;margin-bottom:10px;">成本分析</div>
92 92 <div style="display:flex;padding:10px 0;">
93 93 <div style="margin-right:40px;width:17%">
94 94 <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
... ... @@ -121,7 +121,7 @@
121 121 <div style="height:5px;background-color:red;"></div>
122 122 </div>
123 123 </div>
124   - <div style="font-size:12px;margin:10px 0;">效果分析</div>
  124 + <div style="font-size:14px;margin:10px 0;">效果分析</div>
125 125 <div style="display:flex;padding:10px 0;">
126 126 <div style="margin-right:40px;width:17%">
127 127 <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
... ... @@ -162,22 +162,22 @@
162 162 <div>活动主题</div>
163 163 <div style="margin-top:20px;">
164 164 <div style="display:flex;justify-content: space-between;margin-bottom:10px;">
165   - <div style="font-size:12px;color:#BBBBBB">主题1</div>
  165 + <div style="font-size:14px;color:#BBBBBB">主题1</div>
166 166 <div>300/100家</div>
167 167 </div>
168 168 <el-progress :text-inside="true" :stroke-width="15" :percentage="70"></el-progress>
169 169 <div style="display:flex;justify-content: space-between;margin:10px 0;">
170   - <div style="font-size:12px;color:#BBBBBB">主题2</div>
  170 + <div style="font-size:14px;color:#BBBBBB">主题2</div>
171 171 <div>300/100家</div>
172 172 </div>
173 173 <el-progress :text-inside="true" :stroke-width="15" :percentage="100" status="success"></el-progress>
174 174 <div style="display:flex;justify-content: space-between;margin:10px 0;">
175   - <div style="font-size:12px;color:#BBBBBB">主题3</div>
  175 + <div style="font-size:14px;color:#BBBBBB">主题3</div>
176 176 <div>300/100家</div>
177 177 </div>
178 178 <el-progress :text-inside="true" :stroke-width="15" :percentage="80" status="warning"></el-progress>
179 179 <div style="display:flex;justify-content: space-between;margin:10px 0;">
180   - <div style="font-size:12px;color:#BBBBBB">主题4</div>
  180 + <div style="font-size:14px;color:#BBBBBB">主题4</div>
181 181 <div>300/100家</div>
182 182 </div>
183 183 <el-progress :text-inside="true" :stroke-width="15" :percentage="50" status="exception"></el-progress>
... ... @@ -334,8 +334,8 @@
334 334 <div style="display: flex;justify-content: space-between;border-bottom: 1px solid #E5E5E5;padding: 0 0 10px 0;">
335 335 <div style="display: flex;align-items: center;">
336 336 <div style="margin-right: 10px;">代办任务</div>
337   - <div style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">发起人：</div>
338   - <div style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">任务节点：部门领导审批</div>
  337 + <div style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:14px;color:#56AC83;border-radius: 3px;">发起人：</div>
  338 + <div style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:14px;color:#56AC83;border-radius: 3px;">任务节点：部门领导审批</div>
339 339 </div>
340 340 <div style="margin-right:20px ">
341 341 <el-button size="mini" style="background-color: #3F9B6A;color: #fff;" @click="actSpye=false">关闭</el-button>
... ... @@ -366,7 +366,7 @@
366 366 append-to-body>
367 367 <div style="padding:30px 20px 0 20px">
368 368 <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 1">
369   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;">
  369 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;">
370 370 基本信息
371 371 </div>
372 372 <div style="padding: 15px;">
... ... @@ -438,7 +438,7 @@
438 438 </div>
439 439 </div>
440 440 <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 2">
441   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  441 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
442 442 <div>活动明细</div>
443 443 </div>
444 444 <div style="padding: 15px;">
... ... @@ -466,7 +466,7 @@
466 466 </div>
467 467 </div>
468 468 <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 3">
469   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  469 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
470 470 <div>活动成本</div>
471 471 </div>
472 472 <div style="padding: 15px;">
... ... @@ -528,7 +528,7 @@
528 528 </div>
529 529 </div>
530 530 <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 4">
531   - <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
  531 + <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;">
532 532 <div>预估效果信息</div>
533 533 </div>
534 534 <div style="padding: 15px;">
... ... @@ -600,7 +600,7 @@
600 600 <el-steps direction="vertical" :active="secondData.state!=5? secondData.state - 1: 1" class="shen_steps1">
601 601 <el-step>
602 602 <template slot="title">
603   - <div style="font-size: 12px;font-weight: 600;">部门领导审批</div>
  603 + <div style="font-size: 14px;font-weight: 600;">部门领导审批</div>
604 604 </template>
605 605 <template slot="description">
606 606 <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
... ... @@ -641,7 +641,7 @@
641 641 </el-step>
642 642 <el-step>
643 643 <template slot="title">
644   - <div style="font-size: 12px;font-weight: 600;">公司领导审批</div>
  644 + <div style="font-size: 14px;font-weight: 600;">公司领导审批</div>
645 645 </template>
646 646 <template slot="description">
647 647 <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
... ... @@ -682,7 +682,7 @@
682 682 </el-step>
683 683 <el-step>
684 684 <template slot="title">
685   - <div style="font-size: 12px;font-weight: 600;">其他审批</div>
  685 + <div style="font-size: 14px;font-weight: 600;">其他审批</div>
686 686 </template>
687 687 <template slot="description">
688 688 <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
... ... @@ -766,7 +766,7 @@
766 766 <img :src="$baseURL+secondData.coverPoster" alt="" style="height: 80px;"/>
767 767 </div>
768 768 <div
769   - style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
  769 + style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 14px;">
770 770 <span style="margin-bottom: 10px;">{{text}}</span>
771 771 <span>活动时间：{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}</span>
772 772 <span>活动地点:{{tableData1[0].planName}}</span>
... ... @@ -782,10 +782,10 @@
782 782 <div v-if="activeName=='first'" style="display: flex;">
783 783 <div style="width: 100%;">
784 784 <div style="width: 100%;">
785   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">基本信息</div>
  785 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">基本信息</div>
786 786 <div style="padding: 10px 20px;">
787 787 <el-table :data="tableData1"
788   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  788 + :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
789 789 style="width: 100%;margin: auto;">
790 790 <el-table-column class-name="first-column-bg" label="方案编号" prop="name" min-width="15%">
791 791 </el-table-column>
... ... @@ -804,10 +804,10 @@
804 804 </div>
805 805 </div>
806 806 <div style="width: 100%;">
807   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">活动明细信息</div>
  807 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
808 808 <div style="padding: 10px 20px;">
809 809 <el-table :data="tableData2"
810   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  810 + :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
811 811 style="width: 100%;margin: auto;">
812 812 <el-table-column label="序号" min-width="5%" align='center'>
813 813 <template slot-scope="scope">
... ... @@ -819,7 +819,7 @@
819 819 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
820 820  
821 821 </el-table-column>
822   - <el-table-column label="预估费用" prop="estimatedCost" min-width="20%">
  822 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
823 823  
824 824 </el-table-column>
825 825 <el-table-column label="备注" prop="notes" min-width="20%">
... ... @@ -828,10 +828,10 @@
828 828 </div>
829 829 </div>
830 830 <div style="width: 100%;">
831   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">活动成本信息</div>
  831 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动成本信息</div>
832 832 <div style="padding:10px 20px;">
833 833 <el-table :data="tableData3"
834   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  834 + :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
835 835 style="width: 100%;margin: auto;">
836 836 <el-table-column class-name="first-column-bg" label="内部人力成本预估" prop="name" min-width="15%">
837 837 </el-table-column>
... ... @@ -848,10 +848,10 @@
848 848 </div>
849 849 </div>
850 850 <div style="width: 100%;">
851   - <div style="font-size: 12px;padding:10px 20px 0px 20px;">预估效果</div>
  851 + <div style="font-size: 14px;padding:10px 20px 0px 20px;">预估效果</div>
852 852 <div style="padding:10px 20px;">
853 853 <el-table :data="tableData4"
854   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  854 + :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
855 855 style="width: 100%;margin: auto;">
856 856 <el-table-column class-name="first-column-bg" label="预计吸引流量" prop="name" min-width="15%">
857 857 </el-table-column>
... ... @@ -869,10 +869,10 @@
869 869 </div>
870 870 </div>
871 871 <div style="width: 100%;">
872   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">相关附件信息</div>
  872 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
873 873 <div style="padding:10px 20px;">
874 874 <el-table :data="tableData6"
875   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  875 + :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
876 876 style="width: 100%;margin: auto;">
877 877 <el-table-column label="序号" min-width="5%" align='center'>
878 878 <template slot-scope="scope">
... ... @@ -892,10 +892,10 @@
892 892 </div>
893 893 </div>
894 894 <div style="width: 100%;">
895   - <div style="font-size: 12px;padding: 10px 20px 0px 20px;">系统信息</div>
  895 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">系统信息</div>
896 896 <div style="padding:10px 20px;">
897 897 <el-table :data="tableData5"
898   - :header-cell-style="{fontSize: '12px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  898 + :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
899 899 style="width: 100%;margin: auto;">
900 900 <el-table-column class-name="first-column-bg" label="创建人" prop="name" min-width="15%">
901 901 </el-table-column>
... ... @@ -919,7 +919,7 @@
919 919 <div style="padding: 20px">
920 920 <div style="border: solid 1px #E5E5E5;border-radius: 5px">
921 921 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
922   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  922 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
923 923 基本信息
924 924 </div>
925 925 </div>
... ... @@ -969,7 +969,7 @@
969 969 <div style="padding: 0px 20px 20px 20px">
970 970 <div style="border: solid 1px #E5E5E5;border-radius: 5px">
971 971 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px;display: flex">
972   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  972 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
973 973 活动明细信息
974 974 </div>
975 975  
... ... @@ -977,7 +977,7 @@
977 977 <!-- 表格-->
978 978 <div style="padding: 20px 20px 20px 20px">
979 979 <el-table :data="tableDa"
980   - :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  980 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
981 981 style="width: 100%">
982 982 <el-table-column label="序号" width="auto" min-width="5%" align="center">
983 983 <template slot-scope="scope">
... ... @@ -990,7 +990,7 @@
990 990 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
991 991  
992 992 </el-table-column>
993   - <el-table-column label="预估费用" prop="estimatedCost" width="auto" min-width="15%">
  993 + <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" min-width="15%">
994 994 </el-table-column>
995 995 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
996 996 </el-table-column>
... ... @@ -1007,7 +1007,7 @@
1007 1007 <div style="padding: 20px">
1008 1008 <div style="border: solid 1px #E5E5E5;border-radius: 5px;padding-bottom: 20px;">
1009 1009 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
1010   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  1010 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
1011 1011 实际花费成本
1012 1012 </div>
1013 1013 </div>
... ... @@ -1016,18 +1016,18 @@
1016 1016 style="position: relative">
1017 1017 <el-row :gutter="20">
1018 1018 <el-col :span="8">
1019   - <el-form-item label="内部人力成本预估" class="grid-content bg-purple device-from" prop="name">
  1019 + <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from" prop="name">
1020 1020 <el-input v-model="zhixingList.internalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1021 1021 </el-form-item>
1022 1022 </el-col>
1023 1023 <el-col :span="8">
1024   - <el-form-item label="外部人力成本预估" class="grid-content bg-purple" prop="name">
  1024 + <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" prop="name">
1025 1025 <el-input v-model="zhixingList.externalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1026 1026 </el-form-item>
1027 1027 </el-col>
1028 1028  
1029 1029 <el-col :span="8">
1030   - <el-form-item label="商品成本预估" class="grid-content bg-purple" prop="name">
  1030 + <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" prop="name">
1031 1031 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" :disabled="!zhixingBian"/>
1032 1032 </el-form-item>
1033 1033 </el-col>
... ... @@ -1035,17 +1035,17 @@
1035 1035  
1036 1036 <el-row :gutter="20">
1037 1037 <el-col :span="8">
1038   - <el-form-item label="设备成本" class="grid-content bg-purple" prop="name">
  1038 + <el-form-item label="设备成本(/元)" class="grid-content bg-purple" prop="name">
1039 1039 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" :disabled="!zhixingBian"/>
1040 1040 </el-form-item>
1041 1041 </el-col>
1042 1042 <el-col :span="8">
1043   - <el-form-item label="宣传费用" class="grid-content bg-purple" prop="name">
  1043 + <el-form-item label="宣传费用(/元)" class="grid-content bg-purple" prop="name">
1044 1044 <el-input v-model="zhixingList.estimatedPromotionalExpenses" placeholder="请输入" :disabled="!zhixingBian"/>
1045 1045 </el-form-item>
1046 1046 </el-col>
1047 1047 <el-col :span="8">
1048   - <el-form-item label="其他成本" class="grid-content bg-purple" prop="name">
  1048 + <el-form-item label="其他成本(/元)" class="grid-content bg-purple" prop="name">
1049 1049 <el-input v-model="zhixingList.otherNecessaryEstimates" placeholder="请输入" :disabled="!zhixingBian"/>
1050 1050 </el-form-item>
1051 1051 </el-col>
... ... @@ -1053,7 +1053,7 @@
1053 1053  
1054 1054 <el-row :gutter="20">
1055 1055 <el-col :span="8">
1056   - <el-form-item label="总成本" prop="name" class="grid-content bg-purple">
  1056 + <el-form-item label="总成本(/元)" prop="name" class="grid-content bg-purple">
1057 1057 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1058 1058 </el-form-item>
1059 1059 </el-col>
... ... @@ -1071,7 +1071,7 @@
1071 1071 <div style="padding: 20px">
1072 1072 <div style="border: solid 1px #E5E5E5;border-radius: 5px;padding-bottom: 20px;">
1073 1073 <div style="border-bottom: 1px solid #E5E5E5;padding: 1px">
1074   - <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 12px;">
  1074 + <div style="padding: 10px 20px;background-color: #FAFAFA;font-size: 14px;">
1075 1075 活动执行效果
1076 1076 </div>
1077 1077 </div>
... ... @@ -1091,14 +1091,14 @@
1091 1091 </el-col>
1092 1092  
1093 1093 <el-col :span="8">
1094   - <el-form-item label="直接收益" class="grid-content bg-purple" prop="name">
  1094 + <el-form-item label="直接收益(/元)" class="grid-content bg-purple" prop="name">
1095 1095 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/>
1096 1096 </el-form-item>
1097 1097 </el-col>
1098 1098 </el-row>
1099 1099 <el-row :gutter="20">
1100 1100 <el-col :span="8">
1101   - <el-form-item label="间接收益" class="grid-content bg-purple" prop="name">
  1101 + <el-form-item label="间接收益(/元)" class="grid-content bg-purple" prop="name">
1102 1102 <el-input v-model="zhixingList.expectedIndirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/>
1103 1103 </el-form-item>
1104 1104 </el-col>
... ... @@ -1250,19 +1250,19 @@
1250 1250 externalLaborCostEstimation: '',
1251 1251 tableData3: [{
1252 1252 id: 0,
1253   - name: '商品成本预估',
  1253 + name: '商品成本预估(/元)',
1254 1254 planName: '',
1255   - text: '设备成本预估',
  1255 + text: '设备成本预估(/元)',
1256 1256 eventTheme: ''
1257 1257 }, {
1258 1258 id: 0,
1259   - name: '宣传费用预估',
  1259 + name: '宣传费用预估(/元)',
1260 1260 planName: '',
1261   - text: '其他必要成本预估',
  1261 + text: '其他必要成本预估(/元)',
1262 1262 eventTheme: ''
1263 1263 }, {
1264 1264 id: 0,
1265   - name: '总成本预估',
  1265 + name: '总成本预估(/元)',
1266 1266 planName: '',
1267 1267 text: '备注',
1268 1268 eventTheme: ''
... ... @@ -1271,9 +1271,9 @@
1271 1271 expectedParticipation: '',
1272 1272 tableData4: [{
1273 1273 id: 0,
1274   - name: '预计直接收益',
  1274 + name: '预计直接收益(/元)',
1275 1275 planName: '',
1276   - text: '预计间接收益',
  1276 + text: '预计间接收益(/元)',
1277 1277 eventTheme: '-'
1278 1278 }],
1279 1279 createUser: '',
... ... @@ -1626,7 +1626,7 @@
1626 1626 danqueryById({id:item.id,dataOwnership:'2', pageNumber: 1,pageSize: 10,}).then(res=>{
1627 1627 this.secondData = res.data.content[0]
1628 1628 //基本信息
1629   - // that.id=res.data.content[0].id
  1629 + that.id=res.data.content[0].id
1630 1630 that.text=res.data.content[0].planName
1631 1631 that.tableData1[0].eventTheme =res.data.content[0].planType
1632 1632 that.tableData1[0].planName = res.data.content[0].eventAddrs
... ... @@ -1654,9 +1654,9 @@
1654 1654 that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
1655 1655 //系统信息
1656 1656 that.createUser = res.data.content[0].createUser
1657   - that.createDate = res.data.content[0].createDate
1658   - that.tableData5[0].planName = '-'
1659   - that.tableData5[0].eventTheme = res.data.content[0].updateUser
  1657 + that.createDate = res.data.content[0].createDate
  1658 + that.tableData5[0].planName = res.data.content[0].updateDate
  1659 + that.tableData5[0].eventTheme = res.data.content[0].updateUser
1660 1660  
1661 1661  
1662 1662 }).catch(err=>{
... ... @@ -1794,7 +1794,7 @@
1794 1794 padding:0;
1795 1795 }
1796 1796 .el-dialog__title{
1797   - font-size: 12px;
  1797 + font-size: 14px;
1798 1798 }
1799 1799 .el-dialog__body {
1800 1800 padding: 0px 0px;
... ... @@ -2050,13 +2050,13 @@
2050 2050 margin-top:-24px;
2051 2051 position: relative;
2052 2052 border: 2px solid #FABB41;
2053   - font-size: 12px;
  2053 + font-size: 14px;
2054 2054 }
2055 2055 .el-step__icon .is-text{
2056 2056 padding: 10px;
2057 2057 border-radius:10px;
2058 2058 border: 2px solid #FABB41;
2059   - font-size: 12px;
  2059 + font-size: 14px;
2060 2060 }
2061 2061 }
2062 2062 .is-wait{
... ... @@ -2068,13 +2068,13 @@
2068 2068 margin-top:-24px;
2069 2069 position: relative;
2070 2070 border: 2px solid #C0C4CC;
2071   - font-size: 12px;
  2071 + font-size: 14px;
2072 2072 }
2073 2073 .el-step__icon .is-text{
2074 2074 padding: 10px;
2075 2075 border-radius:10px;
2076 2076 border: 2px solid #C0C4CC;
2077   - font-size: 12px;
  2077 + font-size: 14px;
2078 2078 }
2079 2079 }
2080 2080 .is-finish{
... ... @@ -2087,14 +2087,14 @@
2087 2087 position: relative;
2088 2088 border: 2px solid #3F9B6A;
2089 2089 background-color: #D3E6CC;
2090   - font-size: 12px;
  2090 + font-size: 14px;
2091 2091 color: #3F9B6A;
2092 2092 }
2093 2093 .el-step__icon .is-text{
2094 2094 padding: 10px;
2095 2095 border-radius:10px;
2096 2096 border: 2px solid #3F9B6A;
2097   - font-size: 12px;
  2097 + font-size: 14px;
2098 2098 }
2099 2099 .el-step__line{
2100 2100 background-color: #3F9B6A;
... ... @@ -2190,7 +2190,7 @@
2190 2190 border: none;
2191 2191 margin-right: 10px;
2192 2192 background-color: #F2F2F2;
2193   - font-size:12px;
  2193 + font-size:14px;
2194 2194 border-top-left-radius: 8px;
2195 2195 border-top-right-radius: 8px;
2196 2196 padding:0 15px;
... ...
admin-web-master/src/views/comment/commentSys/index.vue
  View file @0e38abb
... ... @@ -107,7 +107,7 @@
107 107 />
108 108 </div>
109 109 </div>
110   - <div class="line" />
  110 + <!-- <div class="line" />
111 111 <div v-if="commentDetails.addComment !=''" class="addComment">{{ commentDetails.time }}天后追评</div>
112 112 <div class="comment">
113 113 <div v-if="commentDetails.addComment !=''" class="com_left">追评：</div>
... ... @@ -124,7 +124,7 @@
124 124 :preview-src-list="mapimg(commentDetails.addImages)"
125 125 />
126 126 </div>
127   - </div>
  127 + </div> -->
128 128 </div>
129 129 <span slot="footer" class="dialog-footer">
130 130 <el-button v-if="Number(formParams.ifSensitive)" @click="toShow" style="background-color: #3F9B6A;color: #fff">允许展示</el-button>
... ...
admin-web-master/src/views/member/memberList/details.vue
  View file @0e38abb
... ... @@ -182,7 +182,7 @@
182 182 />
183 183 </div>
184 184 </div>
185   - <div class="comment">
  185 + <!-- <div class="comment">
186 186 <div v-if="commentDetails.addComment !=''" class="com_left">追评：</div>
187 187 <div class="com_right">{{ commentDetails.addComment }}</div>
188 188 </div>
... ... @@ -196,7 +196,7 @@
196 196 :preview-src-list="commentDetails.addImages"
197 197 />
198 198 </div>
199   - </div>
  199 + </div> -->
200 200 </div>
201 201 <span slot="footer" class="dialog-footer">
202 202 <el-button v-if="comState" @click="toShow" style="background-color: #3F9B6A;color: #fff">允许展示</el-button>
... ...
admin-web-master/src/views/promotion/account.vue
  View file @0e38abb
... ... @@ -140,16 +140,17 @@
140 140 <el-option label="APP" value="APP" />
141 141 </el-select>
142 142 </el-form-item>
143   - <el-form-item label="账号" v-if="index==1?true:false" prop="accountNumber">
144   - <el-input v-model="formInline.accountNumber" placeholder="请输入"></el-input>
  143 + <el-form-item label="账号" prop="accountNumber">
  144 + <el-input :disabled="index == 1?false:index == 2?true:false" v-model="formInline.accountNumber" placeholder="请输入"></el-input>
145 145 </el-form-item>
146   - <el-form-item label="APPKEY" v-if="index==1?true:false" prop="appKey">
147   - <el-input v-model="formInline.appKey" placeholder="请输入"></el-input>
  146 + <el-form-item label="APPKEY" prop="appKey">
  147 + <el-input :disabled="index == 1?false:index == 2?true:false" v-model="formInline.appKey" placeholder="请输入"></el-input>
148 148 </el-form-item>
149   - <el-form-item label="APP图片" v-if="index==1?true:false" prop="coverPoster"
  149 + <el-form-item label="APP图片" prop="appImages"
150 150 style="margin-bottom:20px;">
151   - <upimg filePath="qudao" :value="formInline.coverPoster" inputtype="coverPoster" :limit="1"
152   - @changimg="e=>changimg(e,'coverPoster')"></upimg>
  151 + <img :src="$baseURL+formInline.appImages" alt="" v-if="index == 2" style="height:100px;">
  152 + <upimg v-else filePath="qudao" :value="formInline.appImages" inputtype="appImages" :limit="1"
  153 + @changimg="e=>changimg(e,'appImages')"></upimg>
153 154  
154 155 </el-form-item>
155 156 <el-form-item label="备注">
... ...
ceres-uniapp-master/config/api.js
  View file @0e38abb
1 1  
2   -// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3   -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
  2 +const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
  3 +const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4 4 // const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
5 5 // const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
6   -const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
7   -// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
8   -const DOMAIN_PREFIXPING = 'http://128.10.249.23:9003'
9   -const DOMAIN_PREFIX = 'http://128.10.249.23:9007'
  6 +// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
  7 +const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
  8 +// const DOMAIN_PREFIXPING = 'http://128.10.249.23:9003'
  9 +// const DOMAIN_PREFIX = 'http://128.10.249.23:9007'
10 10 // const host = `${window.location.protocol}//${window.location.host}`
11 11 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
12 12 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/addEvaluate.vue
  View file @0e38abb
... ... @@ -3,7 +3,7 @@
3 3 <global-loading />
4 4  
5 5 <!-- 追加评论 -->
6   - <view class="addEvaluate-box flex-items-plus flex-column-plus">
  6 + <!-- <view class="addEvaluate-box flex-items-plus flex-column-plus">
7 7 <view class="addEvaluate flex-column-plus">
8 8 <view class="addEvaluateTitle-box flex-row-plus mar-top-20 mar-left-20">
9 9  
... ... @@ -26,10 +26,10 @@
26 26 <u-upload :action="action" ref="uUpload" :limitType="['png', 'jpg', 'jpeg', 'webp', 'gif', 'image']" :header="headerToken" :form-data="formData"></u-upload>
27 27 </view>
28 28 </view>
29   - </view>
30   - <view class="butBox flex-items-plus mar-left-30">
  29 + </view> -->
  30 + <!-- <view class="butBox flex-items-plus mar-left-30">
31 31 <view class="submitbut" @click="submitTap">追加评论</view>
32   - </view>
  32 + </view> -->
33 33 </view>
34 34 </template>
35 35  
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/evaluateDetails.vue
  View file @0e38abb
... ... @@ -22,7 +22,7 @@
22 22 <image class="evaluate-Img" :src="$baseURL+cItem"></image>
23 23 </view>
24 24 </view>
25   - <view class="addComments-box flex-column-plus" v-if="commentVOList.addComment">
  25 + <!-- <view class="addComments-box flex-column-plus" v-if="commentVOList.addComment">
26 26 <label class="font-color-C5AA7B mar-top-30">用户追评</label>
27 27 <label class="mar-top-20">{{commentVOList.addComment}}</label>
28 28 <view class="evaluateImg-box mar-top-20" v-if="commentVOList.addImage">
... ... @@ -30,8 +30,8 @@
30 30 <image class="evaluate-Img" :src="$baseURL+dItem"></image>
31 31 </view>
32 32 </view>
33   - </view>
34   - <view class="goodsDes-box flex-column-plus mar-top-30">
  33 + </view> -->
  34 + <!-- <view class="goodsDes-box flex-column-plus mar-top-30">
35 35 <view class="flex-row-plus" @click="goGoodsDetails">
36 36  
37 37 <image class="goodsDes-img" :src="commentVOList.productImage"></image>
... ... @@ -42,7 +42,7 @@
42 42 </view>
43 43 </view>
44 44 </view>
45   - </view>
  45 + </view> -->
46 46 </view>
47 47 <!-- {{commentVOList}}-->
48 48 <view class="linkBox">
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
  View file @0e38abb
... ... @@ -41,7 +41,7 @@
41 41 </view>
42 42 </view>
43 43 </view>
44   - <view class="addCommentsBut" v-if="item.addComment == ''" @click.stop="addCommentsClick(index,item)">追加评价</view>
  44 + <!-- <view class="addCommentsBut" v-if="item.addComment == ''" @click.stop="addCommentsClick(index,item)">追加评价</view> -->
45 45 </view>
46 46 <view class="fs26 pad-topbot-20 u-skeleton-fillet" style="margin-top: 10rpx">{{item.comment}}</view>
47 47 <view class="evaluateImg-box" v-if="item.image">
... ... @@ -49,7 +49,7 @@
49 49 <image class="evaluate-Img" :src="$baseURL+cItem"></image>
50 50 </view>
51 51 </view>
52   - <view class="addComments-box flex-column-plus" v-if="item.addComment">
  52 + <!-- <view class="addComments-box flex-column-plus" v-if="item.addComment">
53 53 <label class="font-color-C5AA7B mar-top-30">用户追评</label>
54 54 <label class="mar-top-20">{{item.addComment}}</label>
55 55 <view class="evaluateImg-box mar-top-20" v-if="item.addImage">
... ... @@ -57,8 +57,8 @@
57 57 <image class="evaluate-Img" :src="$baseURL+dItem"></image>
58 58 </view>
59 59 </view>
60   - </view>
61   - <view class="goodsDes-box u-skeleton-fillet flex-column-plus mar-top-30">
  60 + </view> -->
  61 + <!-- <view class="goodsDes-box u-skeleton-fillet flex-column-plus mar-top-30">
62 62 <view class="flex-row-plus" @click.stop="goGoodsDetails(item.shopId,item.productId,item.skuId)">
63 63 <image class="goodsDes-img default-img" :src="$baseURL+item.productImage"></image>
64 64 <view class="goodsDesText-box">
... ... @@ -68,8 +68,8 @@
68 68 </view>
69 69 </view>
70 70 </view>
71   - </view>
72   - <view class="flex-items flex-row mar-top-30 flex-sp-between">
  71 + </view> -->
  72 + <!-- <view class="flex-items flex-row mar-top-30 flex-sp-between">
73 73 <view class="font-color-999 fs22">{{item.createTime}}</view>
74 74 <view class="praise-box flex-items flex-row">
75 75 <image class="praise-icon" @click.stop="zanTap(index,item.commentId,0)" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/praiseActiveIcon.png"
... ... @@ -78,7 +78,7 @@
78 78 v-else></image>
79 79 <label class="mar-left-10">{{item.likes}}</label>
80 80 </view>
81   - </view>
  81 + </view> -->
82 82 </view>
83 83 </template>
84 84 <view v-if="evaluateEmpty" class="emptyOrder-box flex-items-plus flex-column">
... ... @@ -109,7 +109,7 @@
109 109 <image class="evaluate-Img" :src="$baseURL+cItem"></image>
110 110 </view>
111 111 </view>
112   - <view class="addComments-box flex-column-plus" v-if="item.addComment">
  112 + <!-- <view class="addComments-box flex-column-plus" v-if="item.addComment">
113 113 <label class="font-color-C5AA7B mar-top-30">用户追评</label>
114 114 <label class="mar-top-20">{{item.addComment}}</label>
115 115 <view class="evaluateImg-box mar-top-20" v-if="item.addImage">
... ... @@ -117,7 +117,7 @@
117 117 <image class="evaluate-Img" :src="$baseURL+dItem"></image>
118 118 </view>
119 119 </view>
120   - </view>
  120 + </view> -->
121 121  
122 122 <view class="flex-items flex-row mar-top-30 flex-sp-between">
123 123 <view class="font-color-999 fs22">{{item.createTime}}</view>
... ...