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/workDetails.vue

@@ -15,8 +15,11 @@
         </h3>
         <div
           v-if="d.w"
-          style="font-size:14px;font-family:pingfangR;margin: 10px 0;padding: 10px;background: #FFF;"
-        >{{d.w.Description}}</div>
+          style="font-size:14px;font-family:pingfangR;margin: 10px 0;padding: 10px;background: #FFF;min-height:200px;"
+        >
+        <div style='font-size:20px;font-weight:400;color:#333;margin-bottom:12px;'>工作计划内容</div>
+        {{d.w.Description}}
+        </div>
         <fieldset v-if="d.w" style="border: 1px solid #DDD;padding: 13px;font-size: 12px;">
           <legend style="padding:0 10px; font-size:14px;">计划工时信息</legend>
           <el-row :gutter="12">
@@ -27,7 +30,51 @@
           </el-row>
         </fieldset>
         <fieldset style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:30px;">
-          <legend style="padding:0 10px; font-size:14px;">计划操作记录</legend>
+          <legend style="padding:0 10px; font-size:14px;">工作进度反馈</legend>
+          <div v-for="(item, index) in d.p" :key="index">
+            <el-card class="work-content">
+              <h4>
+                进度更新:
+                <div style="width:120px;display: inline-block;margin-left: 15px;">
+                  <el-progress
+                    :text-inside="true"
+                    :stroke-width="24"
+                    :percentage="item.Progree"
+                    status="success"
+                  ></el-progress>
+                </div>
+              </h4>
+              <p v-if="d.w">{{d.w.CreateName}} 提交于 {{item.CreateDate}}</p>
+              <div class="cont">{{item.Content}}</div>
+              <div class="attach" v-if="item.Attach!==''">
+                附件：
+                <span
+                  @click="openFile(item.Attach)"
+                  style="cursor: pointer;"
+                  class="work-file"
+                >{{item.Attach.substring(item.Attach.lastIndexOf("/")+1,item.Attach.length)}}</span>
+              </div>
+              <div class="attach" v-if="item.Linker && item.Linker.length>0">
+                相关链接
+                <span
+                  v-for="lik in item.Linker"
+                  :key="lik"
+                  @click="openFile(lik)"
+                  style="cursor: pointer;display:block;margin-top:10px;"
+                  class="work-file"
+                >{{lik}}</span>
+              </div>
+            </el-card>
+          </div>
+          <div v-if="!d.p || d.p.length==0" style="text-align:center;font-size:12px;color:grey;">
+            <div style="display:inline-block">
+              <i class="iconfont icon-kong" style="font-size:120px;"></i><br/>
+              暂无进度反馈
+            </div>
+          </div>
+        </fieldset>
+        <fieldset style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:30px;">
+          <legend style="padding:0 10px; font-size:14px;">总经理审批记录</legend>
           <div v-if="d.w.ZongExamineStatus!=0">
             <el-card
               class="work-content"
@@ -35,7 +82,7 @@
             >
               <el-row :gutter="10">
                 <el-col :span="22">
-                  <h4>总经理审核{{d.w.ZongExamineStatus==-1?'驳回':'通过'}}</h4>
+                  <h4>总经理立项审核{{d.w.ZongExamineStatus==-1?'驳回':'通过'}}</h4>
                   <p>徐总 提交于 {{d.w.ZongExamineDate}}</p>
                   <div class="cont">{{d.w.ZongExamineRemark}}</div>
                 </el-col>
@@ -93,6 +140,80 @@
               </div>
             </el-card>
           </div>
+          <div v-if="d.w.ZongFinishExamineStatus!=0">
+            <el-card
+              class="work-content"
+              :class="{'blue':d.w.ZongFinishExamineStatus==1,'red':d.w.ZongFinishExamineStatus==-1}"
+            >
+              <el-row :gutter="10">
+                <el-col :span="22">
+                  <h4>总经理完成审核{{d.w.ZongFinishExamineStatus==-1?'驳回':'通过'}}</h4>
+                  <p>徐总 提交于 {{d.w.ZongFinishExamineDate}}</p>
+                  <div class="cont">{{d.w.ZongFinishExamineRemark}}</div>
+                </el-col>
+                <el-col :span="2">
+                  <el-button
+                    type="success"
+                    v-if="!showZui4 && userInfo.EmployeeId==1"
+                    @click="showZui4=true"
+                  >追加信息</el-button>
+                  <br/><br/>
+                  <el-button
+                    type="warning"
+                    v-if="canCancel4 && userInfo.EmployeeId==1"
+                    @click="cancelExamine(4)"
+                  >取消审核</el-button>
+                </el-col>
+              </el-row>
+              <div v-if="d.w.ZongFinishExamineRemarkExpand && d.w.ZongFinishExamineRemarkExpand.length>0">
+                <div
+                  v-for="(item, index) in d.w.ZongFinishExamineRemarkExpand"
+                  :key="index"
+                  style="margin-top:10px;border-top:1px dotted #Fefefe;padding-top:10px;"
+                >
+                  <el-row :gutter="12">
+                    <el-col :span="24">
+                      <el-tag type="success" style="margin-right:12px">追加信息</el-tag>
+                      {{item.u}} 提交于 {{item.d}}
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="12" style="margin-top:12px;">
+                    <el-col :span="24">
+                      <div class="cont">{{item.c}}</div>
+                    </el-col>
+                  </el-row>
+                </div>
+              </div>
+              <div
+                v-if="showZui4"
+                style="margin-top:10px;border-top:1px dotted #Fefefe;padding-top:10px;"
+              >
+                <div style="margin:10px 0;font-size:18px;">追加信息</div>
+                <div style="margin-bottom:10px">
+                  <el-input
+                    type="textarea"
+                    :rows="2"
+                    style="width:100%;color:#000 !important;"
+                    placeholder="请输入追加内容信息"
+                    v-model="examineRemarkExpand"
+                  ></el-input>
+                </div>
+                <div slot="footer" class="dialog-footer">
+                  <button class="normalBtn" type="primary" @click="setRemark(3)">确认提交</button>
+                  <button class="normalBtn" @click="showZui4=false">取消</button>
+                </div>
+              </div>
+            </el-card>
+          </div>
+          <div v-if="d.w.ZongExamineStatus==0 && d.w.ZongFinishExamineStatus==0" style="text-align:center;font-size:12px;color:grey;">
+            <div style="display:inline-block">
+              <i class="iconfont icon-kong" style="font-size:120px;"></i><br/>
+              暂无审核信息
+            </div>
+          </div>
+        </fieldset>
+        <fieldset style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:30px;">
+          <legend style="padding:0 10px; font-size:14px;">主管审批记录</legend>
           <div v-if="d.w.ExamineStatus!=0">
             <el-card
               class="work-content"
@@ -158,41 +279,6 @@
               </div>
             </el-card>
           </div>
-          <div v-for="(item, index) in d.p" :key="index">
-            <el-card class="work-content">
-              <h4>
-                进度更新:
-                <div style="width:120px;display: inline-block;margin-left: 15px;">
-                  <el-progress
-                    :text-inside="true"
-                    :stroke-width="24"
-                    :percentage="item.Progree"
-                    status="success"
-                  ></el-progress>
-                </div>
-              </h4>
-              <p v-if="d.w">{{d.w.CreateName}} 提交于 {{item.CreateDate}}</p>
-              <div class="cont">{{item.Content}}</div>
-              <div class="attach" v-if="item.Attach!==''">
-                附件：
-                <span
-                  @click="openFile(item.Attach)"
-                  style="cursor: pointer;"
-                  class="work-file"
-                >{{item.Attach.substring(item.Attach.lastIndexOf("/")+1,item.Attach.length)}}</span>
-              </div>
-              <div class="attach" v-if="item.Linker && item.Linker.length>0">
-                相关链接
-                <span
-                  v-for="lik in item.Linker"
-                  :key="lik"
-                  @click="openFile(lik)"
-                  style="cursor: pointer;display:block;margin-top:10px;"
-                  class="work-file"
-                >{{lik}}</span>
-              </div>
-            </el-card>
-          </div>
           <div v-if="d.w.FinishExamineStatus!=0">
             <el-card
               class="work-content"
@@ -257,9 +343,16 @@
               </div>
             </el-card>
           </div>
+          <div v-if="d.w.ExamineStatus==0&&d.w.FinishExamineStatus==0" style="text-align:center;font-size:12px;color:grey;">
+            <div style="display:inline-block">
+              <i class="iconfont icon-kong" style="font-size:120px;"></i><br/>
+              暂无审核信息
+            </div>
+          </div>
         </fieldset>
+        
         <fieldset
-          v-if="isEaxmine && d.w && (((d.w.ExamineStatus==0 || (d.w.Status>=2 && d.w.FinishExamineStatus==0)) && userInfo.EmployeeId!=1) || (d.w.ZongExamineStatus==0 && userInfo.EmployeeId==1))"
+          v-if="isEaxmine && d.w && (((d.w.ExamineStatus==0 || (d.w.Status>=2 && d.w.FinishExamineStatus==0)) && userInfo.EmployeeId!=1) || ((d.w.ZongExamineStatus==0||(d.w.ZongFinishExamineStatus==0 && d.w.Status>1)) && userInfo.EmployeeId==1))"
           style="border: 1px solid #DDD;padding: 13px;font-size: 12px;margin-top:20px;"
         >
           <legend style="padding:0 10px; font-size:14px;">{{userInfo.EmployeeId==1?"总经理":""}}审批</legend>
@@ -373,11 +466,13 @@ export default {
       showZui1: false,
       showZui2: false,
       showZui3: false,
+      showZui4:false,
       examineRemarkExpand: "",
       userInfo: {},
       canCancel1:false,
       canCancel2:false,
-      canCancel3:false
+      canCancel3:false,
+      canCancel4:false
     };
   },
   mounted() {
@@ -443,6 +538,9 @@ export default {
             if(this.d.w.ZongExamineRemarkExpand && this.d.w.ZongExamineRemarkExpand.length>0){
               this.d.w.ZongExamineRemarkExpand=JSON.parse(this.d.w.ZongExamineRemarkExpand);
             }
+            if(this.d.w.ZongFinishExamineRemarkExpand && this.d.w.ZongFinishExamineRemarkExpand.length>0){
+              this.d.w.ZongFinishExamineRemarkExpand=JSON.parse(this.d.w.ZongFinishExamineRemarkExpand);
+            }
             
             let dateEnd = new Date();
             if (this.d.w.ExamineStatus!=0) {
@@ -467,6 +565,14 @@ export default {
                 this.canCancel3=true;
               }
             }
+            if (this.d.w.ZongFinishExamineStatus!=0) {
+              let dateBegin = new Date(this.d.w.ZongFinishExamineDate.replace(/-/g, "/"))
+              let dateDiff = dateEnd.getTime() - dateBegin.getTime();
+              console.log(dateDiff)
+              if(dateDiff/1000/60<5){
+                this.canCancel4=true;
+              }
+            }
             this.progree = this.d.w.Progree;
             this.d.p.forEach(x => {
               if (x.Linker && x.Linker != "") {
@@ -578,6 +684,17 @@ export default {
           this.d.w.ZongExamineRemarkExpand.push(r);
         }
         p.remark = JSON.stringify(this.d.w.ZongExamineRemarkExpand);
+      } else if (type == 3) {
+        if (
+          this.d.w.ZongFinishExamineRemarkExpand &&
+          this.d.w.ZongFinishExamineRemarkExpand.length > 0
+        ) {
+          this.d.w.ZongFinishExamineRemarkExpand.push(r);
+        } else {
+          this.d.w.ZongFinishExamineRemarkExpand = [];
+          this.d.w.ZongFinishExamineRemarkExpand.push(r);
+        }
+        p.remark = JSON.stringify(this.d.w.ZongFinishExamineRemarkExpand);
       }
 
       this.apipost(
@@ -590,6 +707,7 @@ export default {
             this.showZui1=false;
             this.showZui2=false;
             this.showZui3=false;
+            this.showZui4=false;
             this.examineRemarkExpand='';
           } else {
             this.$message.error(res.data.message);

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"