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

src/components/FinancialModule/OPExtraReward/CommissionRule.vue

@@ -294,11 +294,11 @@
           <div class="ImpressionTicketing-msgbox bottom0">
             <el-row>
               <el-col :span="8" v-if="form.SingleVisaWay">
-                <el-form-item :label="form.SingleVisaWay==1?'单签人头奖':'单签提成比'" prop="FSingleVisaMoney"
+                <el-form-item label="单签人头奖" prop="FSingleVisaMoney"
                 :rules="form.SingleVisaWay==1?rules.SingleVisaRate2:rules.SingleVisaRate">
                   <div class="Impression-ratio-box">
                     <el-input type="Number" v-model="form.FSingleVisaMoney" clearable></el-input>
-                    <span class="Impression-ratio-right">{{form.SingleVisaWay==1?'/人':'%'}}</span>
+                    <span class="Impression-ratio-right">/人</span>
                   </div>
                 </el-form-item>
               </el-col>

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1084,7 +1084,7 @@
           let numToCAN = 0
           let numToCE = 0
           let numToMEN = 0
-
+          let states = true
           this.msg.detailList.forEach((x, index) => {
             let obj = x
             if (x.CostTypeName.indexOf('房') != -1 ||
@@ -1104,9 +1104,21 @@
                 if (x.CostTypeName.indexOf('门票') != -1 && y.Type == 4) {
                   y.show = true, numToMEN += Number(obj.Number), y.Num = numToMEN
                 }
+                states = false
               })
             }
           })
+          if(states){
+            this.msg.detailList.forEach((x, index) => {
+              this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
+                let obj = x
+                if ( y.Type == 3) {
+                  y.show = true, numToCE += Number(obj.Number), y.Num = numToCE
+                  states = false
+                }
+              })
+            })
+          }
         } else {
           this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
             y.show = false
@@ -1369,6 +1381,10 @@
               this.msg.HandFeeList.push(JSON.parse(JSON.stringify(obj)))
             }
           })
+          if(this.msg.HandFeeList.length==0){
+            this.Error('暂无可配置的手配费项,请关闭手配费')
+            return
+          }
         }
         if (z) {
           this.msg.Status = 0;

src/components/SalesModule/Common/productOrderList.vue

@@ -532,7 +532,7 @@
             <span style="font-size: 12px"><span class="people-item-title">联运人数: </span>{{ item.IntermodalCount }}</span>
             <div class="people-item">
               <span class="people-item-title">签证人数:</span>
-              {{ item.VisaNum == -1 ? item.NeedVisaNum : item.VisaNum }}
+              {{ isVisa ? ((item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum) : item.NeedVisaNum }}
             </div>
           </div>
           <div class="d5" style="width:25%">
@@ -567,7 +567,7 @@
     <el-dialog title="编辑" :visible.sync="showDialog" width="600px" height="40%">
       <div v-if="!isVisa">
         <span style="width: 15%; display: inline-block">团OP</span>
-        <el-select style="width: 80%" v-model="queryData.OPId" filterable :placeholder="$t('pub.pleaseSel')">
+        <el-select style="width: 80%" v-model="queryData.OPId" filterable clearable :placeholder="$t('pub.pleaseSel')">
           <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId">
           </el-option>
         </el-select>
@@ -582,7 +582,7 @@
       </div>
       <div style="margin-top: 10px">
         <span style="width: 15%; display: inline-block">签证OP</span>
-        <el-select filterable style="width: 80%" v-model="queryData.VisaOPId" :placeholder="$t('pub.pleaseSel')">
+        <el-select filterable style="width: 80%" clearable v-model="queryData.VisaOPId" :placeholder="$t('pub.pleaseSel')">
           <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId">
           </el-option>
         </el-select>
@@ -595,7 +595,7 @@
           </el-option>
         </el-select>
       </div>
-      <div style="margin-top: 10px" v-if="editNum">
+      <div style="margin-top: 10px" v-if="isVisa && editNum">
         <span style="width: 15%; display: inline-block">签证人数</span>
         <el-input type="number" style="width: 80%; margin-left: 4px" v-model="queryData.VisaNum" />
       </div>
@@ -714,7 +714,7 @@ export default {
       } else {
         params.VisaAssistantId = this.queryData.VisaAssistantId.join(",");
       }
-      if (this.editNum) {
+      if (this.editNum && this.isVisa) {
         if (this.queryData.VisaNum > this.editObj.NeedVisaNum) {
           this.$message.error("签证人数最多" + this.editObj.NeedVisaNum + "人");
           return;
@@ -749,7 +749,7 @@ export default {
             !item.VisaAssistantId || item.VisaAssistantId == "0" ?
             [] :
             item.VisaAssistantId.split(",").map((item) => Number(item)),
-          VisaNum: item.VisaNum == -1 ? item.NeedVisaNum : item.VisaNum,
+          VisaNum: (item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum,
         };
         this.editNum = true;
         this.showDialog = true;

src/components/sale/ExpectedCommission.vue

@@ -587,7 +587,6 @@
               // 年终奖
               this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
               this.AnnualBonus.Commission = this.CommissionInfor.BonusPeriods?this.CommissionInfor.BonusPeriods:0
-              console.log(this.CommissionInfor,'----')
             }else {
               this.Error(res.data.message);
             }