修改报表数据项为空

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -504,6 +504,7 @@ export default {
         ],
         eventValue: [
           {
+            required: true,
             validator: (rule, val, callback) => {
               if (val) {
                 callback()
@@ -1780,12 +1781,13 @@ export default {
       //   return
       // }
       this.chooseDataItemIndex = row.itemName
-      this.chooseDataModel = null
+      this.chooseDataModel = row.dataModelId
       this.dialogDataModelVisible = true
     },
     /** 事件驱动报表 */
     handleReportEventConfig(index, row) {
       this.chooseDataItemIndex = row.itemName
+      this.reportEventConfigForm = JSON.parse(JSON.stringify(row))
       this.dialogReportEventConfigVisible = true
     },
     /** 报表模板移除 */

chuanyi_client2/src/views/my_report/index.vue

@@ -964,7 +964,7 @@ export default {
                   let p_c = parseInt(item.c)
                   if (type.valType == '2') p_r += i
                   else p_c += i
-                  luckysheet.setCellValue(p_r, p_c, dataList[i])
+                  luckysheet.setCellValue(p_r, p_c, dataList[i] ? dataList[i] : '')
                 }
               }
             })
@@ -1202,7 +1202,7 @@ export default {
             let r = p_r
             if (showInfo.valType == '2') r += j
             else c += j
-            luckysheet.setCellValue(r, c, dataList[j] + '')
+            luckysheet.setCellValue(r, c, dataList[j] ? (dataList[j] + '') : '')
           }
         })
       })

chuanyi_client2/src/views/run_config/index.vue

@@ -1127,7 +1127,7 @@ export default {
                   let p_c = parseInt(item.c)
                   if (type.valType == '2') p_r += i
                   else p_c += i
-                  luckysheet.setCellValue(p_r, p_c, dataList[i])
+                  luckysheet.setCellValue(p_r, p_c, dataList[i] ? dataList[i] : '')
                 }
               }
             })
@@ -1394,7 +1394,7 @@ export default {
             let r = p_r
             if (showInfo.valType == '2') r += j
             else c += j
-            luckysheet.setCellValue(r, c, dataList[j] + '')
+            luckysheet.setCellValue(r, c, dataList[j] ? (dataList[j] + '') : '')
           }
         })
       })