预支工资设置页面修改

src/views/dispatch/index.vue

@@ -76,7 +76,7 @@
             <el-button link type="primary"  @click="handleEdit(row)" icon="EditPen">编辑</el-button>
             <el-button v-if="row.line_contract==1" link type="primary"  @click="handleContract(row,'stop')" icon="TurnOff">停用电子合同</el-button>
             <el-button v-else link type="primary"  @click="handleContract(row,'start')" icon="Open">启用电子合同</el-button>
-            <el-button link type="primary"  @click="handleSalaryAdvance(row)" icon="Setting">设置分成比例</el-button>
+            <el-button link type="primary"  @click="handleSalaryAdvance(row)" icon="Setting">预支工资设置</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/dispatch/salary_advance_interval.vue

@@ -3,7 +3,8 @@
     <p class="tips">
       <div class="tipscontent">
         <el-icon size="14px"><WarningFilled/></el-icon>
-        温馨提醒：预支工资最大次数、最大额度不超过1万，阶梯比例最后一个区间的最大次数或结束额度请输入0，0代表9999。</div>
+<!--        温馨提醒：预支工资最大次数、最大额度不超过1万，阶梯比例最后一个区间的最大次数或结束额度请输入0，0代表9999。</div>-->
+        温馨提醒：阶梯比例最后一个区间的最大次数或结束额度请输入0，0代表无限制。</div>
     </p>
 
     <el-form
@@ -18,16 +19,16 @@
     >
 
       <div class="box w100">
-        <el-form-item label="账单日" prop="bill_day" >
+        <el-form-item label="用户结算日" prop="bill_day" >
           <div class="f_c">
             <el-input v-model="formLabelAlign.bill_day" type="number"/>
-            <div class="tips">当到达所设定的特定日期，系统将通知财务对上月预支工资账单进行结算</div>
+            <div class="tips">当月账单次月结算，超过次月结算日，用户未结算、系统会通知用户结算上月账单</div>
           </div>
         </el-form-item>
-        <el-form-item label="结算日" prop="settle_day">
+        <el-form-item label="系统结算日" prop="settle_day">
           <div class="f_c">
             <el-input v-model="formLabelAlign.settle_day" type="number"/>
-            <div class="tips">到达账单日时，如果财务没有主动结算上月预支工资账单，系统将依据设定的结算日自动予以结算</div>
+            <div class="tips">用户未结算的情况下，系统会自动结算上月账单</div>
           </div>
         </el-form-item>
         <div style="height: 10px;"></div>
@@ -48,12 +49,12 @@
                   {{row.minMoney + '-' + (row.maxMoney==0?'无限制':row.maxMoney)}}
                 </template>
               </el-table-column>
-              <el-table-column label="平台服务费比例" align="center" prop="" >
+              <el-table-column label="平台分成比例" align="center" prop="" >
                 <template #default="{row}">
                   {{row.platRatio + '%'}}
                 </template>
               </el-table-column>
-              <el-table-column label="客户留存比例" align="center" prop="" >
+              <el-table-column label="客户分成比例" align="center" prop="" >
                 <template #default="{row}">
                   {{row.customRatio + '%'}}
                 </template>
@@ -91,11 +92,11 @@
         <el-form-item label="结束额度" prop="maxMoney">
           <el-input v-model="addForm.maxMoney" placeholder="请输入结束额度" type="number" @change="changeVal('maxMoney',$event)" />
         </el-form-item>
-        <el-form-item label="平台服务费比例（%）" prop="platRatio">
-          <el-input v-model="addForm.platRatio" placeholder="请输入平台服务费比例" type="number" onchange="if(value) if(value<=0){value=0} if(value>=100){value=100}" @change="ratioChange('plat')"/>
+        <el-form-item label="平台分成比例（%）" prop="platRatio">
+          <el-input v-model="addForm.platRatio" placeholder="请输入平台分成比例" type="number" onchange="if(value) if(value<=0){value=0} if(value>=100){value=100}" @change="ratioChange('plat')"/>
         </el-form-item>
-        <el-form-item label="客户留存比例（%）" prop="customRatio">
-          <el-input v-model="addForm.customRatio" placeholder="请输入客户留存比例" type="number" onchange="if(value) if(value<=0){value=0} if(value>=100){value=100}" @change="ratioChange('cus')"/>
+        <el-form-item label="客户分成比例（%）" prop="customRatio">
+          <el-input v-model="addForm.customRatio" placeholder="请输入客户分成比例" type="number" onchange="if(value) if(value<=0){value=0} if(value>=100){value=100}" @change="ratioChange('cus')"/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -135,10 +136,10 @@ const data = reactive({
   addForm:{},
   rules:{
     ratio: [{required: true,message:"请添加分成比例",trigger:"blur"}],
-    bill_day: [{ required: true, message: "请输入账单日", trigger: ['blur', 'change']},
+    bill_day: [{ required: true, message: "请输入用户结算日", trigger: ['blur', 'change']},
       { pattern : /^\d+$/, message: "请输入正整数", trigger: ['blur', 'change']},
       { validator: validateNumber, trigger: ['blur', 'change']}],
-    settle_day: [{ required: true, message: "请输入结算日", trigger: ['blur', 'change']},
+    settle_day: [{ required: true, message: "请输入系统结算日", trigger: ['blur', 'change']},
       { pattern : /^\d+$/, message: "请输入正整数", trigger: ['blur', 'change']},
       { validator: validateNumber, trigger: ['blur', 'change']}],
   },
@@ -148,7 +149,7 @@ const data = reactive({
     minMoney: [{required: true,message:"请输入起始额度",trigger:"blur"}],
     maxMoney: [{required: true,message:"请输入结束额度",trigger:"blur"}],
     platRatio: [{required: true,message:"请输入平台分成比例",trigger:"blur"}],
-    customRatio: [{required: true,message:"请输入客户留存比例",trigger:"blur"}],
+    customRatio: [{required: true,message:"请输入客户分成比例",trigger:"blur"}],
   }
 });
 
@@ -186,20 +187,27 @@ function ratioChange(type){
 
 function changeVal(type,value){
   if(value){
-    if(value.length>4){
-      if(value.slice(0, 4)>=9999){
-        addForm.value[type] = 0;
-      }else {
-        addForm.value[type] = value.slice(0, 4);
-      }
+    if(value<=0 || value>=10000000){
+      addForm.value[type] = 0;
     }else {
-      if(value<=0 || value>=9999){
-        addForm.value[type] = 0;
-      }else {
-        addForm.value[type] = value;
-      }
+      addForm.value[type] = value;
     }
   }
+  // if(value){
+  //   if(value.length>4){
+  //     if(value.slice(0, 4)>=9999){
+  //       addForm.value[type] = 0;
+  //     }else {
+  //       addForm.value[type] = value.slice(0, 4);
+  //     }
+  //   }else {
+  //     if(value<=0 || value>=9999){
+  //       addForm.value[type] = 0;
+  //     }else {
+  //       addForm.value[type] = value;
+  //     }
+  //   }
+  // }
 }
 
 //校验数字
@@ -385,9 +393,9 @@ function submitForm(){
   proxy.$refs.ruleFormRef.validate(async (valid) => {
     if (!valid) return;
 
-    //校验账单日须早于结算日
-    if(parseFloat(formLabelAlign.value.bill_day)>=parseFloat(formLabelAlign.value.settle_day)){
-      return proxy.$modal.msgWarning('账单日须早于结算日');
+    //校验用户结算日须早于结算日
+    if(parseFloat(formLabelAlign.value.bill_day)>parseFloat(formLabelAlign.value.settle_day)){
+      return proxy.$modal.msgWarning('用户结算日须早于系统结算日');
     }
 
     const submitForm = {...formLabelAlign.value}