Lijy 3 months ago
parent
commit
39d5c06f5f

+ 1 - 2
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/pageComponents/tasks/addEditor.vue

@@ -477,8 +477,7 @@ function initializeData() {
     taskTypeName: fixedFieldTaskType.find(item => item.value == taskType)?.label || '',
     repeatTypeName: fixedFieldRepetitiveType.find(item => item.value == repeatType)?.label || ''
   }
-  console.log(vantFormVal.value, '<========= vantFormVal.value')
-  console.log(row, '<========= vantFormVal.value')
+
   const list = repeatDesignDay && repeatDesignDay.split(',') || []
   customeDate.value = (list || []).map(item => {
     return {

+ 6 - 5
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/biReport/dragEdit/previewTable.vue

@@ -84,12 +84,13 @@ function mergeColumns({ row, rowIndex, columnIndex }: { row: any, rowIndex: numb
 function renderingLabel(row: any, item: any) {
   const { filed } = item
   const list = dropdownBoxFieldIntegration.filter(em => `${em.indicate}_${em.fieldName}` == filed)
-  if(list.length) {
-    const childList = list[0].list
-    return childList.find((dd: any) => dd.value == row[item.label])?.label
-  } else {
+  console.log(list, '<==== list')
+  // if(list.length) {
+  //   const childList = list[0].list
+  //   return childList.find((dd: any) => dd.value == row[item.label])?.label
+  // } else {
     return row[item.label]
-  }
+  // }
 }
 
 function determinationOfDataRange() {

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/biReport/function.ts

@@ -78,7 +78,7 @@ export function rangeGetSql(rangeFilterList: any[] = [], addEditData: addEditDat
 
     // 下拉框
     if(item.valueFlag) {
-      sql = `${seqPrefix}.${item.columnName} = '${item.filterValueThree}`
+      sql = `${seqPrefix}.${item.columnName} = '${item.filterValueThree}'`
     }
 
     return {