1

src/assets/common/lang/zhCN/fill.js

@@ -5052,7 +5052,7 @@ export const obj = {
       qitxrs: '其他线人数',
       qitxjl: '其他线奖励',
       zhuzjl: '组长奖励',
-      ozxfk: '欧洲线罚款',
+      ozxfk: '线路罚款',
       daifa: '待发',
       nianzmx: '年终明细',
       huizrs: '汇总人数',

src/assets/common/lang/zhTW/fill.js

@@ -5052,7 +5052,7 @@ export const obj = {
       qitxrs: '其他線人數',
       qitxjl: '其他線獎勵',
       zhuzjl: '組長獎勵',
-      ozxfk: '欧洲线罚款',
+      ozxfk: '线路罚款',
       daifa: '待發',
       nianzmx: '年終明細',
       huizrs: '彙總人數',

src/components/FinancialModule/TradeCommission/CommissionRule.vue

@@ -101,6 +101,51 @@
 
           </table>
         </div>
+        <div style="width:100%;overflow-x: auto;">
+          <table
+            class="po_content singeRowTable"
+            style="border:1px solid #E6E6E6;display: flex;"
+            cellspacing="0"
+            cellpadding="0"
+          >
+          <tr rowspan="3" style="min-width: 150px;width: 150px;background: #fff;font-size: 13px;padding: 10px;
+          display: flex;align-items: center;justify-content: center;text-align: center;height: 122px;">
+            <span>成都销售推广巴厘岛线补充</span>
+          </tr>
+          <template v-for="( son , sIndex ) in item.BaliExtendRuleList">
+            <tr style="display: flex;flex-direction: column;height: 122px;">
+              <td colspan="3" style="line-height: 40px;">{{son.Name}}<p></p> </td>
+              <table class="po_content singeRowTable" style="height: 80px;"
+              cellspacing="0"
+              cellpadding="0">
+                <tr>
+                  <th style="min-width: 220px;">
+                    {{$t('objFill.zuidirenshu')}}
+                  </th>
+                  <th style="min-width: 220px;">
+                    {{$t('objFill.v101.FinancialModule.mujuanje')}}
+                  </th>
+                  <th style="min-width: 220px;">
+                    {{$t('objFill.v101.FinancialModule.chanyuxs')}}
+                  </th>
+                </tr>
+                <tr>
+                  <td style="min-width: 220px;">
+                    {{son.PeopleNum}}
+                  </td>
+                  <td style="min-width: 220px;">
+                    {{son.Money}}
+                  </td>
+                  <td style="min-width: 220px;">
+                    {{son.EmpNameStr}}
+                  </td>
+                </tr>
+              </table>
+            </tr>
+          </template>
+
+          </table>
+        </div>
         <div style="width:100%;overflow-x: auto;">
           <table
             class="po_content singeRowTable"
@@ -358,6 +403,96 @@
             </el-form-item>
 
 
+          </div>
+        </el-form-item>
+        <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
+          <p class="ImpressionTicketing-title">成都销售推广巴厘岛线补充</p>
+          <div class="ImpressionTicketing-msgbox ImpressionTicketing-msgboxBC"
+          v-for="(item,index) in form.BaliExtendRuleList" :key="index">
+          <div style="flex: 0 0 100%;display: flex;flex-direction: row;">
+            <div>
+              <el-form-item
+              :label="form.BaliExtendRuleList.length>0?`${$t('fnc.gzmingcheng')} ${index+1} `:` ` "
+              :prop="`BaliExtendRuleList.${index}.Name`"
+              :rules="rules.Name"
+              label-width="100px"
+              label-position="left">
+              <el-input
+              v-model="item.Name" clearable></el-input>
+              </el-form-item>
+            </div>
+            <div>
+              <el-form-item
+              :label="form.BaliExtendRuleList.length>0?`${$t('objFill.zuidirenshu')} ${index+1} `:` ` "
+              :prop="`BaliExtendRuleList.${index}.PeopleNum`"
+              :rules="rules.PeopleNum"
+              label-width="100px"
+              label-position="left">
+              <el-input :placeholder="$t('objFill.zuidirenshu')" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
+              v-model="item.PeopleNum" clearable></el-input>
+              </el-form-item>
+            </div>
+            <div>
+              <el-form-item
+              :label="form.BaliExtendRuleList.length>0?`${$t('objFill.v101.FinancialModule.mujuanje')} ${index+1} `:` ` "
+              :prop="`BaliExtendRuleList.${index}.Money`"
+              :rules="rules.Money"
+              label-width="100px"
+              label-position="left">
+              <el-input :placeholder="$t('objFill.v101.FinancialModule.mujuanje')" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
+              v-model="item.Money"></el-input>
+              </el-form-item>
+            </div>
+            <div class="ImpressionTicketing-msg-but">
+              <span @click="addRule(item,index,9)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
+              <span @click="deleteRule(item,index,9)" v-else class="el-icon-delete itc-delete"></span>
+            </div>
+          </div>
+
+
+            <el-form-item label-width="0" style="width: 100%;padding: 5px 0 0 0;background-color: #eee;">
+              <div class="EmpGroupListBox"
+              v-for="(child,i) in item.EmpGroupList">
+                <div>
+                  <el-form-item
+                  :label="form.BaliExtendRuleList.length>0&&form.BaliExtendRuleList[index].EmpGroupList.length>0?`${$t('objFill.v101.FinancialModule.chanyuxs')} ${i+1} `:` ` "
+                  :prop="`BaliExtendRuleList.${index}.EmpGroupList.${i}.EmpIdList`"
+                  :rules="rules.EmpIdList"
+                  label-width=""
+                  label-position="left">
+                  <el-select style="width: 200px;" v-model="child.EmpIdList" filterable multiple
+                  :placeholder="$t('objFill.v101.FinancialModule.chanyuxs')" @change="getEmpIds2(index,i)">
+                    <el-option v-for="(x,i) in EmployeeList" :label="x.EmName"
+                    :value="x.EmployeeId"
+                      :key="i"></el-option>
+                  </el-select>
+                  </el-form-item>
+                </div>
+                <div>
+                  <el-form-item
+                  :label="form.BaliExtendRuleList.length>0&&form.BaliExtendRuleList[index].EmpGroupList.length>0?`${$t('objFill.v101.FinancialModule.chanyurq')} ${i+1} `:` ` "
+                  :prop="`BaliExtendRuleList.${index}.EmpGroupList.${i}.EnableDate`"
+                  :rules="rules.EnableDate"
+                  label-width=""
+                  label-position="left">
+                    <el-date-picker
+                      style="width: 200px;"
+                      class="h34"
+                      v-model="child.EnableDate"
+                      type="month"
+                      value-format="yyyy-MM"
+                      align="right" :placeholder="$t('objFill.v101.FinancialModule.chanyurq')"
+                    ></el-date-picker>
+                  </el-form-item>
+                </div>
+                <div class="ImpressionTicketing-msg-but" style="flex: 0 0 36px;">
+                  <span @click="addEmpDate(item,index,i,9)" v-if="i==0" class="el-icon-circle-plus-outline itc-outline"></span>
+                  <span @click="deleteEmpDate(item,index,i,9)" v-else class="el-icon-delete itc-delete"></span>
+                </div>
+              </div>
+            </el-form-item>
+
+
           </div>
         </el-form-item>
         <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
@@ -701,6 +836,9 @@
         EuropeExtendRuleList:{Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[],
           EmpGroupList:[{EmpIdList:[],EnableDate:''}]
         },
+        BaliExtendRuleList:{Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[],
+          EmpGroupList:[{EmpIdList:[],EnableDate:''}]
+        },
         form:{
           Id:0,
           Name:'',
@@ -716,8 +854,11 @@
           EuropeExtendRuleList:[{
             Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[],
             EmpGroupList:[{EmpIdList:[],EnableDate:''}]
-          }
-        ]
+          }],
+          BaliExtendRuleList:[{
+            Name:'',PeopleNum:null,Money:null,EmpIds:'',EmpIdList:[],
+            EmpGroupList:[{EmpIdList:[],EnableDate:''}]
+          }]
         },
         EmpGroupObj: {EmpIdList:[],EnableDate:''},
         ruleLoading: false,
@@ -737,6 +878,10 @@
         let list = this.form.EuropeExtendRuleList[index].EmpGroupList[i].EmpIdList
         this.form.EuropeExtendRuleList[index].EmpGroupList[i].EmpIds = list.join(',')
       },
+      getEmpIds2(index,i){
+        let list = this.form.BaliExtendRuleList[index].EmpGroupList[i].EmpIdList
+        this.form.BaliExtendRuleList[index].EmpGroupList[i].EmpIds = list.join(',')
+      },
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {
         let userInfo = this.getLocalStorage();
@@ -777,12 +922,15 @@
           this.form.OtherProfitRuleList.push(JSON.parse(JSON.stringify(this.OtherProfitRuleList)))
         }else if(type==8){
           this.form.EuropeExtendRuleList.push(JSON.parse(JSON.stringify(this.EuropeExtendRuleList)))
+        }else if(type==9){
+          this.form.BaliExtendRuleList.push(JSON.parse(JSON.stringify(this.BaliExtendRuleList)))
         }else{
           this.form.BonusRuleList.push(JSON.parse(JSON.stringify(this.BonusRuleList)))
         }
       },
       addEmpDate(row,index,i,type){
         if(type==8)this.form.EuropeExtendRuleList[index].EmpGroupList.push(JSON.parse(JSON.stringify(this.EmpGroupObj)))
+        else if(type==9)this.form.BaliExtendRuleList[index].EmpGroupList.push(JSON.parse(JSON.stringify(this.EmpGroupObj)))
       },
       // 删除规则
       deleteRule(row,index,type){
@@ -800,12 +948,15 @@
           this.form.OtherProfitRuleList.splice(index,1)
         }else if(type==8){
           this.form.EuropeExtendRuleList.splice(index,1)
+        }else if(type==9){
+          this.form.BaliExtendRuleList.splice(index,1)
         }else{
           this.form.BonusRuleList.splice(index,1)
         }
       },
       deleteEmpDate(row,index,i,type){
         if(type==8)this.form.EuropeExtendRuleList[index].EmpGroupList.splice(i,1)
+        else if(type==9)this.form.BaliExtendRuleList[index].EmpGroupList.splice(i,1)
       },
       AddMsg(){//新增
         this.ruleVisible = true
@@ -826,7 +977,8 @@
           OtherAwardRuleList:item.OtherAwardRuleList,
           OtherProfitRuleList:item.OtherProfitRuleList,
           BonusRuleList:item.BonusRuleList,
-          EuropeExtendRuleList: item.EuropeExtendRuleList?item.EuropeExtendRuleList:[this.EuropeExtendRuleList]
+          EuropeExtendRuleList: item.EuropeExtendRuleList?item.EuropeExtendRuleList:[this.EuropeExtendRuleList],
+          BaliExtendRuleList: item.BaliExtendRuleList?item.BaliExtendRuleList:[this.BaliExtendRuleList],
         }
       },
       Delete(item){//删除