Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/view/tender/detail_modal.ejs

@@ -546,14 +546,14 @@
                         <tr><td>开户名称</td><td><input type="text" id="project-name" class="form-control form-control-sm"></td></tr>
                         <tr><td>开户银行</td><td><input type="text" id="project-bank" class="form-control form-control-sm"></td></tr>
                         <tr><td>开户账号</td><td><input type="text" id="project-account" class="form-control form-control-sm"></td></tr>
-                        <tr><td>分账划拨比例</td><td><input type="text" id="project-rate" class="form-control form-control-sm"></td></tr>
+                        <tr><td>分账划拨比例（%）</td><td><input type="text" id="project-rate" class="form-control form-control-sm"></td></tr>
                         <tr><td>联系人</td><td><input type="text" id="project-contact" class="form-control form-control-sm"></td></tr>
                         <tr><td>联系电话</td><td><input type="text" id="project-phone" class="form-control form-control-sm"></td></tr>
                         <tr><th colspan="2" class="text-center">农民工工资专用账户</th></tr>
                         <tr><td>开户名称</td><td><input type="text" id="worker-name" class="form-control form-control-sm"></td></tr>
                         <tr><td>开户银行</td><td><input type="text" id="worker-bank" class="form-control form-control-sm"></td></tr>
                         <tr><td>开户账号</td><td><input type="text" id="worker-account" class="form-control form-control-sm"></td></tr>
-                        <tr><td>分账划拨比例</td><td><input type="text" id="worker-rate" class="form-control form-control-sm"></td></tr>
+                        <tr><td>分账划拨比例（%）</td><td><input type="text" id="worker-rate" class="form-control form-control-sm"></td></tr>
                         <tr><td>联系人</td><td><input type="text" id="worker-contact" class="form-control form-control-sm"></td></tr>
                         <tr><td>联系电话</td><td><input type="text" id="worker-phone" class="form-control form-control-sm"></td></tr>
                     </table>
@@ -1201,6 +1201,36 @@
         loadPayProperty();
     })
     function post7 () {
+        let flag = false;
+        const rate_reg = /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2}))|)$/;
+        const phone_reg = /^((0\d{2,3}-\d{7,8})|(1[3456789]\d{9}))$/;
+
+        const project_rate = $('#project-rate').val();
+        if (!rate_reg.test(project_rate) && project_rate !== '') {
+            toastr.error('工程款账户分账划拨比例数字格式有误且最多保留2位小数');
+            flag = true;
+        }
+
+        const project_phone = $('#project-phone').val();
+        if (!phone_reg.test(project_phone) && project_phone !== '') {
+            toastr.error('工程款账户联系电话格式有误');
+            flag = true;
+        }
+
+        const worker_rate = $('#worker-rate').val();
+        if (!rate_reg.test(worker_rate) && worker_rate !== '') {
+            toastr.error('农民工工资专用账户分账划拨比例数字格式有误且最多保留2位小数');
+            flag = true;
+        }
+
+        const worker_phone = $('#worker-phone').val();
+        if (!phone_reg.test(worker_phone) && worker_phone !== '') {
+            toastr.error('农民工工资专用账户联系电话格式有误');
+            flag = true;
+        }
+        if (flag) {
+            return false;
+        }
         const prop = {
             pay_account: {
                 project: {