Merge branch 'qll' into dev

src/views/draw/metadata/index.scss

@@ -84,6 +84,7 @@
     .pdf_wrap{
         .pic_show{
             max-width: 100%;
+            max-height: 100%;
             height: auto;
         }
         .pdf_tit{

src/views/draw/sip/index.scss

@@ -230,6 +230,7 @@
     .pdf_wrap{
         .pic_show{
             max-width: 100%;
+            max-height: 100%;
         }
         .pdf_tit{
             color: #3F4560;

src/views/submission/atlas/index.scss

@@ -8,7 +8,7 @@
         display: inline-block;
         line-height: 1;
         white-space: nowrap;
-        background-color: rgb(255, 168, 125)
+        background-color: #FF7588
     }
     .check_all{
         padding:20px 20px 0;

src/views/submission/atlas/index.vue

@@ -10,8 +10,8 @@
 					<el-button type="success" plain size="mini" @click="alertBatchUpdate">批量提交</el-button>
 					<el-button type="success" plain size="mini" @click="alertBatchBack">批量驳回</el-button>
 					<el-button type="success" plain size="mini" @click="searchTimerVisible=true">通过时间筛选</el-button>
-					<el-button type="success" plain size="mini" @click="searchUserVisible=true" v-if="!searchForm.createrId">筛选用户提交</el-button>
-					<em class="empty" v-else @click="clearUaer">清空用户筛选</em>
+					<!-- <el-button type="success" plain size="mini" @click="searchUserVisible=true" v-if="!searchForm.createrId">筛选用户提交</!--> 
+					<!-- <em class="empty" v-else @click="clearUaer">清空用户筛选</!--> 
 					<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
 				</div>
 				<div class="screeningConditionsRight">
@@ -126,7 +126,7 @@
 		</el-dialog>
 		<!-- 资源交接弹框 -->
 		<el-dialog
-				title="资源交接"
+				:title="updateTit"
 				:visible.sync="passVisible"
 				width="800px"
 				class=""
@@ -148,21 +148,23 @@
 			</el-form>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="passVisible = false">取消</el-button>
-				<el-button type="primary" @click="singleUpdate" v-if='!batchUpdateVisible&&dataUpdate.status==3'>确定</el-button>
-				<el-button type="primary" @click="batchUpdate" v-if='batchUpdateVisible&&dataUpdate.status==3'>确定</el-button>
-				<el-button type="primary" @click="batchBack" v-if='batchUpdateVisible&&dataUpdate.status==4'>确定</el-button>
-				<el-button type="primary" @click="refuse" v-if="!batchUpdateVisible&&dataUpdate.status==4">确定</el-button>
+				<el-button type="primary" @click="singleUpdate" v-if='!batchUpdateVisible&&dataUpdate.status==1'>确定</el-button>
+				<el-button type="primary" @click="batchUpdate" v-if='batchUpdateVisible&&dataUpdate.status==1'>确定</el-button>
+				<el-button type="primary" @click="batchBack" v-if='batchUpdateVisible&&dataUpdate.status==7'>确定</el-button>
+				<el-button type="primary" @click="refuse" v-if="!batchUpdateVisible&&dataUpdate.status==7">确定</el-button>
 			</span>
 		</el-dialog>
 	</div>
 </template>
 
 <script>
+import Cookies from 'js-cookie'
 import { getListAPI ,batchUpdateStatusAPI} from '@/api/atlas/index'
 import { getUserListAPI} from '@/api/commonResource'
 import pagination from '@/components/pagination/pagination'
 import { operationMsg, confirm } from '@/utils/publicFunctions'
 import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js"
+
 export default {
 	name: 'atlasMetadata',
 	components:{pagination},
@@ -227,15 +229,15 @@ export default {
 				endTime:'',
 				pageNum:1,
 				pageSize:30,
-				status:1,//默认待交接的
-				createrId:'',
+				status:6,//默认待交接的
+				createrId:Cookies.get('userId'),
 				content:''
 			},
 			pdf:{},
 			dataUpdate:{
 				ids:[],
 				remark:'',
-				status: 3//通过交接
+				status: 1//通过交接
 			},
 			dateTime:'',
 			createTime:'desc',
@@ -333,7 +335,7 @@ export default {
 					this.updateTit='批量交接'
 					this.batchUpdateVisible=true;
 					this.passVisible=true;
-					this.dataUpdate.status=3;
+					this.dataUpdate.status=1;
 				}else{
 					this.$message.warning("请先选择需要提交的内容");
 				}	
@@ -341,7 +343,7 @@ export default {
 		batchUpdate(){
 			let data={
 				ids:this.multipleSelection,
-				status: 3,//通过交接
+				status: 1,//通过交接
 				remark:this.pdf.remark
 			}
 			batchUpdateStatusAPI(data).then(res => {
@@ -357,7 +359,7 @@ export default {
 					this.updateTit='批量驳回'
 					this.batchUpdateVisible=true;
 					this.passVisible=true;
-					this.dataUpdate.status=4
+					this.dataUpdate.status=7
 				}else{
 					this.$message.warning("请先选择需要提交的内容");
 				}	
@@ -365,7 +367,7 @@ export default {
 		batchBack(){
 			let data={
 				ids:this.multipleSelection,
-				status: 4,//拒接交接
+				status: 7,//拒接交接
 				remark:this.pdf.remark
 			}
 			batchUpdateStatusAPI(data).then(res => {
@@ -377,7 +379,7 @@ export default {
 			});  
 		},
 		alertUpdate(item){
-			this.dataUpdate.status=3;
+			this.dataUpdate.status=1;
 			this.batchUpdateVisible=false;
 			let {name,responsibility,description}=item;
 			this.pdf.name=name;
@@ -398,7 +400,7 @@ export default {
 			});
 		},
 		alertRefus(item){
-			this.dataUpdate.status=4;
+			this.dataUpdate.status=7;
 			this.batchUpdateVisible=false;
 			let {name,responsibility,description}=item;
 			this.pdf.name=name;
@@ -411,7 +413,7 @@ export default {
 		refuse(){
 				let data={
 					ids:this.dataUpdate.ids,
-					status: 4,//拒绝交接
+					status: 7,//拒绝交接
 					remark:this.pdf.remark
 				}
 				batchUpdateStatusAPI(data).then(res => {
@@ -419,6 +421,7 @@ export default {
 						res.data.code,
 						`提交`
 					]);
+					this.passVisible=false;
 				});
 		},
 		handleCheckAllChange(val) {
@@ -457,8 +460,8 @@ export default {
 				endTime:'',
 				pageNum:1,
 				pageSize:30,
-				status:1,//默认待交接的
-				createrId:'',
+				status:6,//默认待交接的
+				createrId:Cookies.get('userId'),
 				content:''
 			};
 			this.formation='';

src/views/submission/sip/index.scss

@@ -230,6 +230,7 @@
     .pdf_wrap{
         .pic_show{
             max-width: 100%;
+            max-height: 100%;
         }
         .pdf_tit{
             color: #3F4560;

src/views/submission/sip/index.vue

@@ -229,7 +229,7 @@ export default {
 			dataUpdate:{
 				ids:[],
 				remark:'',
-				status: 3//通过交接
+				status: 1//通过交接
 			},
 			dateTime:'',
 			createTime:'desc',
@@ -463,7 +463,7 @@ export default {
 				pageNum:1,
 				pageSize:30,
 				status:6,//默认待提交的
-				createrId:'',
+				createrId:Cookies.get('userId'),
 				content:''
 			};
 			this.formation='';