Merge branch 'main' into dev_sh

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

@@ -70,6 +70,9 @@
       </el-select>
       </div>
       </template>
+      <template #stdGoodsName=scope>
+        {{scope.row.stdGoodsName}}
+      </template>
       <template v-for="prop in numberRange" :key="prop" #[`${prop}-search`]="scope">
         <InputNumberRange
           v-model="tableSearch[prop]"
@@ -156,7 +159,7 @@ const transferFields={
       'goodsName':'goodsname',
       'customName':'customname',
       'dosageName':'dosagename',
-      
+      'stdGoodsName':'stdGoodsIdName'
     }
 const loading = ref(false) // 列表的加载中
 const isInit = ref(false)
@@ -434,13 +437,19 @@ const initTable = async () => {
       '业务区域':'ywqy',
       '标准品名':'bzpm',
     }
+ 
 
     if(Object.keys(jkTableDicFields).includes(item.fieldName)&&config.search){
       config.dataType= 'string'
       config.reportCode= `${jkTableDicFields[item.fieldName]}`
       const formatterData=(res) => { //请求数据格式化
-        const arr=[...new Set(res.records.map(item=>item[transferFields[config.prop]?transferFields[config.prop]:config.prop]))]
-        return arr.map(item=>({label:item,value:item}))
+        const arr=[...new Set(res.records.map(item=>{
+          const v=item[transferFields[config.prop]?transferFields[config.prop]:config.prop]
+          return {
+            value:config.prop=='stdGoodsName'?item[config.prop]:v,
+            label:v,
+          }}))]
+        return arr
       }
       ReportApi.getTableList(jkTableDicFields[item.fieldName],{pageSize: 50, pageNo:1}).then(res=>{
         config.dicData=formatterData(res)
@@ -945,7 +954,12 @@ defineExpose({
         border-bottom: 1px solid #000 !important;
 
       }
-
+      .sort-caret.ascending{
+        border-bottom-color: #000 ;
+      }
+      .sort-caret.descending {
+        border-top-color: #000 ;  
+      }
        td.textAlignCell .cell{
           span{
             display: inline-block;