退伍复学状态修改

src/views/routine/dis/she.vue

@@ -9,7 +9,15 @@
       </el-form-item>
 
       <el-form-item label="时间" prop="times">
-        <el-input v-model="queryParams.times" placeholder="请输入时间" clearable @keyup.enter.native="handleQuery" />
+         <el-form-item label="时间" prop="times">
+         <el-date-picker
+          v-model="queryParams.times"
+          clearable
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请时间"
+        />
+      </el-form-item>  
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -65,7 +73,7 @@
                   <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
                   <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
                   
-                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+                 <el-tag v-else-if="scope.row.zsStatus == 1  &&  scope.row.fdStatus == 1  && scope.row.xwStatus == 1 && scope.row.twoStatus == 1 &&  scope.row.xjglStatus == 1 && scope.row.jwStatus == 1  " type="success">审批通过</el-tag>
 
                   <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
                           type="danger"
@@ -83,8 +91,7 @@
                   <el-tag v-else-if="scope.row.xwStatus == 1 && ( scope.row.twoStatus == 0 || scope.row.twoStatus == null)" >二级学院审核中</el-tag>
                   <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
                   <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
-                  
+                  <el-tag v-else-if="scope.row.fdStatus == 1  && scope.row.xwStatus == 1 && scope.row.twoStatus == 1 &&  scope.row.xjglStatus == 1 && scope.row.jwStatus == 1  " type="success">审批通过</el-tag>
-                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
 
                   <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
                           type="danger"

src/views/routine/dis/shenhe.vue

@@ -19,11 +19,13 @@
       </el-form-item>
     
       <el-form-item label="时间" prop="times">
-        <el-input
+   
+         <el-date-picker
           v-model="queryParams.times"
-          placeholder="请输入时间"
           clearable
-          @keyup.enter.native="handleQuery"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请时间"
         />
       </el-form-item>
       <el-form-item>
@@ -87,7 +89,7 @@
                   <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
                   <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
                   
-                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+                  <el-tag v-else-if="scope.row.zsStatus == 1  &&  scope.row.fdStatus == 1  && scope.row.xwStatus == 1 && scope.row.twoStatus == 1 &&  scope.row.xjglStatus == 1 && scope.row.jwStatus == 1  " type="success">审批通过</el-tag>
         
                   <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
                           type="danger"
@@ -106,7 +108,7 @@
                   <el-tag v-else-if="scope.row.twoStatus == 1 && ( scope.row.xjglStatus == 0 || scope.row.xjglStatus == null)" >学籍管理审核中</el-tag>
                   <el-tag v-else-if="scope.row.xjglStatus == 1 && ( scope.row.jwStatus == 0 || scope.row.jwStatus == null)" >教务处主管审核中</el-tag>
 
-                  <el-tag v-else-if="scope.row.fdStatus == 1  || scope.row.xwStatus == 1 || scope.row.twoStatus == 1 ||  scope.row.xjglStatus == 1 || scope.row.jwStatus == 1   " type="success">审批通过</el-tag>
+                  <el-tag v-else-if="scope.row.fdStatus == 1  && scope.row.xwStatus == 1 && scope.row.twoStatus == 1 &&  scope.row.xjglStatus == 1 && scope.row.jwStatus == 1  " type="success">审批通过</el-tag>
 
                   <el-tag v-else-if="scope.row.fdStatus == 2  || scope.row.xwStatus == 2 || scope.row.twoStatus == 2 ||  scope.row.xjglStatus == 2 || scope.row.jwStatus == 2 "
                           type="danger"
@@ -124,8 +126,10 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
              <el-button
-              v-if="scope.row.zsStatus === '2' ||  scope.row.zsStatus === '3' ||
+              v-if="scope.row.zsStatus === '3' ||  scope.row.fdStatus === '3'  
-              scope.row.fdStatus === '2' ||  scope.row.fdStatus === '3 '"
+              ||  scope.row.fdStatus === '2' || scope.row.twoStatus === '2' || scope.row.xwStatus == '2'
+              || scope.row.xjglStatus == '2' || scope.row.jwStatus == '2'
+              "
               size="mini"
               type="text"
               icon="el-icon-edit"