update

src/components/approval/ConsumApplication.vue

@@ -12,6 +12,8 @@
             <span  @click="addSupplier" style="margin-left:20px" class="addSpan">申请</span>
             <span @click="goMyPurchase('MyPurchaseRequisition')" style="margin-left:20px" class="addSpan">
         新增请购单</span>
+            <span  @click="getTime" style="margin-left:20px" class="addSpan">申请时间</span>
+
         </div>
         <div class="padContent">
             <ul v-show="morequery" class="queryul">
@@ -267,6 +269,70 @@
                 </div>
             </el-form>
         </el-dialog>
+        <!-- 申请时间 -->
+        <el-dialog
+        :title="BranchName"
+        :visible.sync="caozuoState"
+        top="0"
+        width="650px"
+        >   
+            <div v-if="timeInfo.Status==2">
+                
+            <table
+                style="min-width:100%"
+                class="myTable miniTable"
+                v-loading="loading"
+                border="0"
+                cellspacing="0"
+                cellpadding="0"
+            >
+                <thead>
+                <th>日期</th>
+                <th>开始时间</th>
+                <th>结束时间</th>
+                </thead>
+                <tbody>
+                    <tr></tr>
+                <tr v-for="(item, index) in timeInfo.Model.WeekdayList" :key="index">
+                    <td>{{ item.Weekday }}</td>
+                    <td>{{ item.StartTime }}</td>
+                    <td>{{ item.EndTime }}</td>
+                </tr>
+                <tr v-show="timeInfo.Model.WeekdayList.length == 0">
+                    <td colspan="4" align="center">暂无数据</td>
+                </tr>
+                </tbody>
+            </table>
+            <div style="margin-top:15px" class="f14 bold">
+                <span>特殊日期</span>
+            </div>
+            <table
+                style="min-width:100%"
+                class="myTable miniTable"
+                v-loading="loading"
+                border="0"
+                cellspacing="0"
+                cellpadding="0"
+            >
+                <thead>
+                <th>日期</th>
+                <th>开始时间</th>
+                <th>结束时间</th>
+                </thead>
+                <tbody>
+                    <tr></tr>
+                <tr v-for="(item, index) in timeInfo.Model.SpecialList" :key="index">
+                    <td>{{ item.Date }}</td>
+                    <td>{{ item.StartTime }}</td>
+                    <td>{{ item.EndTime }}</td>
+                </tr>
+                <tr v-show="timeInfo.Model.SpecialList.length == 0">
+                    <td colspan="4" align="center">暂无数据</td>
+                </tr>
+                </tbody>
+            </table>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -280,6 +346,8 @@ export default {
         　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
             }
         },
+        timeInfo:[],
+        BranchName:'',
         morequery:false,
         currentPage:1,
         tableData: [],
@@ -341,6 +409,7 @@ export default {
         EmployeeList2:[],
         EmName:'',
         EmployeeId:0,
+        caozuoState:false,
     }
   },
   created(){
@@ -352,11 +421,24 @@ export default {
   mounted(){
     this.getList();
     this.getWareHouse();
-    // this.getEmployee();
 
     
   },
   methods:{
+    getTime(){
+        this.caozuoState=true;
+        this.apiJavaPost("/api/Supplies/GetApplyForInfo",{},
+            res => {
+            if (res.data.resultCode === 1) {
+                this.timeInfo=res.data.data;
+                this.BranchName=this.timeInfo.Model.BranchName;
+            } else {
+                this.Error(res.data.message);
+            }
+            },
+            null
+        );
+    },
     goMyPurchase(path){
       this.$router.push({
         path: "/" + path,
@@ -531,18 +613,28 @@ export default {
         );
     },
     addSupplier(){
-        this.addMsg={
-            Id:0,
-            WarehouseId:'',
-            StockOutDate:'',
-            Remark:'',
-            DetailList:[],
-            IsSelfApplication:1,
-            EmployeeId:this.EmployeeId
+        this.apiJavaPost("/api/Supplies/GetCanApplyFor",{Name:''},
+            res => {
+            if (res.data.resultCode === 1) {
+                this.addMsg={
+                    Id:0,
+                    WarehouseId:'',
+                    StockOutDate:'',
+                    Remark:'',
+                    DetailList:[],
+                    IsSelfApplication:1,
+                    EmployeeId:this.EmployeeId
 
-        }
-        this.wlItemList=[];
-        this.dialogState=true;
+                }
+                this.wlItemList=[];
+                this.dialogState=true;
+            } else {
+                this.Error("不在申请时间范围，请查看申请时间！");
+            }
+            },
+            null
+        );
+        
     },
     submitForm(formName) {
         this.$refs[formName].validate((valid) => {

src/components/approval/Myapplication.vue

@@ -80,7 +80,7 @@
                             <th>分类名称</th>
                             <th>品牌名称</th>
                             <th>操作人/时间</th>
-                            <th width="150px">操作</th>
+                            <th>操作</th>
                         </thead>
                         <tbody>
                             <template v-for="item in tableData">
@@ -119,12 +119,15 @@
                                         <el-tooltip class="item" effect="dark" content="流程查看" placement="top">
                                             <img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','Myapplication','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
                                         </el-tooltip>
+                                        <el-tooltip class="item" effect="dark" content="签名" placement="top">
+                                            <img v-show="item.IsApplyForSign==1" @click="See(item,'approvalDetails','Myapplication','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
+                                        </el-tooltip>
                                     </td>
 
                                 </tr>
                             </template>
                             
-                            <tr v-show="tableData.length==0">
+                            <tr v-if="tableData.length==0">
                                 <td colspan="12" align="center">暂无数据</td>
                             </tr>
                         </tbody>
@@ -201,7 +204,7 @@
                             <th>品牌名称</th>
                             <th>退库前使用人</th>
                             <th>操作人/时间</th>
-                            <th width="150px">操作</th>
+                            <th>操作</th>
                         </thead>
                         <tbody>
                             <template v-for="(item,index1) in tableData2">
@@ -238,12 +241,15 @@
                                         <el-tooltip class="item" effect="dark" content="流程查看" placement="top">
                                             <img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','PaiTui','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
                                         </el-tooltip>
+                                        <el-tooltip class="item" effect="dark" content="签名" placement="top">
+                                            <img v-show="item.IsApplyForSign==1" @click="See(item,'approvalDetails','Myapplication','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
+                                        </el-tooltip>
                                     </td>
 
                                 </tr>
                             </template>
                             
-                            <tr v-show="tableData2.length==0">
+                            <tr v-if="tableData2.length==0">
                                 <td colspan="12" align="center">暂无数据</td>
                             </tr>
                         </tbody>

src/components/global/Autologin.vue

+<template>
+  <div class="Autologin">
+    <div class="gifContent">
+        <img src="../../assets/img/load.gif" alt="">
+    </div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'login',
+  data(){
+      return{
+        
+      }
+  },
+  created(){
+    let href = window.location.href;
+    let param = href.split('?')[1].split("&") ;
+      if(param){
+        let obj={};
+        obj.token=param[0].split('=')[1];
+        obj.SecretKey=param[1].split('=')[1];
+        localStorage.zcuserInfo = JSON.stringify(obj);
+         this.getUserInfo();
+      }
+  },
+  mounted(){
+  },
+  methods:{
+      getUserInfo(){
+        this.apiJavaPost("/api/user/GetUserLoginMenu",{},
+            res => {
+              this.btnLoading=false;
+            if (res.data.resultCode === 1) {
+              let user=res.data.data;
+              var userJson = JSON.stringify(user);
+              localStorage.zcuserInfo = userJson;
+              this.$router.push({path: 'Home'})
+            } else {
+                this.Error(res.data.message);
+                this.$router.push({path: 'login'})
+            }
+            },
+            null
+        );
+      },
+  },
+  
+}
+</script>
+
+<style>
+.Autologin .gifContent{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+</style>

src/router/config.js

 
 import Home from '../components/Home'
 import Login from '../components/global/Login'
+import Autologin from '../components/global/Autologin'
 import index from '../components/global/index'
 
 export default {
@@ -16,6 +17,12 @@ export default {
             name: 'Login',
             component: Login
         },
+        {
+            path: '/Autologin',
+            name: 'Autologin',
+            component: Autologin
+        },
+        
         {
             path: '/index',
             name: 'index',