diff --git a/admin-web-master/src/api/activityBz.js b/admin-web-master/src/api/activityBz.js
index c25c87c..dbd3757 100644
--- a/admin-web-master/src/api/activityBz.js
+++ b/admin-web-master/src/api/activityBz.js
@@ -205,3 +205,43 @@ export function copy(data) {
data
})
}
+
+
+// 审核流程导出
+export function excelQueryByPage(data) {
+ return request({
+ url: '/cereEventDetails/excelQueryByPage',
+ method: 'post',
+ data,
+ responseType: 'blob'
+ })
+}
+
+// 导入
+export function excelAdd(data) {
+ return request({
+ url: '/cereEventDetails/excelAdd',
+ method: 'post',
+ data,
+ headers: {
+ 'Content-type': 'multipart/form-data'
+ }
+ })
+}
+
+// 效果评估
+export function effectEvaluation(data) {
+ return request({
+ url: `/cereEventDetails/effectEvaluation/${data.id}`,
+ method: 'get',
+ data
+ })
+}
+//历史方案查询
+export function lishiDeta(data) {
+ return request({
+ url: '/cereEventDetailsLog/getAll',
+ method: 'post',
+ data
+ })
+}
diff --git a/admin-web-master/src/views/active/couponlist/couponAdd.vue b/admin-web-master/src/views/active/couponlist/couponAdd.vue
index 284ec01..b4a14c3 100644
--- a/admin-web-master/src/views/active/couponlist/couponAdd.vue
+++ b/admin-web-master/src/views/active/couponlist/couponAdd.vue
@@ -241,16 +241,6 @@ export default {
message: '请输入活动介绍',
trigger: 'blur'
}],
- date2:[{
- required: true,
- message: '请选择报名时间',
- trigger: 'change'
- }],
- date1:[{
- required: true,
- message: '请选择活动时间',
- trigger: 'change'
- }],
},
}
},
diff --git a/admin-web-master/src/views/activity/activityBian.vue b/admin-web-master/src/views/activity/activityBian.vue
index 0697120..da21152 100644
--- a/admin-web-master/src/views/activity/activityBian.vue
+++ b/admin-web-master/src/views/activity/activityBian.vue
@@ -69,6 +69,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -269,7 +279,7 @@
返回
- 确定
+ 保存
@@ -588,7 +598,10 @@ this.fucha(this.secondData.id)
.greens {
color: #3F9B6A;
}
-
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
.el-button--primary{
background: #3F9B6A;
border-color: #3F9B6A;
diff --git a/admin-web-master/src/views/activity/activityBz.vue b/admin-web-master/src/views/activity/activityBz.vue
index 0b36649..13a093e 100644
--- a/admin-web-master/src/views/activity/activityBz.vue
+++ b/admin-web-master/src/views/activity/activityBz.vue
@@ -88,6 +88,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -297,7 +319,9 @@
取消
- 确定
+ 暂存
+
+ 确定
@@ -347,7 +371,8 @@
MingEdit,
MingDel,
fujiaAdd,
- imgUp
+ imgUp,
+ lishiDeta
} from '../../api/activityBz'
// import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
import wangEditor from "@/components/editor/index";
@@ -375,6 +400,7 @@
wangEditor,
upimg
},
+
data() {
return {
uploadFileUrl: uploadUrl, // 请求地址
@@ -393,6 +419,7 @@
eventTheme: '', //活动主题
sponsor: '', //活动主办方
participants: '', //活动参与方
+ rangeSetting:'',
mainPurpose: '', //活动主要目的
coverPoster: '', //封面海报
internalLaborCostEstimation: '', //内部人工成本预估
@@ -468,6 +495,8 @@
yugu: null,
fun: null
},
+fenxiData:[],
+lishiList:'',
}
},
@@ -477,6 +506,7 @@
},
mounted() {
this.editTrue = true
+ this.lishi()
},
methods: {
//获取当前时间
@@ -491,6 +521,22 @@
this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
+ lishi(){
+ lishiDeta({eventDetailsType:'1'}).then(res=>{
+ this.fenxiData = res.data
+ })
+ },
+ lichange(e){
+
+ let msg =this.fenxiData[e]
+ let obj = JSON.parse(msg.originalData)
+
+ for (let key in obj) {
+ if (this.ruleForm.hasOwnProperty(key)) {
+ this.ruleForm[key] = obj[key];
+ }
+ }
+ },
zancun() {},
//上传
submitUpload() {
@@ -558,7 +604,7 @@
},
//保存
- onSubmit() {
+ onSubmit(val) {
// pdf.save('output.pdf')
let that = this
let FlieName = this.ruleForm.planName
@@ -614,6 +660,7 @@
// }
this.$refs.jibenFrom.validate((valid) => {
if (valid) {
+ this.ruleForm.isDraft = val
add(this.ruleForm).then(res => {
this.$message({
message: '保存成功',
@@ -735,6 +782,7 @@
eventTheme: '', //活动主题
sponsor: '', //活动主办方
participants: '', //活动参与方
+ rangeSetting:'',
mainPurpose: '', //活动主要目的
coverPoster: '', //封面海报
internalLaborCostEstimation: '', //内部人工成本预估
@@ -839,7 +887,10 @@
color: #3F9B6A;
}
-
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
+
diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue
index bccf00b..293aa5b 100644
--- a/admin-web-master/src/views/activity/activitySp.vue
+++ b/admin-web-master/src/views/activity/activitySp.vue
@@ -57,14 +57,15 @@
{{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
-
+
-
+
- OA流程审批
+ 查看
+ 审核
@@ -505,6 +506,380 @@
+
+
+
+
+
+
![]()
+
+
+ {{text}}
+ 活动时间:{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}
+ 活动地点:{{tableData1[0].planName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
活动明细信息
+
+
+
+
+ {{ scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
活动成本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
预估效果
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
相关附件信息
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+
系统信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +点击上传
+
+ {{zhixingList.feedbackContent}}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -591,9 +966,11 @@
text: '活动主要目的',
eventTheme: ''
}, {
- id: '5',
- name: '状态',
- eventTheme: '待审核'
+ id: 0,
+ name: '范围设置',
+ planName: '',
+ text: '状态',
+ eventTheme: ''
}],
internalLaborCostEstimation: '',
externalLaborCostEstimation: '',
@@ -664,6 +1041,8 @@
pageNumber: 1,
pageSize: 10,
dataOwnership: '1',
+ isDraft:0,
+ state:'待提交'
},
multipleSelection: [],
options: [{
@@ -676,7 +1055,9 @@
defaultProps:{
children: 'children',
label: 'classificationName'
- }
+ },
+ zhixingBian: false, //判断是否编辑执行效果
+ tableDa: [], //执行效果明细列表
}
},
created() {
@@ -752,6 +1133,8 @@
dataOwnership: '1',
pageNumber: 1,
pageSize: 10,
+ isDraft:0,
+ state:'待提交'
})
this.tableData = res.data.content
} else if (this.planName == '' && this.eventTheme != '') {
@@ -760,6 +1143,8 @@
dataOwnership: '1',
pageNumber: 1,
pageSize: 10,
+ isDraft:0,
+ state:'待提交'
})
this.tableData = res.data.content
} else {
@@ -769,6 +1154,8 @@
dataOwnership: '1',
pageNumber: 1,
pageSize: 10,
+ isDraft:0,
+ state:'待提交'
})
this.tableData = res.data.content
}
@@ -876,6 +1263,7 @@
}
this.Liunie = false
this.MsgSp =false
+ this.actSpye = false
},
TabClick(tab, event){
console.log(tab, event)
@@ -895,7 +1283,139 @@
}
this.getAll()
- }
+ },
+ //详情点击
+ handleEditForm(item,val,flag) {
+ if(val ==2){
+ this.activeName = 'five'
+ }
+ this.fileData = []
+ this.zhixingList = {
+ planTime:[],
+ planName: '', //活动名称
+ eventAddrs: '', //实际举办地点
+ eventStartTime: 0, //实际开始时间
+ eventEndTime: 0, //实际结束时间
+ sponsor: '', //实际主办方
+ participants: '', //实际参与方
+ internalLaborCostEstimation: '', //内部人工成本
+ externalLaborCostEstimation: '', //外部人工成本
+ costEstimationGoods: '', //商品成本
+ setCostEstimate: '', //设备成本
+ estimatedPromotionalExpenses: '', //宣传费用预估
+ otherNecessaryEstimates: '', //其他成本预估
+ totalCostEstimation: '', //总成本预估
+ notes: '', //备注
+ expectedAttractTraffic: '', //吸引流量
+ expectedParticipation: '', //参与人数
+ expectedDirectBenefits: '', //直接收益
+ expectedIndirectBenefits: '', //间接收益
+ createDate: '', //创建时间
+ feedbackContent:''
+ } //执行效果列表
+ actPage({
+ detailsId: item.id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res => {
+ console.log(res.data.content)
+ if (res.data.content.length == 0) {
+ this.zhiXing = true
+ } else {
+ mingTable({
+ detailsId: res.data.content[0].id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res => {
+ this.tableDa = res.data.content
+ })
+ this.zhiXing = false
+ this.zhixingList = res.data.content[0]
+ if((typeof this.zhixingList.eventStartTime) == 'object' || (typeof this.zhixingList.eventEndTime) == 'object' ){
+ this.zhixingList.planTime = []
+ }else{
+ console.log(typeof this.zhixingList.eventStartTime)
+ this.zhixingList.planTime = [ this.zhixingList.eventStartTime, this.zhixingList.eventEndTime]
+ }
+
+ }
+ })
+ let that = this
+ this.planTime = [item.eventStartTime, item.eventEndTime]
+ fujiaTable({
+ detailsId: item.id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res => {
+ this.tableData6 = res.data.content
+ })
+ mingTable({
+ detailsId: item.id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res => {
+ this.tableData2 = res.data.content
+ })
+
+
+ danqueryById({
+ id: item.id,
+ dataOwnership: '1',
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res => {
+ this.secondData = res.data.content[0]
+ //基本信息
+ // that.id=res.data.content[0].id
+ that.text = res.data.content[0].planName
+ that.tableData1[0].eventTheme = res.data.content[0].planType
+ that.tableData1[0].planName = res.data.content[0].eventAddrs
+ that.tableData1[1].eventTheme = res.data.content[0].eventStartTime
+ that.tableData1[1].planName = res.data.content[0].eventEndTime
+ that.tableData1[2].eventTheme = res.data.content[0].eventTheme
+ that.tableData1[2].planName = res.data.content[0].sponsor
+ that.tableData1[3].eventTheme = res.data.content[0].participants
+ that.tableData1[3].planName = res.data.content[0].mainPurpose
+ that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
+ that.tableData1[4].eventTheme = res.data.content[0].rangeSetting
+ //活动成本信息
+ that.internalLaborCostEstimation = res.data.content[0].internalLaborCostEstimation
+ that.externalLaborCostEstimation = res.data.content[0].externalLaborCostEstimation
+ that.tableData3[0].eventTheme = res.data.content[0].costEstimationGoods
+ that.tableData3[0].planName = res.data.content[0].setCostEstimate
+ that.tableData3[1].eventTheme = res.data.content[0].estimatedPromotionalExpenses
+ that.tableData3[1].planName = res.data.content[0].otherNecessaryEstimates
+ that.tableData3[2].eventTheme = res.data.content[0].totalCostEstimation
+ that.tableData3[2].planName = res.data.content[0].notes
+ //预估效果
+ that.expectedAttractTraffic = res.data.content[0].expectedAttractTraffic
+ that.expectedParticipation = res.data.content[0].expectedParticipation
+ that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits
+ that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
+ //系统信息
+ that.createUser = res.data.content[0].createUser
+ that.createDate = res.data.content[0].createDate
+
+ that.tableData5[0].planName = '-'
+ that.tableData5[0].eventTheme = res.data.content[0].updateUser
+
+ }).catch(err => {
+ console.log(err)
+
+ })
+ if (!item) {
+ this.formItem = {}
+ } else {
+ this.formItem = item
+ }
+ this.ggXin = true
+ },
+ refreshData() {
+ // console.log('12123')
+ this.tableDa = []
+ this.activeName = 'first'
+ this.zhixingBian = false
+ },
}
}
@@ -916,7 +1436,10 @@
line-height: 0;
}
-
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
.formSearch {
display: flex;
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue
index 393b93c..1ce3075 100644
--- a/admin-web-master/src/views/activity/index.vue
+++ b/admin-web-master/src/views/activity/index.vue
@@ -22,12 +22,24 @@
-
+
新增
删除
- 效果对比
+
+ 草稿箱
+
@@ -74,26 +86,28 @@
-
-
{{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
-
+
-
+
+
修改
- 执行情况
- 上传到OA
- 效果评估
+ 查看
+
+ 提交审核
+
+ 效果评估
复制
@@ -122,7 +136,7 @@
-
+
@@ -140,6 +154,7 @@
+
@@ -275,77 +290,6 @@
-
@@ -545,6 +489,19 @@
+
+
+
+
+ +点击上传
+
+ {{zhixingList.feedbackContent}}
+
+
+
+
@@ -556,7 +513,19 @@
+
+
+ 下载
+
+ 保存
+
+
@@ -777,37 +746,37 @@
吸引游客流量
-
4289人
-
+45%
+
{{fenxiData.expectedAttractTraffic}}人
+
{{fenxiData.expectedAttractTrafficAnalyse}}%
参与人数
-
4289人
-
+45%
+
{{fenxiData.expectedParticipation}}人
+
{{fenxiData.expectedParticipationAnalyse}}%
直接收益
-
4289人
-
+45%
+
{{fenxiData.expectedDirectBenefits}}
+
{{fenxiData.expectedDirectBenefitsAnalysis}}%
间接收益
-
4289人
-
+45%
+
{{fenxiData.expectedIndirectBenefits}}
+
{{fenxiData.expectedIndirectBenefitsAnalysis}}%
投入生产比
-
4289人
-
+45%
+
{{fenxiData.incomeAnalysis}}%
+
{{fenxiData.incomeAnalysis}}%
- 效果分析
-
+
+
-
@@ -1069,6 +950,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
+
+
+
+
+
+
+
+
+
+ 使用
+
+ 删除
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
审核流程配置
+
+
+
+
+
+
+
+ 确定
+ 取消
+
+
+
+
+
+
@@ -1092,19 +1036,33 @@
cereAdd,
cereEdit,
cereDel,
- copy
+ copy,
+ excelQueryByPage,
+ excelAdd,
+ effectEvaluation
} from '../../api/activityBz'
import addAct from "./activityBz"
import actbians from "./activityBian"
import * as echarts from 'echarts'
import Vue from 'vue'
+ import html2canvas from 'html2canvas'
+ import jsPDF from 'jspdf'
+ import wangEditor from "@/components/editor/index"
+ import {
+ uploadUrl
+ } from '@/utils/request'
export default {
components: {
addAct,
- actbians
+ actbians,
+ wangEditor
},
data() {
return {
+ uploadFileUrl: uploadUrl, // 请求地址
+ daoData:[],
+ fenxiData:{},
+ fileData:[],
addAct: false, //新增页
actbianMsg: {
acBian: '', //编辑数据
@@ -1117,7 +1075,7 @@
planFen: '',
eventTheme: '',
currentPage: 1,
- total: 100,
+ total: 0,
flag: false,
pageSize: 10,
ggXin: false,
@@ -1169,9 +1127,11 @@
text: '活动主要目的',
eventTheme: ''
}, {
- id: '5',
- name: '状态',
- eventTheme: '待审核'
+ id: 0,
+ name: '范围设置',
+ planName: '',
+ text: '状态',
+ eventTheme: ''
}],
internalLaborCostEstimation: '',
externalLaborCostEstimation: '',
@@ -1246,11 +1206,13 @@
expectedDirectBenefits: '', //直接收益
expectedIndirectBenefits: '', //间接收益
createDate: '', //创建时间
+ feedbackContent:''
}, //执行效果列表
pageindex: {
pageNumber: 1,
pageSize: 10,
- dataOwnership: '1'
+ dataOwnership: '1',
+ isDraft:0,
},
multipleSelection: [],
options: [],
@@ -1265,8 +1227,7 @@
xiaoguoBox:false,
chart: null, //饼图
chart1: null, //漏斗图
- radio1:'',
- radio1_time:'',
+
dataList:[],
xinlei:false,//分类管理框
fenleiDelId:null,//删除的分类ID
@@ -1287,9 +1248,17 @@
},
copyShow:false,
duibiOne:{},
- duibiTwo:{}
- }
- },
+ duibiTwo:{},
+ caoList:[],
+ caogaoshow:false,
+ peiForm:{
+ auditReminderTime:''
+ },
+ peiShow:false,
+ peiId:'',
+ zhixingqingk:''
+ }
+ },
created() {
this.getAll()
@@ -1351,7 +1320,8 @@
pageNumber: 1,
pageSize: 10,
dataOwnership: '1',
- classificationCode:data.id
+ classificationCode:data.id,
+ isDraft:0
}
const res = await queryByPage(pageindex)
this.tableData = res.data.content
@@ -1361,7 +1331,8 @@
this.pageindex={
pageNumber: 1,
pageSize: 10,
- dataOwnership: '1'
+ dataOwnership: '1',
+ isDraft:0
}
const res = await queryByPage(this.pageindex)
this.tableData = res.data.content
@@ -1387,6 +1358,10 @@
deleteById({
id: this.multipleSelection[0].id
}).then(res => {
+ this.$message({
+ message: '删除成功',
+ type: 'success'
+ })
this.getAll()
done();
})
@@ -1411,6 +1386,8 @@
dataOwnership: '1',
pageNumber: 1,
pageSize: 10,
+ auditTime:0,
+ isDraft:0
})
this.tableData = res.data.content
} else if (this.planName == '' && this.eventTheme != '') {
@@ -1419,6 +1396,8 @@
dataOwnership: '1',
pageNumber: 1,
pageSize: 10,
+ auditTime:0,
+ isDraft:0
})
this.tableData = res.data.content
} else {
@@ -1428,13 +1407,19 @@
dataOwnership: '1',
pageNumber: 1,
pageSize: 10,
+ auditTime:0,
+ isDraft:0
})
this.tableData = res.data.content
}
},
//详情点击
- handleEditForm(item) {
+ handleEditForm(item,val,flag) {
+ if(val ==2){
+ this.activeName = 'five'
+ }
+ this.fileData = []
this.zhixingList = {
planTime:[],
planName: '', //活动名称
@@ -1456,6 +1441,7 @@
expectedDirectBenefits: '', //直接收益
expectedIndirectBenefits: '', //间接收益
createDate: '', //创建时间
+ feedbackContent:''
} //执行效果列表
actPage({
detailsId: item.id,
@@ -1520,8 +1506,8 @@
that.tableData1[2].planName = res.data.content[0].sponsor
that.tableData1[3].eventTheme = res.data.content[0].participants
that.tableData1[3].planName = res.data.content[0].mainPurpose
-
- that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state)
+ that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
+ that.tableData1[4].eventTheme = res.data.content[0].rangeSetting
//活动成本信息
that.internalLaborCostEstimation = res.data.content[0].internalLaborCostEstimation
that.externalLaborCostEstimation = res.data.content[0].externalLaborCostEstimation
@@ -1596,6 +1582,9 @@
},
//执行效果保存
async bianji() {
+ if(this.fileData.length !=0){
+ this.zhixingList.feedbackContent = this.fileData[0].url
+ }
if (this.zhiXing) {
this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
@@ -1756,7 +1745,7 @@
this.$msgbox({
title: '消息',
message: h('p', null, [
- h('span', null, '是否上传到OA '),
+ h('span', null, '是否提交审核 '),
]),
showCancelButton: true,
showClose: false,
@@ -1818,10 +1807,10 @@
}
},
- xiaoguoTab(tab, event){
-
- },
xiaoguo(item) {
+ effectEvaluation({id:item.id}).then(res=>{
+ this.fenxiData = res.data
+ })
this.xiaoguoBox = true
this.$nextTick(() => {
this.shopLiu(this.$refs.shopL);
@@ -2049,7 +2038,143 @@
}
},
+ handleUploadSuccess(response, file, fileList) {
+ const fileMsg = {
+ name:file.name,
+ url: file.response.data.url,
+ }
+ // 将文件地址存储在 uploadedFiles 数组中
+ this.fileData.push(fileMsg);
+ },
+ handleRemove(){
+ this.fileData = []
+ },
+ daoru(response, file, fileList){
+ this.daoData= []
+ this.daoData.push(file.raw)
+ const formDate = new FormData()
+ formDate.append('file', this.daoData[0])
+ excelAdd(formDate).then(res => {
+ this.getAll()
+ })
+ },
+ caogao(){
+
+ let pageindex = {
+ pageNumber: 1,
+ pageSize: 10,
+ dataOwnership: '1',
+ isDraft:1
+ }
+ queryByPage(pageindex).then(res=>{
+ this.caoList = res.data.content
+ })
+ this.caogaoshow =true
+
+ },
+ shiyong(item){
+
+ const h = this.$createElement;
+ this.$msgbox({
+ title: '消息',
+ message: h('p', null, [
+ h('span', null, '是否使用 '),
+ ]),
+ showCancelButton: true,
+ showClose: false,
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ customClass: 'oe-dialog-btn',
+ beforeClose: (action, instance, done) => {
+ if (action === 'confirm') {
+ xiangedit({
+ id:item.id,
+ isDraft:0
+ }).then(res => {
+ this.getAll()
+ this.caogao()
+ done();
+ })
+ } else {
+ done();
+ }
+ }
+ })
+
+
+ },
+ async daochu(){
+ let res = await excelQueryByPage(this.pageindex)
+ if(!res){
+ return
+ }
+ const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+ const fileName = '审核流程.xls'
+ if ('download' in document.createElement('a')) {
+ // 非IE下载
+ const elink = document.createElement('a')
+ elink.download = fileName
+ elink.style.display = 'none'
+ elink.href = URL.createObjectURL(blob)
+ document.body.appendChild(elink)
+ elink.click()
+ URL.revokeObjectURL(elink.href) // 释放URL 对象
+ document.body.removeChild(elink)
+ } else {
+ // IE10+下载
+ navigator.msSaveBlob(blob, fileName)
+ }
+ this.$message({
+ message: '导出成功',
+ type: 'success'
+ })
+
+
+ },
+ // 下载
+ async downloadPdf() {
+ const content = this.$refs.actXiang;
+
+ // 使用 html2canvas 将 div 渲染为画布
+ const canvas = await html2canvas(content);
+
+ // 获取画布的图像数据
+ const imgData = canvas.toDataURL('image/png');
+
+ // 创建一个新的 PDF 文档
+ const pdf = new jsPDF('p', 'mm', 'a4');
+
+ // 添加图像到 PDF,第二个参数是图像格式,第三个参数是缩放比例
+ const imgWidth = 190; // 图像的宽度(mm)
+ const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
+
+ pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置(mm)
+
+ // 保存 PDF 文件
+ pdf.save('活动方案.pdf');
+ },
+ peizhi(item){
+ this.peiForm = {
+ auditTime:''
+ }
+ this.peiShow = true
+ this.peiId = item.id
+ },
+ async peiCheck(){
+ if(this.peiForm.auditReminderTime ==''){
+ this.$message({
+ message: '请填写审核提醒时间',
+ })
+ return;
+ }
+ await xiangedit({id:this.peiId,auditReminderTime:this.peiForm.auditReminderTime})
+ this.peiShow = false
+ this.getAll()
+ },
+ fivebian(){
+
+ },
}
}
@@ -2080,7 +2205,10 @@
line-height: 0;
}
-
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
.formSearch {
display: flex;
diff --git a/admin-web-master/src/views/atmosphere/atmosphereBian.vue b/admin-web-master/src/views/atmosphere/atmosphereBian.vue
index 70931a7..9061b9d 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereBian.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereBian.vue
@@ -66,6 +66,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -261,7 +272,7 @@
返回
- 确定
+ 保存
@@ -547,7 +558,10 @@
.greens {
color: #3f9b6a;
}
-
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
::v-deep .buttonHover:hover{
color:#3f9b6a !important;
border-color: #c5e1d2 !important;
diff --git a/admin-web-master/src/views/atmosphere/atmosphereBz.vue b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
index 8060066..7eb8c93 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereBz.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereBz.vue
@@ -91,7 +91,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -297,12 +318,14 @@
- 保存
-
-
- 取消
+ 取消
+
+ 暂存
+
+ 保存
+
+
@@ -356,7 +379,8 @@
Mingdan,
MingEdit,
MingDel,
- fujiaAdd
+ fujiaAdd,
+ lishiDeta
} from '../../api/activityBz'
import wangEditor from "@/components/editor/index";
import upimg from "@/components/ImageUpload/index"
@@ -393,6 +417,7 @@ uploadFileUrl: uploadUrl, // 请求地址
eventTheme:'',//活动主题
sponsor:'',//活动主办方
participants:'',//活动参与方
+ rangeSetting:'',
mainPurpose:'',//活动主要目的
coverPoster:'',//封面海报
internalLaborCostEstimation:'',//内部人工成本预估
@@ -438,9 +463,14 @@ uploadFileUrl: uploadUrl, // 请求地址
yugu:null,
fun:null
},
-
+fenxiData:[],
+lishiList:'',
}
},
+ mounted() {
+
+ this.lishi()
+ },
methods: {
//获取当前时间
updateCurrentTime() {
@@ -454,6 +484,22 @@ uploadFileUrl: uploadUrl, // 请求地址
this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
+ lishi(){
+ lishiDeta({eventDetailsType:'2'}).then(res=>{
+ this.fenxiData = res.data
+ })
+ },
+ lichange(e){
+
+ let msg =this.fenxiData[e]
+ let obj = JSON.parse(msg.originalData)
+
+ for (let key in obj) {
+ if (this.ruleForm.hasOwnProperty(key)) {
+ this.ruleForm[key] = obj[key];
+ }
+ }
+ },
// 切换事件
beforeTabLeave(activeName, oldActiveName){
@@ -504,7 +550,7 @@ uploadFileUrl: uploadUrl, // 请求地址
// }
},
//保存
- onSubmit(){
+ onSubmit(val){
this.updateCurrentTime();
let that = this
let FlieName = this.ruleForm.planName
@@ -559,6 +605,7 @@ uploadFileUrl: uploadUrl, // 请求地址
// }
this.$refs.jibenFrom.validate((valid) => {
if (valid) {
+ this.ruleForm.isDraft = val
add(this.ruleForm).then(res=>{
this.$message({
message: '保存成功',
@@ -681,6 +728,7 @@ this.tuxiangData = {
eventTheme: '', //活动主题
sponsor: '', //活动主办方
participants: '', //活动参与方
+ rangeSetting:'',
mainPurpose: '', //活动主要目的
coverPoster: '', //封面海报
internalLaborCostEstimation: '', //内部人工成本预估
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index fa8fd0b..50447cb 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -22,11 +22,23 @@
-
+
新增
删除
- 效果对比
+
+ 草稿箱
+
@@ -80,18 +92,22 @@
{{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
-
+
-
+
+
修改
- 执行情况
- 上传到OA
- 效果评估
+ 查看
+
+ 提交审核
+
+ 效果评估
复制
@@ -121,7 +137,7 @@
-
+
@@ -139,6 +155,7 @@
+
@@ -538,18 +555,42 @@
+
+
+
+
+ +点击上传
+
+ {{zhixingList.feedbackContent}}
+
+
+
+
+
编辑
保存
-
+
+ 下载
+
+ 保存
+
+
@@ -598,37 +639,37 @@
吸引游客流量
-
4289人
-
+45%
+
{{fenxiData.expectedAttractTraffic}}人
+
{{fenxiData.expectedAttractTrafficAnalyse}}%
参与人数
-
4289人
-
+45%
+
{{fenxiData.expectedParticipation}}人
+
{{fenxiData.expectedParticipationAnalyse}}%
直接收益
-
4289人
-
+45%
+
{{fenxiData.expectedDirectBenefits}}
+
{{fenxiData.expectedDirectBenefitsAnalysis}}%
间接收益
-
4289人
-
+45%
+
{{fenxiData.expectedIndirectBenefits}}
+
{{fenxiData.expectedIndirectBenefitsAnalysis}}%
投入生产比
-
4289人
-
+45%
+
{{fenxiData.incomeAnalysis}}%
+
{{fenxiData.incomeAnalysis}}%
- 效果分析
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
- {{scope.row.name}}
-
-
-
-
@@ -1064,6 +1016,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
+
+
+
+
+
+
+
+
+
+ 使用
+
+ 删除
+
+
+
+
+
+ 返回
+
+
+
+
+
+
+
审核流程配置
+
+
+
+
+
+
+
+ 确定
+ 取消
+
+
+
+
+
+
@@ -1087,15 +1102,24 @@
cereGet,
cereAdd,
cereEdit,
- cereDel
+ cereDel,
+ excelQueryByPage,
+ excelAdd,
+ effectEvaluation
} from '../../api/activityBz'
import addAct from "./atmosphereBz"
import atmbians from "./atmosphereBian"
import * as echarts from 'echarts'
import Vue from 'vue'
+ import html2canvas from 'html2canvas'
+ import jsPDF from 'jspdf'
+ import wangEditor from "@/components/editor/index"
+ import {
+ uploadUrl
+ } from '@/utils/request'
export default {
name: 'atmosphereGl',
-components: { addAct,atmbians},
+components: { addAct,atmbians,wangEditor},
data() {
return {
addAct:false,//新增页
@@ -1103,11 +1127,12 @@ components: { addAct,atmbians},
acBian:'',//编辑数据
bianshow:false,//编辑页
},
+ fenxiData:{},
planName:'',
planFen:'',
eventTheme:'',
currentPage: 1,
- total: 100,
+ total: 0,
flag: false,
pageSize: 10,
ggXin: false,
@@ -1161,9 +1186,11 @@ components: { addAct,atmbians},
text: '活动主要目的',
eventTheme: ''
},{
- id: '5',
- name: '状态',
- eventTheme: '待审核'
+ id:0,
+ name: '范围设置',
+ planName: '',
+ text: '状态',
+ eventTheme: ''
}],
internalLaborCostEstimation:'',
externalLaborCostEstimation:'',
@@ -1243,7 +1270,8 @@ components: { addAct,atmbians},
pageindex: {
pageNumber: 1,
pageSize: 10,
- dataOwnership:'2'
+ dataOwnership:'2',
+ isDraft:0
},
multipleSelection:[],//选择的数据
options: [],
@@ -1258,8 +1286,6 @@ components: { addAct,atmbians},
xiaoguoBox:false,
chart: null, //饼图
chart1: null, //漏斗图
- radio1:'',
- radio1_time:'',
dataList:[],
xinlei:false,//分类管理框
fenleiDelId:null,//删除的分类ID
@@ -1282,7 +1308,19 @@ components: { addAct,atmbians},
},
copyShow:false,
duibiOne:{},
- duibiTwo:{}
+ duibiTwo:{},
+ uploadFileUrl: uploadUrl, // 请求地址
+ daoData:[],
+ fileData:[],
+ caoList:[],
+ caogaoshow:false,
+ peiForm:{
+ auditReminderTime:''
+ },
+ peiShow:false,
+ peiId:'',
+ zhixingqingk:''
+
}
},
created() {
@@ -1312,7 +1350,7 @@ components: { addAct,atmbians},
//查询全数据
async getAll() {
const res = await queryByPage((this.pageindex))
- console.log(res.data)
+
this.tableData = res.data.content
this.total = res.data.content.length
let page = {
@@ -1342,12 +1380,13 @@ components: { addAct,atmbians},
}));
},
async handleNodeClick(data){
- console.log('Node clicked:', data);
+
let pageindex= {
pageNumber: 1,
pageSize: 10,
dataOwnership: '2',
- classificationCode:data.id
+ classificationCode:data.id,
+ isDraft:0
}
const res = await queryByPage(pageindex)
this.tableData = res.data.content
@@ -1357,7 +1396,8 @@ components: { addAct,atmbians},
this.pageindex={
pageNumber: 1,
pageSize: 10,
- dataOwnership: '2'
+ dataOwnership: '2',
+ isDraft:0
}
const res = await queryByPage(this.pageindex)
this.tableData = res.data.content
@@ -1404,13 +1444,13 @@ components: { addAct,atmbians},
//查询
async onSubmit(){
if(this.planName != '' && this.eventTheme == ''){
- const res = await danqueryById({planName:this.planName,dataOwnership:'2', pageNumber: 1,pageSize: 10,})
+ const res = await danqueryById({planName:this.planName,dataOwnership:'2', pageNumber: 1,pageSize: 10, auditTime:0,isDraft:0})
this.tableData = res.data.content
}else if(this.planName == '' && this.eventTheme != ''){
- const res = await danqueryById({eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10,})
+ const res = await danqueryById({eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, auditTime:0,isDraft:0})
this.tableData = res.data.content
}else{
- const res = await danqueryById({planName:this.planName,eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, })
+ const res = await danqueryById({planName:this.planName,eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, auditTime:0 ,isDraft:0})
this.tableData = res.data.content
}
@@ -1432,7 +1472,9 @@ components: { addAct,atmbians},
},
//执行效果保存
async bianji() {
- console.log(this.zhiXing)
+ if(this.fileData.length !=0){
+ this.zhixingList.feedbackContent = this.fileData[0].url
+ }
if(this.zhiXing){
this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
this.zhixingList.eventEndTime=this.zhixingList.planTime[1]
@@ -1453,7 +1495,11 @@ components: { addAct,atmbians},
this.getAll()
},
//详情点击
- handleEditForm(item) {
+ handleEditForm(item,val) {
+ if(val ==2){
+ this.activeName = 'five'
+ }
+ this.fileData = []
this.zhixingList={
planTime: [],
planName: '', //活动名称
@@ -1535,8 +1581,8 @@ components: { addAct,atmbians},
that.tableData1[2].planName = res.data.content[0].sponsor
that.tableData1[3].eventTheme = res.data.content[0].participants
that.tableData1[3].planName = res.data.content[0].mainPurpose
- // that.tableData1[4].eventTheme = res.data.content[0].state
- that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state)
+ that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
+ that.tableData1[4].eventTheme = res.data.content[0].rangeSetting
//活动成本信息
that.internalLaborCostEstimation=res.data.content[0].internalLaborCostEstimation
that.externalLaborCostEstimation=res.data.content[0].externalLaborCostEstimation
@@ -1720,7 +1766,7 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
this.$msgbox({
title: '消息',
message: h('p', null, [
- h('span', null, '是否上传到OA '),
+ h('span', null, '是否提交审核 '),
]),
showCancelButton: true,
showClose:false,
@@ -1746,6 +1792,9 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
}
},
xiaoguo(item) {
+ effectEvaluation({id:item.id}).then(res=>{
+ this.fenxiData = res.data
+ })
this.xiaoguoBox = true
this.$nextTick(() => {
this.shopLiu(this.$refs.shopL);
@@ -2013,6 +2062,138 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
}
},
+ handleUploadSuccess(response, file, fileList) {
+ const fileMsg = {
+ name:file.name,
+ url: file.response.data.url,
+ }
+ // 将文件地址存储在 uploadedFiles 数组中
+ this.fileData.push(fileMsg);
+ },
+ handleRemove(){
+this.fileData=[]
+ },
+ daoru(response, file, fileList){
+ this.daoData.push(file.raw)
+ const formDate = new FormData()
+ formDate.append('file', this.daoData[0])
+ excelAdd(formDate).then(res => {
+ this.getAll()
+ })
+ },
+ caogao(){
+ let pageindex = {
+ pageNumber: 1,
+ pageSize: 10,
+ dataOwnership: '2',
+ isDraft:1
+ }
+ queryByPage(pageindex).then(res=>{
+ this.caoList = res.data.content
+ })
+ this.caogaoshow =true
+
+ },
+ shiyong(item){
+
+ const h = this.$createElement;
+ this.$msgbox({
+ title: '消息',
+ message: h('p', null, [
+ h('span', null, '是否使用 '),
+ ]),
+ showCancelButton: true,
+ showClose: false,
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ customClass: 'oe-dialog-btn',
+ beforeClose: (action, instance, done) => {
+ if (action === 'confirm') {
+ xiangedit({
+ id: item.id,
+ draftStatus:1,
+ isDraft:0
+ }).then(res => {
+ this.getAll()
+ this.caogao()
+ done();
+ })
+ } else {
+ done();
+ }
+ }
+ })
+
+
+ },
+ async daochu(){
+ let res = await excelQueryByPage(this.pageindex)
+ if(!res){
+ return
+ }
+ const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+ const fileName = '审核流程.xls'
+ if ('download' in document.createElement('a')) {
+ // 非IE下载
+ const elink = document.createElement('a')
+ elink.download = fileName
+ elink.style.display = 'none'
+ elink.href = URL.createObjectURL(blob)
+ document.body.appendChild(elink)
+ elink.click()
+ URL.revokeObjectURL(elink.href) // 释放URL 对象
+ document.body.removeChild(elink)
+ } else {
+ // IE10+下载
+ navigator.msSaveBlob(blob, fileName)
+ }
+ this.$message({
+ message: '导出成功',
+ type: 'success'
+ })
+
+
+ },
+ // 下载
+ async downloadPdf() {
+ const content = this.$refs.actXiang;
+
+ // 使用 html2canvas 将 div 渲染为画布
+ const canvas = await html2canvas(content);
+
+ // 获取画布的图像数据
+ const imgData = canvas.toDataURL('image/png');
+
+ // 创建一个新的 PDF 文档
+ const pdf = new jsPDF('p', 'mm', 'a4');
+
+ // 添加图像到 PDF,第二个参数是图像格式,第三个参数是缩放比例
+ const imgWidth = 190; // 图像的宽度(mm)
+ const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
+
+ pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置(mm)
+
+ // 保存 PDF 文件
+ pdf.save('氛围方案.pdf');
+ },
+ peizhi(item){
+ this.peiForm = {
+ auditTime:''
+ }
+ this.peiShow = true
+ this.peiId = item.id
+ },
+ async peiCheck(){
+ if(this.peiForm.auditReminderTime ==''){
+ this.$message({
+ message: '请填写审核提醒时间',
+ })
+ return;
+ }
+ await xiangedit({id:this.peiId,auditReminderTime:this.peiForm.auditReminderTime})
+ this.peiShow = false
+ this.getAll()
+ },
}
}
@@ -2041,7 +2222,10 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
line-height: 0;
}
-
+.tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+}
.formSearch {
display: flex;
width: 100%;
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl副本.vue b/admin-web-master/src/views/atmosphere/atmosphereGl副本.vue
index 43db0cc..936b247 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl副本.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl副本.vue
@@ -993,7 +993,10 @@ export default {
line-height: 0;
}
-
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
new file mode 100644
index 0000000..571ec08
--- /dev/null
+++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
@@ -0,0 +1,2864 @@
+
+
+
+
+
+
+
+
+
+ 搜索关键词设置
+ 效果对比
+
+ 导入
+
+
+ 审核流程导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
+
+
+
+
+
+
+
+
+
+ 调整
+
+ 调整方案查看
+ 执行情况
+ 策划方案编辑
+ 历史方案查看
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 选择全部
+
+ 反向选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+ {{text}}
+ 氛围时间:{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}
+ 氛围地点:{{tableData1[0].planName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
氛围明细信息
+
+
+
+
+ {{ scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
氛围成本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
预估效果
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
相关附件信息
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+
系统信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 氛围明细信息
+
+
+ 添加明细
+
+
+
+
+
+
+
+ {{scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +点击上传
+
+ {{zhixingList.feedbackContent}}
+
+
+
+
+
+
+
+
+
+
+
+
+
历史氛围策划方案搜索
+
+
+
+
+
调整对比
+
+
+
+
+
+
+
+
+ 方案编号
+
+ {{lixiang.id}}
+
+
+
+ 方案名称
+
+
+ {{lixiang.planName}}
+
+
+
+ 类型
+
+{{lixiang.planType}}
+
+
+
+ 氛围地点
+
+
+ {{lixiang.eventAddrs}}
+
+
+
+ 氛围开始时间
+
+
+ {{lixiang.eventStartTime}}
+
+
+
+ 氛围结束时间
+
+
+{{lixiang.eventEndTime}}
+
+
+
+ 氛围主题
+
+ {{lixiang.eventTheme}}
+
+
+
+ 氛围主办方
+
+{{lixiang.sponsor}}
+
+
+
+
+ 氛围参与方
+
+
+{{lixiang.participants}}
+
+
+
+ 氛围主要目的
+
+
+{{lixiang.mainPurpose}}
+
+
+
+ 范围设置
+
+
+{{lixiang.rangeSetting}}
+
+
+
+ 状态
+
+
+{{getStatus(lixiang.state)}}
+
+
+
+
+
+
+
+
氛围明细信息
+
+
+
+
+ {{ scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 内部人力成本预估
+
+
+{{lixiang.internalLaborCostEstimation}}
+
+
+
+ 外部人力成本预估
+
+
+ {{lixiang.externalLaborCostEstimation}}
+
+
+
+ 商品成本预估
+
+
+{{lixiang.costEstimationGoods}}
+
+
+
+ 设备成本预估
+
+
+{{lixiang.setCostEstimate}}
+
+
+
+ 宣传费用预估
+
+
+ {{lixiang.estimatedPromotionalExpenses}}
+
+
+
+ 其他必要成本预估
+
+
+{{lixiang.otherNecessaryEstimates}}
+
+
+
+ 总成本预估
+
+
+{{lixiang.totalCostEstimation}}
+
+
+
+ 备注
+
+
+{{lixiang.notes}}
+
+
+
+
+
+
+
+
+
+
+ 预计吸引流量
+
+
+{{lixiang.expectedAttractTraffic}}
+
+
+
+ 预计参与人数
+
+
+{{lixiang.expectedParticipation}}
+
+
+
+ 预计直接收益
+
+
+{{lixiang.expectedDirectBenefits}}
+
+
+
+ 预计间接收益
+
+
+{{lixiang.expectedIndirectBenefits}}
+
+
+
+
+
+
+
+
相关附件信息
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+
系统信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+ 导出
+
+ 活动策划调整方案导出
+
+ 氛围策划调整纠错
+
+ 保存
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+ {{text}}
+ 氛围时间:{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}
+ 氛围地点:{{tableData1[0].planName}}
+
+
+
+
+
+
+
+
修改后
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
氛围明细信息
+
+
+
+
+ {{ scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
氛围成本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
预估效果
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
相关附件信息
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+
系统信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
修改前
+
+
+
+
+ 方案编号
+
+ {{lixiang.id}}
+
+
+
+ 方案名称
+
+ {{lixiang.planName}}
+
+
+
+ 类型
+
+ {{lixiang.planType}}
+
+
+
+ 氛围地点
+
+ {{lixiang.eventAddrs}}
+
+
+
+ 氛围开始时间
+
+ {{lixiang.eventStartTime}}
+
+
+
+ 氛围结束时间
+
+ {{lixiang.eventEndTime}}
+
+
+
+ 氛围主题
+
+ {{lixiang.eventTheme}}
+
+
+
+ 氛围主办方
+
+ {{lixiang.sponsor}}
+
+
+
+ 氛围参与方
+
+ {{lixiang.participants}}
+
+
+
+ 氛围主要目的
+
+ {{lixiang.mainPurpose}}
+
+
+
+ 范围设置
+
+ {{lixiang.rangeSetting}}
+
+
+
+ 状态
+
+ {{getStatus(lixiang.state)}}
+
+
+
+
+
+
+
+
氛围明细信息
+
+
+
+
+ {{ scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
氛围成本信息
+
+
+
+
+ 内部人力成本预估
+
+ {{lixiang.internalLaborCostEstimation}}
+
+
+
+ 外部人力成本预估
+
+ {{lixiang.externalLaborCostEstimation}}
+
+
+
+ 商品成本预估
+
+ {{lixiang.costEstimationGoods}}
+
+
+
+ 设备成本预估
+
+ {{lixiang.setCostEstimate}}
+
+
+
+ 宣传费用预估
+
+ {{lixiang.estimatedPromotionalExpenses}}
+
+
+
+ 其他必要成本预估
+
+ {{lixiang.otherNecessaryEstimates}}
+
+
+
+ 总成本预估
+
+ {{lixiang.totalCostEstimation}}
+
+
+
+ 备注
+
+ {{lixiang.notes}}
+
+
+
+
+
+
预估效果
+
+
+
+
+ 预计吸引流量
+
+ {{lixiang.expectedAttractTraffic}}
+
+
+
+ 预计参与人数
+
+ {{lixiang.expectedParticipation}}
+
+
+
+ 预计直接收益
+
+ {{lixiang.expectedDirectBenefits}}
+
+
+
+ 预计间接收益
+
+ {{lixiang.expectedIndirectBenefits}}
+
+
+
+
+
+
+
+
相关附件信息
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+
系统信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+ 取消
+
+
+
+
+
+
+
+
+
+
调整前方案
+
{{xiaoduiObj.biliOne}}
+
投入产出比
+
+
+
+
+
计划任务(完成度)
+
+
+
+
+
+
+
+
+
+
+
调整后方案
+
{{xiaoduiObj.biliTwo}}
+
投入产出比
+
+
+
+
+
计划任务(完成度)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+ 保存
+
+
+
+
+
+
+ 方案名称
+
+ 审核状态
+
+
+
+ 返回
+ 保存
+
+
+
+
+
+
+
氛围策划调整纠错
+
+
+ 确定
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin-web-master/src/views/atmosphere/atmosphereSp.vue b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
index 2d3bce1..7b55858 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereSp.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereSp.vue
@@ -59,14 +59,15 @@
{{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
-
+
-
+
- OA流程审批
+ 查看
+ 审核
@@ -196,7 +197,7 @@
-
+
+ align="right">
@@ -756,6 +757,376 @@
+
+
+
+
+
+
![]()
+
+
+ {{text}}
+ 活动时间:{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}
+ 活动地点:{{tableData1[0].planName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
活动明细信息
+
+
+
+
+ {{ scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
活动成本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
预估效果
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
相关附件信息
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+
系统信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.$index +1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +点击上传
+
+ {{zhixingList.feedbackContent}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -817,34 +1188,36 @@
id: '',
text: 123,
tableData1: [{
- id: 0,
- name: '类型',
- planName: '',
- text: '活动地点',
- eventTheme: ''
- }, {
- id: 0,
- name: '活动开始时间',
- planName: '',
- text: '活动结束时间',
- eventTheme: ''
- }, {
- id: 0,
- name: '活动主题',
- planName: '',
- text: '活动主办方',
- eventTheme: ''
- }, {
- id: 0,
- name: '活动参与方',
- planName: '',
- text: '活动主要目的',
- eventTheme: ''
- }, {
- id: '5',
- name: '状态',
- eventTheme: '待审核'
- }],
+ id:0,
+ name: '类型',
+ planName: '',
+ text: '活动地点',
+ eventTheme: ''
+ },{
+ id:0,
+ name: '活动开始时间',
+ planName: '',
+ text: '活动结束时间',
+ eventTheme: ''
+ },{
+ id:0,
+ name: '活动主题',
+ planName: '',
+ text: '活动主办方',
+ eventTheme: ''
+ },{
+ id:0,
+ name: '活动参与方',
+ planName: '',
+ text: '活动主要目的',
+ eventTheme: ''
+ },{
+ id:0,
+ name: '范围设置',
+ planName: '',
+ text: '状态',
+ eventTheme: ''
+ }],
internalLaborCostEstimation: '',
externalLaborCostEstimation: '',
tableData3: [{
@@ -912,7 +1285,9 @@
pageindex: {
pageNumber: 1,
pageSize: 10,
- dataOwnership: '2'
+ dataOwnership: '2',
+ isDraft:0,
+ state:'待提交'
},
multipleSelection: [],
options: [{
@@ -926,6 +1301,9 @@
children: 'children',
label: 'classificationName'
},
+ dataList:[],
+ zhixingBian:false,//判断是否编辑执行效果
+
}
},
created() {
@@ -990,6 +1368,8 @@
dataOwnership: '2',
pageNumber: 1,
pageSize: 10,
+ isDraft:0,
+ state:'待提交'
})
this.tableData = res.data.content
} else if (this.planName == '' && this.eventTheme != '') {
@@ -998,6 +1378,8 @@
dataOwnership: '2',
pageNumber: 1,
pageSize: 10,
+ isDraft:0,
+ state:'待提交'
})
this.tableData = res.data.content
} else {
@@ -1007,6 +1389,8 @@
dataOwnership: '2',
pageNumber: 1,
pageSize: 10,
+ isDraft:0,
+ state:'待提交'
})
this.tableData = res.data.content
}
@@ -1094,6 +1478,7 @@
})
}
this.Liunie = false
+ this.actSpye = false
},
TabClick(tab, event){
console.log(tab, event)
@@ -1106,7 +1491,133 @@
}
this.getAll()
- }
+ },
+ //详情点击
+ handleEditForm(item,val) {
+ this.zhixingList={
+ planTime: [],
+ planName: '', //活动名称
+ eventAddrs: '', //实际举办地点
+ eventStartTime: 0, //实际开始时间
+ eventEndTime: 0, //实际结束时间
+ sponsor: '', //实际主办方
+ participants: '', //实际参与方
+ internalLaborCostEstimation: '', //内部人工成本
+ externalLaborCostEstimation: '', //外部人工成本
+ costEstimationGoods: '', //商品成本
+ setCostEstimate: '', //设备成本
+ estimatedPromotionalExpenses: '', //宣传费用预估
+ otherNecessaryEstimates: '', //其他成本预估
+ totalCostEstimation: '', //总成本预估
+ notes: '', //备注
+ expectedAttractTraffic: '', //吸引流量
+ expectedParticipation: '', //参与人数
+ expectedDirectBenefits: '', //直接收益
+ expectedIndirectBenefits: '', //间接收益
+ createDate:'',//创建时间
+ }//执行效果列表
+ actPage({
+ detailsId:item.id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res=>{
+ console.log(res.data.content)
+ if(res.data.content.length == 0){
+ this.zhiXing = true
+
+ }else{
+ mingTable({
+ detailsId:res.data.content[0].id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res=>{
+ this.tableDa = res.data.content
+ })
+ this.zhiXing = false
+ this.zhixingList = res.data.content[0]
+ if((typeof this.zhixingList.eventStartTime) == 'object' || (typeof this.zhixingList.eventEndTime) == 'object' ){
+ this.zhixingList.planTime = []
+ }else{
+ console.log(typeof this.zhixingList.eventStartTime)
+ this.zhixingList.planTime = [ this.zhixingList.eventStartTime, this.zhixingList.eventEndTime]
+ }
+ }
+ })
+ this.idX = item.id
+ this.planTime=[item.eventStartTime,item.eventEndTime]
+ let that = this
+
+ fujiaTable({
+ detailsId:item.id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res=>{
+ this.tableData6 = res.data.content
+ })
+ mingTable({
+ detailsId:item.id,
+ pageNumber: 1,
+ pageSize: 10,
+ }).then(res=>{
+ this.tableData2 = res.data.content
+ })
+
+ danqueryById({id:item.id,dataOwnership:'2', pageNumber: 1,pageSize: 10,}).then(res=>{
+ this.secondData = res.data.content[0]
+ //基本信息
+ // that.id=res.data.content[0].id
+ that.text=res.data.content[0].planName
+ that.tableData1[0].eventTheme =res.data.content[0].planType
+ that.tableData1[0].planName = res.data.content[0].eventAddrs
+ that.tableData1[1].eventTheme = res.data.content[0].eventStartTime
+ that.tableData1[1].planName = res.data.content[0].eventEndTime
+ that.tableData1[2].eventTheme =res.data.content[0].eventTheme
+ that.tableData1[2].planName = res.data.content[0].sponsor
+ that.tableData1[3].eventTheme = res.data.content[0].participants
+ that.tableData1[3].planName = res.data.content[0].mainPurpose
+ that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
+ that.tableData1[4].eventTheme = res.data.content[0].rangeSetting
+ //活动成本信息
+ that.internalLaborCostEstimation=res.data.content[0].internalLaborCostEstimation
+ that.externalLaborCostEstimation=res.data.content[0].externalLaborCostEstimation
+ that.tableData3[0].eventTheme = res.data.content[0].costEstimationGoods
+ that.tableData3[0].planName = res.data.content[0].setCostEstimate
+ that.tableData3[1].eventTheme = res.data.content[0].estimatedPromotionalExpenses
+ that.tableData3[1].planName = res.data.content[0].otherNecessaryEstimates
+ that.tableData3[2].eventTheme = res.data.content[0].totalCostEstimation
+ that.tableData3[2].planName = res.data.content[0].notes
+ //预估效果
+ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
+ that.expectedParticipation=res.data.content[0].expectedParticipation
+ that.tableData4[0].eventTheme = res.data.content[0].expectedDirectBenefits
+ that.tableData4[0].planName = res.data.content[0].expectedIndirectBenefits
+ //系统信息
+ that.createUser = res.data.content[0].createUser
+ that.createDate = res.data.content[0].createDate
+ that.tableData5[0].planName = '-'
+ that.tableData5[0].eventTheme = res.data.content[0].updateUser
+
+
+ }).catch(err=>{
+ console.log(err)
+
+ })
+ if (!item) {
+ this.formItem = {}
+ } else {
+ this.formItem = item
+ }
+ this.ggXin = true
+ },
+ refreshData(){
+ // console.log('12123')
+ this.tableDa = []
+ this.activeName = 'first'
+ this.zhixingBian = false
+ },
+ formTime(data){
+ this.zhixingList.planTime = data
+ },
}
}
@@ -1127,7 +1638,10 @@
line-height: 0;
}
-
+ .tableBtn {
+ display: inline-block;
+ margin-right: 10px;
+ }
.formSearch {
display: flex;
diff --git a/admin-web-master/src/views/member/tips/index.vue b/admin-web-master/src/views/member/tips/index.vue
index f0d0fc9..c0ba16b 100644
--- a/admin-web-master/src/views/member/tips/index.vue
+++ b/admin-web-master/src/views/member/tips/index.vue
@@ -1,5 +1,9 @@
+
+
@@ -14,22 +18,23 @@
- 查询
- 重置
+ 查询
+ 重置
-
- 新建标签
- 导出标签
-
+
+
+
+ 新建标签
+ 导出标签
-
- 编辑
- 删除
-
+ 编辑
+ 删除
+
@@ -100,6 +104,7 @@
+
diff --git a/admin-web-master/src/views/revenue/totalsales/index.vue b/admin-web-master/src/views/revenue/totalsales/index.vue
index 389845c..f5f9ad2 100644
--- a/admin-web-master/src/views/revenue/totalsales/index.vue
+++ b/admin-web-master/src/views/revenue/totalsales/index.vue
@@ -10,10 +10,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
@@ -38,21 +58,21 @@
总销售额(元)
-
100,000.00
+
{{moyeOne}}
美团销售总额(元)
-
100,000.00
+
{{meimoye}}
大麦销售总额(元)
-
100,000.00
+
{{moyeTwo}}
携程销售总额(元)
-
100,000.00
+
{{moyethree}}
-
+
@@ -72,10 +92,10 @@
-
+
单位:元
@@ -111,16 +131,16 @@
-
+
单位:元
@@ -135,13 +155,13 @@
diff --git a/admin-web-master/src/views/stockControl/inventory/addCommodity.vue b/admin-web-master/src/views/stockControl/inventory/addCommodity.vue
index 669b405..411bc13 100644
--- a/admin-web-master/src/views/stockControl/inventory/addCommodity.vue
+++ b/admin-web-master/src/views/stockControl/inventory/addCommodity.vue
@@ -3,7 +3,7 @@
商品详情
- 关闭
+ 关闭
审核
@@ -46,7 +46,7 @@
-