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

src/components/FinancialModule/domesticCommission.vue

@@ -234,7 +234,7 @@
             },
             YijianZD(item) {
                 let Money 
-                if(this.msg.OutBranch>0){
+                if(this.msg.OutBranchId>0){
                     Money=item.BranchCommission
                 }else{
                     Money=item.SumPrice
@@ -254,7 +254,7 @@
                     IsUploadPic: 1,
                     orderObj: JSON.stringify(obj)
                 }
-                if(this.msg.OutBranch>0){
+                if(this.msg.OutBranchId>0){
                     query.id = 30
                     query.Name = "分公司销售提成单"
                 }else{

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -995,10 +995,11 @@
                         @click.native="RemoveHotelJourneyOrder(item.TCID)">
                         {{$t('op.HotelXJ')}}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
+                      <!-- 结团 -->
+                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}}
+                      <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">{{$t('visaT.sale')}}
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
                         @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">{{$t('Operation.Op_shouruDan')}}
@@ -2200,21 +2201,37 @@
         });
       },
       //结团/正常
-      OutGroup(TCID, Status) {
+      OutGroup(TCID, Status,TravelEndAudit) {
         let msg = {
           TCID: TCID,
           Status: Status
         };
+        if(TravelEndAudit==1){
+            let that = this;
+                that.$confirm('一旦审批,不能再进行再制单的操作?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                  that.setPriceStatus(msg)
+                }).catch(() => {
+
+                });
+        }else{
+          this.setPriceStatus(msg)
+        }
+      },
+      setPriceStatus(msg){
         this.apipost("travel_post_SetPriceStatus", msg, res => {
-          if (res.data.resultCode == 1) {
-            this.Success(res.data.message);
-            this.getControlList();
-            this.queryCommonData.checkDialogAll = false;
-            this.queryCommonData.ckedplat = [];
-          } else {
-            this.Info(res.data.message);
-          }
-        });
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.getControlList();
+              this.queryCommonData.checkDialogAll = false;
+              this.queryCommonData.ckedplat = [];
+            } else {
+              this.Info(res.data.message);
+            }
+          });
       },
       //分房表下载
       exportExcel_singleRoom(item) {

src/components/systemManagement/lineManagement.vue

@@ -541,6 +541,29 @@
                 :inactive-value="isDefaultUnchecked"></el-switch>
             </el-form-item>
           </el-col>
+          <el-col :span="2">
+            <el-form-item label="结团审批">
+              <el-switch v-model="addMsg.travelEndAudit" :active-value="isDefaultChecked"
+                :inactive-value="isDefaultUnchecked"></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5" v-if='addMsg.travelEndAudit==1'>
+            <el-form-item label="审批人员" prop="auditEmpId">
+              <el-select
+                  v-model="addMsg.auditEmpId"
+                  filterable
+                  placeholder="审批人员"
+                  @change="$forceUpdate()"
+                  >
+                  <el-option
+                    v-for="item in searchList"
+                    :label="item.name"
+                    :value="item.empId"
+                    :key="item.empId"
+                  ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="5">
             <el-form-item :label="$t('Operation.Op_LineDirection')" prop="LineDirection">
               <el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')">
@@ -750,6 +773,8 @@
           RebateMoney: 0, //人头返佣
           TripFeatureTopBg: "", //行程特色顶部图片
           TripFeatureBottomBg: "", //行程特色顶部图片
+          travelEndAudit:0,//结团审批
+          auditEmpId:'',//审批人
         },
         departCompany: "",
         departDepartment: "",
@@ -799,8 +824,15 @@
             required: true,
             message: this.$t('op.qingxzxlfx'),
             trigger: "change"
-          }]
-        }
+          }],
+          auditEmpId: [{
+            required: true,
+            message: '审批人员不能为空',
+            trigger: "blur"
+          }],
+          
+        },
+        searchList:[]
       };
     },
     methods: {
@@ -923,6 +955,14 @@
           };
           this.addMsg.lineCountryList.push(countryObj);
         });
+        if(this.addMsg.travelEndAudit == 1){//结团审核等于1 的时候 审批人员不能为空
+          if(this.addMsg.auditEmpId==''){
+            this.Error('请选择结团审批人');
+            return;
+          }
+        }else{
+          this.addMsg.auditEmpId= 0
+        }
         this.apipost(
           "line_post_Set",
           this.addMsg,
@@ -965,6 +1005,8 @@
         this.addMsg.RebateMoney = getInfo.rebateMoney;
         this.addMsg.TripFeatureTopBg=getInfo.tripFeatureTopBg;
         this.addMsg.TripFeatureBottomBg=getInfo.tripFeatureBottomBg;
+        this.addMsg.travelEndAudit=getInfo.travelEndAudit;
+        this.addMsg.auditEmpId=getInfo.auditEmpId==0?'':getInfo.auditEmpId;
       },
       deletelist(lineID) {
         var that = this;
@@ -1309,11 +1351,30 @@
             x.showOpSet = true;
           }
         });
-      }
+      },
+      getEmployee() {//所有人员下拉
+      let  employeeMsg= {
+            RB_Group_id: "0",
+            RB_Branch_id: "-1",
+            departmentId: "0",
+            IsLeave: "-1"
+          }
+        this.apipost(
+          "app_get_company_employee",
+          employeeMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.searchList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
     },
     mounted() {
       this.getList();
       this.getCountry();
+      this.getEmployee()
     },
     filters: {
       getJoinDepName: function (depList) {
@@ -1337,7 +1398,8 @@
           returnStr = depName.join(",");
         }
         return returnStr;
-      }
+      },
+      
     }
   };