1

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_k0elxank7id.css');
+@import url('//at.alicdn.com/t/font_2077629_1jbxfhyh7ir.css');
 
 html,
 body,

src/api/finance/index.js

@@ -87,4 +87,12 @@ export function setSellCommissionRule(data) {
     data
   });
 }
+// 财务工作台 获取提成周期列表
+export function getSellCommissionPeriodsPageList(data) {
+  return request({
+    url: '/SellCommission/GetSellCommissionPeriodsPageList',
+    method: 'post',
+    data
+  });
+}
 

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -2,7 +2,8 @@
   @import "../css/cssReset.css";
 
   .page_fnDm {
-    background-color: white
+    background-color: white;
+    padding: 0 5px;
   }
 
   .query-box {
@@ -302,7 +303,7 @@
     background-color: #EEEEEE;
     border-radius: 4px;
     margin: 10px 0;
-    width: 190px
+    width: 230px
   }
 
   ._bold {
@@ -504,6 +505,11 @@
     background-color: #1296db;
     font-size: 16px;
   }
+  ._icon_btn i.icon-jiaoyi {
+    background-color: #1296db;
+    font-size: 18px;
+  }
+
 
   .boss_btn_tips,
   .boss_btn {
@@ -845,16 +851,16 @@
           <th v-if="hbState || checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" v-model="isCkedAll"
               @click='checkedAll()'></th>
           <th width="90">{{$t('system.query_company')}}</th>
-          <th>{{$t('fnc.danhao')}}</th>
+          <th width="64">{{$t('fnc.danhao')}}</th>
           <th width="90">{{$t('fnc.djleixing')}}</th>
           <th>{{$t('hotel.hotel_corrlelatition')}}</th>
           <th>{{$t('fnc.feiyongleixing')}}</th>
-          <th>{{$t('tips.jiaoyifangshi')}}</th>
+          <th >{{$t('tips.jiaoyifangshi')}}</th>
           <th>{{$t('fnc.jine')}}</th>
           <th>{{msg.Type==1? $t('fnc.shoukuan') : $t('fnc.fukuan')}}{{$t('fnc.duixiang')}}</th>
           <th width="90">{{$t('fnc.zdrenyuan')}}</th>
-          <th>{{$t('fnc.dqzhuangtai')}}</th>
-          <th>{{$t('system.table_operation')}}</th>
+          <th width="90">{{$t('fnc.dqzhuangtai')}}</th>
+          <th width="150">{{$t('system.table_operation')}}</th>
         </tr>
         <tr class="_item_list" v-for="(item,index) in DataList">
           <td v-if="hbState || checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" :value="item.FrID"
@@ -1024,10 +1030,14 @@
               <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>
-            <el-tooltip class="item" :content="$t('fnc.tzjyriqi')" placement="top">
+            <el-tooltip class="item" :content="$t('fnc.tzjyriqi')" placement="top" v-if="msg.Conditon==2 && item.TradeDate">
               <i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng"
                 @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"></i>
             </el-tooltip>
+            <el-tooltip class="item" content="交易方式" placement="top" v-if="active==2 && istransaction == true">
+              <i v-if="active==2" class="iconfont icon-jiaoyi"
+                @click="showjiaoyi(item.FrID)"></i>
+            </el-tooltip>
           </td>
         </tr>
       </table>
@@ -1090,6 +1100,32 @@
         <el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">{{$t('pub.sureBtn')}}</el-button>
       </div>
     </el-dialog>
+    <!-- 修改交易方式 -->
+    <el-dialog title="修改交易方式" width="600px"
+      :visible.sync="transactionmode" center :before-close="closeChangeMachie">
+      <el-form label-width="110px">
+        <div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
+          <p>收款账户：
+            <el-select filterable v-model='x.AccountTypeId' placeholder="" @change="getAccountList2(x.AccountTypeId,y)"
+              class="w150 _border_b_1">
+              <el-option v-for='item in AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
+              </el-option>
+            </el-select>
+          
+            <el-select filterable v-model='x.AccountId' placeholder="" @change="getAccountList3(x,y)"
+               class="w250 _border_b_1" >
+              <el-option v-for='item in x.list' :label='item.Name' :value='item.ID' :key='item.ID'>
+              </el-option>
+            </el-select>
+          </p>
+        </div>
+        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="hollowFixedBtn" @click="transactionmode=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="一键审批" width="400px" :visible.sync="BOSSDialog" center :close-on-press-escape="false"
       :close-on-click-modal="false">
       <template v-if="!BOSSDialogText">
@@ -1366,6 +1402,7 @@
         zhuanBox: false,
         loading2: false,
         dialogFormVisible: false,
+        transactionmode:false,
         searchList: [],
         minHeight: 400,
         //当前登录用户功能权限
@@ -1416,11 +1453,21 @@
           rowsPerPage: 12,
           SName: "",
           Status: '-1'
-        }
+        },
+        accountList2:[],
+        trabeList:[],//获取的交易方式列表
+        alltransaction:[],
+        istransaction:false,
       }
     },
     created() {
       let userinfo = this.getLocalStorage();
+      userinfo.ActionMenuList.map(x=>{//判断是否有单据交易方式修改的权限
+        if(x.FunctionCode == "Finance_Trademodify"){
+          this.istransaction = true;
+          return
+        }
+      })
       // let ActionMenuCode=userinfo.ActionMenuCode;
       // if(ActionMenuCode.indexOf('F_AccountantFinanceMerge')!=-1){
       //     this.hbShow=true;
@@ -1882,6 +1929,28 @@
         this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
           if (res.data.resultCode == 1) {
             this.AccList = res.data.data;
+            let alltransaction = []
+            this.AccList.forEach(x=>{
+              let  obj = {
+                Id:x.ID,
+                list:[]
+              }
+              this.apipost('FinancialInstitutions_post_GetALLAccountList', {
+                TypeId: x.ID
+                }, res => {
+                  if (res.data.resultCode == 1) {
+                    let data = res.data.data;
+                    data.forEach(x => {
+                      x.allName = x.BackNo + "(" + x.Alias + ")";
+                      x.Name = x.Alias;
+                    })
+                    obj.list = data
+                  }
+                }, err => {})
+             
+              this.alltransaction.push(obj)
+            })
+            
           } else {
             this.$message.error(res.data.message);
           }
@@ -2429,6 +2498,67 @@
             }
           })
         }
+      },
+      showjiaoyi(FrId){//弹出交易方式修改
+        this.apipost('Financial_get_GetFinanceTrabeList', {FrId:FrId}, res => {
+            if (res.data.resultCode == 1) {
+              this.trabeList = res.data.data
+              this.trabeList.forEach(x=>{
+                this.alltransaction.map(j=>{
+                  if(x.AccountTypeId == j.Id){
+                    x.list = j.list
+                    return
+                  }
+                })
+              })
+              this.transactionmode = true
+            }
+          }, err => {})
+      },
+      getAccountList2(AccountTypeId,y){//获取账户类型对应下的账户列表
+        this.alltransaction.map(x=>{
+          if(x.Id == AccountTypeId){
+            this.trabeList[y].list = x.list;
+            return
+          }
+        })
+      },
+      getAccountList3(x,y){
+        x.list.map(item=>{
+          if(x.AccountId == item.ID){
+            this.trabeList[y].Type = item.BankType;
+            return
+          }
+        })
+      },
+      getAccountListtype(AccountId){
+        console.log(AccountId)
+        this.accountList2.map(x=>{
+          if(x.ID == AccountId){
+            this.FinanceTrabeMsg.Type = x.BankType
+            return
+          }
+        })
+      },
+      preservetransaction(){//保存交易方式
+        let msg = []
+        this.trabeList.forEach(x=>{
+          let  obj ={
+            ID:x.ID,
+            Type:x.Type,
+            AccountId:x.AccountId,
+          }
+          msg.push(obj)
+        })
+        this.apipost('Financial_post_SetFinanceTrabeInfo', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.$message.success(res.data.message);
+            this.transactionmode = true
+            this.getPageList()
+          }else{
+            this.Error(res.data.message);
+          }
+        }, err => {})
       }
     },
     watch: {}