update

src/assets/css/common.css

@@ -81,7 +81,6 @@
     display: none;
 }
 .myTable tr{
-    height:50px;
     background:#fff;
     border-bottom: 4px solid #F8FAFB;
     cursor: pointer;
@@ -123,8 +122,8 @@
     border-radius:0 0 20px 0;
 }
 .myTable tr td{
-    padding-left: 20px;
     position: relative;
+    padding:11px 0 11px 20px;
 }
 .f12{
     font-size: 12px;
@@ -228,3 +227,14 @@
     background: #FFD6D5;
     color: #FF7874;
 }
+
+.dialogI{
+    width:4px;
+    height:4px;
+    background:rgba(255,164,117,1);
+    border-radius:50%;
+    display: inline-block;
+    margin-right: 8px;
+    position: relative;
+    top: -2px;
+}

src/components/approval/approvalMan.vue

@@ -77,10 +77,9 @@
         <table v-loading="loading" style="margin-top:10px" class="myTable noHoverTable" border="0" cellspacing="0" cellpadding="0">
                 <thead>
                     <th>状态</th>
-                    <th>领用公司</th>
-                    <th>领用部门</th>
-                    <th>领用人</th>
-                    <th>领用时间</th>
+                    <th>类型</th>
+                    <th>单号</th>
+                    <th>使用人/时间</th>
                     <th>分类名称</th>
                     <th>资产名称</th>
                     <th>资产编号</th>
@@ -100,10 +99,14 @@
                                 <span class="ColorSpan redSpan" v-if="item.AuditStatus==5">终</span>
                                 {{item.AuditStatusName}}
                             </td>    
-                            <td :rowspan="item.DetailList.length" v-if="index==0">{{item.BranchName}}</td>    
-                            <td :rowspan="item.DetailList.length" v-if="index==0">{{item.DepartmentName}}</td>    
-                            <td :rowspan="item.DetailList.length" v-if="index==0">{{item.EmName}}</td>    
-                            <td :rowspan="item.DetailList.length" v-if="index==0">{{item.Time}}</td>    
+                            <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td>  
+                            <td :rowspan="item.DetailList.length" v-if="index==0">{{item.OrderCode}}</td>  
+                               
+                            <td :rowspan="item.DetailList.length" v-if="index==0">
+                                <p>{{item.EmName}}</p>
+                                <p>{{item.Time}}</p>
+                            </td>    
+                            <td :rowspan="item.DetailList.length" v-if="index==0"></td>    
                             <td>{{delist.CategoryName}}</td>     
                             <td>{{delist.PropertyName}}</td>     
                             <td>{{delist.PropertyNum}}</td>     

src/components/assetsman/assetsList.vue

@@ -99,8 +99,8 @@
                       
                     <td>{{item.PropertyModel}}</td>    
                     <td>
-                        <p>使用人名称：{{item.EmName}}</p>
-                        <p style="padding:2px 0">使用时间：{{item.GetTime}}</p>
+                        <p v-if="item.EmName!=''">使用人名称：{{item.EmName}}</p>
+                        <p v-if="item.GetTime!=''" style="padding:2px 0">使用时间：{{item.GetTime}}</p>
                         <!-- <p>归还时间：{{item.BackTime}}</p> -->
                     </td>   
                     <td>
@@ -138,6 +138,35 @@
             width="975px">
             <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
                 <div class="basefix">
+                    <div>
+                        <p style="margin-bottom:15px;" class="f12"><i class="dialogI"></i>使用信息</p>
+                        <div class="basefix">
+                            <el-form-item label="">
+                                <span class="label">使用人</span>
+                                <el-select size="mini" filterable v-model="addMsg.EmployeeId" placeholder="请选择" :filter-method="getEmployee2">
+                                    <el-option 
+                                    v-for="item in EmployeeList2"
+                                    :key="item.EmployeeId"
+                                    :label="item.EmName"
+                                    :value="item.EmployeeId">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="">
+                                <p class="label">领取时间</p>
+                                <el-date-picker
+                                size="mini"
+                                    v-model="addMsg.GetTime"
+                                    type="date"
+                                    value-format="yyyy-MM-dd"
+                                    placeholder="选择日期">
+                                </el-date-picker>
+                            </el-form-item>
+
+                        </div>
+                    </div>
+                    <p style="margin-bottom:15px;" class="f12"><i class="dialogI"></i>基本信息</p>
+                    <div class="baseform">
                         <el-form-item label="" prop="Name">
                             <span class="label">资产名称</span>
                             <el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
@@ -217,17 +246,7 @@
                             <span class="label">备注</span>
                             <el-input size="mini" v-model="addMsg.Remark" placeholder="请输入"></el-input>
                         </el-form-item>
-                    <el-form-item label="">
-                        <span class="label">使用人</span>
-                        <el-select size="mini" filterable v-model="addMsg.EmployeeId" placeholder="请选择" :filter-method="getEmployee2">
-                            <el-option 
-                            v-for="item in EmployeeList2"
-                            :key="item.EmployeeId"
-                            :label="item.EmName"
-                            :value="item.EmployeeId">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                        
                         <el-form-item label="" prop="SupplierId">
                             <span class="label">供应商</span>
                             <el-select size="mini" v-model="addMsg.SupplierId" placeholder="请选择">
@@ -239,16 +258,9 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                    <el-form-item label="">
-                        <p class="label">领取时间</p>
-                        <el-date-picker
-                        size="mini"
-                            v-model="addMsg.GetTime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择日期">
-                        </el-date-picker>
-                    </el-form-item>
+                    </div>
+                    
+                    
                 </div>
                 <div class="_addUpload_box">
                     <ul class="uploadUl">
@@ -731,7 +743,7 @@ export default {
 </script>
 
 <style>
-.assetsList .MyEditForm .el-form-item:nth-child(4n){
+.assetsList .MyEditForm .baseform .el-form-item:nth-child(4n){
     margin-right:0;
 }
 .assetsList .zczt1{

src/components/global/Nav.vue

@@ -9,7 +9,7 @@
       :default-active="defaulActive"
       class="el-menu-vertical-demo">
       <el-menu-item index="0" route="/home">
-        <div class="menuDiv">
+        <div @click="goHome" class="menuDiv">
           <i class="iconfont icon-shouye"></i>
           <span slot="title">首页</span>
         </div>
@@ -122,9 +122,14 @@ export default {
         
         
       },
+      menuList:[],
     }
   },
   created(){
+      if(!this.getLocalStorage()){
+        this.$router.push({path: 'login'})
+        return;
+      }
       this.$bus.on('once',(path,key) =>{//处理传过来的值
         if(key){
           this.defaulActive=key;
@@ -133,6 +138,9 @@ export default {
       this.getMenu();
   },
   methods:{
+    goHome(){
+      this.$router.push({path: '/Home'})
+    },
     goUrl(child){
       this.$router.push({path: child.MenuUrl})
     },

src/components/global/index.vue

@@ -62,6 +62,10 @@ export default {
     },
     created(){
       this.minHeight=document.body.clientHeight-70;
+      if(!this.getLocalStorage()){
+        this.$router.push({path: 'login'})
+        return;
+      }
       let zcuserInfo = this.getLocalStorage();
       this.zcuserInfo=zcuserInfo;
       if (this.$route.name === 'index') {

src/main.js

@@ -16,6 +16,7 @@ Vue.prototype.$echarts = echarts
 import 'xe-utils'
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/index.css'
+import commonUtils from './assets/utils/commonUtils'
 Vue.use(VXETable)
 
 Vue.use(ElementUI);
@@ -27,6 +28,9 @@ import VueBus from 'vue-bus';
 Vue.use(VueBus);
 
 
+Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
+
+
 Vue.filter("YMD", function (date) {
  
   return moment(date).format("YYYY-MM-DD");

src/router/config.js

@@ -114,6 +114,12 @@ export default {
                     name: 'approvalDetails',
                     component: resolve => require(['@/components/approval/approvalDetails'], resolve),
                 },
+                // 签字
+                {
+                    path: '/Sign', 
+                    name: 'Sign',
+                    component: resolve => require(['@/components/approval/Sign'], resolve),
+                },