1 佣金批量制单 + 金蝶相关调整

src/components/FinancialModule/BasicDocuments.vue

@@ -1162,7 +1162,7 @@
       <CostmonthDetails v-if="GetDetail.OtherType==75||getTemplate(GetDetail)" :GetDetail="GetDetail">
       </CostmonthDetails>
        <!-- 相同对象付款单据 -->
-       <SamePayment v-if="GetDetail.Type==2&&GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0" :GetDetail="GetDetail">
+       <SamePayment v-if="GetDetail.Type==2&&GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0&&(GetDetail.DijieBathFinanceList==null || GetDetail.DijieBathFinanceList.length==0)" :GetDetail="GetDetail">
       </SamePayment>
       <!-- 团成员已制单名单 -->
       <template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">

src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue

@@ -125,7 +125,7 @@
         <p>
             <span class="">{{$t('visa.v_tuanhao')}}：
               <template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
-                  <span v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" >{{o.TCNUM}}（{{o.TCID}}）</span>
+                  <span v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" >{{o.TCNUM}}<br/>（{{o.TCID}}）</span>
               </template>
               <span v-else>{{$t('fnc.no')}}</span>
             </span>
@@ -161,7 +161,7 @@
     <table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
       <tr>
         <th rowspan="2">{{$t('system.query_company')}}</th>
-        <th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
+        <!-- <th rowspan="2">{{$t('visa.v_tuanhao')}}</th> -->
         <th rowspan="2">{{$t('fnc.danhao')}}</th>
         <th rowspan="2">{{GetDetail.Type==1? '收款账户' : '付款对象'}}</th>
         <th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
@@ -179,13 +179,13 @@
         <template v-for="(item) in GetDetail.DijieBathFinanceList">
           <tr class="_color_b">
             <td height="34px">{{item.BName}}</td>
-            <td height="34px">
+            <!-- <td height="34px">
                 <template v-for="tc in item.TCIDAndTCNUMList">
-                  <p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
+                  <p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">{{tc.TCNUM}}<br/>({{tc.TCID}})</p>
                 </template>
-            </td>
-            <td height="34px">{{item.FinanceId}}</td>
-            <td height="34px" style="max-width: 160px;">{{item.AccountHolder}}<br>{{item.AccountNumber}}</td>
+            </td> -->
+            <td height="34px"><span class="_jump_page" @click="jumpPage('FinancialDocumentsDetail',item.FinanceId,3)">{{item.FinanceId}}</span></td>
+            <td height="34px" style="max-width: 160px;">{{item.AccountHolder}}<br>{{item.Type==2? item.AccountNumber:''}}</td>
             <td height="34px">{{item.CostTypeName}}</td>
             <td height="34px">{{item.CurrencyName}}</td>
             <td height="34px">{{item.OriginalMoney}}</td>
@@ -209,7 +209,7 @@
       </template>
       <tr v-if="GetDetail.DijieBathFinanceList&&GetDetail.DijieBathFinanceList.length<2">
               <td height="26px"></td>
-              <td height="26px"></td>
+              <!-- <td height="26px"></td> -->
               <td height="26px"></td>
               <td height="26px"></td>
               <td height="26px"></td>
@@ -222,7 +222,7 @@
           </tr>
           <tr v-if="GetDetail.DijieBathFinanceList&&GetDetail.DijieBathFinanceList.length<3">
               <td height="26px"></td>
-              <td height="26px"></td>
+              <!-- <td height="26px"></td> -->
               <td height="26px"></td>
               <td height="26px"></td>
               <td height="26px"></td>
@@ -235,7 +235,7 @@
           </tr>
           <tr v-if="GetDetail.DijieBathFinanceList&&GetDetail.DijieBathFinanceList.length<4">
               <td height="26px"></td>
-              <td height="26px"></td>
+              <!-- <td height="26px"></td> -->
               <td height="26px"></td>
               <td height="26px"></td>
               <td height="26px"></td>
@@ -248,7 +248,7 @@
           </tr>
           <tr>
             <td height="26px">合计</td>
-            <td height="26px"></td>
+            <!-- <td height="26px"></td> -->
             <td height="26px"></td>
             <td height="26px"></td>
             <td height="26px"></td>
@@ -332,11 +332,17 @@
             query: { starTime:this.StartDate,endTime:this.EndDate,EmployeeId:this.EmployeeId,blank:'y'}
           })
         }
+        else if(type==3){
+          this.$router.push({
+            name: path,
+            query: {id: id,blank: 'y',tab: '财务单据'}
+          })
+        }
       },
       Financial_post_GetDetail(id){  //获取单据详情
         if(!id) return
         this.loading = true;
-        this.apipost('Financial_post_GetDetail',{ID:id}, res => {
+        this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
           if(res.data.resultCode == 1) {
             let data= res.data.data;
             data.DetailList.forEach(x=>{

src/components/FinancialModule/Kingdee/currency.vue

@@ -66,6 +66,7 @@
         <ul class="clearfix">
           <li class="hight_query">
               <button class="hollowFixedBtn" @click="resetForm('addMsg'),clickEdit()">新增</button>
+              <button class="normalBtn" @click="method5()">导入金蝶后变更导出</button>
           </li>
       </ul>
       </div>
@@ -351,6 +352,10 @@
             }
           }, err => {})
         },
+        method5(type) {
+          let userInfo = this.getLocalStorage();
+          this.GetLocalFile("Financial_post_DownLoadFinanceKingdeeUpdate", {EmployeeId:userInfo.EmployeeId}, "导入金蝶后变动.xls");
+        },
       },
     }
   

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -43,7 +43,7 @@
         </li>
         <li>
           <span>
-            <em>只看已导入佣金数据的团</em>
+            <em>只看已导入佣金数据未制单的团</em>
             <el-switch v-model="msg.IsQCommission" active-value="true" inactive-value="false">
             </el-switch>
           </span>
@@ -380,7 +380,21 @@
 
     <el-dialog title="生成财务单据" :visible.sync="BOSSDialogText" class="Shopping_bossdialog">
       <template v-if="!BOSSDialog">
-
+        <div style="margin-bottom: 30px;">
+          <ul>
+            <li style="float: left; margin-right: 30px;" v-for="(qitem,qindex) in LeaderGuideDefault">
+              <span :style="qitem.IsAccount==0?'color:red':'color:black'">{{qitem.Name}} > {{(qitem.IsAccount==1?qitem.Bank:'请在付款对象管理界面配置佣金账户')}}</span>
+            </li>
+          </ul>
+        </div>
+        <br/>
+        <div style="display: inline-block;" v-if="IsLGCommissionAccount==false">请完善领队导游佣金账户配置后方可批量生成单据</div>
+        <div style="display: inline-block;" v-else>
+          <p>请注意所有单据一旦生成将直接进入审核，只有此处创建的单据支持批量审核</p>
+          <p>领队导游使用常规付款支付、如需资金池付款请单独操作、并不含转账手续费</p>
+          <p>注意凭证问题：如果此处上传凭证，则单据使用此凭证， 如未上传凭证 则使用对应团号下操作界面上传的附件</p>
+        </div>
+        <br/>
         <el-form label-width="110px">
           <el-row>
             <el-col :span="12" :gutter="35">
@@ -421,7 +435,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <button class="normalBtn" type="primary"
+          <button class="normalBtn" type="primary" v-if="IsLGCommissionAccount"
             @click="bossLen = 1, MoreSureCreateBill()">{{$t('pub.saveBtn')}}</button>
           <button class="hollowFixedBtn" @click="BOSSDialogText=false">{{$t('pub.cancelBtn')}}</button>
         </div>
@@ -501,6 +515,8 @@
         BOSSDialogText: false,
         //上传数组
         saveMsg: [],
+        LeaderGuideDefault:[],
+        IsLGCommissionAccount:true,
         userMenuCode: false,
         HandShow: false,
         nMsg: {
@@ -848,9 +864,40 @@
           this.$message.error("请至少选择一个团!");
           return;
         }
-        this.saveMsg = [];
-        this.BOSSDialog = false;
-        this.BOSSDialogText = true;
+
+        let leaderIds=[];
+        this.shopDataList.forEach((item) => {
+            if (item.IsCheck){
+              leaderIds.push(item.LeaderGuideIds);              
+            }
+          })
+        
+        this.loading = true;
+        this.IsLGCommissionAccount=true;
+        this.apipost(
+            "dmcstatistics_post_GetShopLeaderGuideAccount",
+            {LeaderGuideIds:leaderIds.join(',')},
+            res => {
+              if (res.data.resultCode == 1) {
+                this.loading = false;
+                this.LeaderGuideDefault = res.data.data;
+                this.LeaderGuideDefault.forEach(item=>{
+                  if(item.IsAccount==0){
+                    this.IsLGCommissionAccount=false;
+                  }
+                });
+                this.saveMsg = [];
+                this.BOSSDialog = false;
+                this.BOSSDialogText = true;
+              } else {
+                this.$message.error(res.data.message);
+                this.loading = false;
+                this.BOSSDialog = false;
+                this.BOSSDialogText = false;
+              }
+            },
+            err => {}
+          );
       },
       MoreSureCreateBill() {
 
@@ -1060,3 +1107,4 @@
   }
 
 </style>
+

src/components/administrative/empBankAccountAll.vue

@@ -373,7 +373,7 @@
         <th>{{ $t("admin.admin_operate") }}</th>
       </tr>
       <tr v-for="(item, index) in list">
-        <td>{{ item.TypeName }}</td>
+        <td>{{ item.TypeName }}<span style="color: #e6a014;">{{item.IsDefaultCommission==1?" >佣金":""}}</span></td>
         <td>{{ item.OpenBankName }}</td>
         <td>{{ item.AccountAlias }}</td>
         <td>
@@ -453,6 +453,29 @@
                 icon="iconfont icon-rizhi1"
               ></el-button>
             </el-tooltip>
+            <el-tooltip v-if="item.Type==7"
+              class="item"
+              effect="dark"
+              :content="
+                item.IsDefaultCommission == '1' ? '取消佣金账户' : '设置为佣金账户'
+              "
+              placement="top-start"
+            >
+              <el-button
+                v-if="item.IsDefaultCommission == 1"
+                @click="SetDefaultCommission(item.ID)"
+                type="primary"
+                style="background: #09d49d; border-color: #09d49d"
+                icon="iconfont icon-shangyi"
+              ></el-button>
+              <el-button
+                v-if="item.IsDefaultCommission == 0"
+                @click="SetDefaultCommission(item.ID)"
+                type="primary"
+                style="background: #e95252; border-color: #e95252"
+                icon="iconfont icon-xiayi1"
+              ></el-button>
+            </el-tooltip>
           </el-button-group>
         </td>
       </tr>
@@ -977,6 +1000,31 @@ export default {
           this.$message.info(this.$t("ground.yiquxiao"));
         });
     },
+    SetDefaultCommission(id) {
+      this.$confirm('确认设置/取消此佣金账户', "提示", {
+        confirmButtonText: this.$t("pub.sureBtn"),
+        cancelButtonText: this.$t("pub.cancelBtn"),
+        type: "warning",
+      })
+        .then(() => {
+          this.apipost(
+            "admin_post_SetEmpBankIsDefaultCommission",
+            {
+              ClientAccountId: id,
+            },
+            (res) => {
+              if (res.data.resultCode == 1) {
+                this.$message.success(res.data.message);
+                this.getList();
+              }
+            },
+            (err) => {}
+          );
+        })
+        .catch(() => {
+          this.$message.info(this.$t("ground.yiquxiao"));
+        });
+    },
     handleCurrentChange(val) {
       this.msg.pageIndex = val;
       this.getList();

src/components/sale/ExpectedCommission.vue

@@ -311,7 +311,7 @@
                 <detailsButtom :type="3" :obj="commissionMsg" :Month="Month"/>
                 </div>
               </div>
-              <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年3月起始</span></p>
+              <p style="padding: 0 0 10px 0;text-align: left;"><span style="font-size: 13px;color: red;">注:年终奖励从每年11月起始</span></p>
               <div class="CommissionInfor">
                 <span>达标 <span style="margin-left: 5px;margin-right: 5px;">{{CommissionInfor.BonusNum}}</span>月</span>
                 <span><span>每月人数35人以上</span></span>