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

src/components/work/mywork.vue

@@ -110,10 +110,11 @@
         <th>开始时间</th>
         <th>截止时间</th>
         <th>创建时间</th>
-        <th>总经理审批</th>
-        <th>立项审批</th>
+        <th>总经理立项审批</th>
+        <th>主管立项审批</th>
         <th>当前进度</th>
-        <th>完成审批</th>
+        <th>总经理完成审批</th>
+        <th>主管完成审批</th>
         <th width="200">操作</th>
       </tr>
       <tr v-for="(item, index) in tempList" :key="index">
@@ -159,6 +160,16 @@
             status="success"
           ></el-progress>
         </td>
+        <td>
+          <span v-if="item.Status==2||item.Status==3">
+            <span v-if="item.ZongFinishExamineStatus==0" style="color:grey">审批中</span>
+            <span
+              v-else-if="item.ZongFinishExamineStatus==1"
+              style="color:green;text-decoration: underline;"
+            >已通过</span>
+            <span v-else style="color:red;text-decoration: underline;">已驳回</span>
+          </span>
+        </td>
         <td>
           <span v-if="item.Status==2||item.Status==3">
             <span v-if="item.FinishExamineStatus==0" style="color:grey">审批中</span>

src/components/work/workManager.vue

@@ -122,10 +122,11 @@
         <th>开始时间</th>
         <th>截止时间</th>
         <th>创建时间</th>
-        <th>总经理审批</th>
-        <th>立项审批信息</th>
+        <th>总经理立项审批</th>
+        <th>主管立项审批</th>
         <th>当前进度</th>
-        <th>完成审批信息</th>
+        <th>总经理完成审批</th>
+        <th>主管完成审批</th>
         <th>操作</th>
       </tr>
       <tr v-for="(item, index) in DataList" :key="index">
@@ -173,6 +174,16 @@
             status="success"
           ></el-progress>
         </td>
+        <td>
+          <span v-if="item.Status==2||item.Status==3">
+            <span v-if="item.ZongFinishExamineStatus==0" style="color:grey">审批中</span>
+            <span
+              v-else-if="item.ZongFinishExamineStatus==1"
+              style="color:green;text-decoration: underline;"
+            >已通过</span>
+            <span v-else style="color:red;text-decoration: underline;">已驳回</span>
+          </span>
+        </td>
         <td>
           <span v-if="item.Status==2||item.Status==3">
             <span v-if="item.FinishExamineStatus==0" style="color:grey">审批中</span>
@@ -213,7 +224,7 @@
             effect="dark"
             content="总经理审核"
             placement="top-start"
-            v-if="userInfo.EmployeeId==1 && item.ZongExamineStatus==0"
+            v-if="userInfo.EmployeeId==1 && (item.ZongExamineStatus==0 || (item.ZongFinishExamineStatus==0 && item.Status>1))"
           >
             <el-button
               style="padding:4px"

src/plug/index.js

@@ -753,10 +753,15 @@ export default {
               that.$http.post(uploadUrl, formData, {})
                 .then(res => {
                   successCall(res);
-                })
+                }).catch(function(reason){
+                  that.$refs['my-upload'].clearFiles();
+                  that.$message.error('上传失败！');
+                });
+      
             }
           }).catch(function (err) {
-  
+            that.$refs['my-upload'].clearFiles();
+            that.$message.error('上传失败！');
           });
         }
       }