Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/administrative/AssetsSystem/AssetsShenpi.vue

@@ -5,7 +5,7 @@
             
             <div style="margin-top:30px;background:rgba(255,255,255,1);border-radius:10px;padding:20px;position:relative;">
                 <div style="padding-bottom:10px;text-align:right">
-                    <span @click="GoZcUrl" class="backTo" style="">资产管理</span>
+                    <span @click="GoZcUrl" style="font-size:12px;text-decoration:underline;cursor: pointer;">跳转到资产管理</span>
                 </div>
                 <el-row class="HeaderDiv" style="border-bottom:1px solid #E2E4EB;padding-bottom:20px">
                     <span class="underline"></span>
@@ -53,6 +53,10 @@
                         <span v-if="GetDetail.BackTime!=''">{{GetDetail.BackTime}}</span>
                         
                     </el-col>
+                    <el-col v-if="GetDetail.ChangePerson && GetDetail.ChangePerson!=''" :span="12">
+                        <span>原领用人 :</span>
+                        <span>{{GetDetail.ChangePerson}}</span>
+                    </el-col>
                     <el-col :span="12">
                         <span>备注 :</span>
                         <span>{{GetDetail.Remark}}</span>
@@ -312,7 +316,7 @@
                                 </div>
                             </div>
                         </template>
-                        <div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi' && !needSign" class="_upload_box basefix" style="margin-bottom:20px;">
+                        <div v-if="GetDetail.Is_CanAudit==1 && compType=='shenpi' && !needSign" class="_upload_box basefix" style="margin-bottom:20px;padding-left:75px">
                             <ul class="clearfix">
                                 <li v-for="(img,imgIndex) in uploadImgList" :key="imgIndex">
                                     <img :src="img" alt="">
@@ -373,7 +377,7 @@
                     
                 </div>   
             </div>
-            <el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px">
+            <el-dialog title="详情" :visible.sync="CheckDetailState" width="1200px">
                 <CheckDetails ref="mychild"></CheckDetails>
             </el-dialog>
             <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
@@ -475,8 +479,9 @@ export default {
         GoZcUrl(){
             let url='';
             if (!this.isOnline()) {
-                url="http://www.test.com:8081/#/";
+                url="http://www.test.com:8080/#/Home";
             }else{
+                // 还未修改正式地址
                 url="http://yx.oytour.com/#/";
             }
             window.open(url)
@@ -1203,7 +1208,7 @@ li{
 }
 .approvalDetails .HeaderDiv .underline{
     display: block;
-    width:101px;
+    width:135px;
     height:2px;
     position: absolute;
     bottom: 0;

src/components/administrative/AssetsSystem/CheckDetails.vue

@@ -305,12 +305,15 @@ export default {
 .CheckDetails .baseDiv .desItem:nth-child(3n){
     margin-right:0;
 }
+.CheckDetails p{
+  margin:0;
+} 
 .CheckDetails .desItem p:first-child{
     margin-bottom: 4px;
 }
 .CheckDetails .desItem{
     display: inline-block;
-    background: #fff;
+    background: #F1F1F1;
     box-sizing: border-box;
     border-radius: 10px;
     width: 200px;
@@ -332,7 +335,7 @@ export default {
     padding:25px;
 }
 .CheckDetails .right{
-    width: 660px;
+    width: 680px;
     padding:0 10px 0 15px;
     box-sizing: border-box;
 }