运营平台账单日、结算日设置位置调整

src/views/dispatch/add.vue

 <template>
   <div class="app-container" style="padding: 20px 50px">
-    <p class="tips">
-      <div class="tipscontent">
-        <el-icon size="14px"><WarningFilled/></el-icon>
-        温馨提醒：账单日：当到达所设定的特定日期，系统将通知财务对上月预支工资账单进行结算。<br>
-        <div style="margin-left: 77px;">结算日：到达账单日时，如果财务没有主动结算上月预支工资账单，系统将依据设定的结算日自动予以结算。</div>
-       </div>
-    </p>
-
     <el-form
         :inline="true"
         label-position="right"
@@ -57,12 +49,6 @@
       <el-form-item label="联系人" prop="contracts">
         <el-input v-model="formLabelAlign.contracts" maxlength="20" />
       </el-form-item>
-      <el-form-item label="账单日" prop="bill_day" >
-        <el-input v-model="formLabelAlign.bill_day" type="number" />
-      </el-form-item>
-      <el-form-item label="结算日" prop="settle_day">
-        <el-input v-model="formLabelAlign.settle_day" type="number" />
-      </el-form-item>
       <el-form-item label="联系电话" prop="contract_number">
         <el-input v-model="formLabelAlign.contract_number" />
       </el-form-item>
@@ -73,7 +59,6 @@
         <el-input v-model="formLabelAlign.address"  maxlength="50"/>
       </el-form-item>
   </el-form>
-
     <el-form-item style="width: 100%;">
       <div style="margin: 0 auto;">
         <el-button @click="cancel">取消</el-button>
@@ -123,12 +108,6 @@ const rules = ref({
   register_time:[{ validator: validateTime, trigger: ['blur', 'change'] }],
   contract_number: [{ pattern: /^\d[0-9\-]{5,11}\d$/, message: "请输入正确的手机号或座机号", trigger: "blur" }],
   contracts: [{ 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']},
-      { pattern : /^\d+$/, message: "请输入正整数", trigger: ['blur', 'change']},
-      { validator: validateNumber, trigger: ['blur', 'change']}],
 })
 
 //编辑时获取详情
@@ -204,15 +183,6 @@ function validateTime(rule, value, callback) {
     callback();
   }
 }
-//校验数字
-function validateNumber(rule,value,callback) {
-  if(value<1 || value>31){
-    callback(new Error("请输入1-31之间的数字"));
-  }else {
-    callback();
-  }
-}
-
 function handleSsqChange () {
   let ssq_id = formLabelAlign.value.ssq_id;
   formLabelAlign.value.province_id = ssq_id[0];
@@ -249,20 +219,3 @@ function submitForm(){
 
 
 </script>
-
-<style lang="scss">
-.tips{
-  margin-top: 0px;
-  padding: 8px;
-  color: #ED6F1C;
-  background: #FFFAE8;
-  line-height: 1.4;
-  font-size: 12px;
-  display: flex;
-  justify-content: flex-start;
-}
-
-.tipscontent{
-  margin-left: 7.4%;
-}
-</style>
\ No newline at end of file

src/views/dispatch/index.vue

@@ -44,8 +44,16 @@
         <el-table-column label="派遣公司名称" align="left" prop="name"  width="260" fixed />
         <el-table-column label="默认账号" align="left" prop="default_account" width="180" fixed/>
         <el-table-column label="前缀" align="left" prop="prefix" width="100"/>
-        <el-table-column label="账单日" align="center" prop="bill_day" />
-        <el-table-column label="结算日" align="center" prop="settle_day" />
+        <el-table-column label="账单日" align="center" prop="bill_day" >
+          <template #default="{row}">
+            {{row.bill_day=='0'?'':row.bill_day}}
+          </template>
+        </el-table-column>
+        <el-table-column label="结算日" align="center" prop="settle_day" >
+          <template #default="{row}">
+            {{row.settle_day=='0'?'':row.settle_day}}
+          </template>
+        </el-table-column>
         <el-table-column label="规模" align="center" prop="scale" />
         <el-table-column label="联系人" align="center" prop="contracts" />
         <el-table-column label="联系电话" align="center" prop="contract_number" width="120"/>

src/views/dispatch/salary_advance_interval.vue

@@ -17,6 +17,18 @@
         class="ruleFormRef"
     >
 
+      <div class="box">
+        <el-form-item label="账单日" prop="bill_day" >
+          <el-input v-model="formLabelAlign.bill_day" type="number" />
+        </el-form-item>
+        <el-form-item>当到达所设定的特定日期，系统将通知财务对上月预支工资账单进行结算</el-form-item>
+        <el-form-item></el-form-item>
+        <el-form-item label="结算日" prop="settle_day">
+          <el-input v-model="formLabelAlign.settle_day" type="number" />
+        </el-form-item>
+        <el-form-item>到达账单日时，如果财务没有主动结算上月预支工资账单，系统将依据设定的结算日自动予以结算</el-form-item>
+      </div>
+
       <div class="box">
         <div class="boxTitle">平台与客户分成比例</div>
           <el-form-item label="比例" style="width: 1080px;" prop="ratio">
@@ -119,6 +131,12 @@ const data = reactive({
   addForm:{},
   rules:{
     ratio: [{required: true,message:"请添加分成比例",trigger:"blur"}],
+    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']},
+      { pattern : /^\d+$/, message: "请输入正整数", trigger: ['blur', 'change']},
+      { validator: validateNumber, trigger: ['blur', 'change']}],
   },
   feeRules:{
     minAmount: [{required: true,message:"请输入最小次数",trigger:"blur"}],
@@ -180,6 +198,15 @@ function changeVal(type,value){
   }
 }
 
+//校验数字
+function validateNumber(rule,value,callback) {
+  if(value<1 || value>31){
+    callback(new Error("请输入1-31之间的数字"));
+  }else {
+    callback();
+  }
+}
+
 /** 新增、编辑手续费弹窗 */
 function add(e){
   if(e){
@@ -376,7 +403,9 @@ function submitForm(){
 /** 获取当前派遣公司下设置的平台与客户分成比例 */
 function getSalaryAdvanceInterval(){
   salaryAdvanceIntervalSingle({code:code}).then(res => {
-    formLabelAlign.value.ratio = res.data;
+    formLabelAlign.value.ratio = res.data.salaryAdvanceIntervalList;
+    formLabelAlign.value.bill_day = res.data.billDay;
+    formLabelAlign.value.settle_day = res.data.settleDay;
     if(res.data.length>0){
       action.value = "update";
     }