Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/base/base_bills_service.js

@@ -750,15 +750,15 @@ class BaseBillsSerivce extends TreeService {
                                     newDetail.str2 = cd.str2 || '';
                                     newDetail.str3 = cd.str3 || '';
                                     newDetail.str4 = cd.str4 || '';
-                                    newDetail.num1 = cd.num1 || 0;
-                                    newDetail.num2 = cd.num2 || 0;
-                                    newDetail.num3 = cd.num3 || 0;
-                                    newDetail.num4 = cd.num4 || 0;
-                                    newDetail.num5 = cd.num5 || 0;
-                                    newDetail.num6 = cd.num6 || 0;
-                                    newDetail.num7 = cd.num7 || 0;
-                                    newDetail.num8 = cd.num8 || 0;
-                                    newDetail.num9 = cd.num9 || 0;
+                                    newDetail.num_a = cd.num_a || 0;
+                                    newDetail.num_b = cd.num_b || 0;
+                                    newDetail.num_c = cd.num_c || 0;
+                                    newDetail.num_d = cd.num_d || 0;
+                                    newDetail.num_e = cd.num_e || 0;
+                                    newDetail.num_f = cd.num_f || 0;
+                                    newDetail.num_g = cd.num_g || 0;
+                                    newDetail.num_h = cd.num_h || 0;
+                                    newDetail.num_i = cd.num_i || 0;
                                     newDetail.qty = cd.qty || 0;
                                     newDetail.expr = cd.expr || '';
                                     newDetail.spec = cd.spec || '';

app/service/calc_tmpl.js

@@ -42,10 +42,10 @@ const PosCalc = (function(){
     const TestData = {
         col_set: [
             { title: '名称', width: 80, type: 'str', field: 'str1' },
-            { title: '长度', width: 80, type: 'num', field: 'num1', decimal: 2, unit: 'm', calc_code: 'A' },
-            { title: '宽度', width: 80, type: 'num', field: 'num2', decimal: 2, unit: 'm', calc_code: 'B' },
-            { title: '高度', width: 80, type: 'num', field: 'num3', decimal: 2, unit: 'm', calc_code: 'C' },
-            { title: '数量', width: 80, type: 'num', field: 'num3', decimal: 2, },
+            { title: '长度', width: 80, type: 'num', field: 'num_a', decimal: 2, unit: 'm', calc_code: 'A' },
+            { title: '宽度', width: 80, type: 'num', field: 'num_b', decimal: 2, unit: 'm', calc_code: 'B' },
+            { title: '高度', width: 80, type: 'num', field: 'num_c', decimal: 2, unit: 'm', calc_code: 'C' },
+            { title: '数量', width: 80, type: 'num', field: 'qty', decimal: 2, },
         ]
     };
     return { EmptySpreadCache, BaseSpreadColSetting, ValidColInfo, TestData };