Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

src/components/toLead.vue

@@ -9,7 +9,7 @@
                         <span class="ramin">{{item.name}}</span>
                     </div>
             </div>
-			<div :style="dstyle" style="padding: 40px 140px">
+			<div :style="dstyle" style="height:150px;padding: 40px 140px">
                 <slot name="1" v-if="nowIndex == 1"></slot>
                 <div v-if="nowIndex == 2" style="text-align: center;">
                     <div>
@@ -17,7 +17,7 @@
                         <span class="el-icon-loading"></span>
                     </div>
                     <div>
-                        导入需要一定时间，切记不要关闭当前窗口
+                        导入需要一定时间，请不要关闭当前窗口
                     </div>
                 </div>
                 <div v-if="nowIndex == 3" class="leadtree">
@@ -77,12 +77,6 @@
     },
     methods: {
         errClick(id){
-            console.log(process.env.VUE_APP_BASE_API +
-                '/api/download/fail_data_export?employee_id=' + 
-                this.$getUserData().id 
-                + '&bs_id=' + id 
-                + '&export_type=' 
-                + this.export_type)
 			window.open(
 				process.env.VUE_APP_BASE_API +
                 '/api/download/fail_data_export?employee_id=' + 
@@ -98,7 +92,7 @@
         },
 		closePopup() {
 			this.$nextTick(() => {
-                this.$emit('confirm');
+                if(this.tolead.success && this.tolead.success.length > 0) this.$emit('confirm');
 				this.$emit('update:visible', false);
 			});
 		},

src/index.vue

@@ -134,11 +134,11 @@ export default {
 	created() {
 		this.initRouter();
 		this.getEmployee()//缓存人员列表
-		this.$store.dispatch('export_filter',false).then((res)=>{
-			console.log(res)
-		}).catch((err)=>{
-			console.log(err)
-		})
+		// this.$store.dispatch('export_filter',false).then((res)=>{
+		// 	console.log(res)
+		// }).catch((err)=>{
+		// 	console.log(err)
+		// })
 	},
 	mounted() {
 		this.getTypes();

src/views/ranking/integral_event.vue

@@ -51,11 +51,18 @@
 				</el-form-item>
 				<el-form-item>
 					<el-button v-if="employeeOrdept" type="success" size="medium" @click="toleadShw = true" plain>导入数据</el-button>
-					<el-button type="primary" size="medium" @click="exportExcel" plain>导出当前数据<span v-if="total && total > 0">：{{total}}条</span></el-button>
+					<el-button type="primary" size="medium" @click="exportExcel" plain>导出当前数据</el-button>
 					<el-button class="first-element-btn" v-if="employeeOrdept" :disabled="deleteDisabled" @click="deleteInBatches" type="danger">批量删除</el-button>
 					<!-- <el-button type="primary" size="medium" plain @click="swiperShow = true">轮播事件</el-button> -->
 				</el-form-item>
+
+				<div class="diy-tip1" style="margin-bottom: 10px;">
+					<div>
+						当前数据：{{total}}条
+					</div>
+				</div>
 			</el-form>
+			
 			<!-- 表格 -->
 			<div>
 				<el-table :data="list" style="width: 100%" v-loading="loading" @row-click="open_detail" @selection-change="deleteEvents">
@@ -221,7 +228,7 @@
 		</el-dialog>
 
 		<!-- 导入数据 -->
-		<el-dialog title="导入积分事件数据" width="600px" :visible.sync="excelImportShow" :close-on-click-modal="false" :before-close="close_import">
+		<!-- <el-dialog title="导入积分事件数据" width="600px" :visible.sync="excelImportShow" :close-on-click-modal="false" :before-close="close_import">
 			<div style="padding:0 50px;">
 				<div class="flex-box flex-v-ce margin-bottom">
 					<div style="margin-right: 10px;">1、下载积分事件模版，批量录入积分事件</div>
@@ -244,13 +251,11 @@
 						</p>
 					</el-upload>
 				</div>
-				<!-- <div>3、选择文件后点击下方【上传】按钮</div> -->
 			</div>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="close_import" size="medium">取 消</el-button>
-				<!-- <el-button type="primary" @click="uploadFile()"  size="medium" :loading="update_btn">上传</el-button> -->
 			</div>
-		</el-dialog>
+		</el-dialog> -->
 
 		<el-dialog title="导入错误信息" :visible.sync="importErrorInfoShow" width="30%">
 			<div>
@@ -284,35 +289,32 @@
 				</router-link>
 			</span>
 		</el-dialog>
-		<toLead :visible.sync="toleadShw" :nowIndex.sync="nowIndex" :tolead="toleadResult" @confirm="tealConfirm" :export_type="'integral_event'" :dstyle="'height:150px;'">
+		<toLead :visible.sync="toleadShw" :nowIndex.sync="nowIndex" :tolead="toleadResult" @confirm="tealConfirm" :export_type="'integral_event'" :dstyle="'height:130px;'">
 			<template slot="1">
-				<!-- <div style="padding: 50px 140px 20px 140px;"> -->
-					<div v-if="nowIndex == 1">
-						<div class="flex-box flex-v-ce margin-bottom">
-							<div style="margin-right: 10px;">1、下载积分事件模版，批量录入积分事件</div>
-							<el-button size="medium" type="primary" @click="downloadTemplate" plain>下载模板</el-button>
-						</div>
-						<div class="margin-bottom">
-							<el-upload
-								:limit="1"
-								:headers="ATOKEN"
-								ref="upload"
-								:action="action"
-								:on-remove="handleRemove"
-								:on-success="handlePictureCardPrediv"
-								:file-list="fileList"
-								:before-upload="beforeFilesUpload"
-								:on-progress="handleOnthecross"
-							>
-								<p>
-									2、上传积分事件数据Excel表
-									<el-button style="margin-left: 10px;" size="medium" type="primary" plain>选择文件</el-button>
-								</p>
-							</el-upload>
-						</div>
-						<!-- <div>3、选择文件后点击下方【上传】按钮</div> -->
+				<div v-if="nowIndex == 1">
+					<div class="flex-box flex-v-ce margin-bottom">
+						<div style="margin-right: 10px;">1、下载积分事件模版，批量录入积分事件</div>
+						<el-button size="medium" type="primary" @click="downloadTemplate" plain>下载模板</el-button>
 					</div>
-				<!-- </div> -->
+					<div class="margin-bottom">
+						<el-upload
+							:limit="1"
+							:headers="ATOKEN"
+							ref="upload"
+							:action="action"
+							:on-remove="handleRemove"
+							:on-success="handlePictureCardPrediv"
+							:file-list="fileList"
+							:before-upload="beforeFilesUpload"
+							:on-progress="handleOnthecross"
+						>
+							<p>
+								2、上传积分事件数据Excel表
+								<el-button style="margin-left: 10px;" size="medium" type="primary" plain>选择文件</el-button>
+							</p>
+						</el-upload>
+					</div>
+				</div>
 			</template>
 		</toLead>
 	</div>
@@ -478,7 +480,6 @@ export default {
 			this.nowIndex = 2
 		},
 		handlePictureCardPrediv(response) {
-			console.log(response)
 			if(response.code == 1){
 				response.data.id = 1
 			}else{
@@ -821,4 +822,14 @@ span.point {
 .examine_steps ::v-deep .el-step.is-vertical .el-step__title {
 	padding-bottom: 0;
 }
+
+.diy-tip1 {
+	margin-bottom: 10px !important;
+	background: #f0f9eb !important;
+	color: #67c23a !important;
+	border: 1px solid #67c23a !important;
+	padding:9px !important;
+	min-width: 800px;
+	border-radius: 4px;
+}
 </style>

src/views/set/jurisdiction.vue

@@ -639,7 +639,7 @@
 			</span>
 		</el-dialog>
 		<!-- 导出员工 -->
-		<el-dialog title="导出/修改部门管理者信息" width="600px" :visible.sync="exportEmploye" :close-on-click-modal="false" :before-close="close_export">
+		<!-- <el-dialog title="导出/修改部门管理者信息" width="600px" :visible.sync="exportEmploye" :close-on-click-modal="false" :before-close="close_export">
 			<div style="float: left;width:49%" class="ps">
 				<div style="margin-left: 20%;">
 					<p>1.导出部门管理者信息</p>
@@ -663,16 +663,14 @@
 					>
 						<p><el-button slot="trigger" type="primary" plain>选取文件</el-button></p>
 					</el-upload>
-					<!-- <p>先选择文件后再完成上传</p> -->
-					<!-- <el-button type="primary" @click="uploadFile('prize_buckle')" :loading="update_btn" plain>上传</el-button> -->
 				</div>
 			</div>
 			<div class="align-center" style="margin-bottom:20px; float:left; margin-left:10px;"></div>
 			<div class="align-center" style="margin-bottom:20px; float:left; margin-left:10px;"></div>
 			<div style="clear:both;"></div>
-		</el-dialog>
+		</el-dialog> -->
 		
-		<toLead :visible.sync="toleadShw" :nowIndex.sync="nowIndex" :tolead="toleadResult" @confirm="tealConfirm" :export_type="'integral_event'" :dstyle="'height:150px;'">
+		<toLead :visible.sync="toleadShw" :nowIndex.sync="nowIndex" :tolead="toleadResult" @confirm="tealConfirm" :export_type="'prize_import'" :dstyle="'height:130px;'">
 			<template slot="1">
 				<div v-if="nowIndex == 1">
 					<div class=" margin-bottom">
@@ -680,13 +678,9 @@
 							<div style="margin-right: 10px;">1、导出部门管理者信息</div>
 							<el-button size="medium" type="primary" @click="downloadSheet" plain>导出</el-button>
 						</div>
-						<!-- <div class="leadhint">导出部门管理者信息表进行修改</div> -->
 					</div>
 					
 					<div class="margin-bottom">
-						<!-- <p>2、修改部门管理者信息<br>
-						导出部门管理者信息表进行修改<br>
-						上传修改好的部门管理者信息表</p> -->
 						<el-upload
 							:limit="1"
 							:headers="ATOKEN"
@@ -701,42 +695,8 @@
 								<el-button style="margin-left: 10px;" size="medium" type="primary" plain>选取文件</el-button>
 							</div>
 						</el-upload>
-						<!-- <div class="leadhint">上传修改好的部门管理者信息表</div> -->
 					</div>
-					<!-- <div>3、选择文件后点击下方【上传】按钮</div> -->
 				</div>
-
-				<!-- <div v-if="nowIndex == 1">
-					<div style="float: left;width:49%" class="ps">
-						<div style="margin-left: 20%;">
-							<p>1.导出部门管理者信息</p>
-							<el-button type="primary" plain @click="downloadSheet">导出</el-button>
-						</div>
-					</div>
-					<div style="border-left: 1px solid #D8D8D8;width: 1px;height: 255px;float: left;"></div>
-
-					<div style="float: left;width:49%;" class="ps">
-						<div style="margin-left: 20%;">
-							<p>2.修改部门管理者信息</p>
-							<p>导出部门管理者信息表进行修改</p>
-							<p>上传修改好的部门管理者信息表</p>
-							<el-upload
-								:limit="1"
-								:headers="ATOKEN"
-								ref="upload2"
-								:action="integralUpload"
-								:on-success="handlePictureCardPreview"
-								:before-upload="beforeFilesUpload"
-								:on-progress="handleOnthecross"
-							>
-								<p><el-button slot="trigger" type="primary" plain>选取文件</el-button></p>
-							</el-upload>
-						</div>
-					</div>
-					<div class="align-center" style="margin-bottom:20px; float:left; margin-left:10px;"></div>
-					<div class="align-center" style="margin-bottom:20px; float:left; margin-left:10px;"></div>
-					<div style="clear:both;"></div>
-				</div> -->
 			</template>
 		</toLead>
 
@@ -1004,7 +964,6 @@ export default {
 			this.get_table_list();
 		},
 		handlePictureCardPreview(response) {
-			console.log(response)
 			if(response.code == 1){
 				response.data.id = 1
 			}else{
@@ -1540,8 +1499,4 @@ export default {
 .ps p {
 	margin-bottom: 10px;
 }
-.leadhint{
-	padding: 2px 0 0 10px;
-	color: #949494;
-}
 </style>

src/views/set/rule.vue

@@ -205,7 +205,7 @@
 		</el-dialog> -->
 
 		
-		<toLead :visible.sync="toleadShw" :nowIndex.sync="nowIndex" :tolead="toleadResult" @confirm="tealConfirm" :export_type="'rule_items'" :dstyle="'height:180px;'">
+		<toLead :visible.sync="toleadShw" :nowIndex.sync="nowIndex" :tolead="toleadResult" @confirm="tealConfirm" :export_type="'rule_items'" :dstyle="'height:180px;padding: 40px 80px;'">
 			<template slot="1">
 				<el-row v-if="nowIndex == 1">
 					<el-col :span="12">
@@ -237,7 +237,6 @@
 							>
 								<el-button slot="trigger" type="primary">选取文件</el-button>
 							</el-upload>
-							<!-- <p><el-button type="primary" @click="submitUpload" :loading="save_loading" v-show="import_btn_show" block>导入</el-button></p> -->
 						</div>
 					</el-col>
 				</el-row>
@@ -488,7 +487,6 @@ export default {
 			this.getData();
 		},
 		handleSuccess(response) {
-			console.log(response)
 			if(response.code == 1){
 				response.data.id = 1
 			}else{

src/views/set/voluntarilyPoint.vue

@@ -56,7 +56,7 @@
 							<div class="flex-1">
 								<el-button size="small" @click="del_item" type="danger" plain>批量移除</el-button>
 								<el-button size="small" type="primary" @click="add_employee_show=true">添加人员</el-button>
-								<el-button size="small" type="primary" plain @click="import_rules_show = true">导入自动积分</el-button>
+								<el-button size="small" type="primary" plain @click="toleadShw = true">导入自动积分</el-button>
 							</div>
 							<div>
 								<el-select size="small" v-model="employee_id" filterable clearable placeholder="请输入或选择人员">
@@ -183,7 +183,7 @@
 			</el-dialog>
 		
 			<!-- 导入规则 -->
-			<el-dialog title="导入自动积分" :visible.sync="import_rules_show" width="500px" @before-close="close_import">
+			<!-- <el-dialog title="导入自动积分" :visible.sync="import_rules_show" width="500px" @before-close="close_import">
 			  <el-row>
 			    <el-col :span="12">
 			      <div style="text-align: center;line-height: 34px;">
@@ -214,11 +214,50 @@
 			        >
 			          <el-button slot="trigger" type="primary">选取文件</el-button>
 			        </el-upload>
-			        <!-- <p><el-button type="primary" @click="submitUpload" :loading="save_loading" v-show="import_btn_show" block>导入</el-button></p> -->
 			      </div>
 			    </el-col>
 			  </el-row>
-			</el-dialog>
+			</el-dialog> -->
+
+			<toLead :visible.sync="toleadShw" :nowIndex.sync="nowIndex" :tolead="toleadResult" @confirm="tealConfirm" :export_type="'auto_point'" :dstyle="'padding: 40px 80px;'">
+				<template slot="1">
+					<el-row v-if="nowIndex == 1">
+						<el-col :span="12">
+						<div style="text-align: center;line-height: 34px;">
+							<p>1、导出模板，填写好规则</p>
+							<p><img src="../../assets/image/rules_mould.png" alt="" /></p>
+							<p>规则表</p>
+							<p>
+							<a target="_blank" :href="publicBASE_API + '/api/download/point_auto'"><el-button type="primary" >下载模板</el-button></a>
+							</p>
+						</div>
+						</el-col>
+						<el-col :span="12">
+						<div style="text-align: center;line-height: 34px;">
+							<p>2、上传填好的规则表</p>
+							<p><img src="../../assets/image/rules_mould1.png" alt="" /></p>
+							<p>仅支持xls、xlsx格式文件</p>
+							<el-upload
+							class="upload-demo"
+							:headers="ATOKEN"
+							:data="{ type: 'auto_integral' }"
+							ref="upload"
+							:limit="1"
+							:action="action"
+							:on-remove="handleRemove"
+							:on-success="handleSuccess"
+							:before-upload="beforeFilesUpload"
+							:file-list="fileList"
+							:on-progress="handleOnthecross"
+							>
+							<el-button slot="trigger" type="primary">选取文件</el-button>
+							</el-upload>
+							<!-- <p><el-button type="primary" @click="submitUpload" :loading="save_loading" v-show="import_btn_show" block>导入</el-button></p> -->
+						</div>
+						</el-col>
+					</el-row>
+				</template>
+			</toLead>
 		</div>
 	</div>
 </template>
@@ -226,6 +265,7 @@
 <script>
 import EmployeeSelector from '@/components/EmployeeSelector';
 import noData from '@/components/noData';
+import toLead from '@/components/toLead';
 export default {
 	data() {
 		return {
@@ -348,16 +388,24 @@ export default {
 			employee_map:[],
 			employee_id:'',
 			selectData:{},
+			//导入相关
+			toleadShw: false,
+			nowIndex: 1,
+			toleadResult: {}
 		};
 	},
 	components: {
 		EmployeeSelector,
-		noData
+		noData,
+		toLead
 	},
 	created() {
 		this.getEmployee();
 	},
 	watch:{
+		toleadShw(val){
+			if(val) this.nowIndex = 1
+		},
 		employee_id(val){
 			this.page=1;
 			this.open_right(this.selectData);
@@ -420,13 +468,31 @@ export default {
 		  let len = file.name.split('.').length - 1;
 		  const $ext_name = file.name.split('.')[len];
 		  if ($ext_list.indexOf($ext_name) != -1) {
-		    this.import_btn_show = true;
 		  } else {
-		    this.$message.warning('文件格式上传错误,仅支持上传xlsx,xls）');
+			this.toleadResult.id = 0
+			this.toleadResult.name = '文件格式上传错误,仅支持上传xlsx,xls）'
+			this.nowIndex = 3
+		    // this.$message.warning('文件格式上传错误,仅支持上传xlsx,xls）');
 		    return false;
 		  }
 		},
+		tealConfirm(){
+			this.page=1;
+			this.open_right(this.selectData);
+		},
+		handleOnthecross(event, file, fileList){
+			this.nowIndex = 2
+		},
 		handleSuccess(response) {
+			if(response.code == 1){
+				response.data.id = 1
+			}else{
+				response.data.id = 0
+				response.data.name = response.msg
+			}
+			this.toleadResult = response.data
+			this.nowIndex = 3
+			return
 		  if (response.code == 1) {
 		  	if (response.data.length > 0) {
 		  		var htmls = response.data;
@@ -471,7 +537,6 @@ export default {
 			this.open_right();
 		},
 		open_rights(data){
-			console.log(data)
 			this.page=1;
 			this.selectData=data;
 			this.open_right(data);