钉钉1.4 终

src/api/auth.js

@@ -52,9 +52,15 @@ export function supremeAuthority () {//获取当前角色最高权限     判断
 export function authoritys (key) {//判断是否为某项权限：this.$authoritys('dept_manager')
 	return supremeAuthority() == key
 }
-
+//过滤绩效分
+ function GlTypes(arr){
+	return arr.filter(function(item){
+		return item.code!='JX'
+	})
+}
 export function setTyps (data) {
-     localStorage.setItem(TypesKey,JSON.stringify(data))
+    var arr=GlTypes(data);
+    localStorage.setItem(TypesKey,JSON.stringify(arr))
 }
 
 export function getToken () {

src/components/bonusPointsPopup.vue

@@ -606,7 +606,7 @@ export default {
 								}
 							});
 						} else {
-							res.data.data.forEach(item => {
+							res.data.data.list.forEach(item => {
 								if (item.status != 1) {
 									is = false;
 									msg = item.rule_item;

src/components/examinePopup.vue

@@ -12,13 +12,12 @@
 							<template>
 								<div class="flex-box flex-v-ce">
 									<span style="line-height:50px; margin-left:10px;margin-right:10px;">{{ detail_info.employee_name }}</span>
-									<span class="point" v-show="detail_info.point >= 0 && detail_info.point">
-										<span class="red" v-if="(detail_info.review_point == 0 ? detail_info.point : detail_info.review_point) > 0">+{{ detail_info.review_point == 0 ? detail_info.point : detail_info.review_point }}</span>
-										<span v-else class="green">{{ detail_info.review_point == 0 ? detail_info.point : detail_info.review_point }}</span>
+									<span class="point" v-if="detail_info.status==1">
+										<span class="red" v-if="detail_info.review_point > 0">+{{detail_info.review_point}}</span>
+										<span v-else class="green">{{detail_info.review_point}}</span>
 										<span style="margin-left: 5px;"> {{$getTypsName(detail_info.pt_id)}}</span>
 									</span>
 									<div style="margin-left: 5px;">
-										<span class="green point" v-show="detail_info.point < 0 && detail_info.point">{{ detail_info.point }}</span>
 										<span v-if="detail_info.status == 1" class="green">审批通过</span>
 										<span v-else-if="detail_info.status == 2" class="red">审批驳回</span>
 										<span v-else-if="detail_info.status == 0" class="yellow">待审批</span>
@@ -83,25 +82,24 @@
 							审批人 &nbsp;
 							<span class="row_tips" style="font-size:12px;color:#909399">多人审批时，以最后一人为准</span>
 						</p>
-
 						<div class="examine_steps">
 							<el-steps direction="vertical" :space="50">
-								<el-step v-for="(item, index) in detail_info.process" :key="index" style="display:flex;">
+								<el-step v-for="(item, index) in detail_info.process" :key="index">
 									<template slot="icon">
 										<userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
 									</template>
 									<template slot="title">
 										<div style="color: #303133;font-size:14px;margin-top:-2px;">
-											{{ item.name }} &nbsp;
+											{{ item.name }} 
 											<span v-if="item.remark == '待审核'" class="yellow">待审批</span>
 											<span v-else-if="item.remark == '审核通过'" class="green">审批通过</span>
 											<span v-else-if="item.remark == '审核驳回'" class="red">审批驳回</span>
 											<span v-else>{{ item.remark }}</span>
-											<span style="color: #909399;font-size:12px;float:right">{{ item.time }}</span>
 										</div>
 									</template>
 									<template slot="description">
-										<div style="word-break:break-all;">{{ item.review_remark }}</div>
+										<div>{{ item.time }}</div>
+										<div style="color: #333; margin-bottom: 15px;">{{ item.review_remark }}</div>
 									</template>
 								</el-step>
 							</el-steps>
@@ -114,7 +112,7 @@
 							<el-button v-else @click="rejectBtn">驳回</el-button>
 							<el-button type="primary" @click="adoptBtn">通过</el-button>
 						</el-col>
-						<el-col :span="24" style="text-align: right;padding-top:20px" v-else>
+						<el-col :span="24" style="text-align: right;padding-top:20px" v-if="(detail_info.status==1||detail_info.status==2)&&detail_info.review_status==0">
 							<span style="color:#909399;font-size:12px;padding-right:20px">撤回后需重新审批</span>
 							<el-button type="primary" @click="revokeApproval">撤回审批</el-button>
 						</el-col>
@@ -592,12 +590,12 @@ export default {
 			this.adoptForm.rule_id = 0;
 			this.adoptForm.item_id = 0;
 			this.forbiddenInputNum = false;
+			this.adoptForm.reviewer_id=0;
 			this.adoptShow = false;
 			this.manager = ''; //清空递交审批
 			this.manager_selected = { dept: [], employee: [] }; //清空递交审批
 			this.adoptForm.remark = '';
 			this.adoptForm.switch = false;
-			// this.$refs["adoptForm"].resetFields();
 		},
 		// 确定通过
 		submitAdopt(formName) {
@@ -676,7 +674,7 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped="scoped">
 	label {
 	    font-weight: 700;
 	}
@@ -697,7 +695,8 @@ export default {
 	padding: 20px;
 	overflow-y: auto;
 	overflow-x: hidden !important;
-	height: calc(100vh - 60px);
+	height: calc(100vh - 100px);
+	padding-bottom: 30px;
 	.row_title {
 		position: relative;
 		margin: 0 0 20px 0;
@@ -726,4 +725,9 @@ export default {
 	padding: 20px;
 	border-bottom: 1px #efefef solid;
 }
+.examine_steps {
+	.el-step {
+		flex-basis: auto !important;
+	}
+}
 </style>

src/init.vue

@@ -29,7 +29,7 @@ export default {
 			isRefresh: false,
 			disabled: false,
 			showBtnCunt: 0,
-			dialogFormVisible:true
+			dialogFormVisible:false
 		};
 	},
 	watch: {},

src/main.js

@@ -19,9 +19,9 @@ import { getToken, setToken,getUserData,setUserData,getTyps,setTyps,getIsCreator
 import userImage from '@/components/UserImage'
 Vue.component('userImage', userImage)
 Vue.use(ElementUI);
-if (process.env.NODE_ENV === 'development') {
-  new VConsole()
-}
+// if (process.env.NODE_ENV === 'development') {
+//   new VConsole()
+// }
 
 Vue.prototype.$echarts = echarts
 Vue.prototype.$dd=dd;

src/views/abPoint/apply_list.vue

@@ -167,7 +167,6 @@
 								<template slot="title">
 									<div style="color: #303133;font-size:14px;margin-top:-2px;">
 										{{ item.name }} {{ item.remark }}
-										<!-- <span v-show="item.point !== 0">{{item.point}}</span> -->
 									</div>
 								</template>
 								<template slot="description">

src/views/abPoint/award_punish.vue

@@ -244,11 +244,11 @@
 								<template slot="title">
 									<div style="color: #303133;font-size:14px;margin-top:-2px;">
 										{{ item.name }} {{ item.remark }}
-										<!-- <span v-show="item.point !== 0">{{item.point}}</span> -->
 									</div>
 								</template>
 								<template slot="description" style="">
 									<div style="color:#828282">{{ item.time }}</div>
+									<div style="color:#717171;font-size:14px;margin-bottom:15px;">{{item.review_remark}}</div>
 								</template>
 							</el-step>
 						</el-steps>
@@ -542,9 +542,14 @@ export default {
 	padding: 20px;
 	min-height: calc(100vh - 160px);
 }
+.examine_steps {
+	.el-step {
+		flex-basis: auto !important;
+	}
+}
 .detail_popup {
 	padding: 20px;
-	height: calc(100vh - 60px);
+	height: calc(100vh - 100px);
 	overflow: auto;
 	.row_title {
 		position: relative;

src/views/ranking/dept_rank.vue

@@ -556,7 +556,7 @@ export default {
 		},
 	},
 	mounted() {
-		this.point_types=this.$getTyps().slice(1);
+		this.point_types=this.$getTyps();
 		this.tips_show = JSON.parse(localStorage.getItem('dept_rank_tips')) ? false : true;
 		this.getDepartment();
 		this.getEmployeeList();

src/views/ranking/integral_event.vue

@@ -126,12 +126,12 @@
 					</div>
 				</el-row>
 
-				<el-row>
+				<el-row v-show="detail_info.rule_list">
 					<el-col :span="6">任务描述</el-col>
 					<el-col :span="18" v-if="detail_info.remark">{{ detail_info.remark && (detail_info.remark.customize || detail_info.remark.rule) }}</el-col>
 				</el-row>
 
-				<el-row>
+				<el-row v-show="detail_info.rule_list">
 					<el-col :span="6">规则分类</el-col>
 					<el-col :span="18">{{ detail_info.rule_list }}</el-col>
 				</el-row>
@@ -153,7 +153,7 @@
 
 				<el-row v-show="detail_info.files !== null && detail_info.files.length > 0">
 					<el-col :span="6">图片</el-col>
-					<el-col :span="18"><el-image style="width: 100px; height: 100px" :src="detail_info.files[0]" :preview-src-list="detail_info.files"></el-image></el-col>
+					<el-col :span="18"><el-image style="width: 100px; height: 100px" :src="detail_info.files[0]" :prediv-src-list="detail_info.files"></el-image></el-col>
 				</el-row>
 
 				<div v-show="detail_info.rule_id">
@@ -190,8 +190,8 @@
 									<div style="color: #303133;font-size:14px;margin-top:-2px;">
 										{{ item.name }} {{ item.remark }}
 										<strong style="font-weight: 500;">
-											<span class="red point" v-show="item.review_point > 0">+{{ item.review_point }}</span>
-											<span class="green point" v-show="item.review_point < 0">{{ item.review_point }}</span>
+											<span class="red point" v-show="item.rediv_point > 0">+{{ item.rediv_point }}</span>
+											<span class="green point" v-show="item.rediv_point < 0">{{ item.rediv_point }}</span>
 										</strong>
 									</div>
 								</template>
@@ -202,13 +202,43 @@
 						</el-steps>
 					</div>
 				</div>
+				
+				<div style="text-align: center;margin-top: 30px;" v-if="detail_info.source_type==10">
+					 <el-button type="primary" size="medium" @click="showLog=true">查看日志详情内容 <span style=";padding-left:5px;">»</span></el-button>
+				</div>
 				<div v-if="!this.$authoritys('employee')" style="position: absolute; bottom: 20px; display: block; right: 20px;">
 					<el-button @click="close_integral_event">取消</el-button>
 					<el-button type="danger" @click="del_integral_event(detail_info)">删除</el-button>
 				</div>
 			</div>
 		</el-drawer>
-
+			
+		<el-dialog title="查看日志详情" width="600px" :visible.sync="showLog">
+			<div class="title">{{ding_report.creator_name}}的{{ding_report.template_name}}</div>
+			<div v-if="ding_report.contents.length>0">
+				<div class="contents" v-for="(item,index) in ding_report.contents" :key="index">
+					<div class="key">{{item.key}}</div>
+					<div class="value fontColorF">
+						<span v-if="item.value">{{item.value}}</span>
+						<span v-else>未填写</span>
+					</div>
+				</div>  
+			</div>
+			<div  v-if="ding_report.images.length>0">
+			  <div class="key" style="margin-bottom: 20px;">图片</div>
+			  <div class="flex-box flex-d-wrap">
+				  <el-image
+				  	v-for="(item, index) in ding_report.images"
+				  	:key="index"
+				  	style="width: 100px; height: 100px;margin-right:8px"
+				  	:src="item"
+				  	:preview-src-list="ding_report.images"
+				  ></el-image>
+<!-- 				  <img class="imgs" :src="imgs" v-for="(imgs,index) in ding_report.images" :key="index"/> -->
+			  </div>
+			</div>
+		</el-dialog>
+		
 		<!-- 导入数据 -->
 		<el-dialog title="导入积分事件数据" width="600px" :visible.sync="excelImportShow" :close-on-click-modal="false" :before-close="close_import">
 			<div style="padding:0 50px;">
@@ -223,7 +253,7 @@
 					ref="upload" 
 					:action="action" 
 					:on-remove="handleRemove"
-					:on-success="handlePictureCardPreview" 
+					:on-success="handlePictureCardPrediv" 
 					:file-list="fileList"
 					:before-upload="beforeFilesUpload">
 						<p>2、上传积分事件数据Excel表<el-button  style="margin-left: 10px;" size="medium" type="primary" plain>选择文件</el-button></p>
@@ -309,11 +339,16 @@ export default {
 			employeeOrdept:!this.$authoritys('employee') && !this.$authoritys('dept_manager'),
 			
       		selectionID:[],//删除的事件ID
+			// 查看日志
+			showLog:false,
+			ding_report:{
+				contents:[],
+				images:[]
+			}
+			
 		};
 	},
 	components: { noData },
-	created() {
-	},
 	mounted() {
 		this.getDepartment();
 		this.get_rule_trees();
@@ -410,7 +445,7 @@ export default {
 					}, 3000);
 				});
 		},
-		handlePictureCardPreview(response) {
+		handlePictureCardPrediv(response) {
 			if (response.code == 1) {
 				if(response.data.error.length>0){
 					var htmls=response.data.error;
@@ -445,7 +480,7 @@ export default {
 				return false;
 			}
 		},
-		onFilePreView() {},
+		onFilePrediv() {},
 		exportExcel() {
 			window.open(process.env.VUE_APP_BASE_API +'api/download/integral?employee_id='+this.$getUserData().id+'&page=' +this.formData.page +
 					'&page_size=' +
@@ -517,6 +552,10 @@ export default {
 			this.$axios("get",'/api/integral/statistics/integral/info',data).then(res => {
 					if (res.data.code == 1) {
 						this.detail_info = res.data.data;
+						var ding_report=res.data.data.remark.ding_report
+						if(Object.keys(ding_report).length!=0){
+							this.ding_report= res.data.data.remark.ding_report
+						}
 					} else {
 						this.$message.error(res.data.data.msg);
 					}
@@ -622,6 +661,29 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.title{
+  text-align: center;
+  font-weight: 700;
+  max-width: 70%;
+  margin: 20px auto;
+  margin-top: 0;
+  font-size: 18px;
+}
+.key{
+  font-weight: 700;
+  font-size: 16px;
+}
+.value{
+  font-size: 14px;
+  margin: 10px 0;
+  margin-bottom: 20px;
+}
+.imgs{
+  width: 80px;
+  height: 80px;
+  margin-right: 5px;
+  margin-bottom: 5px;
+}
 header.el-drawer__header {
 	font-size: 18px;
 	font-family: MicrosoftYaHei;

src/views/set/log.vue

@@ -3,14 +3,19 @@
 		<div class="all" style="padding: 40px;">
 			<div style="margin-bottom: 30px;">
 				<div class="initia_title">工作日志积分</div>
-				<div class="initia_title_1">日志的相关说明</div>
+				<div class="initia_title_1">
+					1、启用后，在钉钉发布工作日志，系统自动按“日志积分规则”奖分<br />
+					2、日志名称必须与“钉钉日志模板名称”一致，否则奖分不会生效<br />
+					3、日志支持每月、每周、每次汇报，可自行根据需要设置“日志积分规则
+					
+				</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="日志积分规则">
 					<template slot-scope="scope">
-						<span>{{getMoney(scope.row.interval)}}<span v-if="scope.row.config.upper_limit>0">{{scope.row.config.upper_limit }}</span>汇报,每次奖{{ scope.row.config.point }} B分</span>
+						<span>{{ getMoney(scope.row.interval) }}汇报,每次奖{{ scope.row.config.point }} B分</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="状态">
@@ -29,39 +34,47 @@
 				</template>
 			</el-table>
 		</div>
-		<el-dialog title="设置" :visible.sync="dialogVisible" top="25vh" width="520px">
-			<el-form label-width="110px" :model="selectItem" ref="setForm">
-				<el-form-item label="是否启用"><el-switch v-model="selectItem.enable"></el-switch></el-form-item>
-				<el-form-item label="日志名称" prop="name" :rules="[{ required: true, message: '请输入日志名称'}]">
-					 <div class="flex-box flex-v-ce">
-						 <div class="font-flex-word name">{{selectItem.name}}</div>
-						 <div class="blue" @click="showName(selectItem.name)">修改</div>
-					 </div>
-					 <el-dialog title="设置名称" :visible.sync="isShowName" top="25vh" width="520px" append-to-body>
-						 <div style="text-align: center;">
-							  <!-- <el-popover placement="top-start" title="温馨提示" width="200" trigger="hover" content="日志名称必须与钉钉预设模板名称一致,否则可能会无法同步钉钉的日志记录"> -->
-								 <el-input style="width: 200px;" v-model="nameVal" slot="reference"></el-input>
-							  <!-- </el-popover> -->
-							  <div  class="yellow" style="margin-top: 10px;">*日志名称必须与钉钉预设模板名称一致,<br/>否则可能会无法同步钉钉的日志记录*</div>
-							  <div class="flex-box-end" style="margin-top: 20px;">
-								  <el-button @click="isShowName = false">取消</el-button>
-								  <el-button type="primary" @click="submitName()">确定</el-button>
-							  </div>
-						  </div>
-					 </el-dialog>
-				</el-form-item>
-				<div class="title">日志积分规则</div>
-				<el-form-item label="日志汇报要求" prop="interval" :rules="[{ required: true, message: '请选择汇报要求'}]">
-					  <el-select class="widthInput"  v-model="selectItem.interval" placeholder="请选择">
-					    <el-option v-for="item in options"  :key="item.value" :label="item.label" :value="item.value"></el-option>
-					  </el-select>
-				</el-form-item>
-				<el-form-item label="每次汇报奖" :rules="[{ required: true, message: '请输入分值', trigger: 'change' }]" prop="config.point">
-					<el-input class="widthInput"  oninput="value=value.replace(/[^\d]/g,'')"  v-model.number="selectItem.config.point"></el-input><span style="margin-left: 5px;">B分</span>
-				</el-form-item>
-				<el-form-item label="汇报提交超过" prop="config.upper_limit" :rules="[{ required: true, message: '请输入次数'}]" >
-					<el-input class="widthInput"  oninput="value=value.replace(/[^\d]/g,'')" v-model.number="selectItem.config.upper_limit"></el-input><span style="margin-left: 5px;">次,不再奖励积分</span>
+		<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="日志名称">
+					<div class="flex-box flex-v-ce">
+						<div class="font-flex-word name">{{ selectItem.name }}</div>
+						<div class="blue" @click="showName(selectItem.name)">修改</div>
+					</div>
+					<el-dialog title="设置名称" :visible.sync="isShowName" top="25vh" width="520px" append-to-body>
+						<div style="text-align: center;">
+							<!-- <el-popover placement="top-start" title="温馨提示" width="200" trigger="hover" content="日志名称必须与钉钉预设模板名称一致,否则可能会无法同步钉钉的日志记录"> -->
+							<el-input style="width: 200px;" v-model="nameVal" slot="reference"></el-input>
+							<!-- </el-popover> -->
+							<div class="yellow" style="margin-top: 10px;">
+								*日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分*
+							</div>
+							<div class="flex-box-end" style="margin-top: 20px;">
+								<el-button @click="isShowName = false">取消</el-button>
+								<el-button type="primary" @click="submitName()">确定</el-button>
+							</div>
+						</div>
+					</el-dialog>
 				</el-form-item>
+				<el-form-item style="margin-bottom: 10px;" label="是否启用"><el-switch v-model="selectItem.enable"></el-switch></el-form-item>
+				<template v-if="selectItem.enable">
+					<div style="margin-top: 20px;"></div>
+					<div class="title">日志积分规则</div>
+					<el-form-item label="日志汇报要求" prop="interval" :rules="[{ required: true, message: '请选择汇报要求' }]">
+						<el-select class="widthInput" v-model="selectItem.interval" placeholder="请选择">
+							<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="每次汇报奖励" :rules="[{ required: true, message: '请输入分值', trigger: 'change' }]" prop="config.point">
+						<el-input class="widthInput" oninput="value=value.replace(/[^\d]/g,'')" v-model.number="selectItem.config.point"></el-input>
+						<span style="margin-left: 5px;">B分</span>
+					</el-form-item>
+					<el-form-item label="汇报提交超过" prop="config.upper_limit" :rules="[{ required: true, message: '请输入次数' }]">
+						<el-input class="widthInput" oninput="value=value.replace(/[^\d]/g,'')" v-model.number="selectItem.config.upper_limit"></el-input>
+						<span style="margin-left: 5px;">次,不再奖励积分</span>
+					</el-form-item>
+				</template>
 				<el-form-item style="text-align: right; margin-bottom: 0">
 					<el-button @click="dialogVisible = false">取消</el-button>
 					<el-button type="primary" :loading="setLoading" :disabled="setLoading" @click="submit('setForm')">确定</el-button>
@@ -82,71 +95,77 @@ export default {
 			ding_enable: true,
 			list: [],
 			dialogVisible: false,
-			selectItem:{
-				config: {point: "", upper_limit: ""},
+			selectItem: {
+				config: { point: '', upper_limit: '' },
 				enable: '',
 				id: '',
 				interval: '',
-				name: "",
+				name: '',
 				site_id: '',
-				type: "",
+				type: ''
 			},
-			options: [{
-			  value: 1,
-			  label: '每日'
-			}, {
-			  value: 2,
-			  label: '每周'
-			}, {
-			  value: 3,
-			  label: '每月'
-			}],
-			isShowName:false,
-			nameVal:"",
+			options: [
+				{
+					value: 1,
+					label: '每日'
+				},
+				{
+					value: 2,
+					label: '每周'
+				},
+				{
+					value: 3,
+					label: '每月'
+				}
+			],
+			isShowName: false,
+			nameVal: ''
 		};
 	},
 	mounted() {
 		this.getList();
 	},
 	methods: {
-		submitName(){
-			if(!this.nameVal||this.nameVal==null||this.nameVal==undefined){
-				this.$message.error("请输入日志名称");
-				return
+		submitName() {
+			if (!this.nameVal || this.nameVal == null || this.nameVal == undefined) {
+				this.$message.error('请输入日志名称');
+				return;
 			}
-			this.selectItem.name=this.nameVal
-			this.isShowName=false;
+			this.selectItem.name = this.nameVal;
+			this.isShowName = false;
 		},
-		showName(name){
-			this.nameVal=name;
-			this.isShowName=true;
+		showName(name) {
+			this.nameVal = name;
+			this.isShowName = true;
 		},
 		submit(fromName) {
 			this.$refs[fromName].validate(valid => {
 				if (valid) {
 					this.setLoading = true;
-					let jsonItem=JSON.stringify(this.selectItem)
-					let data=JSON.parse(jsonItem);
-					data.enable=data.enable? 1:0;
-					data.point=data.config.point;
-					data.upper_limit=data.config.upper_limit;
-					this.$axios('post', '/api/integral/report/templates', data).then(res => {
-						if (res.data.code == 1) {
-							this.$message.success(res.data.msg);
-							this.getList();
-							this.dialogVisible = false;
-						}
-					}).finally(() => {
-						this.setLoading = false;
-					});
+					let jsonItem = JSON.stringify(this.selectItem);
+					let data = JSON.parse(jsonItem);
+					data.enable = data.enable ? 1 : 0;
+					data.point = data.config.point;
+					data.upper_limit = data.config.upper_limit;
+					this.$axios('post', '/api/integral/report/templates', data)
+						.then(res => {
+							if (res.data.code == 1) {
+								this.$message.success(res.data.msg);
+								this.getList();
+								this.dialogVisible = false;
+							}
+						})
+						.finally(() => {
+							this.setLoading = false;
+						});
 				}
 			});
 		},
 		openSet(item) {
-			var jsonItem=JSON.stringify(item)
-			this.selectItem=JSON.parse(jsonItem);
-			this.selectItem.enable=this.selectItem.enable==0? false:true
-			this.dialogVisible=true;
+			var jsonItem = JSON.stringify(item);
+			this.selectItem = JSON.parse(jsonItem);
+			this.selectItem.enable = this.selectItem.enable == 0 ? false : true;
+			this.dialogVisible = true;
 		},
 		getMoney: function(index) {
 			var str; //1-每日 2-每周 3-每月
@@ -177,14 +196,19 @@ export default {
 };
 </script>
 <style scoped lang="scss">
- .widthInput{
-	 width: 120px;
- }	
+.el-dialog__body{
+	position: relative;
+	top: -20px;
+}	
+.widthInput {
+	width: 120px;
+}
 .title {
 	margin: 10px 0;
 	margin-top: 0;
-	font-size: 16px;
+	font-size: 14px;
 	font-weight: 700;
+	padding-left: 13px;
 }
 .initia_title {
 	font-size: 20px;
@@ -205,7 +229,7 @@ export default {
 .lookQrcode:hover {
 	color: #2490fd;
 }
-.name{
+.name {
 	max-width: 200px;
 	margin-right: 10px;
 }

src/views/set/systemLayout.vue

@@ -26,11 +26,9 @@
 						<el-switch style="margin-left:30px;" v-model="isApB"></el-switch>
 					</b>
 					<div class="flex-box flex-v-ce" style="margin-top:10px;" v-if="isApB">
-						1A分=
-						<el-input v-model.number="pointNum" autofocus="0" class="pointNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-						B分
+						1A分=<el-input v-model.number="pointNum" autofocus="0" size="mini" class="pointNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>B分
 					</div>
-					<div style="margin-top:5px;" class="fontColorF">
+					<div style="margin-top:10px;" class="fontColorF">
 						<div>开启后，每奖/扣1条A分，额外产生一条分值按比例转换后的B分记录；</div>
 						<div>例如：设置1A分=10B分时，因表现出色奖10A分的同时，额外奖100B分。</div>
 					</div>
@@ -201,7 +199,6 @@ export default {
 	.pointNum {
 		width: 100px;
 		margin: 0 10px;
-		height: 35px;
 	}
 	b {
 		font-size: 16px;

src/views/workbench/approval_list.vue

@@ -90,16 +90,7 @@
           </el-table-column>
           <el-table-column label="审批内容" prop="remark.rule">
             <template slot-scope="scope">
-              <el-popover trigger="hover" placement="top" popper-class="popperSPBOX">
-                <span>{{
-                scope.row.remark.customize  ||  scope.row.remark.rule
-                }}</span>
-                <div slot="reference" class="name-wrapper"  style="width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
-                  <span>{{
-                   scope.row.remark.customize ||  scope.row.remark.rule
-                  }}</span>
-                </div>
-              </el-popover>
+					<span class="font-flex-word" style="max-width: 200px;">{{  scope.row.remark.customize  ||  scope.row.remark.rule}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -109,12 +100,8 @@
           ></el-table-column>
           <el-table-column label="积分" prop="review_point" width="120">
             <template slot-scope="scope">
-              <span v-show="scope.row.review_point < 0" class="red">{{
-                scope.row.review_point
-              }}</span>
-              <span v-show="scope.row.review_point >= 0"
-                >+{{ scope.row.review_point }}</span
-              >
+              <span v-show="scope.row.review_point < 0" class="green">{{ scope.row.review_point}}   <span>{{$getTypsName(scope.row.pt_id)}}</span></span>
+              <span class="red" v-show="scope.row.review_point >= 0">+{{ scope.row.review_point }}  <span>{{$getTypsName(scope.row.pt_id)}}</span></span>
             </template>
           </el-table-column>
           <el-table-column label="状态" prop="status" width="80">