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

src/components/FinancialModule/FinancialDocuments.vue

@@ -968,9 +968,9 @@ input[type="number"] {
                         <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>
-                        <el-tooltip  class="item" effect="dark" content="转交"  placement="top">
+                        <!-- <el-tooltip  class="item" effect="dark" content="转交"  placement="top">
                             <i v-if="msg.Conditon==7" class="iconfont icon-zhuanhuan1" @click="getExchange(item.FrID)"></i>
-                        </el-tooltip>
+                        </el-tooltip> -->
                         <el-tooltip  class="item" effect="dark" :content="$t('active.cl_zuofei')"  placement="top">
                             <i v-if="((msg.Conditon==1 ||msg.Conditon==7)  && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
                         </el-tooltip>
@@ -1861,6 +1861,7 @@ export default {
     },
     //设置转交
     setExchange() {
+      return
       if (this.zhuanjiaoMsg.CreateBy == "") {
         this.Error("请选择转交人");
         return;