webapp / GreenwayWeb

Commit 98d43fa279d528042bb04b235ddca5695b11718d

Authored by 杨鑫
1 parent d015f907

'最新'

Inline Side-by-side
Showing 13 changed files with 287 additions and 271 deletions
admin-web-master/src/layout/index.vue
  View file @98d43fa
@@ -197,17 +197,17 @@ @@ -197,17 +197,17 @@
197 } 197 }
198 } 198 }
199 return { 199 return {
200 - // msg: [],  
201 - // list: [], 200 + msg: [],
  201 + list: [],
202 // msg: ['招商服务系统'], 202 // msg: ['招商服务系统'],
203 - msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],  
204 - list: [  
205 - ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],  
206 - ['品牌策划', '活动策划', '氛围策划', '媒体推广'],  
207 - ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],  
208 - ['联机交易', '对账处理', '日志管理', '商户服务'],  
209 - ['渠道售票统计分析', '销售额统计分析'],  
210 - ], 203 + // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  204 + // list: [
  205 + // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
  206 + // ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
  207 + // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
  208 + // ['联机交易', '对账处理', '日志管理', '商户服务'],
  209 + // ['渠道售票统计分析', '销售额统计分析'],
  210 + // ],
211 listMune: [], 211 listMune: [],
212 mumeList: [], 212 mumeList: [],
213 mumeChildren1: [], 213 mumeChildren1: [],
@@ -296,10 +296,10 @@ @@ -296,10 +296,10 @@
296 this.userAvatar = getUserAvatar() 296 this.userAvatar = getUserAvatar()
297 }, 297 },
298 mounted() { 298 mounted() {
299 - // this.getMemu()  
300 - // this.address()  
301 - // this.waibu()  
302 - this.neibu() 299 + this.getMemu()
  300 + this.address()
  301 + this.waibu()
  302 + // this.neibu()
303 }, 303 },
304 304
305 methods: { 305 methods: {
@@ -780,12 +780,12 @@ @@ -780,12 +780,12 @@
780 ['联机交易', '对账处理', '日志管理', '商户服务'], 780 ['联机交易', '对账处理', '日志管理', '商户服务'],
781 ['渠道售票统计分析', '销售额统计分析'], 781 ['渠道售票统计分析', '销售额统计分析'],
782 ] 782 ]
783 - this.neibu() 783 + // this.neibu()
784 784
785 785
786 - // this.getMemu()  
787 - // this.waibu()  
788 - // this.list = this.mumeList 786 + this.getMemu()
  787 + this.waibu()
  788 + this.list = this.mumeList
789 789
790 790
791 }, 791 },
admin-web-master/src/views/activity/activityBian.vue
  View file @98d43fa
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 120 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
121 121
122 </el-table-column> 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 </el-table-column> 124 </el-table-column>
125 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 125 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
126 </el-table-column> 126 </el-table-column>
@@ -146,12 +146,12 @@ @@ -146,12 +146,12 @@
146 style="position: relative"> 146 style="position: relative">
147 <el-row :gutter="20"> 147 <el-row :gutter="20">
148 <el-col :span="12"> 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 <el-input v-model="secondData.internalLaborCostEstimation" placeholder="请输入" /> 150 <el-input v-model="secondData.internalLaborCostEstimation" placeholder="请输入" />
151 </el-form-item> 151 </el-form-item>
152 </el-col> 152 </el-col>
153 <el-col :span="12"> 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 <el-input v-model="secondData.externalLaborCostEstimation" placeholder="请输入" /> 155 <el-input v-model="secondData.externalLaborCostEstimation" placeholder="请输入" />
156 </el-form-item> 156 </el-form-item>
157 </el-col> 157 </el-col>
@@ -161,12 +161,12 @@ @@ -161,12 +161,12 @@
161 161
162 <el-row :gutter="20"> 162 <el-row :gutter="20">
163 <el-col :span="12"> 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 <el-input v-model="secondData.costEstimationGoods" placeholder="请输入" /> 165 <el-input v-model="secondData.costEstimationGoods" placeholder="请输入" />
166 </el-form-item> 166 </el-form-item>
167 </el-col> 167 </el-col>
168 <el-col :span="12"> 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 <el-input v-model="secondData.setCostEstimate" placeholder="请输入" /> 170 <el-input v-model="secondData.setCostEstimate" placeholder="请输入" />
171 </el-form-item> 171 </el-form-item>
172 </el-col> 172 </el-col>
@@ -174,19 +174,19 @@ @@ -174,19 +174,19 @@
174 </el-row> 174 </el-row>
175 <el-row :gutter="20"> 175 <el-row :gutter="20">
176 <el-col :span="12"> 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 <el-input v-model="secondData.estimatedPromotionalExpenses" placeholder="请输入" /> 178 <el-input v-model="secondData.estimatedPromotionalExpenses" placeholder="请输入" />
179 </el-form-item> 179 </el-form-item>
180 </el-col> 180 </el-col>
181 <el-col :span="12"> 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 <el-input v-model="secondData.otherNecessaryEstimates" placeholder="请输入" /> 183 <el-input v-model="secondData.otherNecessaryEstimates" placeholder="请输入" />
184 </el-form-item> 184 </el-form-item>
185 </el-col> 185 </el-col>
186 </el-row> 186 </el-row>
187 <el-row :gutter="20"> 187 <el-row :gutter="20">
188 <el-col :span="12"> 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 <el-input v-model="secondData.totalCostEstimation" placeholder="请输入" /> 190 <el-input v-model="secondData.totalCostEstimation" placeholder="请输入" />
191 </el-form-item> 191 </el-form-item>
192 </el-col> 192 </el-col>
@@ -225,12 +225,12 @@ @@ -225,12 +225,12 @@
225 </el-row> 225 </el-row>
226 <el-row :gutter="20"> 226 <el-row :gutter="20">
227 <el-col :span="12"> 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 <el-input v-model="secondData.expectedDirectBenefits" placeholder="请输入" /> 229 <el-input v-model="secondData.expectedDirectBenefits" placeholder="请输入" />
230 </el-form-item> 230 </el-form-item>
231 </el-col> 231 </el-col>
232 <el-col :span="12"> 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 <el-input v-model="secondData.expectedIndirectBenefits" placeholder="请输入" /> 234 <el-input v-model="secondData.expectedIndirectBenefits" placeholder="请输入" />
235 </el-form-item> 235 </el-form-item>
236 </el-col> 236 </el-col>
@@ -303,7 +303,7 @@ @@ -303,7 +303,7 @@
303 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" /> 303 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
304 </el-form-item> 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 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" /> 307 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
308 </el-form-item> 308 </el-form-item>
309 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName"> 309 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
admin-web-master/src/views/activity/activityBz.vue
  View file @98d43fa
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 155 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
156 156
157 </el-table-column> 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 </el-table-column>
161 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 161 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
@@ -182,14 +182,14 @@ @@ -182,14 +182,14 @@
182 style="position: relative"> 182 style="position: relative">
183 <el-row :gutter="20"> 183 <el-row :gutter="20">
184 <el-col :span="12"> 184 <el-col :span="12">
185 - <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from" 185 + <el-form-item label="内部人力成本预估(元)" class="grid-content bg-purple device-from"
186 prop="internalLaborCostEstimation"> 186 prop="internalLaborCostEstimation">
187 <el-input v-model="ruleForm.internalLaborCostEstimation" 187 <el-input v-model="ruleForm.internalLaborCostEstimation"
188 placeholder="请输入" /> 188 placeholder="请输入" />
189 </el-form-item> 189 </el-form-item>
190 </el-col> 190 </el-col>
191 <el-col :span="12"> 191 <el-col :span="12">
192 - <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" 192 + <el-form-item label="外部人力成本预估(元)" class="grid-content bg-purple"
193 prop="externalLaborCostEstimation"> 193 prop="externalLaborCostEstimation">
194 <el-input v-model="ruleForm.externalLaborCostEstimation" 194 <el-input v-model="ruleForm.externalLaborCostEstimation"
195 placeholder="请输入" /> 195 placeholder="请输入" />
@@ -201,13 +201,13 @@ @@ -201,13 +201,13 @@
201 201
202 <el-row :gutter="20"> 202 <el-row :gutter="20">
203 <el-col :span="12"> 203 <el-col :span="12">
204 - <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" 204 + <el-form-item label="商品成本预估(元)" class="grid-content bg-purple"
205 prop="costEstimationGoods"> 205 prop="costEstimationGoods">
206 <el-input v-model="ruleForm.costEstimationGoods" placeholder="请输入" /> 206 <el-input v-model="ruleForm.costEstimationGoods" placeholder="请输入" />
207 </el-form-item> 207 </el-form-item>
208 </el-col> 208 </el-col>
209 <el-col :span="12"> 209 <el-col :span="12">
210 - <el-form-item label="设备成本预估(/元)" class="grid-content bg-purple" 210 + <el-form-item label="设备成本预估(元)" class="grid-content bg-purple"
211 prop="setCostEstimate"> 211 prop="setCostEstimate">
212 <el-input v-model="ruleForm.setCostEstimate" placeholder="请输入" /> 212 <el-input v-model="ruleForm.setCostEstimate" placeholder="请输入" />
213 </el-form-item> 213 </el-form-item>
@@ -217,14 +217,14 @@ @@ -217,14 +217,14 @@
217 217
218 <el-row :gutter="20"> 218 <el-row :gutter="20">
219 <el-col :span="12"> 219 <el-col :span="12">
220 - <el-form-item label="宣传费用预估(/元)" class="grid-content bg-purple" 220 + <el-form-item label="宣传费用预估(元)" class="grid-content bg-purple"
221 prop="estimatedPromotionalExpenses"> 221 prop="estimatedPromotionalExpenses">
222 <el-input v-model="ruleForm.estimatedPromotionalExpenses" 222 <el-input v-model="ruleForm.estimatedPromotionalExpenses"
223 placeholder="请输入" /> 223 placeholder="请输入" />
224 </el-form-item> 224 </el-form-item>
225 </el-col> 225 </el-col>
226 <el-col :span="12"> 226 <el-col :span="12">
227 - <el-form-item label="其他必要成本预估(/元)" class="grid-content bg-purple" 227 + <el-form-item label="其他必要成本预估(元)" class="grid-content bg-purple"
228 prop="otherNecessaryEstimates"> 228 prop="otherNecessaryEstimates">
229 <el-input v-model="ruleForm.otherNecessaryEstimates" 229 <el-input v-model="ruleForm.otherNecessaryEstimates"
230 placeholder="请输入" /> 230 placeholder="请输入" />
@@ -233,7 +233,7 @@ @@ -233,7 +233,7 @@
233 </el-row> 233 </el-row>
234 <el-row :gutter="20"> 234 <el-row :gutter="20">
235 <el-col :span="12"> 235 <el-col :span="12">
236 - <el-form-item label="总成本预估(/元)" prop="totalCostEstimation" 236 + <el-form-item label="总成本预估(元)" prop="totalCostEstimation"
237 class="grid-content bg-purple"> 237 class="grid-content bg-purple">
238 <el-input v-model="ruleForm.totalCostEstimation" placeholder="请输入" /> 238 <el-input v-model="ruleForm.totalCostEstimation" placeholder="请输入" />
239 </el-form-item> 239 </el-form-item>
@@ -274,13 +274,13 @@ @@ -274,13 +274,13 @@
274 </el-row> 274 </el-row>
275 <el-row :gutter="20"> 275 <el-row :gutter="20">
276 <el-col :span="12"> 276 <el-col :span="12">
277 - <el-form-item label="预计直接收益(/元)" class="grid-content bg-purple" 277 + <el-form-item label="预计直接收益(元)" class="grid-content bg-purple"
278 prop="expectedDirectBenefits"> 278 prop="expectedDirectBenefits">
279 <el-input v-model="ruleForm.expectedDirectBenefits" placeholder="请输入" /> 279 <el-input v-model="ruleForm.expectedDirectBenefits" placeholder="请输入" />
280 </el-form-item> 280 </el-form-item>
281 </el-col> 281 </el-col>
282 <el-col :span="12"> 282 <el-col :span="12">
283 - <el-form-item label="预计间接收益(/元)" class="grid-content bg-purple" 283 + <el-form-item label="预计间接收益(元)" class="grid-content bg-purple"
284 prop="expectedIndirectBenefits"> 284 prop="expectedIndirectBenefits">
285 <el-input v-model="ruleForm.expectedIndirectBenefits" 285 <el-input v-model="ruleForm.expectedIndirectBenefits"
286 placeholder="请输入" /> 286 placeholder="请输入" />
@@ -360,7 +360,7 @@ @@ -360,7 +360,7 @@
360 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" /> 360 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
361 </el-form-item> 361 </el-form-item>
362 362
363 - <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs"> 363 + <el-form-item label="预估费用(元)" class="grid-content bg-purple" prop="eventAddrs">
364 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" /> 364 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
365 </el-form-item> 365 </el-form-item>
366 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName"> 366 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
@@ -836,9 +836,8 @@ @@ -836,9 +836,8 @@
836 createDate: '', //创建时间 836 createDate: '', //创建时间
837 solutionEditor: null, 837 solutionEditor: null,
838 } 838 }
839 - }).catch(err => {  
840 - console.log(err)  
841 }) 839 })
  840 + this.$emit('childClose', false);
842 } else { 841 } else {
843 this.$message({ 842 this.$message({
844 message: '请填写数据', 843 message: '请填写数据',
admin-web-master/src/views/activity/activityHis.vue
  View file @98d43fa
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 203 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
204 204
205 </el-table-column> 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 </el-table-column> 208 </el-table-column>
209 <el-table-column label="备注" prop="notes" min-width="20%"> 209 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -217,14 +217,14 @@ @@ -217,14 +217,14 @@
217 <el-table :data="tableData3" 217 <el-table :data="tableData3"
218 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}" 218 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
219 style="width: 100%;margin: auto;"> 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 min-width="15%"> 221 min-width="15%">
222 </el-table-column> 222 </el-table-column>
223 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme" 223 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
224 min-width="35%"> 224 min-width="35%">
225 225
226 </el-table-column> 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 min-width="15%"> 228 min-width="15%">
229 229
230 </el-table-column> 230 </el-table-column>
@@ -316,7 +316,7 @@ @@ -316,7 +316,7 @@
316 </div> 316 </div>
317 </div> 317 </div>
318 <div style="padding: 20px 40px 20px 20px"> 318 <div style="padding: 20px 40px 20px 20px">
319 - <el-form label-position="top" :rules="zhixingRules" :model="zhixingList" 319 + <el-form label-position="top" ref="zhixingFormInfo" :rules="zhixingRules" :model="zhixingList"
320 label-width="120px" style="position: relative"> 320 label-width="120px" style="position: relative">
321 <el-row :gutter="20"> 321 <el-row :gutter="20">
322 <el-col :span="8"> 322 <el-col :span="8">
@@ -337,7 +337,7 @@ @@ -337,7 +337,7 @@
337 <el-form-item label="实际举办时间" class="grid-content bg-purple" 337 <el-form-item label="实际举办时间" class="grid-content bg-purple"
338 prop="event_start_time" style="position: relative"> 338 prop="event_start_time" style="position: relative">
339 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime" 339 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime"
340 - @input="formTime" value-format="yyyy-MM-dd HH:mm:ss" 340 + @change="formTime" @blur="blur" clear-icon="none" value-format="yyyy-MM-dd HH:mm:ss"
341 :disabled="!zhixingBian" type="datetimerange" 341 :disabled="!zhixingBian" type="datetimerange"
342 range-separator="至" start-placeholder="开始日期" 342 range-separator="至" start-placeholder="开始日期"
343 end-placeholder="结束日期" align="right"> 343 end-placeholder="结束日期" align="right">
@@ -394,7 +394,7 @@ @@ -394,7 +394,7 @@
394 min-width="15%"> 394 min-width="15%">
395 395
396 </el-table-column> 396 </el-table-column>
397 - <el-table-column label="预估费用(/元)" prop="estimatedCost" width="auto" 397 + <el-table-column label="预估费用(元)" prop="estimatedCost" width="auto"
398 min-width="15%"> 398 min-width="15%">
399 </el-table-column> 399 </el-table-column>
400 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 400 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
@@ -424,14 +424,14 @@ @@ -424,14 +424,14 @@
424 label-width="120px" style="position: relative"> 424 label-width="120px" style="position: relative">
425 <el-row :gutter="20"> 425 <el-row :gutter="20">
426 <el-col :span="8"> 426 <el-col :span="8">
427 - <el-form-item label="实际内部人力成本(/元)" 427 + <el-form-item label="实际内部人力成本(元)"
428 class="grid-content bg-purple device-from" prop="name"> 428 class="grid-content bg-purple device-from" prop="name">
429 <el-input v-model="zhixingList.internalLaborCostEstimation" 429 <el-input v-model="zhixingList.internalLaborCostEstimation"
430 placeholder="请输入" :disabled="!zhixingBian" /> 430 placeholder="请输入" :disabled="!zhixingBian" />
431 </el-form-item> 431 </el-form-item>
432 </el-col> 432 </el-col>
433 <el-col :span="8"> 433 <el-col :span="8">
434 - <el-form-item label="实际外部人力成本(/元)" class="grid-content bg-purple" 434 + <el-form-item label="实际外部人力成本(元)" class="grid-content bg-purple"
435 prop="name"> 435 prop="name">
436 <el-input v-model="zhixingList.externalLaborCostEstimation" 436 <el-input v-model="zhixingList.externalLaborCostEstimation"
437 placeholder="请输入" :disabled="!zhixingBian" /> 437 placeholder="请输入" :disabled="!zhixingBian" />
@@ -439,7 +439,7 @@ @@ -439,7 +439,7 @@
439 </el-col> 439 </el-col>
440 440
441 <el-col :span="8"> 441 <el-col :span="8">
442 - <el-form-item label="实际商品成本(/元)" class="grid-content bg-purple" 442 + <el-form-item label="实际商品成本(元)" class="grid-content bg-purple"
443 prop="name"> 443 prop="name">
444 <el-input v-model="zhixingList.costEstimationGoods" 444 <el-input v-model="zhixingList.costEstimationGoods"
445 placeholder="请输入" :disabled="!zhixingBian" /> 445 placeholder="请输入" :disabled="!zhixingBian" />
@@ -449,21 +449,21 @@ @@ -449,21 +449,21 @@
449 449
450 <el-row :gutter="20"> 450 <el-row :gutter="20">
451 <el-col :span="8"> 451 <el-col :span="8">
452 - <el-form-item label="实际设备成本(/元)" class="grid-content bg-purple" 452 + <el-form-item label="实际设备成本(元)" class="grid-content bg-purple"
453 prop="name"> 453 prop="name">
454 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 454 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
455 :disabled="!zhixingBian" /> 455 :disabled="!zhixingBian" />
456 </el-form-item> 456 </el-form-item>
457 </el-col> 457 </el-col>
458 <el-col :span="8"> 458 <el-col :span="8">
459 - <el-form-item label="实际宣传费用(/元)" class="grid-content bg-purple" 459 + <el-form-item label="实际宣传费用(元)" class="grid-content bg-purple"
460 prop="name"> 460 prop="name">
461 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 461 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
462 placeholder="请输入" :disabled="!zhixingBian" /> 462 placeholder="请输入" :disabled="!zhixingBian" />
463 </el-form-item> 463 </el-form-item>
464 </el-col> 464 </el-col>
465 <el-col :span="8"> 465 <el-col :span="8">
466 - <el-form-item label="实际其他成本(/元)" class="grid-content bg-purple" 466 + <el-form-item label="实际其他成本(元)" class="grid-content bg-purple"
467 prop="name"> 467 prop="name">
468 <el-input v-model="zhixingList.otherNecessaryEstimates" 468 <el-input v-model="zhixingList.otherNecessaryEstimates"
469 placeholder="请输入" :disabled="!zhixingBian" /> 469 placeholder="请输入" :disabled="!zhixingBian" />
@@ -473,7 +473,7 @@ @@ -473,7 +473,7 @@
473 473
474 <el-row :gutter="20"> 474 <el-row :gutter="20">
475 <el-col :span="8"> 475 <el-col :span="8">
476 - <el-form-item label="实际总成本(/元)" prop="name" 476 + <el-form-item label="实际总成本(元)" prop="name"
477 class="grid-content bg-purple"> 477 class="grid-content bg-purple">
478 <el-input v-model="zhixingList.totalCostEstimation" 478 <el-input v-model="zhixingList.totalCostEstimation"
479 placeholder="请输入" :disabled="!zhixingBian" /> 479 placeholder="请输入" :disabled="!zhixingBian" />
@@ -517,7 +517,7 @@ @@ -517,7 +517,7 @@
517 </el-col> 517 </el-col>
518 518
519 <el-col :span="8"> 519 <el-col :span="8">
520 - <el-form-item label="实际直接收益(/元)" class="grid-content bg-purple" 520 + <el-form-item label="实际直接收益(元)" class="grid-content bg-purple"
521 prop="name"> 521 prop="name">
522 <el-input v-model="zhixingList.expectedDirectBenefits" 522 <el-input v-model="zhixingList.expectedDirectBenefits"
523 placeholder="请输入" :disabled="!zhixingBian" /> 523 placeholder="请输入" :disabled="!zhixingBian" />
@@ -526,7 +526,7 @@ @@ -526,7 +526,7 @@
526 </el-row> 526 </el-row>
527 <el-row :gutter="20"> 527 <el-row :gutter="20">
528 <el-col :span="8"> 528 <el-col :span="8">
529 - <el-form-item label="实际间接收益(/元)" class="grid-content bg-purple" 529 + <el-form-item label="实际间接收益(元)" class="grid-content bg-purple"
530 prop="name"> 530 prop="name">
531 <el-input v-model="zhixingList.expectedIndirectBenefits" 531 <el-input v-model="zhixingList.expectedIndirectBenefits"
532 placeholder="请输入" :disabled="!zhixingBian" /> 532 placeholder="请输入" :disabled="!zhixingBian" />
@@ -631,7 +631,7 @@ @@ -631,7 +631,7 @@
631 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 631 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
632 632
633 </el-table-column> 633 </el-table-column>
634 - <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%"> 634 + <el-table-column label="预估费用(元)" prop="estimatedCost" min-width="20%">
635 635
636 </el-table-column> 636 </el-table-column>
637 <el-table-column label="备注" prop="notes" min-width="20%"> 637 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -645,14 +645,14 @@ @@ -645,14 +645,14 @@
645 :labelStyle="labelStyle" :contentStyle="contentStyle"> 645 :labelStyle="labelStyle" :contentStyle="contentStyle">
646 <el-descriptions-item> 646 <el-descriptions-item>
647 <template slot="label"> 647 <template slot="label">
648 - 实际内部人力成本(/元) 648 + 实际内部人力成本(元)
649 </template> 649 </template>
650 650
651 <span>{{duibiList.internalLaborCostEstimation}}</span> 651 <span>{{duibiList.internalLaborCostEstimation}}</span>
652 </el-descriptions-item> 652 </el-descriptions-item>
653 <el-descriptions-item> 653 <el-descriptions-item>
654 <template slot="label"> 654 <template slot="label">
655 - 实际外部人力成本(/元) 655 + 实际外部人力成本(元)
656 </template> 656 </template>
657 <span>{{duibiList.externalLaborCostEstimation}}</span> 657 <span>{{duibiList.externalLaborCostEstimation}}</span>
658 658
@@ -660,35 +660,35 @@ @@ -660,35 +660,35 @@
660 </el-descriptions-item> 660 </el-descriptions-item>
661 <el-descriptions-item> 661 <el-descriptions-item>
662 <template slot="label"> 662 <template slot="label">
663 - 实际商品成本(/元) 663 + 实际商品成本(元)
664 </template> 664 </template>
665 <span>{{duibiList.costEstimationGoods}}</span> 665 <span>{{duibiList.costEstimationGoods}}</span>
666 666
667 </el-descriptions-item> 667 </el-descriptions-item>
668 <el-descriptions-item> 668 <el-descriptions-item>
669 <template slot="label"> 669 <template slot="label">
670 - 实际设备成本(/元) 670 + 实际设备成本(元)
671 </template> 671 </template>
672 <span>{{duibiList.setCostEstimate}}</span> 672 <span>{{duibiList.setCostEstimate}}</span>
673 673
674 </el-descriptions-item> 674 </el-descriptions-item>
675 <el-descriptions-item> 675 <el-descriptions-item>
676 <template slot="label"> 676 <template slot="label">
677 - 实际宣传费用(/元) 677 + 实际宣传费用(元)
678 </template> 678 </template>
679 <span>{{duibiList.estimatedPromotionalExpenses}}</span> 679 <span>{{duibiList.estimatedPromotionalExpenses}}</span>
680 680
681 </el-descriptions-item> 681 </el-descriptions-item>
682 <el-descriptions-item> 682 <el-descriptions-item>
683 <template slot="label"> 683 <template slot="label">
684 - 实际其他成本(/元) 684 + 实际其他成本(元)
685 </template> 685 </template>
686 <span>{{duibiList.otherNecessaryEstimates}}</span> 686 <span>{{duibiList.otherNecessaryEstimates}}</span>
687 687
688 </el-descriptions-item> 688 </el-descriptions-item>
689 <el-descriptions-item> 689 <el-descriptions-item>
690 <template slot="label"> 690 <template slot="label">
691 - 实际总成本(/元) 691 + 实际总成本(元)
692 </template> 692 </template>
693 <span>{{duibiList.totalCostEstimation}}</span> 693 <span>{{duibiList.totalCostEstimation}}</span>
694 694
@@ -724,14 +724,14 @@ @@ -724,14 +724,14 @@
724 </el-descriptions-item> 724 </el-descriptions-item>
725 <el-descriptions-item> 725 <el-descriptions-item>
726 <template slot="label"> 726 <template slot="label">
727 - 实际直接收益(/元) 727 + 实际直接收益(元)
728 </template> 728 </template>
729 <span>{{duibiList.expectedDirectBenefits}}</span> 729 <span>{{duibiList.expectedDirectBenefits}}</span>
730 730
731 </el-descriptions-item> 731 </el-descriptions-item>
732 <el-descriptions-item> 732 <el-descriptions-item>
733 <template slot="label"> 733 <template slot="label">
734 - 实际间接收益(/元) 734 + 实际间接收益(元)
735 </template> 735 </template>
736 <span>{{duibiList.expectedIndirectBenefits}}</span> 736 <span>{{duibiList.expectedIndirectBenefits}}</span>
737 737
@@ -819,7 +819,7 @@ @@ -819,7 +819,7 @@
819 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 819 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
820 820
821 </el-table-column> 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 </el-table-column> 824 </el-table-column>
825 <el-table-column label="备注" prop="notes" min-width="20%"> 825 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -833,14 +833,14 @@ @@ -833,14 +833,14 @@
833 <el-table :data="tableData3" 833 <el-table :data="tableData3"
834 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}" 834 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
835 style="width: 100%;margin: auto;"> 835 style="width: 100%;margin: auto;">
836 - <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name" 836 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(元)" prop="name"
837 min-width="15%"> 837 min-width="15%">
838 </el-table-column> 838 </el-table-column>
839 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme" 839 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
840 min-width="35%"> 840 min-width="35%">
841 841
842 </el-table-column> 842 </el-table-column>
843 - <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text" 843 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(元)" prop="text"
844 min-width="15%"> 844 min-width="15%">
845 845
846 </el-table-column> 846 </el-table-column>
@@ -1020,7 +1020,7 @@ @@ -1020,7 +1020,7 @@
1020 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 1020 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
1021 1021
1022 </el-table-column> 1022 </el-table-column>
1023 - <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%"> 1023 + <el-table-column label="预估费用(元)" prop="estimatedCost" min-width="20%">
1024 1024
1025 </el-table-column> 1025 </el-table-column>
1026 <el-table-column label="备注" prop="notes" min-width="20%"> 1026 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -1034,43 +1034,43 @@ @@ -1034,43 +1034,43 @@
1034 <el-descriptions class="margin-top" :column="2" border :labelStyle="labelStyleOne"> 1034 <el-descriptions class="margin-top" :column="2" border :labelStyle="labelStyleOne">
1035 <el-descriptions-item> 1035 <el-descriptions-item>
1036 <template slot="label"> 1036 <template slot="label">
1037 - 内部人力成本预估(/元) 1037 + 内部人力成本预估(元)
1038 </template> 1038 </template>
1039 {{lixiang.internalLaborCostEstimation}} 1039 {{lixiang.internalLaborCostEstimation}}
1040 </el-descriptions-item> 1040 </el-descriptions-item>
1041 <el-descriptions-item> 1041 <el-descriptions-item>
1042 <template slot="label"> 1042 <template slot="label">
1043 - 外部人力成本预估(/元) 1043 + 外部人力成本预估(元)
1044 </template> 1044 </template>
1045 {{lixiang.externalLaborCostEstimation}} 1045 {{lixiang.externalLaborCostEstimation}}
1046 </el-descriptions-item> 1046 </el-descriptions-item>
1047 <el-descriptions-item> 1047 <el-descriptions-item>
1048 <template slot="label"> 1048 <template slot="label">
1049 - 商品成本预估(/元) 1049 + 商品成本预估(元)
1050 </template> 1050 </template>
1051 {{lixiang.costEstimationGoods}} 1051 {{lixiang.costEstimationGoods}}
1052 </el-descriptions-item> 1052 </el-descriptions-item>
1053 <el-descriptions-item> 1053 <el-descriptions-item>
1054 <template slot="label"> 1054 <template slot="label">
1055 - 设备成本预估(/元) 1055 + 设备成本预估(元)
1056 </template> 1056 </template>
1057 {{lixiang.setCostEstimate}} 1057 {{lixiang.setCostEstimate}}
1058 </el-descriptions-item> 1058 </el-descriptions-item>
1059 <el-descriptions-item> 1059 <el-descriptions-item>
1060 <template slot="label"> 1060 <template slot="label">
1061 - 宣传费用预估(/元) 1061 + 宣传费用预估(元)
1062 </template> 1062 </template>
1063 {{lixiang.estimatedPromotionalExpenses}} 1063 {{lixiang.estimatedPromotionalExpenses}}
1064 </el-descriptions-item> 1064 </el-descriptions-item>
1065 <el-descriptions-item> 1065 <el-descriptions-item>
1066 <template slot="label"> 1066 <template slot="label">
1067 - 其他必要成本预估(/元) 1067 + 其他必要成本预估(元)
1068 </template> 1068 </template>
1069 {{lixiang.otherNecessaryEstimates}} 1069 {{lixiang.otherNecessaryEstimates}}
1070 </el-descriptions-item> 1070 </el-descriptions-item>
1071 <el-descriptions-item> 1071 <el-descriptions-item>
1072 <template slot="label"> 1072 <template slot="label">
1073 - 总成本预估(/元) 1073 + 总成本预估(元)
1074 </template> 1074 </template>
1075 {{lixiang.totalCostEstimation}} 1075 {{lixiang.totalCostEstimation}}
1076 </el-descriptions-item> 1076 </el-descriptions-item>
@@ -1101,13 +1101,13 @@ @@ -1101,13 +1101,13 @@
1101 </el-descriptions-item> 1101 </el-descriptions-item>
1102 <el-descriptions-item> 1102 <el-descriptions-item>
1103 <template slot="label"> 1103 <template slot="label">
1104 - 预计直接收益(/元) 1104 + 预计直接收益(元)
1105 </template> 1105 </template>
1106 {{lixiang.expectedDirectBenefits}} 1106 {{lixiang.expectedDirectBenefits}}
1107 </el-descriptions-item> 1107 </el-descriptions-item>
1108 <el-descriptions-item> 1108 <el-descriptions-item>
1109 <template slot="label"> 1109 <template slot="label">
1110 - 预计间接收益(/元) 1110 + 预计间接收益(元)
1111 </template> 1111 </template>
1112 {{lixiang.expectedIndirectBenefits}} 1112 {{lixiang.expectedIndirectBenefits}}
1113 </el-descriptions-item> 1113 </el-descriptions-item>
@@ -1183,7 +1183,7 @@ @@ -1183,7 +1183,7 @@
1183 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" /> 1183 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
1184 </el-form-item> 1184 </el-form-item>
1185 1185
1186 - <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs"> 1186 + <el-form-item label="预估费用(元)" class="grid-content bg-purple" prop="eventAddrs">
1187 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" /> 1187 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
1188 </el-form-item> 1188 </el-form-item>
1189 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName"> 1189 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
@@ -1662,19 +1662,19 @@ @@ -1662,19 +1662,19 @@
1662 externalLaborCostEstimation: '', 1662 externalLaborCostEstimation: '',
1663 tableData3: [{ 1663 tableData3: [{
1664 id: 0, 1664 id: 0,
1665 - name: '商品成本预估(/元)', 1665 + name: '商品成本预估(元)',
1666 planName: '', 1666 planName: '',
1667 - text: '设备成本预估(/元)', 1667 + text: '设备成本预估(元)',
1668 eventTheme: '' 1668 eventTheme: ''
1669 }, { 1669 }, {
1670 id: 0, 1670 id: 0,
1671 - name: '宣传费用预估(/元)', 1671 + name: '宣传费用预估(元)',
1672 planName: '', 1672 planName: '',
1673 - text: '其他必要成本预估(/元)', 1673 + text: '其他必要成本预估(元)',
1674 eventTheme: '' 1674 eventTheme: ''
1675 }, { 1675 }, {
1676 id: 0, 1676 id: 0,
1677 - name: '总成本预估(/元)', 1677 + name: '总成本预估(元)',
1678 planName: '', 1678 planName: '',
1679 text: '备注', 1679 text: '备注',
1680 eventTheme: '' 1680 eventTheme: ''
@@ -1683,9 +1683,9 @@ @@ -1683,9 +1683,9 @@
1683 expectedParticipation: '', 1683 expectedParticipation: '',
1684 tableData4: [{ 1684 tableData4: [{
1685 id: 0, 1685 id: 0,
1686 - name: '预计直接收益(/元)', 1686 + name: '预计直接收益(元)',
1687 planName: '', 1687 planName: '',
1688 - text: '预计间接收益(/元)', 1688 + text: '预计间接收益(元)',
1689 eventTheme: '-' 1689 eventTheme: '-'
1690 }], 1690 }],
1691 createUser: '', 1691 createUser: '',
@@ -2027,6 +2027,7 @@ @@ -2027,6 +2027,7 @@
2027 this.zhixingList.planTime = [] 2027 this.zhixingList.planTime = []
2028 } else { 2028 } else {
2029 console.log(typeof this.zhixingList.eventStartTime) 2029 console.log(typeof this.zhixingList.eventStartTime)
  2030 +
2030 this.zhixingList.planTime = [this.zhixingList.eventStartTime, this.zhixingList 2031 this.zhixingList.planTime = [this.zhixingList.eventStartTime, this.zhixingList
2031 .eventEndTime 2032 .eventEndTime
2032 ] 2033 ]
@@ -2110,6 +2111,10 @@ @@ -2110,6 +2111,10 @@
2110 }, 2111 },
2111 formTime(data) { 2112 formTime(data) {
2112 this.zhixingList.planTime = data 2113 this.zhixingList.planTime = data
  2114 +
  2115 + },
  2116 + blur(){
  2117 + this.$forceUpdate()
2113 }, 2118 },
2114 removeEmptyValues(obj) { 2119 removeEmptyValues(obj) {
2115 if (typeof obj !== 'object' || obj === null) { 2120 if (typeof obj !== 'object' || obj === null) {
admin-web-master/src/views/activity/activitySp.vue
  View file @98d43fa
@@ -657,7 +657,7 @@ @@ -657,7 +657,7 @@
657 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 657 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
658 658
659 </el-table-column> 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 </el-table-column> 662 </el-table-column>
663 <el-table-column label="备注" prop="notes" min-width="20%"> 663 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -671,14 +671,14 @@ @@ -671,14 +671,14 @@
671 <el-table :data="tableData3" 671 <el-table :data="tableData3"
672 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}" 672 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
673 style="width: 100%;margin: auto;"> 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 min-width="15%"> 675 min-width="15%">
676 </el-table-column> 676 </el-table-column>
677 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme" 677 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
678 min-width="35%"> 678 min-width="35%">
679 679
680 </el-table-column> 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 min-width="15%"> 682 min-width="15%">
683 683
684 </el-table-column> 684 </el-table-column>
@@ -852,7 +852,7 @@ @@ -852,7 +852,7 @@
852 min-width="15%"> 852 min-width="15%">
853 853
854 </el-table-column> 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 </el-table-column> 856 </el-table-column>
857 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 857 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
858 </el-table-column> 858 </el-table-column>
@@ -880,7 +880,7 @@ @@ -880,7 +880,7 @@
880 label-width="120px" style="position: relative"> 880 label-width="120px" style="position: relative">
881 <el-row :gutter="20"> 881 <el-row :gutter="20">
882 <el-col :span="8"> 882 <el-col :span="8">
883 - <el-form-item label="实际内部人力成本(/元)" 883 + <el-form-item label="实际内部人力成本(元)"
884 class="grid-content bg-purple device-from" prop="name"> 884 class="grid-content bg-purple device-from" prop="name">
885 <el-input v-model="zhixingList.internalLaborCostEstimation" 885 <el-input v-model="zhixingList.internalLaborCostEstimation"
886 placeholder="请输入" v-if="zhixingBian" /> 886 placeholder="请输入" v-if="zhixingBian" />
@@ -888,7 +888,7 @@ @@ -888,7 +888,7 @@
888 </el-form-item> 888 </el-form-item>
889 </el-col> 889 </el-col>
890 <el-col :span="8"> 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 prop="name"> 892 prop="name">
893 <el-input v-model="zhixingList.externalLaborCostEstimation" 893 <el-input v-model="zhixingList.externalLaborCostEstimation"
894 placeholder="请输入" v-if="zhixingBian" /> 894 placeholder="请输入" v-if="zhixingBian" />
@@ -897,7 +897,7 @@ @@ -897,7 +897,7 @@
897 </el-col> 897 </el-col>
898 898
899 <el-col :span="8"> 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 <el-input v-model="zhixingList.costEstimationGoods" 901 <el-input v-model="zhixingList.costEstimationGoods"
902 placeholder="请输入" v-if="zhixingBian" /> 902 placeholder="请输入" v-if="zhixingBian" />
903 <div v-else>{{ zhixingList.costEstimationGoods }}</div> 903 <div v-else>{{ zhixingList.costEstimationGoods }}</div>
@@ -907,21 +907,21 @@ @@ -907,21 +907,21 @@
907 907
908 <el-row :gutter="20"> 908 <el-row :gutter="20">
909 <el-col :span="8"> 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 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 911 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
912 v-if="zhixingBian" /> 912 v-if="zhixingBian" />
913 <div v-else>{{ zhixingList.setCostEstimate }}</div> 913 <div v-else>{{ zhixingList.setCostEstimate }}</div>
914 </el-form-item> 914 </el-form-item>
915 </el-col> 915 </el-col>
916 <el-col :span="8"> 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 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 918 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
919 placeholder="请输入" v-if="zhixingBian" /> 919 placeholder="请输入" v-if="zhixingBian" />
920 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div> 920 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div>
921 </el-form-item> 921 </el-form-item>
922 </el-col> 922 </el-col>
923 <el-col :span="8"> 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 <el-input v-model="zhixingList.otherNecessaryEstimates" 925 <el-input v-model="zhixingList.otherNecessaryEstimates"
926 placeholder="请输入" v-if="zhixingBian" /> 926 placeholder="请输入" v-if="zhixingBian" />
927 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div> 927 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div>
@@ -931,7 +931,7 @@ @@ -931,7 +931,7 @@
931 931
932 <el-row :gutter="20"> 932 <el-row :gutter="20">
933 <el-col :span="8"> 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 <el-input v-model="zhixingList.totalCostEstimation" 935 <el-input v-model="zhixingList.totalCostEstimation"
936 placeholder="请输入" v-if="zhixingBian" /> 936 placeholder="请输入" v-if="zhixingBian" />
937 <div v-else>{{ zhixingList.totalCostEstimation }}</div> 937 <div v-else>{{ zhixingList.totalCostEstimation }}</div>
@@ -978,7 +978,7 @@ @@ -978,7 +978,7 @@
978 </el-col> 978 </el-col>
979 979
980 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedDirectBenefits" 982 <el-input v-model="zhixingList.expectedDirectBenefits"
983 placeholder="请输入" v-if="zhixingBian" /> 983 placeholder="请输入" v-if="zhixingBian" />
984 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div> 984 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div>
@@ -987,7 +987,7 @@ @@ -987,7 +987,7 @@
987 </el-row> 987 </el-row>
988 <el-row :gutter="20"> 988 <el-row :gutter="20">
989 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedIndirectBenefits" 991 <el-input v-model="zhixingList.expectedIndirectBenefits"
992 placeholder="请输入" v-if="zhixingBian" /> 992 placeholder="请输入" v-if="zhixingBian" />
993 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div> 993 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div>
@@ -1149,19 +1149,19 @@ @@ -1149,19 +1149,19 @@
1149 externalLaborCostEstimation: '', 1149 externalLaborCostEstimation: '',
1150 tableData3: [{ 1150 tableData3: [{
1151 id: 0, 1151 id: 0,
1152 - name: '商品成本预估(/元)', 1152 + name: '商品成本预估(元)',
1153 planName: '', 1153 planName: '',
1154 - text: '设备成本预估(/元)', 1154 + text: '设备成本预估(元)',
1155 eventTheme: '' 1155 eventTheme: ''
1156 }, { 1156 }, {
1157 id: 0, 1157 id: 0,
1158 - name: '宣传费用预估(/元)', 1158 + name: '宣传费用预估(元)',
1159 planName: '', 1159 planName: '',
1160 - text: '其他必要成本预估(/元)', 1160 + text: '其他必要成本预估(元)',
1161 eventTheme: '' 1161 eventTheme: ''
1162 }, { 1162 }, {
1163 id: 0, 1163 id: 0,
1164 - name: '总成本预估(/元)', 1164 + name: '总成本预估(元)',
1165 planName: '', 1165 planName: '',
1166 text: '备注', 1166 text: '备注',
1167 eventTheme: '' 1167 eventTheme: ''
@@ -1170,9 +1170,9 @@ @@ -1170,9 +1170,9 @@
1170 expectedParticipation: '', 1170 expectedParticipation: '',
1171 tableData4: [{ 1171 tableData4: [{
1172 id: 0, 1172 id: 0,
1173 - name: '预计直接收益(/元)', 1173 + name: '预计直接收益(元)',
1174 planName: '', 1174 planName: '',
1175 - text: '预计间接收益(/元)', 1175 + text: '预计间接收益(元)',
1176 eventTheme: '-' 1176 eventTheme: '-'
1177 }], 1177 }],
1178 createUser: '', 1178 createUser: '',
admin-web-master/src/views/activity/index.vue
  View file @98d43fa
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" /> 157 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
158 </el-form-item> 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 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" /> 161 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
162 </el-form-item> 162 </el-form-item>
163 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName"> 163 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
@@ -660,7 +660,7 @@ @@ -660,7 +660,7 @@
660 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 660 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
661 661
662 </el-table-column> 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 </el-table-column> 665 </el-table-column>
666 <el-table-column label="备注" prop="notes" min-width="20%"> 666 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -674,14 +674,14 @@ @@ -674,14 +674,14 @@
674 <el-table :data="tableData3" 674 <el-table :data="tableData3"
675 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}" 675 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
676 style="width: 100%;margin: auto;"> 676 style="width: 100%;margin: auto;">
677 - <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name" 677 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(元)" prop="name"
678 min-width="18%"> 678 min-width="18%">
679 </el-table-column> 679 </el-table-column>
680 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme" 680 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
681 min-width="35%"> 681 min-width="35%">
682 682
683 </el-table-column> 683 </el-table-column>
684 - <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text" 684 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(元)" prop="text"
685 min-width="18%"> 685 min-width="18%">
686 686
687 </el-table-column> 687 </el-table-column>
@@ -796,7 +796,7 @@ @@ -796,7 +796,7 @@
796 <el-form-item label="实际举办时间" class="grid-content bg-purple" 796 <el-form-item label="实际举办时间" class="grid-content bg-purple"
797 prop="event_start_time" style="position: relative"> 797 prop="event_start_time" style="position: relative">
798 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime" 798 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime"
799 - @input="formTime" value-format="yyyy-MM-dd HH:mm:ss" 799 + @change="formTime" @blur="blur" clear-icon="none" value-format="yyyy-MM-dd HH:mm:ss"
800 v-if="zhixingBian" type="datetimerange" range-separator="至" 800 v-if="zhixingBian" type="datetimerange" range-separator="至"
801 start-placeholder="开始日期" end-placeholder="结束日期" > 801 start-placeholder="开始日期" end-placeholder="结束日期" >
802 </el-date-picker> 802 </el-date-picker>
@@ -851,7 +851,7 @@ @@ -851,7 +851,7 @@
851 <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%"> 851 <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%">
852 852
853 </el-table-column> 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 </el-table-column> 855 </el-table-column>
856 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 856 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
857 </el-table-column> 857 </el-table-column>
@@ -879,7 +879,7 @@ @@ -879,7 +879,7 @@
879 label-width="120px" style="position: relative"> 879 label-width="120px" style="position: relative">
880 <el-row :gutter="20"> 880 <el-row :gutter="20">
881 <el-col :span="8"> 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 prop="name"> 883 prop="name">
884 884
885 <el-input v-model="zhixingList.internalLaborCostEstimation" 885 <el-input v-model="zhixingList.internalLaborCostEstimation"
@@ -888,7 +888,7 @@ @@ -888,7 +888,7 @@
888 </el-form-item> 888 </el-form-item>
889 </el-col> 889 </el-col>
890 <el-col :span="8"> 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 <el-input v-model="zhixingList.externalLaborCostEstimation" 892 <el-input v-model="zhixingList.externalLaborCostEstimation"
893 placeholder="请输入" v-if="zhixingBian" /> 893 placeholder="请输入" v-if="zhixingBian" />
894 <div v-else>{{ zhixingList.externalLaborCostEstimation }}</div> 894 <div v-else>{{ zhixingList.externalLaborCostEstimation }}</div>
@@ -896,7 +896,7 @@ @@ -896,7 +896,7 @@
896 </el-col> 896 </el-col>
897 897
898 <el-col :span="8"> 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 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" 900 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
901 v-if="zhixingBian" /> 901 v-if="zhixingBian" />
902 <div v-else>{{ zhixingList.costEstimationGoods }}</div> 902 <div v-else>{{ zhixingList.costEstimationGoods }}</div>
@@ -906,21 +906,21 @@ @@ -906,21 +906,21 @@
906 906
907 <el-row :gutter="20"> 907 <el-row :gutter="20">
908 <el-col :span="8"> 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 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 910 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
911 v-if="zhixingBian" /> 911 v-if="zhixingBian" />
912 <div v-else>{{ zhixingList.setCostEstimate }}</div> 912 <div v-else>{{ zhixingList.setCostEstimate }}</div>
913 </el-form-item> 913 </el-form-item>
914 </el-col> 914 </el-col>
915 <el-col :span="8"> 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 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 917 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
918 placeholder="请输入" v-if="zhixingBian" /> 918 placeholder="请输入" v-if="zhixingBian" />
919 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div> 919 <div v-else>{{ zhixingList.estimatedPromotionalExpenses }}</div>
920 </el-form-item> 920 </el-form-item>
921 </el-col> 921 </el-col>
922 <el-col :span="8"> 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 <el-input v-model="zhixingList.otherNecessaryEstimates" 924 <el-input v-model="zhixingList.otherNecessaryEstimates"
925 placeholder="请输入" v-if="zhixingBian" /> 925 placeholder="请输入" v-if="zhixingBian" />
926 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div> 926 <div v-else>{{ zhixingList.otherNecessaryEstimates }}</div>
@@ -930,7 +930,7 @@ @@ -930,7 +930,7 @@
930 930
931 <el-row :gutter="20"> 931 <el-row :gutter="20">
932 <el-col :span="8"> 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 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" 934 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
935 v-if="zhixingBian" /> 935 v-if="zhixingBian" />
936 <div v-else>{{ zhixingList.totalCostEstimation }}</div> 936 <div v-else>{{ zhixingList.totalCostEstimation }}</div>
@@ -977,7 +977,7 @@ @@ -977,7 +977,7 @@
977 </el-col> 977 </el-col>
978 978
979 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" 981 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
982 v-if="zhixingBian" /> 982 v-if="zhixingBian" />
983 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div> 983 <div v-else>{{ zhixingList.expectedDirectBenefits }}</div>
@@ -986,7 +986,7 @@ @@ -986,7 +986,7 @@
986 </el-row> 986 </el-row>
987 <el-row :gutter="20"> 987 <el-row :gutter="20">
988 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedIndirectBenefits" 990 <el-input v-model="zhixingList.expectedIndirectBenefits"
991 placeholder="请输入" v-if="zhixingBian" /> 991 placeholder="请输入" v-if="zhixingBian" />
992 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div> 992 <div v-else>{{ zhixingList.expectedIndirectBenefits }}</div>
@@ -1170,19 +1170,19 @@ @@ -1170,19 +1170,19 @@
1170 externalLaborCostEstimation: '', 1170 externalLaborCostEstimation: '',
1171 tableData3: [{ 1171 tableData3: [{
1172 id: 0, 1172 id: 0,
1173 - name: '商品成本预估(/元)', 1173 + name: '商品成本预估(元)',
1174 planName: '', 1174 planName: '',
1175 - text: '设备成本预估(/元)', 1175 + text: '设备成本预估(元)',
1176 eventTheme: '' 1176 eventTheme: ''
1177 }, { 1177 }, {
1178 id: 0, 1178 id: 0,
1179 - name: '宣传费用预估(/元)', 1179 + name: '宣传费用预估(元)',
1180 planName: '', 1180 planName: '',
1181 - text: '其他必要成本预估(/元)', 1181 + text: '其他必要成本预估(元)',
1182 eventTheme: '' 1182 eventTheme: ''
1183 }, { 1183 }, {
1184 id: 0, 1184 id: 0,
1185 - name: '总成本预估(/元)', 1185 + name: '总成本预估(元)',
1186 planName: '', 1186 planName: '',
1187 text: '备注', 1187 text: '备注',
1188 eventTheme: '' 1188 eventTheme: ''
@@ -1191,9 +1191,9 @@ @@ -1191,9 +1191,9 @@
1191 expectedParticipation: '', 1191 expectedParticipation: '',
1192 tableData4: [{ 1192 tableData4: [{
1193 id: 0, 1193 id: 0,
1194 - name: '预计直接收益(/元)', 1194 + name: '预计直接收益(元)',
1195 planName: '', 1195 planName: '',
1196 - text: '预计间接收益(/元)', 1196 + text: '预计间接收益(元)',
1197 eventTheme: '-' 1197 eventTheme: '-'
1198 }], 1198 }],
1199 createUser: '', 1199 createUser: '',
@@ -1592,6 +1592,9 @@ @@ -1592,6 +1592,9 @@
1592 formTime(data) { 1592 formTime(data) {
1593 this.zhixingList.planTime = data 1593 this.zhixingList.planTime = data
1594 }, 1594 },
  1595 + blur(){
  1596 + this.$forceUpdate()
  1597 + },
1595 removeEmptyValues(obj) { 1598 removeEmptyValues(obj) {
1596 if (typeof obj !== 'object' || obj === null) { 1599 if (typeof obj !== 'object' || obj === null) {
1597 return obj; 1600 return obj;
admin-web-master/src/views/atmosphere/atmosphereBian.vue
  View file @98d43fa
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 117 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
118 118
119 </el-table-column> 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 </el-table-column> 121 </el-table-column>
122 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 122 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
123 </el-table-column> 123 </el-table-column>
@@ -142,18 +142,18 @@ @@ -142,18 +142,18 @@
142 style="position: relative"> 142 style="position: relative">
143 <el-row :gutter="20"> 143 <el-row :gutter="20">
144 <el-col :span="8"> 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 <el-input v-model="secondData.internalLaborCostEstimation" placeholder="请输入" /> 146 <el-input v-model="secondData.internalLaborCostEstimation" placeholder="请输入" />
147 </el-form-item> 147 </el-form-item>
148 </el-col> 148 </el-col>
149 <el-col :span="8"> 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 <el-input v-model="secondData.externalLaborCostEstimation" placeholder="请输入" /> 151 <el-input v-model="secondData.externalLaborCostEstimation" placeholder="请输入" />
152 </el-form-item> 152 </el-form-item>
153 </el-col> 153 </el-col>
154 154
155 <el-col :span="8"> 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 <el-input v-model="secondData.costEstimationGoods" placeholder="请输入" /> 157 <el-input v-model="secondData.costEstimationGoods" placeholder="请输入" />
158 </el-form-item> 158 </el-form-item>
159 </el-col> 159 </el-col>
@@ -161,17 +161,17 @@ @@ -161,17 +161,17 @@
161 161
162 <el-row :gutter="20"> 162 <el-row :gutter="20">
163 <el-col :span="8"> 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 <el-input v-model="secondData.setCostEstimate" placeholder="请输入" /> 165 <el-input v-model="secondData.setCostEstimate" placeholder="请输入" />
166 </el-form-item> 166 </el-form-item>
167 </el-col> 167 </el-col>
168 <el-col :span="8"> 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 <el-input v-model="secondData.estimatedPromotionalExpenses" placeholder="请输入" /> 170 <el-input v-model="secondData.estimatedPromotionalExpenses" placeholder="请输入" />
171 </el-form-item> 171 </el-form-item>
172 </el-col> 172 </el-col>
173 <el-col :span="8"> 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 <el-input v-model="secondData.otherNecessaryEstimates" placeholder="请输入" /> 175 <el-input v-model="secondData.otherNecessaryEstimates" placeholder="请输入" />
176 </el-form-item> 176 </el-form-item>
177 </el-col> 177 </el-col>
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
179 179
180 <el-row :gutter="20"> 180 <el-row :gutter="20">
181 <el-col :span="8"> 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 <el-input v-model="secondData.totalCostEstimation" placeholder="请输入" /> 183 <el-input v-model="secondData.totalCostEstimation" placeholder="请输入" />
184 </el-form-item> 184 </el-form-item>
185 </el-col> 185 </el-col>
@@ -217,14 +217,14 @@ @@ -217,14 +217,14 @@
217 </el-col> 217 </el-col>
218 218
219 <el-col :span="8"> 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 <el-input v-model="secondData.expectedDirectBenefits" placeholder="请输入" /> 221 <el-input v-model="secondData.expectedDirectBenefits" placeholder="请输入" />
222 </el-form-item> 222 </el-form-item>
223 </el-col> 223 </el-col>
224 </el-row> 224 </el-row>
225 <el-row :gutter="20"> 225 <el-row :gutter="20">
226 <el-col :span="8"> 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 <el-input v-model="secondData.expectedIndirectBenefits" placeholder="请输入" /> 228 <el-input v-model="secondData.expectedIndirectBenefits" placeholder="请输入" />
229 </el-form-item> 229 </el-form-item>
230 </el-col> 230 </el-col>
@@ -296,7 +296,7 @@ @@ -296,7 +296,7 @@
296 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" /> 296 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
297 </el-form-item> 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 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" /> 300 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
301 </el-form-item> 301 </el-form-item>
302 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName"> 302 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @98d43fa
@@ -154,7 +154,7 @@ @@ -154,7 +154,7 @@
154 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 154 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
155 155
156 </el-table-column> 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 </el-table-column>
160 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 160 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
@@ -181,14 +181,14 @@ @@ -181,14 +181,14 @@
181 label-width="180px" style="position: relative"> 181 label-width="180px" style="position: relative">
182 <el-row :gutter="20"> 182 <el-row :gutter="20">
183 <el-col :span="12"> 183 <el-col :span="12">
184 - <el-form-item label="内部人力成本预估(/元)" class="grid-content bg-purple device-from" 184 + <el-form-item label="内部人力成本预估(元)" class="grid-content bg-purple device-from"
185 prop="internalLaborCostEstimation"> 185 prop="internalLaborCostEstimation">
186 <el-input v-model="ruleForm.internalLaborCostEstimation" 186 <el-input v-model="ruleForm.internalLaborCostEstimation"
187 placeholder="请输入" /> 187 placeholder="请输入" />
188 </el-form-item> 188 </el-form-item>
189 </el-col> 189 </el-col>
190 <el-col :span="12"> 190 <el-col :span="12">
191 - <el-form-item label="外部人力成本预估(/元)" class="grid-content bg-purple" 191 + <el-form-item label="外部人力成本预估(元)" class="grid-content bg-purple"
192 prop="externalLaborCostEstimation"> 192 prop="externalLaborCostEstimation">
193 <el-input v-model="ruleForm.externalLaborCostEstimation" 193 <el-input v-model="ruleForm.externalLaborCostEstimation"
194 placeholder="请输入" /> 194 placeholder="请输入" />
@@ -200,13 +200,13 @@ @@ -200,13 +200,13 @@
200 200
201 <el-row :gutter="20"> 201 <el-row :gutter="20">
202 <el-col :span="12"> 202 <el-col :span="12">
203 - <el-form-item label="商品成本预估(/元)" class="grid-content bg-purple" 203 + <el-form-item label="商品成本预估(元)" class="grid-content bg-purple"
204 prop="costEstimationGoods"> 204 prop="costEstimationGoods">
205 <el-input v-model="ruleForm.costEstimationGoods" placeholder="请输入" /> 205 <el-input v-model="ruleForm.costEstimationGoods" placeholder="请输入" />
206 </el-form-item> 206 </el-form-item>
207 </el-col> 207 </el-col>
208 <el-col :span="12"> 208 <el-col :span="12">
209 - <el-form-item label="设备成本预估(/元)" class="grid-content bg-purple" 209 + <el-form-item label="设备成本预估(元)" class="grid-content bg-purple"
210 prop="setCostEstimate"> 210 prop="setCostEstimate">
211 <el-input v-model="ruleForm.setCostEstimate" placeholder="请输入" /> 211 <el-input v-model="ruleForm.setCostEstimate" placeholder="请输入" />
212 </el-form-item> 212 </el-form-item>
@@ -218,14 +218,14 @@ @@ -218,14 +218,14 @@
218 218
219 219
220 <el-col :span="12"> 220 <el-col :span="12">
221 - <el-form-item label="宣传费用预估(/元)" class="grid-content bg-purple" 221 + <el-form-item label="宣传费用预估(元)" class="grid-content bg-purple"
222 prop="estimatedPromotionalExpenses"> 222 prop="estimatedPromotionalExpenses">
223 <el-input v-model="ruleForm.estimatedPromotionalExpenses" 223 <el-input v-model="ruleForm.estimatedPromotionalExpenses"
224 placeholder="请输入" /> 224 placeholder="请输入" />
225 </el-form-item> 225 </el-form-item>
226 </el-col> 226 </el-col>
227 <el-col :span="12"> 227 <el-col :span="12">
228 - <el-form-item label="其他必要成本预估(/元)" class="grid-content bg-purple" 228 + <el-form-item label="其他必要成本预估(元)" class="grid-content bg-purple"
229 prop="otherNecessaryEstimates"> 229 prop="otherNecessaryEstimates">
230 <el-input v-model="ruleForm.otherNecessaryEstimates" 230 <el-input v-model="ruleForm.otherNecessaryEstimates"
231 placeholder="请输入" /> 231 placeholder="请输入" />
@@ -234,7 +234,7 @@ @@ -234,7 +234,7 @@
234 </el-row> 234 </el-row>
235 <el-row :gutter="20"> 235 <el-row :gutter="20">
236 <el-col :span="12"> 236 <el-col :span="12">
237 - <el-form-item label="总成本预估(/元)" prop="totalCostEstimation" 237 + <el-form-item label="总成本预估(元)" prop="totalCostEstimation"
238 class="grid-content bg-purple"> 238 class="grid-content bg-purple">
239 <el-input v-model="ruleForm.totalCostEstimation" placeholder="请输入" /> 239 <el-input v-model="ruleForm.totalCostEstimation" placeholder="请输入" />
240 </el-form-item> 240 </el-form-item>
@@ -277,13 +277,13 @@ @@ -277,13 +277,13 @@
277 </el-row> 277 </el-row>
278 <el-row :gutter="20"> 278 <el-row :gutter="20">
279 <el-col :span="12"> 279 <el-col :span="12">
280 - <el-form-item label="预计直接收益(/元)" class="grid-content bg-purple" 280 + <el-form-item label="预计直接收益(元)" class="grid-content bg-purple"
281 prop="expectedDirectBenefits"> 281 prop="expectedDirectBenefits">
282 <el-input v-model="ruleForm.expectedDirectBenefits" placeholder="请输入" /> 282 <el-input v-model="ruleForm.expectedDirectBenefits" placeholder="请输入" />
283 </el-form-item> 283 </el-form-item>
284 </el-col> 284 </el-col>
285 <el-col :span="12"> 285 <el-col :span="12">
286 - <el-form-item label="预计间接收益(/元)" class="grid-content bg-purple" 286 + <el-form-item label="预计间接收益(元)" class="grid-content bg-purple"
287 prop="expectedIndirectBenefits"> 287 prop="expectedIndirectBenefits">
288 <el-input v-model="ruleForm.expectedIndirectBenefits" 288 <el-input v-model="ruleForm.expectedIndirectBenefits"
289 placeholder="请输入" /> 289 placeholder="请输入" />
@@ -359,7 +359,7 @@ @@ -359,7 +359,7 @@
359 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" /> 359 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
360 </el-form-item> 360 </el-form-item>
361 361
362 - <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs"> 362 + <el-form-item label="预估费用(元)" class="grid-content bg-purple" prop="eventAddrs">
363 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" /> 363 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
364 </el-form-item> 364 </el-form-item>
365 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName"> 365 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
@@ -714,7 +714,7 @@ @@ -714,7 +714,7 @@
714 for (let i = 0; i < this.tableData.length; i++) { 714 for (let i = 0; i < this.tableData.length; i++) {
715 this.tableData[i].detailsId = res.data.id 715 this.tableData[i].detailsId = res.data.id
716 MingAdd(this.tableData[i]).then(res => { 716 MingAdd(this.tableData[i]).then(res => {
717 - console.log('成功') 717 +
718 }) 718 })
719 } 719 }
720 for (let i = 0; i < this.dataList.length; i++) { 720 for (let i = 0; i < this.dataList.length; i++) {
@@ -724,7 +724,7 @@ @@ -724,7 +724,7 @@
724 attachmentUrl: this.dataList[i].response.data.url, 724 attachmentUrl: this.dataList[i].response.data.url,
725 } 725 }
726 fujiaAdd(fuji).then(res => { 726 fujiaAdd(fuji).then(res => {
727 - console.log('成功') 727 +
728 }) 728 })
729 } 729 }
730 730
@@ -754,7 +754,6 @@ @@ -754,7 +754,6 @@
754 // .then(data => console.log(data)) 754 // .then(data => console.log(data))
755 // .catch(error => console.log(error)); 755 // .catch(error => console.log(error));
756 756
757 - this.$emit('childClose', false);  
758 this.$refs.editor.html = '<p><br></p>' 757 this.$refs.editor.html = '<p><br></p>'
759 this.ruleForm = { 758 this.ruleForm = {
760 classificationCode: '', 759 classificationCode: '',
@@ -784,9 +783,8 @@ @@ -784,9 +783,8 @@
784 createDate: '', //创建时间 783 createDate: '', //创建时间
785 solutionEditor: null, 784 solutionEditor: null,
786 } 785 }
787 - }).catch(err => {  
788 - console.log(err)  
789 }) 786 })
  787 + this.$emit('childClose', false);
790 } else { 788 } else {
791 this.$message({ 789 this.$message({
792 message: '请填写数据', 790 message: '请填写数据',
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @98d43fa
@@ -653,7 +653,7 @@ @@ -653,7 +653,7 @@
653 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 653 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
654 654
655 </el-table-column> 655 </el-table-column>
656 - <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%"> 656 + <el-table-column label="预估费用(元)" prop="estimatedCost" min-width="20%">
657 657
658 </el-table-column> 658 </el-table-column>
659 <el-table-column label="备注" prop="notes" min-width="20%"> 659 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -667,14 +667,14 @@ @@ -667,14 +667,14 @@
667 <el-table :data="tableData3" 667 <el-table :data="tableData3"
668 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}" 668 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
669 style="width: 100%;margin: auto;"> 669 style="width: 100%;margin: auto;">
670 - <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name" 670 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(元)" prop="name"
671 min-width="15%"> 671 min-width="15%">
672 </el-table-column> 672 </el-table-column>
673 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme" 673 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
674 min-width="35%"> 674 min-width="35%">
675 675
676 </el-table-column> 676 </el-table-column>
677 - <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text" 677 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(元)" prop="text"
678 min-width="15%"> 678 min-width="15%">
679 679
680 </el-table-column> 680 </el-table-column>
@@ -859,7 +859,7 @@ @@ -859,7 +859,7 @@
859 prop="event_start_time" style="position: relative"> 859 prop="event_start_time" style="position: relative">
860 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime" 860 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime"
861 value-format="yyyy-MM-dd HH:mm:ss" :disabled="!zhixingBian" 861 value-format="yyyy-MM-dd HH:mm:ss" :disabled="!zhixingBian"
862 - @input="formTime" type="datetimerange" range-separator="至" 862 + @change="formTime" @blur="blur" clear-icon="none" type="datetimerange" range-separator="至"
863 start-placeholder="开始日期" end-placeholder="结束日期" align="right"> 863 start-placeholder="开始日期" end-placeholder="结束日期" align="right">
864 </el-date-picker> 864 </el-date-picker>
865 </el-form-item> 865 </el-form-item>
@@ -910,7 +910,7 @@ @@ -910,7 +910,7 @@
910 <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%"> 910 <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%">
911 911
912 </el-table-column> 912 </el-table-column>
913 - <el-table-column label="实际费用(/元)" prop="estimatedCost" width="auto" min-width="15%"> 913 + <el-table-column label="实际费用(元)" prop="estimatedCost" width="auto" min-width="15%">
914 </el-table-column> 914 </el-table-column>
915 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 915 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
916 </el-table-column> 916 </el-table-column>
@@ -937,14 +937,14 @@ @@ -937,14 +937,14 @@
937 label-width="120px" style="position: relative"> 937 label-width="120px" style="position: relative">
938 <el-row :gutter="20"> 938 <el-row :gutter="20">
939 <el-col :span="8"> 939 <el-col :span="8">
940 - <el-form-item label="实际内部人力成本(/元)" 940 + <el-form-item label="实际内部人力成本(元)"
941 class="grid-content bg-purple device-from" prop="name"> 941 class="grid-content bg-purple device-from" prop="name">
942 <el-input v-model="zhixingList.internalLaborCostEstimation" 942 <el-input v-model="zhixingList.internalLaborCostEstimation"
943 placeholder="请输入" :disabled="!zhixingBian" /> 943 placeholder="请输入" :disabled="!zhixingBian" />
944 </el-form-item> 944 </el-form-item>
945 </el-col> 945 </el-col>
946 <el-col :span="8"> 946 <el-col :span="8">
947 - <el-form-item label="实际外部人力成本(/元)" class="grid-content bg-purple" 947 + <el-form-item label="实际外部人力成本(元)" class="grid-content bg-purple"
948 prop="name"> 948 prop="name">
949 <el-input v-model="zhixingList.externalLaborCostEstimation" 949 <el-input v-model="zhixingList.externalLaborCostEstimation"
950 placeholder="请输入" :disabled="!zhixingBian" /> 950 placeholder="请输入" :disabled="!zhixingBian" />
@@ -952,7 +952,7 @@ @@ -952,7 +952,7 @@
952 </el-col> 952 </el-col>
953 953
954 <el-col :span="8"> 954 <el-col :span="8">
955 - <el-form-item label="实际商品成本(/元)" class="grid-content bg-purple" prop="name"> 955 + <el-form-item label="实际商品成本(元)" class="grid-content bg-purple" prop="name">
956 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" 956 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
957 :disabled="!zhixingBian" /> 957 :disabled="!zhixingBian" />
958 </el-form-item> 958 </el-form-item>
@@ -961,19 +961,19 @@ @@ -961,19 +961,19 @@
961 961
962 <el-row :gutter="20"> 962 <el-row :gutter="20">
963 <el-col :span="8"> 963 <el-col :span="8">
964 - <el-form-item label="实际设备成本(/元)" class="grid-content bg-purple" prop="name"> 964 + <el-form-item label="实际设备成本(元)" class="grid-content bg-purple" prop="name">
965 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 965 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
966 :disabled="!zhixingBian" /> 966 :disabled="!zhixingBian" />
967 </el-form-item> 967 </el-form-item>
968 </el-col> 968 </el-col>
969 <el-col :span="8"> 969 <el-col :span="8">
970 - <el-form-item label="实际宣传费用(/元)" class="grid-content bg-purple" prop="name"> 970 + <el-form-item label="实际宣传费用(元)" class="grid-content bg-purple" prop="name">
971 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 971 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
972 placeholder="请输入" :disabled="!zhixingBian" /> 972 placeholder="请输入" :disabled="!zhixingBian" />
973 </el-form-item> 973 </el-form-item>
974 </el-col> 974 </el-col>
975 <el-col :span="8"> 975 <el-col :span="8">
976 - <el-form-item label="实际其他成本(/元)" class="grid-content bg-purple" prop="name"> 976 + <el-form-item label="实际其他成本(元)" class="grid-content bg-purple" prop="name">
977 <el-input v-model="zhixingList.otherNecessaryEstimates" 977 <el-input v-model="zhixingList.otherNecessaryEstimates"
978 placeholder="请输入" :disabled="!zhixingBian" /> 978 placeholder="请输入" :disabled="!zhixingBian" />
979 </el-form-item> 979 </el-form-item>
@@ -982,7 +982,7 @@ @@ -982,7 +982,7 @@
982 982
983 <el-row :gutter="20"> 983 <el-row :gutter="20">
984 <el-col :span="8"> 984 <el-col :span="8">
985 - <el-form-item label="实际总成本(/元)" prop="name" class="grid-content bg-purple"> 985 + <el-form-item label="实际总成本(元)" prop="name" class="grid-content bg-purple">
986 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" 986 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
987 :disabled="!zhixingBian" /> 987 :disabled="!zhixingBian" />
988 </el-form-item> 988 </el-form-item>
@@ -1025,7 +1025,7 @@ @@ -1025,7 +1025,7 @@
1025 </el-col> 1025 </el-col>
1026 1026
1027 <el-col :span="8"> 1027 <el-col :span="8">
1028 - <el-form-item label="实际直接收益(/元)" class="grid-content bg-purple" prop="name"> 1028 + <el-form-item label="实际直接收益(元)" class="grid-content bg-purple" prop="name">
1029 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" 1029 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
1030 :disabled="!zhixingBian" /> 1030 :disabled="!zhixingBian" />
1031 </el-form-item> 1031 </el-form-item>
@@ -1033,7 +1033,7 @@ @@ -1033,7 +1033,7 @@
1033 </el-row> 1033 </el-row>
1034 <el-row :gutter="20"> 1034 <el-row :gutter="20">
1035 <el-col :span="8"> 1035 <el-col :span="8">
1036 - <el-form-item label="实际间接收益(/元)" class="grid-content bg-purple" prop="name"> 1036 + <el-form-item label="实际间接收益(元)" class="grid-content bg-purple" prop="name">
1037 <el-input v-model="zhixingList.expectedIndirectBenefits" 1037 <el-input v-model="zhixingList.expectedIndirectBenefits"
1038 placeholder="请输入" :disabled="!zhixingBian" /> 1038 placeholder="请输入" :disabled="!zhixingBian" />
1039 </el-form-item> 1039 </el-form-item>
@@ -1213,19 +1213,19 @@ @@ -1213,19 +1213,19 @@
1213 externalLaborCostEstimation: '', 1213 externalLaborCostEstimation: '',
1214 tableData3: [{ 1214 tableData3: [{
1215 id: 0, 1215 id: 0,
1216 - name: '商品成本预估(/元)', 1216 + name: '商品成本预估(元)',
1217 planName: '', 1217 planName: '',
1218 - text: '设备成本预估(/元)', 1218 + text: '设备成本预估(元)',
1219 eventTheme: '' 1219 eventTheme: ''
1220 }, { 1220 }, {
1221 id: 0, 1221 id: 0,
1222 - name: '宣传费用预估(/元)', 1222 + name: '宣传费用预估(元)',
1223 planName: '', 1223 planName: '',
1224 - text: '其他必要成本预估(/元)', 1224 + text: '其他必要成本预估(元)',
1225 eventTheme: '' 1225 eventTheme: ''
1226 }, { 1226 }, {
1227 id: 0, 1227 id: 0,
1228 - name: '总成本预估(/元)', 1228 + name: '总成本预估(元)',
1229 planName: '', 1229 planName: '',
1230 text: '备注', 1230 text: '备注',
1231 eventTheme: '' 1231 eventTheme: ''
@@ -1234,9 +1234,9 @@ @@ -1234,9 +1234,9 @@
1234 expectedParticipation: '', 1234 expectedParticipation: '',
1235 tableData4: [{ 1235 tableData4: [{
1236 id: 0, 1236 id: 0,
1237 - name: '预计直接收益(/元)', 1237 + name: '预计直接收益(元)',
1238 planName: '', 1238 planName: '',
1239 - text: '预计间接收益(/元)', 1239 + text: '预计间接收益(元)',
1240 eventTheme: '-' 1240 eventTheme: '-'
1241 }], 1241 }],
1242 createDate: '', 1242 createDate: '',
@@ -1515,6 +1515,9 @@ @@ -1515,6 +1515,9 @@
1515 formTime(data) { 1515 formTime(data) {
1516 this.zhixingList.planTime = data 1516 this.zhixingList.planTime = data
1517 }, 1517 },
  1518 + blur(){
  1519 + this.$forceUpdate()
  1520 + },
1518 //执行效果保存 1521 //执行效果保存
1519 bianji() { 1522 bianji() {
1520 this.$refs.zhixingFormInfo.validate((valid) => { 1523 this.$refs.zhixingFormInfo.validate((valid) => {
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @98d43fa
@@ -314,7 +314,7 @@ @@ -314,7 +314,7 @@
314 </div> 314 </div>
315 </div> 315 </div>
316 <div style="padding: 20px 40px 20px 20px"> 316 <div style="padding: 20px 40px 20px 20px">
317 - <el-form label-position="top" :rules="zhixingRules" :model="zhixingList" 317 + <el-form label-position="top" ref="zhixingFormInfo" :rules="zhixingRules" :model="zhixingList"
318 label-width="120px" style="position: relative"> 318 label-width="120px" style="position: relative">
319 <el-row :gutter="20"> 319 <el-row :gutter="20">
320 <el-col :span="8"> 320 <el-col :span="8">
@@ -335,7 +335,7 @@ @@ -335,7 +335,7 @@
335 <el-form-item label="实际举办时间" class="grid-content bg-purple" 335 <el-form-item label="实际举办时间" class="grid-content bg-purple"
336 prop="event_start_time" style="position: relative"> 336 prop="event_start_time" style="position: relative">
337 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime" 337 <el-date-picker style="width: 100%;" v-model="zhixingList.planTime"
338 - @input="formTime" value-format="yyyy-MM-dd HH:mm:ss" 338 + @change="formTime" @blur="blur" clear-icon="none" value-format="yyyy-MM-dd HH:mm:ss"
339 :disabled="!zhixingBian" type="datetimerange" range-separator="至" 339 :disabled="!zhixingBian" type="datetimerange" range-separator="至"
340 start-placeholder="开始日期" end-placeholder="结束日期" align="right"> 340 start-placeholder="开始日期" end-placeholder="结束日期" align="right">
341 </el-date-picker> 341 </el-date-picker>
@@ -387,7 +387,7 @@ @@ -387,7 +387,7 @@
387 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%"> 387 <el-table-column label="预估数量" prop="estimatedQuantity" width="auto" min-width="15%">
388 388
389 </el-table-column> 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 </el-table-column> 391 </el-table-column>
392 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 392 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
393 </el-table-column> 393 </el-table-column>
@@ -415,21 +415,21 @@ @@ -415,21 +415,21 @@
415 label-width="120px" style="position: relative"> 415 label-width="120px" style="position: relative">
416 <el-row :gutter="20"> 416 <el-row :gutter="20">
417 <el-col :span="8"> 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 prop="name"> 419 prop="name">
420 <el-input v-model="zhixingList.internalLaborCostEstimation" 420 <el-input v-model="zhixingList.internalLaborCostEstimation"
421 placeholder="请输入" :disabled="!zhixingBian" /> 421 placeholder="请输入" :disabled="!zhixingBian" />
422 </el-form-item> 422 </el-form-item>
423 </el-col> 423 </el-col>
424 <el-col :span="8"> 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 <el-input v-model="zhixingList.externalLaborCostEstimation" 426 <el-input v-model="zhixingList.externalLaborCostEstimation"
427 placeholder="请输入" :disabled="!zhixingBian" /> 427 placeholder="请输入" :disabled="!zhixingBian" />
428 </el-form-item> 428 </el-form-item>
429 </el-col> 429 </el-col>
430 430
431 <el-col :span="8"> 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 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" 433 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入"
434 :disabled="!zhixingBian" /> 434 :disabled="!zhixingBian" />
435 </el-form-item> 435 </el-form-item>
@@ -438,19 +438,19 @@ @@ -438,19 +438,19 @@
438 438
439 <el-row :gutter="20"> 439 <el-row :gutter="20">
440 <el-col :span="8"> 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 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" 442 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入"
443 :disabled="!zhixingBian" /> 443 :disabled="!zhixingBian" />
444 </el-form-item> 444 </el-form-item>
445 </el-col> 445 </el-col>
446 <el-col :span="8"> 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 <el-input v-model="zhixingList.estimatedPromotionalExpenses" 448 <el-input v-model="zhixingList.estimatedPromotionalExpenses"
449 placeholder="请输入" :disabled="!zhixingBian" /> 449 placeholder="请输入" :disabled="!zhixingBian" />
450 </el-form-item> 450 </el-form-item>
451 </el-col> 451 </el-col>
452 <el-col :span="8"> 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 <el-input v-model="zhixingList.otherNecessaryEstimates" 454 <el-input v-model="zhixingList.otherNecessaryEstimates"
455 placeholder="请输入" :disabled="!zhixingBian" /> 455 placeholder="请输入" :disabled="!zhixingBian" />
456 </el-form-item> 456 </el-form-item>
@@ -459,7 +459,7 @@ @@ -459,7 +459,7 @@
459 459
460 <el-row :gutter="20"> 460 <el-row :gutter="20">
461 <el-col :span="8"> 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 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" 463 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入"
464 :disabled="!zhixingBian" /> 464 :disabled="!zhixingBian" />
465 </el-form-item> 465 </el-form-item>
@@ -502,7 +502,7 @@ @@ -502,7 +502,7 @@
502 </el-col> 502 </el-col>
503 503
504 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" 506 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入"
507 :disabled="!zhixingBian" /> 507 :disabled="!zhixingBian" />
508 </el-form-item> 508 </el-form-item>
@@ -510,7 +510,7 @@ @@ -510,7 +510,7 @@
510 </el-row> 510 </el-row>
511 <el-row :gutter="20"> 511 <el-row :gutter="20">
512 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedIndirectBenefits" 514 <el-input v-model="zhixingList.expectedIndirectBenefits"
515 placeholder="请输入" :disabled="!zhixingBian" /> 515 placeholder="请输入" :disabled="!zhixingBian" />
516 </el-form-item> 516 </el-form-item>
@@ -612,7 +612,7 @@ @@ -612,7 +612,7 @@
612 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 612 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
613 613
614 </el-table-column> 614 </el-table-column>
615 - <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%"> 615 + <el-table-column label="预估费用(元)" prop="estimatedCost" min-width="20%">
616 616
617 </el-table-column> 617 </el-table-column>
618 <el-table-column label="备注" prop="notes" min-width="20%"> 618 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -626,14 +626,14 @@ @@ -626,14 +626,14 @@
626 :labelStyle="labelStyle" :contentStyle="contentStyle"> 626 :labelStyle="labelStyle" :contentStyle="contentStyle">
627 <el-descriptions-item> 627 <el-descriptions-item>
628 <template slot="label"> 628 <template slot="label">
629 - 实际内部人力成本(/元) 629 + 实际内部人力成本(元)
630 </template> 630 </template>
631 631
632 <span>{{duibiList.internalLaborCostEstimation}}</span> 632 <span>{{duibiList.internalLaborCostEstimation}}</span>
633 </el-descriptions-item> 633 </el-descriptions-item>
634 <el-descriptions-item> 634 <el-descriptions-item>
635 <template slot="label"> 635 <template slot="label">
636 - 实际外部人力成本(/元) 636 + 实际外部人力成本(元)
637 </template> 637 </template>
638 <span>{{duibiList.externalLaborCostEstimation}}</span> 638 <span>{{duibiList.externalLaborCostEstimation}}</span>
639 639
@@ -641,35 +641,35 @@ @@ -641,35 +641,35 @@
641 </el-descriptions-item> 641 </el-descriptions-item>
642 <el-descriptions-item> 642 <el-descriptions-item>
643 <template slot="label"> 643 <template slot="label">
644 - 实际商品成本(/元) 644 + 实际商品成本(元)
645 </template> 645 </template>
646 <span>{{duibiList.costEstimationGoods}}</span> 646 <span>{{duibiList.costEstimationGoods}}</span>
647 647
648 </el-descriptions-item> 648 </el-descriptions-item>
649 <el-descriptions-item> 649 <el-descriptions-item>
650 <template slot="label"> 650 <template slot="label">
651 - 实际设备成本(/元) 651 + 实际设备成本(元)
652 </template> 652 </template>
653 <span>{{duibiList.setCostEstimate}}</span> 653 <span>{{duibiList.setCostEstimate}}</span>
654 654
655 </el-descriptions-item> 655 </el-descriptions-item>
656 <el-descriptions-item> 656 <el-descriptions-item>
657 <template slot="label"> 657 <template slot="label">
658 - 实际宣传费用(/元) 658 + 实际宣传费用(元)
659 </template> 659 </template>
660 <span>{{duibiList.estimatedPromotionalExpenses}}</span> 660 <span>{{duibiList.estimatedPromotionalExpenses}}</span>
661 661
662 </el-descriptions-item> 662 </el-descriptions-item>
663 <el-descriptions-item> 663 <el-descriptions-item>
664 <template slot="label"> 664 <template slot="label">
665 - 实际其他成本(/元) 665 + 实际其他成本(元)
666 </template> 666 </template>
667 <span>{{duibiList.otherNecessaryEstimates}}</span> 667 <span>{{duibiList.otherNecessaryEstimates}}</span>
668 668
669 </el-descriptions-item> 669 </el-descriptions-item>
670 <el-descriptions-item> 670 <el-descriptions-item>
671 <template slot="label"> 671 <template slot="label">
672 - 实际总成本(/元) 672 + 实际总成本(元)
673 </template> 673 </template>
674 <span>{{duibiList.totalCostEstimation}}</span> 674 <span>{{duibiList.totalCostEstimation}}</span>
675 675
@@ -705,14 +705,14 @@ @@ -705,14 +705,14 @@
705 </el-descriptions-item> 705 </el-descriptions-item>
706 <el-descriptions-item> 706 <el-descriptions-item>
707 <template slot="label"> 707 <template slot="label">
708 - 实际直接收益(/元) 708 + 实际直接收益(元)
709 </template> 709 </template>
710 <span>{{duibiList.expectedDirectBenefits}}</span> 710 <span>{{duibiList.expectedDirectBenefits}}</span>
711 711
712 </el-descriptions-item> 712 </el-descriptions-item>
713 <el-descriptions-item> 713 <el-descriptions-item>
714 <template slot="label"> 714 <template slot="label">
715 - 实际间接收益(/元) 715 + 实际间接收益(元)
716 </template> 716 </template>
717 <span>{{duibiList.expectedIndirectBenefits}}</span> 717 <span>{{duibiList.expectedIndirectBenefits}}</span>
718 718
@@ -798,7 +798,7 @@ @@ -798,7 +798,7 @@
798 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 798 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
799 799
800 </el-table-column> 800 </el-table-column>
801 - <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%"> 801 + <el-table-column label="预估费用(元)" prop="estimatedCost" min-width="20%">
802 802
803 </el-table-column> 803 </el-table-column>
804 <el-table-column label="备注" prop="notes" min-width="20%"> 804 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -812,14 +812,14 @@ @@ -812,14 +812,14 @@
812 <el-table :data="tableData3" 812 <el-table :data="tableData3"
813 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}" 813 :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
814 style="width: 100%;margin: auto;"> 814 style="width: 100%;margin: auto;">
815 - <el-table-column class-name="first-column-bg" label="内部人力成本预估(/元)" prop="name" 815 + <el-table-column class-name="first-column-bg" label="内部人力成本预估(元)" prop="name"
816 min-width="15%"> 816 min-width="15%">
817 </el-table-column> 817 </el-table-column>
818 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme" 818 <el-table-column :label="internalLaborCostEstimation" prop="eventTheme"
819 min-width="35%"> 819 min-width="35%">
820 820
821 </el-table-column> 821 </el-table-column>
822 - <el-table-column class-name="first-column-bg" label="外部人力成本预估(/元)" prop="text" 822 + <el-table-column class-name="first-column-bg" label="外部人力成本预估(元)" prop="text"
823 min-width="15%"> 823 min-width="15%">
824 824
825 </el-table-column> 825 </el-table-column>
@@ -999,7 +999,7 @@ @@ -999,7 +999,7 @@
999 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%"> 999 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="18%">
1000 1000
1001 </el-table-column> 1001 </el-table-column>
1002 - <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%"> 1002 + <el-table-column label="预估费用(元)" prop="estimatedCost" min-width="20%">
1003 1003
1004 </el-table-column> 1004 </el-table-column>
1005 <el-table-column label="备注" prop="notes" min-width="20%"> 1005 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -1013,43 +1013,43 @@ @@ -1013,43 +1013,43 @@
1013 <el-descriptions class="margin-top" :column="2" border :labelStyle="labelStyleOne"> 1013 <el-descriptions class="margin-top" :column="2" border :labelStyle="labelStyleOne">
1014 <el-descriptions-item> 1014 <el-descriptions-item>
1015 <template slot="label"> 1015 <template slot="label">
1016 - 内部人力成本预估(/元) 1016 + 内部人力成本预估(元)
1017 </template> 1017 </template>
1018 {{lixiang.internalLaborCostEstimation}} 1018 {{lixiang.internalLaborCostEstimation}}
1019 </el-descriptions-item> 1019 </el-descriptions-item>
1020 <el-descriptions-item> 1020 <el-descriptions-item>
1021 <template slot="label"> 1021 <template slot="label">
1022 - 外部人力成本预估(/元) 1022 + 外部人力成本预估(元)
1023 </template> 1023 </template>
1024 {{lixiang.externalLaborCostEstimation}} 1024 {{lixiang.externalLaborCostEstimation}}
1025 </el-descriptions-item> 1025 </el-descriptions-item>
1026 <el-descriptions-item> 1026 <el-descriptions-item>
1027 <template slot="label"> 1027 <template slot="label">
1028 - 商品成本预估(/元) 1028 + 商品成本预估(元)
1029 </template> 1029 </template>
1030 {{lixiang.costEstimationGoods}} 1030 {{lixiang.costEstimationGoods}}
1031 </el-descriptions-item> 1031 </el-descriptions-item>
1032 <el-descriptions-item> 1032 <el-descriptions-item>
1033 <template slot="label"> 1033 <template slot="label">
1034 - 设备成本预估(/元) 1034 + 设备成本预估(元)
1035 </template> 1035 </template>
1036 {{lixiang.setCostEstimate}} 1036 {{lixiang.setCostEstimate}}
1037 </el-descriptions-item> 1037 </el-descriptions-item>
1038 <el-descriptions-item> 1038 <el-descriptions-item>
1039 <template slot="label"> 1039 <template slot="label">
1040 - 宣传费用预估(/元) 1040 + 宣传费用预估(元)
1041 </template> 1041 </template>
1042 {{lixiang.estimatedPromotionalExpenses}} 1042 {{lixiang.estimatedPromotionalExpenses}}
1043 </el-descriptions-item> 1043 </el-descriptions-item>
1044 <el-descriptions-item> 1044 <el-descriptions-item>
1045 <template slot="label"> 1045 <template slot="label">
1046 - 其他必要成本预估(/元) 1046 + 其他必要成本预估(元)
1047 </template> 1047 </template>
1048 {{lixiang.otherNecessaryEstimates}} 1048 {{lixiang.otherNecessaryEstimates}}
1049 </el-descriptions-item> 1049 </el-descriptions-item>
1050 <el-descriptions-item> 1050 <el-descriptions-item>
1051 <template slot="label"> 1051 <template slot="label">
1052 - 总成本预估(/元) 1052 + 总成本预估(元)
1053 </template> 1053 </template>
1054 {{lixiang.totalCostEstimation}} 1054 {{lixiang.totalCostEstimation}}
1055 </el-descriptions-item> 1055 </el-descriptions-item>
@@ -1080,13 +1080,13 @@ @@ -1080,13 +1080,13 @@
1080 </el-descriptions-item> 1080 </el-descriptions-item>
1081 <el-descriptions-item> 1081 <el-descriptions-item>
1082 <template slot="label"> 1082 <template slot="label">
1083 - 预计直接收益(/元) 1083 + 预计直接收益(元)
1084 </template> 1084 </template>
1085 {{lixiang.expectedDirectBenefits}} 1085 {{lixiang.expectedDirectBenefits}}
1086 </el-descriptions-item> 1086 </el-descriptions-item>
1087 <el-descriptions-item> 1087 <el-descriptions-item>
1088 <template slot="label"> 1088 <template slot="label">
1089 - 预计间接收益(/元) 1089 + 预计间接收益(元)
1090 </template> 1090 </template>
1091 {{lixiang.expectedIndirectBenefits}} 1091 {{lixiang.expectedIndirectBenefits}}
1092 </el-descriptions-item> 1092 </el-descriptions-item>
@@ -1162,7 +1162,7 @@ @@ -1162,7 +1162,7 @@
1162 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" /> 1162 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
1163 </el-form-item> 1163 </el-form-item>
1164 1164
1165 - <el-form-item label="预估费用(/元)" class="grid-content bg-purple" prop="eventAddrs"> 1165 + <el-form-item label="预估费用(元)" class="grid-content bg-purple" prop="eventAddrs">
1166 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" /> 1166 <el-input v-model="mingFrom.estimatedCost" placeholder="请输入" />
1167 </el-form-item> 1167 </el-form-item>
1168 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName"> 1168 <el-form-item label="备注" class="grid-content bg-purple device-from" prop="planName">
@@ -1640,19 +1640,19 @@ @@ -1640,19 +1640,19 @@
1640 externalLaborCostEstimation: '', 1640 externalLaborCostEstimation: '',
1641 tableData3: [{ 1641 tableData3: [{
1642 id: 0, 1642 id: 0,
1643 - name: '商品成本预估(/元)', 1643 + name: '商品成本预估(元)',
1644 planName: '', 1644 planName: '',
1645 - text: '设备成本预估(/元)', 1645 + text: '设备成本预估(元)',
1646 eventTheme: '' 1646 eventTheme: ''
1647 }, { 1647 }, {
1648 id: 0, 1648 id: 0,
1649 - name: '宣传费用预估(/元)', 1649 + name: '宣传费用预估(元)',
1650 planName: '', 1650 planName: '',
1651 - text: '其他必要成本预估(/元)', 1651 + text: '其他必要成本预估(元)',
1652 eventTheme: '' 1652 eventTheme: ''
1653 }, { 1653 }, {
1654 id: 0, 1654 id: 0,
1655 - name: '总成本预估(/元)', 1655 + name: '总成本预估(元)',
1656 planName: '', 1656 planName: '',
1657 text: '备注', 1657 text: '备注',
1658 eventTheme: '' 1658 eventTheme: ''
@@ -1661,9 +1661,9 @@ @@ -1661,9 +1661,9 @@
1661 expectedParticipation: '', 1661 expectedParticipation: '',
1662 tableData4: [{ 1662 tableData4: [{
1663 id: 0, 1663 id: 0,
1664 - name: '预计直接收益(/元)', 1664 + name: '预计直接收益(元)',
1665 planName: '', 1665 planName: '',
1666 - text: '预计间接收益(/元)', 1666 + text: '预计间接收益(元)',
1667 eventTheme: '-' 1667 eventTheme: '-'
1668 }], 1668 }],
1669 createUser: '', 1669 createUser: '',
@@ -2069,6 +2069,9 @@ @@ -2069,6 +2069,9 @@
2069 formTime(data) { 2069 formTime(data) {
2070 this.zhixingList.planTime = data 2070 this.zhixingList.planTime = data
2071 }, 2071 },
  2072 + blur(){
  2073 + this.$forceUpdate()
  2074 + },
2072 removeEmptyValues(obj) { 2075 removeEmptyValues(obj) {
2073 if (typeof obj !== 'object' || obj === null) { 2076 if (typeof obj !== 'object' || obj === null) {
2074 return obj; 2077 return obj;
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @98d43fa
@@ -819,7 +819,7 @@ @@ -819,7 +819,7 @@
819 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%"> 819 <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
820 820
821 </el-table-column> 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 </el-table-column> 824 </el-table-column>
825 <el-table-column label="备注" prop="notes" min-width="20%"> 825 <el-table-column label="备注" prop="notes" min-width="20%">
@@ -990,7 +990,7 @@ @@ -990,7 +990,7 @@
990 <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%"> 990 <el-table-column label="实际数量" prop="estimatedQuantity" width="auto" min-width="15%">
991 991
992 </el-table-column> 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 </el-table-column> 994 </el-table-column>
995 <el-table-column prop="notes" label="备注" width="auto" min-width="15%"> 995 <el-table-column prop="notes" label="备注" width="auto" min-width="15%">
996 </el-table-column> 996 </el-table-column>
@@ -1016,18 +1016,18 @@ @@ -1016,18 +1016,18 @@
1016 style="position: relative"> 1016 style="position: relative">
1017 <el-row :gutter="20"> 1017 <el-row :gutter="20">
1018 <el-col :span="8"> 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 <el-input v-model="zhixingList.internalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/> 1020 <el-input v-model="zhixingList.internalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1021 </el-form-item> 1021 </el-form-item>
1022 </el-col> 1022 </el-col>
1023 <el-col :span="8"> 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 <el-input v-model="zhixingList.externalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/> 1025 <el-input v-model="zhixingList.externalLaborCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1026 </el-form-item> 1026 </el-form-item>
1027 </el-col> 1027 </el-col>
1028 1028
1029 <el-col :span="8"> 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 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" :disabled="!zhixingBian"/> 1031 <el-input v-model="zhixingList.costEstimationGoods" placeholder="请输入" :disabled="!zhixingBian"/>
1032 </el-form-item> 1032 </el-form-item>
1033 </el-col> 1033 </el-col>
@@ -1035,17 +1035,17 @@ @@ -1035,17 +1035,17 @@
1035 1035
1036 <el-row :gutter="20"> 1036 <el-row :gutter="20">
1037 <el-col :span="8"> 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 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" :disabled="!zhixingBian"/> 1039 <el-input v-model="zhixingList.setCostEstimate" placeholder="请输入" :disabled="!zhixingBian"/>
1040 </el-form-item> 1040 </el-form-item>
1041 </el-col> 1041 </el-col>
1042 <el-col :span="8"> 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 <el-input v-model="zhixingList.estimatedPromotionalExpenses" placeholder="请输入" :disabled="!zhixingBian"/> 1044 <el-input v-model="zhixingList.estimatedPromotionalExpenses" placeholder="请输入" :disabled="!zhixingBian"/>
1045 </el-form-item> 1045 </el-form-item>
1046 </el-col> 1046 </el-col>
1047 <el-col :span="8"> 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 <el-input v-model="zhixingList.otherNecessaryEstimates" placeholder="请输入" :disabled="!zhixingBian"/> 1049 <el-input v-model="zhixingList.otherNecessaryEstimates" placeholder="请输入" :disabled="!zhixingBian"/>
1050 </el-form-item> 1050 </el-form-item>
1051 </el-col> 1051 </el-col>
@@ -1053,7 +1053,7 @@ @@ -1053,7 +1053,7 @@
1053 1053
1054 <el-row :gutter="20"> 1054 <el-row :gutter="20">
1055 <el-col :span="8"> 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 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/> 1057 <el-input v-model="zhixingList.totalCostEstimation" placeholder="请输入" :disabled="!zhixingBian"/>
1058 </el-form-item> 1058 </el-form-item>
1059 </el-col> 1059 </el-col>
@@ -1091,14 +1091,14 @@ @@ -1091,14 +1091,14 @@
1091 </el-col> 1091 </el-col>
1092 1092
1093 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/> 1095 <el-input v-model="zhixingList.expectedDirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/>
1096 </el-form-item> 1096 </el-form-item>
1097 </el-col> 1097 </el-col>
1098 </el-row> 1098 </el-row>
1099 <el-row :gutter="20"> 1099 <el-row :gutter="20">
1100 <el-col :span="8"> 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 <el-input v-model="zhixingList.expectedIndirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/> 1102 <el-input v-model="zhixingList.expectedIndirectBenefits" placeholder="请输入" :disabled="!zhixingBian"/>
1103 </el-form-item> 1103 </el-form-item>
1104 </el-col> 1104 </el-col>
@@ -1250,19 +1250,19 @@ @@ -1250,19 +1250,19 @@
1250 externalLaborCostEstimation: '', 1250 externalLaborCostEstimation: '',
1251 tableData3: [{ 1251 tableData3: [{
1252 id: 0, 1252 id: 0,
1253 - name: '商品成本预估(/元)', 1253 + name: '商品成本预估(元)',
1254 planName: '', 1254 planName: '',
1255 - text: '设备成本预估(/元)', 1255 + text: '设备成本预估(元)',
1256 eventTheme: '' 1256 eventTheme: ''
1257 }, { 1257 }, {
1258 id: 0, 1258 id: 0,
1259 - name: '宣传费用预估(/元)', 1259 + name: '宣传费用预估(元)',
1260 planName: '', 1260 planName: '',
1261 - text: '其他必要成本预估(/元)', 1261 + text: '其他必要成本预估(元)',
1262 eventTheme: '' 1262 eventTheme: ''
1263 }, { 1263 }, {
1264 id: 0, 1264 id: 0,
1265 - name: '总成本预估(/元)', 1265 + name: '总成本预估(元)',
1266 planName: '', 1266 planName: '',
1267 text: '备注', 1267 text: '备注',
1268 eventTheme: '' 1268 eventTheme: ''
@@ -1271,9 +1271,9 @@ @@ -1271,9 +1271,9 @@
1271 expectedParticipation: '', 1271 expectedParticipation: '',
1272 tableData4: [{ 1272 tableData4: [{
1273 id: 0, 1273 id: 0,
1274 - name: '预计直接收益(/元)', 1274 + name: '预计直接收益(元)',
1275 planName: '', 1275 planName: '',
1276 - text: '预计间接收益(/元)', 1276 + text: '预计间接收益(元)',
1277 eventTheme: '-' 1277 eventTheme: '-'
1278 }], 1278 }],
1279 createUser: '', 1279 createUser: '',
admin-web-master/src/views/promotion/account.vue
  View file @98d43fa
@@ -134,12 +134,15 @@ @@ -134,12 +134,15 @@
134 <el-input v-model="formInline.channelName" 134 <el-input v-model="formInline.channelName"
135 :disabled="index == 1?false:index == 2?true:false" placeholder="请输入"></el-input> 135 :disabled="index == 1?false:index == 2?true:false" placeholder="请输入"></el-input>
136 </el-form-item> 136 </el-form-item>
137 - <el-form-item label="渠道类型" prop="channelType"> 137 + <!-- <el-form-item label="渠道类型" prop="channelType">
138 <el-select v-model="formInline.channelType" placeholder="请选择" 138 <el-select v-model="formInline.channelType" placeholder="请选择"
139 :disabled="index == 1?false:index == 2?true:false" style="width:100%"> 139 :disabled="index == 1?false:index == 2?true:false" style="width:100%">
140 <el-option label="APP" value="APP" /> 140 <el-option label="APP" value="APP" />
  141 + <el-option label="APP" value="APP" />
  142 + <el-option label="APP" value="APP" />
  143 + <el-option label="APP" value="APP" />
141 </el-select> 144 </el-select>
142 - </el-form-item> 145 + </el-form-item> -->
143 <el-form-item label="账号" prop="accountNumber"> 146 <el-form-item label="账号" prop="accountNumber">
144 <el-input :disabled="index == 1?false:index == 2?true:false" v-model="formInline.accountNumber" placeholder="请输入"></el-input> 147 <el-input :disabled="index == 1?false:index == 2?true:false" v-model="formInline.accountNumber" placeholder="请输入"></el-input>
145 </el-form-item> 148 </el-form-item>
@@ -337,11 +340,11 @@ @@ -337,11 +340,11 @@
337 message: '请输入渠道名称', 340 message: '请输入渠道名称',
338 trigger: 'blur' 341 trigger: 'blur'
339 }], 342 }],
340 - channelType: [{  
341 - required: true,  
342 - message: '请选择类型',  
343 - trigger: 'change'  
344 - }], 343 + // channelType: [{
  344 + // required: true,
  345 + // message: '请选择类型',
  346 + // trigger: 'change'
  347 + // }],
345 accountNumber: [{ 348 accountNumber: [{
346 required: true, 349 required: true,
347 message: '请输入账号', 350 message: '请输入账号',
admin-web-master/src/views/promotion/contentMant.vue
  View file @98d43fa
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <!-- 搜索 --> 7 <!-- 搜索 -->
8 <div class="formSearch"> 8 <div class="formSearch">
9 <div class="demo-input-suffix"> 9 <div class="demo-input-suffix">
10 - <div style="width: 68px;height:36px;line-height:32px;">方案名称</div> 10 + <div style="width: 68px;height:36px;line-height:32px;">渠道分类</div>
11 <el-input placeholder="请输入" v-model="chaName" style="width:168px;"> 11 <el-input placeholder="请输入" v-model="chaName" style="width:168px;">
12 </el-input> 12 </el-input>
13 </div> 13 </div>
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 <div class="custom-tree-node" slot-scope="{ node, data }"> 47 <div class="custom-tree-node" slot-scope="{ node, data }">
48 <span>{{ node.label }}</span> 48 <span>{{ node.label }}</span>
49 <span style="font-size: 15px !important;"> 49 <span style="font-size: 15px !important;">
50 - <i class="el-icon-circle-plus" @click="xinFenlei(node,data)" style="padding-right: 7px;"></i>  
51 - <i class="el-icon-edit" @click="editFenlei(node, data)" 50 + <i class="el-icon-circle-plus" @click="xinFenlei(node,data)" v-if="node.level!=2" style="padding-right: 7px;"></i>
  51 + <i class="el-icon-edit" @click="editFenlei(node, data)"
52 style="padding-right: 7px;"></i> 52 style="padding-right: 7px;"></i>
53 <i class="el-icon-delete-solid" @click="() => fenDelete(node, data)"></i> 53 <i class="el-icon-delete-solid" @click="() => fenDelete(node, data)"></i>
54 </span> 54 </span>
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 </el-dialog> 178 </el-dialog>
179 <!-- 新建 --> 179 <!-- 新建 -->
180 <div v-if="ggXin" > 180 <div v-if="ggXin" >
181 - <div style="height:58px;line-height:58px;background-color:#fff;padding-left:20px;"> 181 + <div style="height:58px;line-height:58px;background-color:#fff;padding:0 20px;">
182 <div style="color:#0006"> <span>媒体推广</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">{{index == 1?'内容新增':index == 2?'内容详情':'内容编辑'}}</span></div> 182 <div style="color:#0006"> <span>媒体推广</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">{{index == 1?'内容新增':index == 2?'内容详情':'内容编辑'}}</span></div>
183 </div> 183 </div>
184 <div style="background-color:#fff;padding-left:20px;"> 184 <div style="background-color:#fff;padding-left:20px;">
@@ -235,10 +235,10 @@ @@ -235,10 +235,10 @@
235 :auto-upload="true" v-if="index ==3 || index ==1"> 235 :auto-upload="true" v-if="index ==3 || index ==1">
236 <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover" v-if="fileData.length==0">+点击上传</el-button> 236 <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
237 </el-upload> --> 237 </el-upload> -->
238 - <div style="padding:20px;" v-if="index == 2">  
239 - {{formInline.attachmentUpload[0]&&formInline.attachmentUpload[0].name?formInline.attachmentUpload[0].name:''}} 238 + <div style="" v-if="index == 2">
  239 + <a :href="$baseURL+formInline.attachmentUpload" style="color: #3F9B6A;" >{{formInline.attachmentUpload}}</a>
240 </div> 240 </div>
241 - <upfile filePath="tuiguang" inputtype="otherImageVideos" :limit="1" :accept="'.docx'" :value="formInline.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')" v-else></upfile> 241 + <upfile filePath="tuiguang" inputtype="attachmentUpload" :limit="1" :accept="'.docx'" :value="formInline.attachmentUpload" @changimg="e=>changimg(e,'attachmentUpload')" v-else></upfile>
242 242
243 </el-form-item> 243 </el-form-item>
244 <el-form-item label="渠道类型" prop="channelType"> 244 <el-form-item label="渠道类型" prop="channelType">
@@ -254,14 +254,13 @@ @@ -254,14 +254,13 @@
254 </el-select> 254 </el-select>
255 </el-form-item> 255 </el-form-item>
256 256
257 - <el-form-item label="APPKEY" v-if="index==1?true:false" prop="appKey"> 257 + <!-- <el-form-item label="APPKEY" v-if="index==1?true:false" prop="appKey">
258 258
259 <el-input v-model="formInline.appKey" placeholder="请输入"></el-input> 259 <el-input v-model="formInline.appKey" placeholder="请输入"></el-input>
260 - </el-form-item>  
261 - <el-form-item label="APP图片" v-if="index==1?true:false" prop="appImage" style="margin-bottom:20px;">  
262 - <!-- <upimg v-model="formInline.appImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> --> 260 + </el-form-item> -->
  261 + <!-- <el-form-item label="APP图片" v-if="index==1?true:false" prop="appImage" style="margin-bottom:20px;">
263 <upimg filePath="tuiguang" :value="formInline.appImage" inputtype="appImage" :limit="1" @changimg="e=>changimg(e,'appImage')"></upimg> 262 <upimg filePath="tuiguang" :value="formInline.appImage" inputtype="appImage" :limit="1" @changimg="e=>changimg(e,'appImage')"></upimg>
264 - </el-form-item> 263 + </el-form-item> -->
265 <el-form-item label="备注" prop="remarks" > 264 <el-form-item label="备注" prop="remarks" >
266 <div v-if="index ==2"> 265 <div v-if="index ==2">
267 {{formInline.remarks}} 266 {{formInline.remarks}}
@@ -405,15 +404,15 @@ @@ -405,15 +404,15 @@
405 methods: { 404 methods: {
406 changimg(e,type) { 405 changimg(e,type) {
407 this.formInline[type] = e 406 this.formInline[type] = e
408 - if(type=='otherImageVideos'){  
409 - const parts = e.split('/');  
410 - const filename = parts[parts.length - 1];  
411 - let file ={  
412 - url:e,  
413 - name:filename  
414 - }  
415 - this.formInline.attachmentUpload = JSON.stringify(this.file)  
416 - } 407 + // if(type=='attachmentUpload'){
  408 + // const parts = e.split('/');
  409 + // const filename = parts[parts.length - 1];
  410 + // let file ={
  411 + // url:e,
  412 + // name:filename
  413 + // }
  414 + // this.formInline.attachmentUpload = JSON.stringify(this.file)
  415 + // }
417 }, 416 },
418 async getAll() { 417 async getAll() {
419 const res = await quGetAll(this.pageindex) 418 const res = await quGetAll(this.pageindex)
@@ -507,14 +506,16 @@ @@ -507,14 +506,16 @@
507 } else if (val === 2 || val === 3) { 506 } else if (val === 2 || val === 3) {
508 this.formInline.id = item.id 507 this.formInline.id = item.id
509 this.formInline = item 508 this.formInline = item
510 - if(typeof item.attachmentUpload == 'string' && item.attachmentUpload !=''){  
511 - this.formInline.attachmentUpload = JSON.parse(this.formInline.attachmentUpload)  
512 - this.fileData = this.formInline.attachmentUpload 509 + this.fileData = this.formInline.attachmentUpload
  510 + // if(typeof item.attachmentUpload == 'string' && item.attachmentUpload !=''){
  511 + // this.formInline.attachmentUpload = JSON.parse(this.formInline.attachmentUpload)
  512 + // this.fileData = this.formInline.attachmentUpload
513 513
514 - } 514 + // }
515 this.formInline.channelClassification = Number(item.channelClassification) 515 this.formInline.channelClassification = Number(item.channelClassification)
516 } 516 }
517 this.index = val 517 this.index = val
  518 + this.caogaoshow = false
518 this.ggXin = true 519 this.ggXin = true
519 }, 520 },
520 bianji() { 521 bianji() {
@@ -539,6 +540,7 @@ @@ -539,6 +540,7 @@
539 // this.formInline.attachmentUpload = JSON.stringify(this.fileData) 540 // this.formInline.attachmentUpload = JSON.stringify(this.fileData)
540 541
541 // } 542 // }
  543 + console.log(this.formInline,'this.formInline')
542 contentEdit(this.formInline).then(res => { 544 contentEdit(this.formInline).then(res => {
543 this.getFenAll() 545 this.getFenAll()
544 this.ggXin = false 546 this.ggXin = false