Explorar o código

Merge remote-tracking branch 'origin/master'

ZaiZai hai 1 ano
pai
achega
e2f458b64f

+ 1 - 1
src/config/index.json

@@ -1,6 +1,6 @@
 {
     "version": "20230607160059",
-    "target": "http://192.168.0.109:8090",
+    "target": "http://127.0.0.1:8090",
     "smsPhone": "",
     "vite": {
         "port": 5174,

+ 1 - 2
src/views/data-fill/collapse-form/index.vue

@@ -17,8 +17,7 @@
                                 <el-link type="danger" :disabled="item.isBussShow === 2 || tableFormDelLoading" @click.stop="delClick(item, index)">删除本表</el-link>
                             </HcTooltip>
                             <el-link 
-                                v-if=" treenodeDataInfo?.majorDataType === 2 && treenodeDataInfo?.nodeType === 2 
-                                    || treenodeDataInfo?.majorDataType === 2 && treenodeDataInfo?.nodeType === 4"
+                                v-if=" treenodeDataInfo?.majorDataType === 2 && treenodeDataInfo?.nodeType <=4"
                                 :disabled="evaluateLoaing"
                                 type="primary"
                                 @click="evaluate(item)"

+ 1 - 1
src/views/ledger/components/internal.vue

@@ -1,7 +1,7 @@
 <template>
     <HcNewCard>
         <template #header>
-            <div class="absolute inset-0" style="height: 32px; top: -15px">
+            <div class="absolute inset-0" style="height: 32px; top: -14px">
                 <div class="relative w-full ">
                     <el-scrollbar>
                         <div class="relative whitespace-nowrap">