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

app/public/js/stage_audit.js

@@ -55,7 +55,7 @@ $(document).ready(function () {
     $('#account_group').change(function () {
         let account_html = '<option value="0">选择审批人</option>';
         for (const account of accountList) {
-            if (parseInt($(this).val()) === 0 || parseInt($(this).val()) === account.account_group) {
+            if ((parseInt($(this).val()) === 0 || parseInt($(this).val()) === account.account_group) && account.id !== parseInt(userID)) {
                 const role = account.role !== '' ? '（' + account.role + '）' : '';
                 const company = account.company !== '' ? ' -' + account.company : '';
                 account_html += '<option value="' + account.id + '">' + account.name + role + company + '</option>';

app/public/report/js/rpt_jspdf.js

@@ -32,8 +32,8 @@ let JpcJsPDFHelper = {
     },
     outputAsPdf: function (pageData, paperSize, pdfName, signatureRelArr) {
         let me = this;
-        let offsetX = 10;
-        let offsetY = 10;
+        let offsetX = 0;
+        let offsetY = 0;
         let newName = pdfName;
         let pageObj = pageData;
         let paperSizeIdx = JV.PAGES_SIZE_STR.indexOf(paperSize);