1

src/components/Suggest.vue

@@ -19,6 +19,7 @@
 					:on-success="handleFilesSuccess"
 					:on-preview="onFilePreView"
 					:before-upload="beforeUpload"
+					accept="image/jpeg,image/png"
 					:on-remove="onFileRemove"
 					:limit="1"
 					:multiple="true"
@@ -136,12 +137,12 @@ export default {
 		// 图片上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 2;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
 				this.$message.error('上传图片只能是 jpeg|png|jpg 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},
@@ -157,9 +158,12 @@ export default {
 			this.params.file_list = imgs;
 		},
 		handleFilesSuccess(response, file, fileList) {
-			this.img_fileList = fileList;
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
+			this.img_fileList = fileListData;
 			let imgs = [];
-			fileList.forEach((element, index) => {
+			fileListData.forEach((element, index) => {
 				imgs.push(element.url);
 			});
 			this.params.file_list = imgs;

src/components/applicationIntegrationPopup.vue

@@ -100,6 +100,7 @@
 								:before-upload="beforeUpload"
 								:on-remove="onFileRemove"
 								:limit="3"
+								accept="image/jpeg,image/png"
 								:multiple="true"
 								ref="clearPicture"
 							>
@@ -433,12 +434,12 @@ export default {
 		// 附件上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图片只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},
@@ -453,9 +454,12 @@ export default {
 			});
 		},
 		handleFilesSuccess(response, file, fileList) {
-			this.dialogData.items[this.itemIndex].fileList = fileList;
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
+			this.dialogData.items[this.itemIndex].fileList = fileListData;
 			this.dialogData.items[this.itemIndex].files = [];
-			fileList.forEach((element, index) => {
+			fileListData.forEach((element, index) => {
 				this.dialogData.items[this.itemIndex].files.push(element.url);
 			});
 		},

src/components/bonusPointsPopup.vue

@@ -111,6 +111,7 @@
 								:before-upload="beforeUpload"
 								:on-remove="onFileRemove"
 								:limit="3"
+								accept="image/jpeg,image/png"
 								:multiple="true"
 								ref="clearPicture"
 							>
@@ -466,12 +467,12 @@ export default {
 		// 附件上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},
@@ -488,9 +489,12 @@ export default {
 			});
 		},
 		handleFilesSuccess(response, file, fileList) {
-			this.dialogData.items[this.itemIndex].fileList = fileList;
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
+			this.dialogData.items[this.itemIndex].fileList = fileListData;
 			this.dialogData.items[this.itemIndex].files = [];
-			fileList.forEach((element, index) => {
+			fileListData.forEach((element, index) => {
 				this.dialogData.items[this.itemIndex].files.push(element.url);
 			});
 		},

src/components/upload.vue

@@ -14,6 +14,7 @@
 			:before-upload="_beforeUpload"
 			:on-exceed="_onExceed"
 			:limit="limit"
+			:accept="accept"
 			:on-change="handleChange"
 			:multiple="multiple"
 		>
@@ -30,6 +31,10 @@ import moment from 'moment';
 import axios from 'axios';
 export default {
 	props: {
+		accept:{
+		  type:String,
+		  // default:'image/*'
+		},
 		action: {
 			//必选参数，上传的地址
 			type: String,

src/main.js

@@ -23,7 +23,7 @@ Vue.component('userImage', userImage)
 Vue.component('noData', noData)
 Vue.use(ElementUI);
 if (process.env.NODE_ENV === 'development') {
-  // new VConsole()
+  new VConsole()
 }
 Vue.prototype.$echarts = echarts
 Vue.prototype.$dd = dd;

src/views/common/rewardTask.vue

@@ -167,6 +167,7 @@
 							:before-upload="beforeUpload"
 							:on-remove="onFileRemove"
 							:limit="3"
+							accept="image/jpeg,image/png"
 							:multiple="true"
 							ref="clearPicture"
 						>
@@ -643,7 +644,10 @@ export default {
 			return data;
 		},
 		handleFilesSuccess(response, file, fileList) {
-			this.fileFun(file, fileList)
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
+			this.fileFun(file, fileListData)
 		},
 		onFilePreView(file) {
 			if (file.response) {
@@ -663,12 +667,12 @@ export default {
 		// 附件上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图片只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},

src/views/common/rewardTaskAmend.vue

@@ -137,6 +137,7 @@
 							:on-success="handleFilesSuccess"
 							:on-preview="onFilePreView"
 							:before-upload="beforeUpload"
+							accept="image/jpeg,image/png"
 							:on-remove="onFileRemove"
 							:limit="3"
 							:multiple="true"
@@ -476,7 +477,10 @@ export default {
 			item.rule_value=[];
 		},
 		handleFilesSuccess(response, file, fileList) {
-			this.fileFun(file, fileList)
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
+			this.fileFun(file, fileListData)
 		},
 		onFilePreView(file) {
 			if (file.response) {
@@ -496,12 +500,12 @@ export default {
 		// 附件上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图片只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},

src/views/common/temporaryTask.vue

@@ -165,6 +165,7 @@
 							:before-upload="beforeUpload"
 							:on-remove="onFileRemove"
 							:limit="3"
+							accept="image/jpeg,image/png"
 							:multiple="true"
 							ref="clearPicture"
 						>
@@ -450,7 +451,10 @@ export default {
 		},
 		
 		handleFilesSuccess(response, file, fileList) {
-			this.fileFun(file, fileList);
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
+			this.fileFun(file, fileListData);
 		},
 		onFilePreView(file) {
 			if (file.response) {
@@ -470,12 +474,12 @@ export default {
 		// 附件上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图片只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},

src/views/common/temporaryTaskAmend.vue

@@ -160,6 +160,7 @@
 							:before-upload="beforeUpload"
 							:on-remove="onFileRemove"
 							:limit="3"
+							accept="image/jpeg,image/png"
 							:multiple="true"
 							ref="clearPicture"
 						>
@@ -616,7 +617,10 @@ export default {
 			this.resetForm('formData')
 		},
 		handleFilesSuccess(response, file, fileList) {
-			this.fileFun(file, fileList)
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
+			this.fileFun(file, fileListData)
 		},
 		onFilePreView(file) {
 			if (file.response) {
@@ -636,12 +640,12 @@ export default {
 		// 附件上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图片只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},

src/views/ranking/integral_event.vue

@@ -233,7 +233,7 @@
 					<Steps :process="detail_info.process"></Steps>
 				</div>
 
-				<div style="text-align: center;margin-top: 30px;" v-if="detail_info.source_type == 10">
+				<div style="text-align: center;margin-top: 30px;" v-if="detail_info.source_type == 10&&see_log">
 					<el-button type="primary" size="medium" @click="showLog = true">
 						查看日志详情内容
 						<span style=";padding-left:5px;">»</span>
@@ -405,6 +405,7 @@ export default {
 			selectionID: [], //删除的事件ID
 			// 查看日志
 			showLog: false,
+			see_log:1,
 			ding_report: {
 				contents: [],
 				images: []
@@ -435,6 +436,8 @@ export default {
 		this.getDepartment();
 		this.get_rule_trees();
 		this.get_integral_list(this.formData);
+		this.see_log=this.$store.state.config.see_log;
+		console.log(this.see_log)
 		this.point_types = this.getTypes();
 	},
 	watch: {

src/views/set/log.vue

@@ -12,15 +12,16 @@
 				</div>
 				<div class="flex-box-end" style="margin-top: 20px;">
 					<el-button  v-if="$authoritys() != 'dept_manager' && $authoritys() != 'employee'" plain @click="isShowLog = true">刷新汇报记录</el-button>
-					<el-button  type="primary"  @click="add()">添加日志模板</el-button>
+					<el-button  type="primary" plain  @click="add()">添加日志模板</el-button>
+					<el-button  type="primary" @click="isPz = true">设置<i class="el-icon-setting el-icon--right"></i></el-button>
 				</div>
 			</div>
 			<el-table ref="multipleTable" :data="list" tooltip-effect="dark" align="center" v-loading="loading">
 				<el-table-column label="序号" align="left" type="index"></el-table-column>
 				<el-table-column label="日志名称" prop="name"></el-table-column>
-				<el-table-column label="日志积分规则">
+				<el-table-column label="日志积分规则"  min-width="300">
 					<template slot-scope="scope">
-						<span>{{ getMoney(scope.row.interval) }}汇报,每次奖{{ scope.row.config.point }} B分</span>
+						<span>{{ getMoney(scope.row.interval) }}汇报,每次奖{{ scope.row.config.point }} B分,汇报超过{{scope.row.config.point}}次不再奖励积分</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="状态">
@@ -47,7 +48,17 @@
 				</template>
 			</el-table>
 		</div>
-		<el-dialog title="设置" :visible.sync="dialogVisible" top="25vh" width="520px" class="dialog">
+		<el-dialog title="日志配置" :visible.sync="isPz" top="25vh" width="520px" class="dialog">
+			<el-alert class="el-dialog__body" title="日志配置适用所有日志" type="warning" :closable="false" show-icon></el-alert>
+			<el-form label-width="170px" ref="setForm" class="form">
+				<el-form-item label="是否允许查看日志内容"><el-switch v-model="see_log" :active-value="1" :inactive-value="0"></el-switch></el-form-item>
+				<el-form-item style="text-align: right; margin-bottom: 0">
+					<el-button @click="isPz = false">取消</el-button>
+					<el-button type="primary" :loading="setLoading" :disabled="setLoading" @click="saveFirst()">确定</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
+		<el-dialog title="添加日志模板" :visible.sync="dialogVisible" top="25vh" width="520px" class="dialog">
 			<el-alert class="el-dialog__body" title="日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分" type="warning" :closable="false" show-icon></el-alert>
 			<el-form label-width="110px" :model="selectItem" ref="setForm" class="form">
 				<el-form-item style="margin-bottom: 0px;" label="日志名称">
@@ -141,6 +152,7 @@ export default {
 			ding_enable: true,
 			list: [],
 			dialogVisible: false,
+			isPz:false,
 			pickerOptions: {
 				disabledDate(time) {
 					return time.getTime() > Date.now() - 8.64e7;
@@ -179,7 +191,9 @@ export default {
 			logData: {
 				type: 1,
 				target_date: ''
-			}
+			},
+			configData:{},
+			see_log:1
 		};
 	},
 	watch: {
@@ -200,8 +214,32 @@ export default {
 	},
 	mounted() {
 		this.getList();
+		this.cheakAx();
 	},
 	methods: {
+		saveFirst(name) {
+			this.configData.see_log=this.see_log
+			this.$axios('post', '/api/integral/site/config', this.configData)
+				.then(res => {
+					if (res.data.code == 1) {
+						this.$message({
+							message: res.data.msg,
+							type: 'success'
+						});
+					}
+				})
+				.finally(() => {
+					this.isPz=false;
+					this.cheakAx('first');
+				});
+		},
+		cheakAx() {
+			this.$axios('get', '/api/integral/site/config').then(res => {
+				this.$store.dispatch('setConfig', res.data.data);
+				this.configData = res.data.data;
+				this.see_log=res.data.data.see_log;
+			})
+		},
 		refresh(fromName) {
 			this.$refs[fromName].validate(valid => {
 				if (valid) {
@@ -324,7 +362,6 @@ export default {
 			});
 		},
 		openSet(item) {
-			console.log(item);
 			var jsonItem = JSON.stringify(item);
 			this.selectItem = JSON.parse(jsonItem);
 			this.selectItem.enable = this.selectItem.enable == 0 ? false : true;

src/views/task/my_task.vue

@@ -131,6 +131,7 @@
 							:before-upload="beforeUpload"
 							:on-remove="onFileRemove"
 							:limit="3"
+							accept="image/jpeg,image/png"
 							:multiple="true"
 							ref="clearPicture"
 						>
@@ -226,6 +227,9 @@ export default {
 			this.get_list()
 		},
 		handleFilesSuccess(response, file, fileList) {
+			let fileListData=fileList.filter(e=>{
+			  return e.url
+			})
 			this.fileFun(file, fileList)
 		},
 		onFilePreView(file) {
@@ -246,12 +250,12 @@ export default {
 		// 附件上传
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图片只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},

src/views/welfare/prize.vue

@@ -369,12 +369,12 @@ export default {
 
 		beforeUpload(file) {
 			const isJPG = /^image\/(jpeg|png|jpg)$/.test(file.type);
-			const isLt2M = file.size / 1024 / 1024 < 1;
+			const isLt2M = file.size / 1024 / 1024 < 5;
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 JPEG,PNG,JPG 格式!');
+				this.$message.error('上传图片只能是 JPEG,PNG,JPG 格式!');
 			}
 			if (!isLt2M) {
-				this.$message.error('上传头像图片大小不能超过 2MB!');
+				this.$message.error('上传图片大小不能超过 5MB!');
 			}
 			return isJPG && isLt2M;
 		},