变更一些修改

app/const/code_rule.js

@@ -37,7 +37,7 @@ const measure = {
 };
 measure.ruleString[measure.ruleType.tenderName] = '标段名称';
 measure.ruleString[measure.ruleType.text] = '文本';
-measure.ruleString[measure.ruleType.inDate] = '当前年月';
+measure.ruleString[measure.ruleType.inDate] = '当前年份';
 measure.ruleString[measure.ruleType.addNo] = '自增编号';
 
 measure.connectorString[measure.connectorType.dash] = '-';

app/controller/change_controller.js

@@ -102,7 +102,7 @@ module.exports = app => {
                         rule.preview = tender.name;
                         break;
                     case codeRuleConst.measure.ruleType.inDate:
-                        rule.preview = moment().format('YYYYMM');
+                        rule.preview = moment().format('YYYY');
                         break;
                     case codeRuleConst.measure.ruleType.text:
                         rule.preview = rule.text;
@@ -181,7 +181,7 @@ module.exports = app => {
                             code.push(rule.text);
                             break;
                         case codeRuleConst.measure.ruleType.inDate:
-                            code.push(moment().format('YYYYMM'));
+                            code.push(moment().format('YYYY'));
                             break;
                         case codeRuleConst.measure.ruleType.addNo:
                             let s = '0000000000';
@@ -558,7 +558,7 @@ module.exports = app => {
                     filepath: path.join(dirName, fileName),
                 };
                 const result = await ctx.service.changeAtt.save(stream.fields, fileData, ctx.session.sessionUser.accountId);
-                if (result.effectRows !== 1) {
+                if (!result) {
                     throw '导入数据库保存失败';
                 }
                 fileData.in_time = moment(create_time * 1000).format('YYYY-MM-DD');

app/public/js/change.js

@@ -76,7 +76,7 @@ class codeRuleSet {
                     break;
                 }
                 case ruleConst.ruleType.inDate: {
-                    preview = moment().format('YYYYMM');
+                    preview = moment().format('YYYY');
                     break;
                 }
                 case ruleConst.ruleType.addNo: {
@@ -86,6 +86,10 @@ class codeRuleSet {
                     preview = s.substr(s.length - rule.format);
                     break;
                 }
+                default: {
+                    toast('请选择组件再添加', 'error');
+                    return false;
+                }
             }
             // 更新规则
             codeRule.push(rule);
@@ -97,8 +101,8 @@ class codeRuleSet {
             const part = $('#ruleParts', obj).append(html.join(''));
             // 更新规则预览
             const connectorType = connectorRule !== '' && parseInt(connectorRule) !== 3 ? ruleConst.connectorString[connectorRule] : '';
-            console.log(connectorRule);
-            $('#preview', obj).text($.trim($('#preview', obj).text()) + connectorType + preview);
+            const previewtext = $.trim($('#preview', obj).text()) === '' ? preview : $.trim($('#preview', obj).text()) + connectorType + preview;
+            $('#preview', obj).text(previewtext);
 
             $('a', part).bind('click', function () {
                 const index = $('a', obj).index(this);

app/public/js/change_set.js

@@ -13,6 +13,7 @@ $(document).ready(() => {
     gclGatherModel.loadLedgerData(ledger);
     gclGatherModel.loadPosData(pos);
     const gclGatherData = gclGatherModel.gatherGclData();
+    console.log(gclGatherData);
     // 先加载台账数据
     let listHtml = '';
     let list_index = 1;
@@ -23,7 +24,7 @@ $(document).ready(() => {
             '<td>' + gcl.name + '</td>' +
             '<td>' + gcl.unit + '</td>' +
             '<td>' + roundnum(gcl.unit_price, totalPriceUnit) + '</td>' +
-            '<td>' + roundnum(gcl.quantity, gcl.unit) + '</td>' +
+            '<td>' + roundnum(gcl.quantity, findDecimal(gcl.unit)) + '</td>' +
             '<td>' + roundnum(parseFloat(gcl.unit_price).mul(parseFloat(gcl.quantity)), totalPriceUnit) + '</td>' +
             '</tr>';
         list_index++;
@@ -204,6 +205,9 @@ $(document).ready(() => {
             $(this).children('span').text(index);
             index++;
         });
+        if (index === 1) {
+            $('#account_list').val(0);
+        }
 
         // 重新上报时。移除审批流程
         // 令最后一个图标转换

app/view/change/info.ejs

@@ -417,7 +417,7 @@
                     <th rowspan="2" class="text-center">单位</th>
                     <th rowspan="2" class="text-center">单价</th>
                     <th colspan="2" class="text-center">原设计</th>
-                    <th colspan="2" class="text-center">申报变更</th>
+                    <th colspan="2" class="text-center">申报变更增（+）减（-）</th>
                     <th rowspan="2" class="text-center">操作</th>
                 </tr>
                 <tr>
@@ -490,7 +490,7 @@
                         <th rowspan="2" class="text-center">单位</th>
                         <th rowspan="2" class="text-center">单价</th>
                         <th colspan="2" class="text-center">原设计</th>
-                        <th colspan="2" class="text-center">申报变更</th>
+                        <th colspan="2" class="text-center">申报变更增（+）减（-）</th>
                         <th colspan="2" class="text-center">审批后变更</th>
                     </tr>
                     <tr>
@@ -539,7 +539,7 @@
                         <th rowspan="2" class="text-center">单位</th>
                         <th rowspan="2" class="text-center">单价</th>
                         <th colspan="2" class="text-center">原设计</th>
-                        <th colspan="2" class="text-center">申报变更</th>
+                        <th colspan="2" class="text-center">申报变更增（+）减（-）</th>
                         <% for (const audit of auditList2) { %>
                         <% if (audit.usite !== 0) { %>
                         <th colspan="2" class="text-center"><%= audit.name %> 审批</th>
@@ -605,7 +605,7 @@
                         <th rowspan="2" class="text-center">单位</th>
                         <th rowspan="2" class="text-center">单价</th>
                         <th colspan="2" class="text-center">原设计</th>
-                        <th colspan="2" class="text-center">申报变更</th>
+                        <th colspan="2" class="text-center">申报变更增（+）减（-）</th>
                         <% for (const audit of auditList) { %>
                             <% if (audit.usite !== 0) { %>
                                 <th colspan="2" class="text-center"><%= audit.name %> 审批</th>

app/view/change/info_modal.ejs

@@ -484,7 +484,7 @@
                 </button>
             </div>
             <div class="modal-body">
-                <p>上传文件大小最大：30MB</p>
+                <p>大小限制：30MB，支持office等文档格式、图片格式、压缩包格式</p>
                 <p><input class="btn btn-primary" value="选择文件" type="file" id="upload-file" /></p>
             </div>
             <div class="modal-footer">

app/view/change/modal.ejs

@@ -60,7 +60,7 @@
                 <button class="btn btn-outline-primary" id="addRule">添加组件</button>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">暂时不需要</button>
                 <button class="btn btn-primary" id="setRule">确定</button>
             </div>
         </div>
@@ -77,7 +77,7 @@
                 <div class="form-group">
                     <label>申请编号<b class="text-danger">*</b></label>
                     <div class="input-group">
-                        <input type="text" class="form-control is-invalid" placeholder="请输入变更令号" value="WJQR1-201711" id="bj-code">
+                        <input type="text" class="form-control is-invalid" placeholder="请输入变更令号" value="变更申请编号" id="bj-code">
                         <div class="input-group-append">
                             <button class="btn btn-outline-secondary" type="button" title="自动编号" id="autoCode"><i class="fa fa-repeat"></i></button>
                         </div>

config/config.local.js

@@ -56,8 +56,13 @@ module.exports = appInfo => {
 
     // 上传设置
     config.multipart = {
-        whitelist: ['.xls', '.xlsx', '.json'],
-        fileSize: '10mb',
+        whitelist: ['.json', '.txt',
+            '.xls', '.xlsx',
+            '.doc', '.docx',
+            '.pdf',
+            '.png', '.jpg', '.jpeg', '.gif', '.bmp',
+            '.zip', '.rar', '.7z'],
+        fileSize: '30mb',
     };
 
     // 是否压缩替换前端js

config/config.test.js

@@ -65,8 +65,13 @@ module.exports = appInfo => {
 
     // 上传设置
     config.multipart = {
-        whitelist: ['.xls', '.xlsx', '.json'],
-        fileSize: '10mb',
+        whitelist: ['.json', '.txt',
+            '.xls', '.xlsx',
+            '.doc', '.docx',
+            '.pdf',
+            '.png', '.jpg', '.jpeg', '.gif', '.bmp',
+            '.zip', '.rar', '.7z'],
+        fileSize: '30mb',
     };
 
     // 是否压缩替换前端js

package-lock.json

@@ -1978,9 +1978,9 @@
       }
     },
     "bignumber.js": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.0.4.tgz",
-      "integrity": "sha512-LDXpJKVzEx2/OqNbG9mXBNvHuiRL4PzHCGfnANHMJ+fv68Ads3exDVJeGDJws+AoNEuca93bU3q+S0woeUaCdg=="
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz",
+      "integrity": "sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ=="
     },
     "binary-extensions": {
       "version": "1.11.0",
@@ -2661,6 +2661,11 @@
         }
       }
     },
+    "complex.js": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz",
+      "integrity": "sha512-6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw=="
+    },
     "component-emitter": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
@@ -2932,6 +2937,11 @@
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
+    "decimal.js": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.1.1.tgz",
+      "integrity": "sha512-vEEgyk1fWVEnv7lPjkNedAIjzxQDue5Iw4FeX4UkNUDSVyD/jZTD0Bw2kAO7k6iyyJRAhM9oxxI0D1ET6k0Mmg=="
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -4422,6 +4432,11 @@
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
+    "escape-latex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
+      "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -5890,6 +5905,11 @@
       "resolved": "https://registry.npmjs.org/frac/-/frac-0.3.1.tgz",
       "integrity": "sha1-V3Z3t/3L5vr3xGHxgB00E3zaQ1Q="
     },
+    "fraction.js": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz",
+      "integrity": "sha512-8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA=="
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -7992,6 +8012,11 @@
         "semver": "^5.5.0"
       }
     },
+    "javascript-natural-sort": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+      "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
+    },
     "jest-changed-files": {
       "version": "23.4.2",
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.4.2.tgz",
@@ -8830,6 +8855,21 @@
       "dev": true,
       "optional": true
     },
+    "mathjs": {
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-5.9.0.tgz",
+      "integrity": "sha512-f1xmJklkTCr48y023cFy/ZSoVzOfgHp1gutvebi/Vv5RLly6j8G9T2/XHkfXewZKcwPDbhBkFEYljaCjudxulQ==",
+      "requires": {
+        "complex.js": "2.0.11",
+        "decimal.js": "10.1.1",
+        "escape-latex": "1.2.0",
+        "fraction.js": "4.0.12",
+        "javascript-natural-sort": "0.7.1",
+        "seed-random": "2.2.0",
+        "tiny-emitter": "2.1.0",
+        "typed-function": "1.1.0"
+      }
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -9038,6 +9078,11 @@
         "sqlstring": "2.3.0"
       },
       "dependencies": {
+        "bignumber.js": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.0.4.tgz",
+          "integrity": "sha512-LDXpJKVzEx2/OqNbG9mXBNvHuiRL4PzHCGfnANHMJ+fv68Ads3exDVJeGDJws+AoNEuca93bU3q+S0woeUaCdg=="
+        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -9302,6 +9347,11 @@
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
+    "number-precision": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/number-precision/-/number-precision-1.3.1.tgz",
+      "integrity": "sha512-cmwgKUsS5Ibi8OWVNeBUTIAD1Y+frSr6I2fZ8rMbHJuS4Sgkvfw2kuR0ssp0ArpkFuZMEl+CIaIzMh79/IoG8w=="
+    },
     "nunjucks": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.0.1.tgz",
@@ -11969,6 +12019,11 @@
         "is-type-of": "^1.2.0"
       }
     },
+    "seed-random": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
+      "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ="
+    },
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
@@ -12817,6 +12872,11 @@
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
     },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+    },
     "title-case": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
@@ -12989,6 +13049,11 @@
       "integrity": "sha1-7+fUEj2KxSr/9/QMfk3sUmYAj7Q=",
       "dev": true
     },
+    "typed-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz",
+      "integrity": "sha512-TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA=="
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",