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

src/components/FinancialModule/FProcessManagement.vue

@@ -201,7 +201,7 @@
                         <p class="_s">{{$t('fnc.sygongsi')}}</p>
                     </div>
                     <div>
-                        <p class="_t" v-if="item.Status==1">{{item.FlowNum==null?$t('fnc.no'):item.FlowNum}}</p>
+                        <p class="_t" v-if="item.Status==1">{{item.FlowNum==null?$t('fnc.no'):item.FlowNum}} <span v-if="item.IsMonthly==1">&nbsp;&nbsp;<el-tag>{{$t('ground.yuejie')}}</el-tag></span></p>
                         <p class="_t" v-else>{{$t('fnc.zwkqliucheng')}}</p>
                         <p class="_s">{{$t('fnc.zlchengshu')}}</p>
                     </div>
@@ -248,6 +248,9 @@
                      <el-tooltip class="item"  effect="dark"  :content="$t('fnc.qiyong')"  placement="top">
                          <i class="iconfont icon-bofang" v-show="item.Status==2"  @click="UpdateStatus(item.Id,item.TemplateType)"></i>
                     </el-tooltip>
+                    <el-tooltip  class="item" effect="dark" :content="$t('ground.yuejie')"  placement="top">
+                        <i  class="edit icon-bofang" v-show="item.Status==1" @click="UpdateMonthly(item.Id)"></i>
+                    </el-tooltip> 
                     <el-tooltip class="item" effect="dark" :content="$t('fnc.tingyong')"  placement="top">
                          <i class="iconfont icon-zanting1" v-show="item.Status==1" @click="UpdateStatus(item.Id,item.TemplateType)"></i>
                     </el-tooltip>
@@ -257,7 +260,6 @@
                     <!-- <el-tooltip  class="item" effect="dark" :content="$t('system.table_delete')"  placement="top">
                         <i  class="edit el-icon-delete" v-show="item.Status==1" @click="deletTemplate(item.Id,item.Name)"></i>
                     </el-tooltip>  -->
-
                 </div>
             </li>
         </ul>
@@ -381,6 +383,16 @@ export default {
                 }
             },err=>{})
         },
+        UpdateMonthly(id){  //月结
+            this.apipost('Template_post_SetMonthlyTemplate',{TemplateId:id},res=>{
+                if(res.data.resultCode==1){
+                    this.$message.success(res.data.message)
+                    this.getTemplateList()
+                }else{
+                    this.$message.error(res.data.message)
+                }
+            },err=>{})
+        },
         getTemplateList(){
             this.loading = true;
             let url = 'FinancialFlowTemplate_post_GetPageList'

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -997,12 +997,13 @@
                 v-if="isCostTypeId||GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
                             || GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
                             || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
-                            || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99||  GetDetail.TemplateId === 126
-                            || GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)"
+                            || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99||  GetDetail.TemplateId === 126||  GetDetail.TemplateId === 89
+                            || GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)
+                            || (userInfo.RB_Group_id!=2 && o.TCID>0 && GetDetail.OrderID==0 && F_Disbursement_Schedule)"
                 @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span
                   class="_jump_page _font_bold">{{$t('objFill.ykjh')}}</span>
               </td>
-              <td v-if="GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)"
+              <td v-if="GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)|| (userInfo.RB_Group_id!=2 && o.TCID>0 && GetDetail.OrderID==0 && F_Disbursement_Schedule)"
                 @click="jumpPlanPage('leaderPay2',o.TCID)"> <span
                   class="_jump_page _font_bold">{{$t('objFill.ldbz')}}</span> </td>
               <td

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -2588,6 +2588,15 @@
         if(!this.msg.BankList || this.msg.BankList.length<=0){return;}        
         if(!this.msg.detailList || this.msg.detailList.length<=0){return;}
         if(this.msg.TradeDate==''){return;}
+        //验证  如果选择虚拟账户 
+        if(this.bankType>0 && this.AccList && this.AccList.length>0){
+          let IsVirtual = this.AccList.find(x=>x.ID==this.bankType).IsVirtual;
+          if(IsVirtual && IsVirtual==1){
+            this.msg.BankList[0].IsVirtual=1;
+            return;
+          }//虚拟账户
+        }
+
         if(!(this.msg.BankList[0].Type==1 || (this.msg.BankList[0].Type==2 && this.msg.BankList[0].AccountId==92))){return;}
         if(this.msg.BankList[0].Type==1 && (this.msg.BankList[0].AccountId==7||this.msg.BankList[0].AccountId==134||this.msg.BankList[0].AccountId==156)){return;}
         //验证日期 必须大于  上线的那一天  --------------------------------------------  注意调整