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

src/components/examinePopup.vue

@@ -2,7 +2,7 @@
 	<div>
 		<el-drawer :title="title" :visible.sync="show" :with-header="false" :size="'600px'" :before-close="closeDetail" direction="rtl">
 			<div class="drawer_title">审批详情</div>
-			<div v-loading="detail_loading">
+			<div v-loading="detail_loading" style="height: 100%;">
 				<div class="detail_popup" v-if="detail_info !== null">
 					<el-row :gutter="10" style="padding-bottom:20px;border-bottom:1px #f8f8f8 solid;position: relative;">
 						<el-col :span="24">
@@ -70,19 +70,20 @@
 					<div v-show="detail_info.process">
 						<Steps :process="detail_info.process"></Steps>	
 					</div>
-
-					<el-row style="border-top: 1px #f8f8f8 solid;">
-						<el-col :span="24" style="text-align: right;padding-top:20px" v-if="detail_info.status == 0&&detail_info.reviewer_id==$getUserData().id">
-							<el-button v-if="detail_info.pt_id == 1" @click="closeDetail">取消</el-button>
-							<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-if="detail_info.can_refuse == '1'">
-							<span style="color:#909399;font-size:12px;padding-right:20px">撤回后需重新审批</span>
-							<el-button type="primary" @click="revokeApproval">撤回审批</el-button>
-						</el-col>
-					</el-row>
 				</div>
+				
+				<div class="detailBut" >
+					<div style="text-align: right;padding-top:20px" v-if="detail_info.status == 0&&detail_info.reviewer_id==$getUserData().id">
+						<el-button v-if="detail_info.pt_id == 1" @click="closeDetail">取消</el-button>
+						<el-button v-else @click="rejectBtn">驳回</el-button>
+						<el-button type="primary" @click="adoptBtn">通过</el-button>
+					</div>
+					<div style="text-align: right;padding-top:20px" v-if="detail_info.can_refuse == '1'">
+						<span style="color:#909399;font-size:12px;padding-right:20px">撤回后需重新审批</span>
+						<el-button type="primary" @click="revokeApproval">撤回审批</el-button>
+					</div>
+				</div>
+				
 			</div>
 		</el-drawer>
 
@@ -721,11 +722,21 @@ label {
 	}
 }
 
+.detailBut {
+	border-top: 1px solid rgb(248, 248, 248);
+    width: 100%;
+    position: absolute;
+    bottom: 0px;
+    right: 0;
+    padding: 0 20px 10px 0;
+    z-index: 1;
+    background-color: #fff;
+}
 .detail_popup {
 	padding: 20px;
 	overflow-y: auto;
 	overflow-x: hidden !important;
-	height: calc(100vh - 100px);
+	height: calc(100vh - 184px);
 	padding-bottom: 30px;
 	.row_title {
 		position: relative;

src/views/common/rewardTaskAmend.vue

@@ -402,6 +402,7 @@ export default {
 				filtList.push({name: item ,url:item, response: { url:item }})
 			})
 			this.fileList = filtList
+			this.fileFun('', filtList)
 
 			// if(this.rewardTaskAmendData.point_config.tree_echo.length > 0){
 			// 	if(this.rewardTaskAmendData.point_config.tree_echo){

src/views/common/rewardTaskDetailsPopup.vue

@@ -82,7 +82,7 @@
 						<div class="label">截止时间</div>
 						<div class="content_text">{{ workDetailData.end_time }}</div>
 					</li>
-					<li class="flex-box" v-if="workDetailData.point_config">
+					<li class="flex-box" v-if="workDetailData.point_config.timeout_deduction_point">
 						<div class="label">逾期扣分</div>
 						<div class="content_text">{{ workDetailData.point_config.timeout_deduction_point }}/天</div>
 					</li>

src/views/common/temporaryTaskAmend.vue

@@ -445,6 +445,7 @@ export default {
 				filtList.push({name: item ,url:item, response: { url:item }})
 			})
 			this.fileList = filtList
+			this.fileFun('', filtList)
 
 
 			// if(this.modifyData.point_config.tree_echo.length != 0){

src/views/task/get_task.vue

@@ -14,7 +14,8 @@
 					</el-table-column>
 					<el-table-column label="积分" prop="base_point">
 						<template slot-scope="scope">
-							<span class="red">+{{scope.row.base_point}} {{$getTypsName(scope.row.pt_id)}}</span>
+							<span v-if="scope.row.base_point > 0" class="red">+{{scope.row.base_point}} {{$getTypsName(scope.row.pt_id)}}</span>
+							<span v-else class="green">{{scope.row.base_point}} {{$getTypsName(scope.row.pt_id)}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="截止时间" prop="expire_time"></el-table-column>
@@ -154,11 +155,11 @@
 						<el-col :span="4">截止时间</el-col>
 						<el-col :span="20">{{ detailInfo.expire_time }}</el-col>
 					</el-row>
-					<el-row v-if="detailInfo.point_config">
+					<el-row v-if="detailInfo.point_config.ahead_award_point">
 						<el-col :span="4">提前奖分</el-col>
 						<el-col :span="20">{{ detailInfo.point_config.ahead_award_point }}/天</el-col>
 					</el-row>
-					<el-row v-if="detailInfo.point_config">
+					<el-row v-if="detailInfo.point_config.timeout_deduction_point">
 						<el-col :span="4">逾期扣分</el-col>
 						<el-col :span="20">{{detailInfo.point_config.timeout_deduction_point}}/天</el-col>
 					</el-row>