Guoxiaohuan 5 gadi atpakaļ
vecāks
revīzija
449594d5af
2 mainītis faili ar 66 papildinājumiem un 48 dzēšanām
  1. 49 32
      src/views/appeal/index.vue
  2. 17 16
      src/views/audit/index.vue

+ 49 - 32
src/views/appeal/index.vue

@@ -10,10 +10,23 @@
                         <span class='Micbold'>可申诉的未执行策略</span>
                         <span v-if='appealsArr.length>0'>{{appealsArr.length}}</span>
                     </div>
-                    <div class='left' v-if="appealsArr1.length>0">
+                    <div class='left' v-if='appealsArr1.length>0'>
                         <div style='margin-bottom:24px' v-for='(item2,index) in appealsArr1' :key='index'>
-                            <p class='date MicrYaHei'>{{item2.date?formatterStr(item2.date):'--'}}</p>
-
+                            <div v-if='item2.date'>
+                                <p class='date MicrYaHei' v-if='item2.date==today'>{{formatterStr(item2.date)+'&nbsp;&nbsp;今天'}}</p>
+                                <p v-if='item2.date==yesterday' class='date MicrYaHei'>{{formatterStr(item2.date)+'&nbsp;&nbsp;昨天'}}</p>
+                                <p class='date MicrYaHei' v-if='item2.date!=today&&item2.date!=yesterday'>
+                                    {{formatterStr(item2.date)+'&nbsp;&nbsp;'}}
+                                    <span v-if='formatter3(formatters(item2.date))==0'>星期日</span>
+                                    <span v-if='formatter3(formatters(item2.date))==1'>星期一</span>
+                                    <span v-if='formatter3(formatters(item2.date))==2'>星期二</span>
+                                    <span v-if='formatter3(formatters(item2.date))==3'>星期三</span>
+                                    <span v-if='formatter3(formatters(item2.date))==4'>星期四</span>
+                                    <span v-if='formatter3(formatters(item2.date))==5'>星期五</span>
+                                    <span v-if='formatter3(formatters(item2.date))==6'>星期六</span>
+                                </p>
+                            </div>
+                            <!-- <p class='date MicrYaHei'>{{item2.date?formatterStr(item2.date):'--'}}</p> -->
                             <div class='execute'>
                                 <div class='card' v-for='(item,index) in item2.children' :key='index'>
                                     <div class='time'>执行时间:{{item.recommend?formatterStr2(item.recommend.time):'--'}}</div>
@@ -47,16 +60,14 @@
                             </div>
                         </div>
                     </div>
-                    <div class="no-data" v-else>
-                        暂无数据
-                    </div>
+                    <div class='no-data' v-else>暂无数据</div>
                 </div>
                 <div class='appealBoxCenter'>
                     <div class='title'>
                         <span class='Micbold'>审核中</span>
                         <span v-if='InAuditArr.length>0'>{{InAuditArr.length}}</span>
                     </div>
-                    <div class='center' v-if="InAuditArr.length>0">
+                    <div class='center' v-if='InAuditArr.length>0'>
                         <div class='card' v-for='(item,index) in InAuditArr' :key='index'>
                             <div class='time' @click='menus(item,2)'>
                                 <span class='time-box'>
@@ -71,16 +82,14 @@
                             <div class='remark'>{{item.reason||'--'}}</div>
                         </div>
                     </div>
-                    <div class="no-data" v-else>
-                        暂无数据
-                    </div>
+                    <div class='no-data' v-else>暂无数据</div>
                 </div>
                 <div class='appealBoxRight' ref='appealBoxRight'>
                     <div class='title Micbold'>审核完成/超时未申诉</div>
-                    <div class='right' v-if="auditCompletedArr.length>0">
+                    <div class='right' v-if='auditCompletedArr.length>0'>
                         <div class='card' v-for='(item,index) in auditCompletedArr' :key='index'>
                             <div class='remark' @click='menus(item,0)'>
-                                <div class='remark-left'>审批时间:{{item.updateTime?formatter1(item.updateTime):'--'}}</div>
+                                <div class='remark-left'>审批时间:{{item.status=='306'?'--':(item.updateTime?formatter1(item.updateTime):'--')}}</div>
                                 <div class='remark-right Micbold'>
                                     <span :class='item.status=="303"?"backout":(item.status=="306"?"backout1":"backout2")'>
                                         <img
@@ -108,9 +117,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="no-data" v-else>
-                        暂无数据
-                    </div>
+                    <div class='no-data' v-else>暂无数据</div>
                 </div>
             </div>
         </div>
@@ -147,7 +154,9 @@ export default {
             loading: false,
             time: '',
             day: '',
-            day1: ''
+            day1: '',
+            yesterday: '',
+            today: ''
         }
     },
     components: {
@@ -155,6 +164,8 @@ export default {
         EvSnapshotsDialog
     },
     mounted() {
+        this.today = this.formatter2(moment(new Date()))
+        this.yesterday = this.formatter2(moment(new Date()).add(-1, 'days'))
         this.init()
     },
     methods: {
@@ -180,6 +191,9 @@ export default {
                 this.init()
             })
         },
+        formatter3(date) {
+            return moment.unix(date / 1000).format('d')
+        },
         formatter(date) {
             return moment.unix(date / 1000).format('YYYY.MM.DD hh:mm')
         },
@@ -196,6 +210,9 @@ export default {
                 return str.substring(0, 2) + ':' + str.substring(2, 4)
             }
         },
+        formatters(date) {
+            return moment(date).valueOf()
+        },
         menus(item, type) {
             this.queryExecutes(item, type)
         },
@@ -417,7 +434,7 @@ export default {
                 height: 100%;
                 display: flex;
                 flex-direction: column;
-                border-right: 1px solid #EFF0F1;
+                border-right: 1px solid #eff0f1;
                 // overflow: scroll;
                 .title {
                     display: flex;
@@ -582,33 +599,33 @@ export default {
                         height: 0;
                     }
                 }
-                .no-data{
-                    font-size:14px;
-                    font-family:MicrosoftYaHei;
-                    color:rgba(100,108,115,1);
+                .no-data {
+                    font-size: 14px;
+                    font-family: MicrosoftYaHei;
+                    color: rgba(100, 108, 115, 1);
                     height: 100%;
                     justify-content: center;
                     align-items: center;
-                     display: flex;
+                    display: flex;
                 }
             }
             .appealBoxCenter {
                 flex: 1;
                 height: 100%;
                 margin: 0 24px;
-                border-right: 1px solid #EFF0F1;
+                border-right: 1px solid #eff0f1;
                 // overflow: scroll;
                 //  height: 100%;
                 display: flex;
                 flex-direction: column;
-                .no-data{
-                    font-size:14px;
-                    font-family:MicrosoftYaHei;
-                    color:rgba(100,108,115,1);
+                .no-data {
+                    font-size: 14px;
+                    font-family: MicrosoftYaHei;
+                    color: rgba(100, 108, 115, 1);
                     height: 100%;
                     justify-content: center;
                     align-items: center;
-                     display: flex;
+                    display: flex;
                 }
                 .title {
                     display: flex;
@@ -707,10 +724,10 @@ export default {
                 height: 100%;
                 display: flex;
                 flex-direction: column;
-                .no-data{
-                    font-size:14px;
-                    font-family:MicrosoftYaHei;
-                    color:rgba(100,108,115,1);
+                .no-data {
+                    font-size: 14px;
+                    font-family: MicrosoftYaHei;
+                    color: rgba(100, 108, 115, 1);
                     height: 100%;
                     justify-content: center;
                     align-items: center;

+ 17 - 16
src/views/audit/index.vue

@@ -13,7 +13,7 @@
                         </el-select>
                     </div>
                     <div class='appeal-left-box'>
-                        <div v-if="auditArr.length==0" class="no-data">
+                        <div v-if='auditArr.length==0' class='no-data'>
                             <span>暂无待审核策略</span>
                         </div>
                         <div v-else v-for='(item1,index) in auditArr' :key='index'>
@@ -41,9 +41,9 @@
                             >
                                 <div class='time'>
                                     <span>{{item.pushTime?formatter(item.pushTime):'--'}} {{item.title||'--'}}</span>
-                                    <span>
+                                    <span v-if='item.pics'>
                                         <img src='../../assets/tp.png' alt />
-                                        <span v-if='item.pics'>{{item.pics.length}}</span>
+                                        <span>{{item.pics.length}}</span>
                                     </span>
                                 </div>
                                 <div class='content'>
@@ -56,8 +56,8 @@
                     </div>
                 </div>
                 <div class='appeal-right'>
-                    <div class='title Micbold' v-if="Object.keys(auditObj).length>0">未执行申诉单</div>
-                    <div class='detailContainer' v-if="Object.keys(auditObj).length>0">
+                    <div class='title Micbold' v-if='Object.keys(auditObj).length>0'>未执行申诉单</div>
+                    <div class='detailContainer' v-if='Object.keys(auditObj).length>0'>
                         <div class='nav MicrYaHei'>
                             <span>项目名称:{{'--'}}</span>
                             <span>申请人:{{auditObj.applyUser||'--'}}</span>
@@ -86,7 +86,7 @@
                             <upload-img :souseArr='auditObj.pics || []'></upload-img>
                         </div>
                     </div>
-                    <div class='opinion' v-if="Object.keys(auditObj).length>0">
+                    <div class='opinion' v-if='Object.keys(auditObj).length>0'>
                         <span class='opinion-title Micbold'>审批意见</span>
                         <div class='opinion-bottom MicrYaHei'>
                             <input type='text' v-model='comment' :class='{isRed: isRed}' />
@@ -94,8 +94,9 @@
                             <span @click='approvalOpinion(auditObj,"approve")'>同意</span>
                         </div>
                     </div>
-                    <div class="no-data" v-if="Object.keys(auditObj).length==0">
-                        <img src="@/assets/noData.png"><br/>
+                    <div class='no-data' v-if='Object.keys(auditObj).length==0'>
+                        <img src='@/assets/noData.png' />
+                        <br />
                         <div>暂无内容</div>
                     </div>
                 </div>
@@ -380,14 +381,14 @@ export default {
                     flex: 1;
                     overflow: scroll;
                     margin-bottom: 24px;
-                    .no-data{
+                    .no-data {
                         display: flex;
                         justify-content: center;
                         align-items: center;
-                        font-size:14px;
+                        font-size: 14px;
                         height: 100%;
-                        font-family:MicrosoftYaHei;
-                        color:rgba(100,108,115,1);
+                        font-family: MicrosoftYaHei;
+                        color: rgba(100, 108, 115, 1);
                     }
                     .date {
                         height: 18px;
@@ -459,15 +460,15 @@ export default {
                 display: flex;
                 flex-direction: column;
                 background: #fff;
-                .no-data{
+                .no-data {
                     height: 100%;
                     display: flex;
                     justify-content: center;
                     align-items: center;
                     flex-direction: column;
-                    font-size:14px;
-                    font-family:MicrosoftYaHei;
-                    color:rgba(100,108,115,1);
+                    font-size: 14px;
+                    font-family: MicrosoftYaHei;
+                    color: rgba(100, 108, 115, 1);
                 }
                 .title {
                     height: 32px;