iZaiZaiA 2 жил өмнө
parent
commit
71d8673771

+ 1 - 1
src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209261726',    //开发版本号
+    dev_version: '202209261812',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

+ 14 - 5
src/views/data-fill/components/WbsTree.vue

@@ -1,5 +1,5 @@
 <template>
-    <ElTree class="hc-tree-node tree-line" :class="ui" ref="ElTreeRef" :props="ElTreeProps" :load="ElTreeLoadNode" lazy highlight-current accordion node-key="primaryKeyId"
+    <ElTree class="hc-tree-node tree-line wbs-tree-node" :class="ui" ref="ElTreeRef" :props="ElTreeProps" :load="ElTreeLoadNode" lazy highlight-current accordion node-key="primaryKeyId"
             :default-expanded-keys="defaultExpandedCids" @node-click="ElTreeClick" @node-contextmenu="ElTreeLabelContextMenu" :indent="0">
         <template #default="{ node, data }">
             <div class="data-custom-tree-node" :id="`${idPrefix}${data['primaryKeyId']}`">
@@ -312,7 +312,7 @@ defineExpose({
         left: 1px;
         top: -26px;
         border-width: 1px;
-        border-left: 1px dashed #ccc;
+        border-left: 2px dashed var(--el-color-primary);
     }
     // 当前层最后⼀个节点的竖线⾼度固定
     :deep(.el-tree-node:last-child::before) {
@@ -327,7 +327,7 @@ defineExpose({
         left: 2px;
         top: 12px;
         border-width: 1px;
-        border-top: 1px dashed #ccc;
+        border-top: 2px dashed var(--el-color-primary);
     }
     // 去掉最顶层的虚线,放最下⾯样式才不会被上⾯的覆盖了
     & > :deep(.el-tree-node::after) {
@@ -347,7 +347,16 @@ defineExpose({
 }
 </style>
 <style lang="scss">
-.hc-tree-node .el-tree-node__label {
-    flex: 1;
+.hc-tree-node.wbs-tree-node {
+    .el-tree-node__content {
+        height: 28px;
+    }
+    .el-tree-node__label {
+        flex: 1;
+    }
+    &.el-tree--highlight-current .el-tree-node.is-current {
+        background: #cacaca;
+        border-radius: 4px;
+    }
 }
 </style>

+ 12 - 8
src/views/data-fill/wbs.vue

@@ -1103,15 +1103,19 @@ const tableFormSaveClick = async () => {
         FormData = ListItemRef.value.getFormData()
     }
     console.log(FormData)
-    tableFormSaveLoading.value = true
-    const {error, code} = await wbsApi.saveExcelBussData({
-        dataInfo: {orderList: FormData}
-    })
-    tableFormSaveLoading.value = false
-    if (!error && code === 200) {
+    if (FormData.length > 0) {
+        tableFormSaveLoading.value = true
+        const {error, code} = await wbsApi.saveExcelBussData({
+            dataInfo: {orderList: FormData}
+        })
+        tableFormSaveLoading.value = false
+        if (!error && code === 200) {
+            window?.$message?.success('保存成功')
+            bussPdfsClick()
+            getTableDataAll()
+        }
+    } else {
         window?.$message?.success('保存成功')
-        bussPdfsClick()
-        getTableDataAll()
     }
 }