Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web

src/components/LowDesign/src/LowReport/index.vue

@@ -253,7 +253,11 @@ const initTable = async () => {
       childFieldConfigs.get(field.parentFieldCode).push(field)
     }
   })
-  
+  // let tableDicData=[]
+  // if( dynamicFields.filter(item=>['货品名称','剂型名称'].includes(item.fieldName)&&item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y')?.length){
+  //    tableDicData =await ReportApi.getTableList(props.reportCode)
+
+  //   }
   // 处理动态列（暂不构建children，等数据返回后动态生成）
   dynamicFields.forEach((item, index) => {
     if (item.parentFieldCode && item.parentFieldCode !== '') return
@@ -281,7 +285,7 @@ const initTable = async () => {
           tableSearch.value[config.prop]=item.searchDefaultValue
         }
     }
-    if(['年','年度','年份','月','月度','月份','年月'].includes(item.fieldName)){
+    if(['年','年度','年份','月','月度','月份','年月'].includes(item.fieldName)&&config.search){
       config.searchSpan=3
       config.searchLabelWidth=60
       if(item.fieldName.includes('年')){
@@ -291,6 +295,25 @@ const initTable = async () => {
         config.dicData=[{label:'1月',value:'1'},{label:'2月',value:'2'},{label:'3月',value:'3'},{label:'4月',value:'4'},{label:'5月',value:'5'},{label:'6月',value:'6'},{label:'7月',value:'7'},{label:'8月',value:'8'},{label:'9月',value:'9'},{label:'10月',value:'10'},{label:'11月',value:'11'},{label:'12月',value:'12'}]
       }
     }
+    if(['货品名称','货品名称','剂型','剂型名称','客户名称','客户'].includes(item.fieldName)&&config.search){
+      console.log(config.search)
+      config.dataType= 'string'
+      config.dictType= 'defaultTable'
+      config.dicUrl= `/lideeyunji/report-data/list/${item.fieldName.includes('客户')?'khxx':'hpmx'}`
+      config.dicMethod= 'post'
+      config.dicQuery= { //请求参数
+           pageSize: 1000000,
+           pageNo:1
+        }
+      config.filterable= true
+      // config.props ={ label:config.prop , value:config.prop  }
+      config.dicFormatter= (res) => { //请求数据格式化
+        const arr=[...new Set(res.records.map(item=>item[config.prop]))]
+        return arr.map(item=>({label:item,value:item}))
+      }
+      config.searchType='select'
+    }
+   
     if(!!item.isAmount){
       index==0?amountFieds.value.fistField=config.prop:''
       amountFieds.value[item.isAmount]=config

src/views/lowdesign/reportDesign/index.vue

@@ -354,7 +354,6 @@ const tableFormVerify = (type) => {
         let tabKey = 'mysql'
         // 子字段不能再包含子字段
         if (item.isSubField && item.hasChildren === 'Y') {
-          debugger
           messageText = `<div style="line-height:24px">
               <div>子字段不能包含子字段</div>
               <div>序号：${index + 1}</div>