Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/views/customerReport/combinationDetails.vue

@@ -131,7 +131,7 @@
               v-for="(item, index) in columnData"
               :key="index"
               :prop="item.prop"
-              :label="item.lable"
+              :label="item.label"
               align="left"
             >
             </el-table-column>
@@ -445,7 +445,7 @@ page-break-before: avoid;}}`, // 去除页眉页脚
             let that = this;
             let template = {
               prop: "",
-              lable: "",
+              label: "",
             };
             that.columnData = [];
             that.category = [];
@@ -461,30 +461,24 @@ page-break-before: avoid;}}`, // 去除页眉页脚
                   if(that.summary=="Y"){
                     this.$set(
                       bodys[i],
-                //   bodys[i].registerChecks[k].registerCheckId +
-                    bodys[i].registerChecks[k].checkName +
-                    "小结",
+                      bodys[i].registerChecks[k].checkName + "小结",
                       bodys[i].registerChecks[k].registerCheckSummarys
                     );
                   }
                   if(this.combinationDetails=="Y"){
                     if (bodys[i].registerChecks[k].checkName == that.category[m]) {
                       for (let j = 0;j < bodys[i].registerChecks[k].registerCheckItems.length;j++) {
-                                              let templatess = JSON.parse(JSON.stringify(template));
+                        let templatess = Object.assign({}, template);
                         templatess.prop =
-                        // bodys[i].registerChecks[k].registerCheckId +
                           bodys[i].registerChecks[k].checkName +
                           bodys[i].registerChecks[k].registerCheckItems[j]
                             .itemName;
-                      templatess.lable =
-                        // bodys[i].registerChecks[k].checkName +
-                        // "/" +
+                        templatess.label =
                           bodys[i].registerChecks[k].registerCheckItems[j]
                             .itemName;
                         that.columnData.push(templatess);
                         this.$set(
                           bodys[i],
-                        // bodys[i].registerChecks[k].registerCheckId +
                           bodys[i].registerChecks[k].checkName +
                             bodys[i].registerChecks[k].registerCheckItems[j]
                               .itemName,
@@ -496,9 +490,9 @@ page-break-before: avoid;}}`, // 去除页眉页脚
                 }
               }
               if(that.summary=="Y"){
-              let templates = JSON.parse(JSON.stringify(template));
+              let templates = Object.assign({}, template);
               templates.prop =that.category[m] +"小结";
-              templates.lable = that.category[m] + "小结";
+              templates.label = that.category[m] + "小结";
               that.columnData.push(templates);
               }
             }
@@ -510,9 +504,6 @@ page-break-before: avoid;}}`, // 去除页眉页脚
             let qc = this.columnData.filter(
               (key) => !map.has(key.prop) && map.set(key.prop, 1)
             );
-            // qc.sort(function (a, b) {
-            //     return a.lable < b.lable ? -1 : 1; //根据名称属性进行排序
-            // })
 
             this.columnData = qc;
             this.dataList = bodys;