Merge branch 'master' of http://git.taauav.net/gitadmin/jndz_admin_web

src/utils/mixin.js

@@ -1,7 +1,6 @@
-
-
 let getNumber = (item, index, arr, props) => {
     let number = 1
+
     while (arr[++index]) {
         for (let prop of props) {
             if (arr[index][prop].trim() != item[prop].trim()) {
@@ -214,8 +213,8 @@ export let categoryName = {
  * @param {*} params 
  * [{name: 'quota, col: [1,2]}] 
  */
-export function mergeSpan(params) { 
-    
+export function mergeSpan(params) {
+
     return {
         methods: {
             reduceData(data) {
@@ -239,6 +238,14 @@ export function mergeSpan(params) {
                                     }
                                     item[param.name + 'Row'] = getNumber(item, index, arr, spans)
                                 }
+                                if (params[ind + 1]) {
+                                    prev[ind+1] = item[params[ind+1].name].trim();
+                                    let spans = [];
+                                    for (let i = 0; i <= ind+1; i++) {
+                                        spans.push(params[i].name)
+                                    }
+                                    item[params[ind+1].name + 'Row'] = getNumber(item, index, arr, spans)
+                                }
                             }
                         })
                         return item;