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

src/App.vue

@@ -113,7 +113,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_7l7pdpshnqc.css";
+  @import "//at.alicdn.com/t/font_635492_hjv41l1i5.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/FinancialModule/FinancialDocuments.vue

@@ -81,9 +81,9 @@
     ._icon_btn i.icon-quxiao1{background-color: #E95252;}
     ._icon_btn i.icon-quxiao1:hover{background-color: #ea6d6d}
     ._icon_btn i.icon-quxiao1:active{background-color:#e42d2d}
-    ._icon_btn i.icon-zhuanjiao1{background-color: #E6A014;font-size: 16px;}
-    ._icon_btn i.icon-zhuanjiao1:hover{background-color: rgb(235, 184, 84)}
-    ._icon_btn i.icon-zhuanjiao1:active{background-color: rgb(223, 150, 6)}
+    ._icon_btn i.icon-zhuanjiao1,._icon_btn i.icon-cuishou{background-color: #E6A014;font-size: 16px;}
+    ._icon_btn i.icon-zhuanjiao1:hover,._icon_btn i.icon-cuishou:hover{background-color: rgb(235, 184, 84)}
+    ._icon_btn i.icon-zhuanjiao1:active,._icon_btn i.icon-cuishou:active{background-color: rgb(223, 150, 6)}
     ._tag_span{background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #409eff;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;}
     ._tag_span._tag_warr{background-color: rgba(103,194,58,.1);border-color: rgba(103,194,58,.2);color: #67c23a;}
     ._fex_cen{display: flex;align-items: center}
@@ -548,6 +548,9 @@
                         <el-tooltip class="item"  effect="dark" :content="$t('fnc.shenhe')"   placement="top">
                             <i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
                         </el-tooltip>
+                        <el-tooltip class="item"  effect="dark" content="催审"   placement="top">
+                            <i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-cuishou" @click="cuishen('Financial_post_SetFinancePushOn', item.FrID)"></i>
+                        </el-tooltip>
                         <el-tooltip class="item"  effect="dark" :content="$t('fnc.zhuanjiao')"   placement="top">
                             <i v-if="msg.Conditon==3 && !BOSSBtn2" class="iconfont icon-zhuanjiao1" @click="zhuanBox = true,zhuanMsg.WorkFlowId = item.FrID"></i>
                         </el-tooltip>
@@ -889,6 +892,17 @@ export default {
         this.AccountType_post_GetList();
     },
     methods:{
+        // 催审
+        cuishen: function (cmd, id) {
+            this.apipost(cmd,{FrId: id},res=>{
+                if(res.data.resultCode==1){
+                    this.Success(res.data.message);
+                    this.getPageList();
+                }else{
+                    this.Error(res.data.message);
+                }
+            },err=>{})
+        },
         //转交
         getExchange(FrID){
             this.zhuanjiaoMsg.CreateBy = '';