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

src/components/FinancialModule/OPRules.vue

@@ -312,11 +312,11 @@ export default {
                 //     this.Error("请选择分助理！")
                 //     return;
                 // }
-                if(this.form.FInternMoney==0){
+                if(this.form.FManagerMoney==0){
                     this.Error("请填写分负责人金额！")
                     return;
                 }
-                if(this.form.FManagerMoney==0){
+                if(this.form.FInternMoney==0){
                     this.Error("请填写分助理金额！")
                     return;
                 }
@@ -439,7 +439,6 @@ export default {
         this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
             if(res.data.resultCode == 1) {
                 this.departmentList = res.data.data;
-                console.log("this.departmentList",this.departmentList)
             }
         }, err => {})				
      },

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1485,7 +1485,7 @@ export default {
         var that=this;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
         this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
-        
+        let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
         if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
@@ -1499,7 +1499,12 @@ export default {
         if (this.orderObj && this.orderObj.OtherType) {
             this.ZhuiJiaTK = true
         }
-         
+        this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID}, res => {
+            if(res.data.resultCode == 1) {
+                this.coinGetList = res.data.data;
+                console.log("this.coinGetList 522555",this.coinGetList )
+            }
+        }, err => {})
     },
     mounted(){
         let userInfo = this.getLocalStorage();
@@ -1520,8 +1525,7 @@ export default {
         let minute = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes();
         let second = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds();
         this.timer = hour + ':' + minute + ':' + second;
-        let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
-        this.financeinfo_post_GetList(TCID);
+        // this.financeinfo_post_GetList(TCID);
         if(this.$route.query.edit){
             // 编辑
             this.msg.FrID = this.$route.query.FrID;

src/components/administrative/QzCommissionDetail.vue

@@ -135,7 +135,7 @@ export default {
             RB_Branch_Id:data.RB_Branch_Id,
             IsPublic:6,
             BType:4,
-            AccountId:22,
+            AccountId:23,
             CostTypeID:189,
             WBMoney:data.CommissionMoney,
             Remark:'',
@@ -162,7 +162,7 @@ export default {
                   this.loading = false;
                   if (res.data.resultCode == 1) {
                     this.apipost(
-                    "OPCommission_UpdatePeriodsFrID",
+                    "VisaCommission_UpdatePeriodsFrID",
                     {ID:this.oPComissionPeriods.ID,FrId:res.data.data},
                     res => {
                       if (res.data.resultCode == 1) {
@@ -293,14 +293,14 @@ export default {
         //   单据号：${oPComissionPeriods.FRID}</span>`;
         // }
       };
-      // let opera = {
-      //   title: "操作",
-      //   titleAlign: "left",
-      //   columnAlign: "left",
-      //   width: 80,
-      //   isResize: false,
-      //   componentName: "commission-table-operation"
-      // };
+      let opera = {
+        title: "操作",
+        titleAlign: "left",
+        columnAlign: "left",
+        width: 80,
+        isResize: false,
+        componentName: "commission-table-operation"
+      };
       this.columns = [];
       this.columns.push(company);
       this.columns.push(department);
@@ -313,7 +313,7 @@ export default {
     //   this.columns.push(visaPeopleCount);
       this.columns.push(Zhanbi);
       this.columns.push(remark);
-      // this.columns.push(opera);
+      this.columns.push(opera);
       this.isReady = true;
     },
     sortChange(param) {