vue2-client 1.15.72 → 1.15.74

package/.env

@@ -15,6 +15,6 @@ VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_WEB_STYLES_KEY=admin.webstylesconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
-VUE_APP_SYSTEM_NAME=af-apply
+VUE_APP_SYSTEM_NAME=af-revenue
 VUE_APP_LOGIN_VERSION=V4
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.72",
+  "version": "1.15.74",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XFormTable/demo.vue

@@ -8,7 +8,7 @@
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
-      serviceName="af-system"
+      serviceName="af-revenue"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -26,7 +26,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'UserFilesListCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/base-client/components/common/XPrint/PrintBill.vue

@@ -11,16 +11,17 @@
     >
       <a-skeleton v-if="!loaded" active/>
       <div
+        class="normal-bill"
         style="display: flex;justify-content: center;"
-        :id="id"
+        id="normal-bill"
         v-else
         v-html="bill.data">
       </div>
     </a-modal>
     <div
-      v-if="!showModal"
+      class="normal-bill"
       style="justify-content: center;"
-      :id="id"
+      id="normal-bill-hide"
       v-show="false"
       v-html="bill.data">
     </div>
@@ -118,6 +119,9 @@ export default {
     async print (data) {
       if (!this.autoPrint) {
         this.showModal = true
+        this.id = 'normal-bill'
+      } else {
+        this.id = 'normal-bill-hide'
       }
       await this.getBillData(data).catch(
         _err => {
@@ -219,85 +223,85 @@ export default {
 </script>
 <style scoped>
 
-#normal-bill >>> td {
+.normal-bill >>> td {
   padding: 0.5px;
   border: 2px solid #000000;
 }
 
-#normal-bill >>> table {
+.normal-bill >>> table {
   border-collapse: collapse;
   border: solid;
 }
 
-#normal-bill >>> .noborder {
+.normal-bill >>> .noborder {
   border: 1px dashed #ccc;
 }
 
-#normal-bill >>> .tdleft {
+.normal-bill >>> .tdleft {
   text-align: left;
 }
 
-#normal-bill >>> .tdright {
+.normal-bill >>> .tdright {
   text-align: right;
 }
 
-#normal-bill >>> .tdcenter {
+.normal-bill >>> .tdcenter {
   text-align: center;
 }
 
-#normal-bill >>> .fs10 {
+.normal-bill >>> .fs10 {
   font-size: 0.4em;
 }
 
-#normal-bill >>> .fs11 {
+.normal-bill >>> .fs11 {
   font-size: 0.5em;
 }
 
-#normal-bill >>> .fs12 {
+.normal-bill >>> .fs12 {
   font-size: 0.6em;
 }
 
-#normal-bill >>> .fs13 {
+.normal-bill >>> .fs13 {
   font-size: 0.7em;
 }
 
-#normal-bill >>> .fs15 {
+.normal-bill >>> .fs15 {
   font-size: 0.9em;
 }
 
-#normal-bill >>> .fs17 {
+.normal-bill >>> .fs17 {
   font-size: 1.1em;
 }
 
-#normal-bill >>> .fs19 {
+.normal-bill >>> .fs19 {
   font-size: 1.2em;
 }
 
-#normal-bill >>> .fs24 {
+.normal-bill >>> .fs24 {
   font-size: 1.5em;
 }
 
-#normal-bill >>> .fs26 {
+.normal-bill >>> .fs26 {
   font-size: 1.6em;
 }
 
-#normal-bill >>> .b {
+.normal-bill >>> .b {
   font-weight: bold;
 }
 
-#normal-bill >>> .td-border-right {
+.normal-bill >>> .td-border-right {
   border-right: #000000 1px solid;
 }
 
-#normal-bill >>> .td-border-top {
+.normal-bill >>> .td-border-top {
   border-top: #000000 1px solid;
 }
 
-#normal-bill >>> .td-border-left {
+.normal-bill >>> .td-border-left {
   border-left: #000000 1px solid;
 }
 
-#normal-bill >>> .td-border-bottom {
+.normal-bill >>> .td-border-bottom {
   border-bottom: #000000 1px solid;
 }
 

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: '376'
+      workflowId: '1801'
     })
   },
   methods: {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowTimeline.vue

@@ -59,12 +59,15 @@
 
         <!-- 并行分支容器 -->
         <div class="parallel-branches-container">
+          <!-- 并行节点标题 -->
+          <a-tag color="cyan" size="small" class="parallel-node-title">
+            <a-icon type="apartment" /> 并行节点
+          </a-tag>
           <!-- 动态渲染并行分支 -->
           <div
             v-for="(branch, branchIndex) in segment.branches"
             :key="'segment-' + segmentIndex + '-branch-' + branchIndex"
             class="branch-row">
-
             <!-- 分支时间轴 -->
             <div :class="['branch-timeline', getBranchTimelineClass(branch)]">
               <a-steps size="small" class="branch-steps">
@@ -574,20 +577,20 @@ export default {
     /deep/ .ant-steps-item-title {
       font-size: 14px;
       h3 {
+        font-size: 14px;
         margin-bottom: 0;
       }
     }
   }
 
-    .parallel-section {
+  .parallel-section {
     display: flex;
     align-items: flex-start;
     position: relative;
 
     .connection-line {
       width: 2rem;
-      height: 0px;
-      // background: #f0f0f0;
+      height: 0;
       flex-shrink: 0;
       margin-top: 1rem;
 
@@ -599,9 +602,9 @@ export default {
           content: '';
           position: absolute;
           left: -4.8rem;
-          top: 0;
-          width: 6rem;
-          height: 2.5px;
+          top: -1px;
+          width: 7rem;
+          height: 3px;
           background: #f0f0f0;
         }
       }
@@ -613,10 +616,10 @@ export default {
         &::before {
           content: '';
           position: absolute;
-          right: -4.5rem;
-          top: 0;
-          width: 6rem;
-          height: 2.5px;
+          right: -4.6rem;
+          top: -1px;
+          width: 6.8rem;
+          height: 3px;
           background: #f0f0f0;
         }
       }
@@ -624,170 +627,104 @@ export default {
 
     .parallel-branches-container {
       display: flex;
-      flex-direction: column;
-      gap: 16px;
-      padding: 16px 20px;
-      background: #fafafa;
-      border: 1px solid #e0e0e0;
+      flex-direction: column;  /* 竖直排列分支节点 */
+      gap: 6px;  /* 缩小间距 */
+      align-items: center;
+      position: relative;
+      border: 2px dotted #d9d9d9;
       border-radius: 8px;
-      min-width: 400px;
-      width: fit-content;
-      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-
-      .branch-row {
-        .branch-timeline {
-          padding: 12px 16px;
-          background: #fff;
-          border-radius: 6px;
-          border-left: 4px solid #d9d9d9;
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
-
-          .branch-steps {
-            /deep/ .ant-steps-dot {
-              margin-bottom: 6px;
-
-              .ant-steps-item-tail {
-                top: 7px;
-                margin-left: 70px;
-                width: calc(100% - 16px);
-              }
-
-              .ant-steps-item-icon {
-                margin-left: 60px;
-                width: 8px;
-                height: 8px;
-                line-height: 8px;
-              }
-
-              .ant-steps-item-content {
-                min-width: 160px;
-                margin-top: 24px;
-
-                .ant-steps-item-description {
-                  text-align: left;
-                  background: #fff;
-                  border-radius: 4px;
-                  padding: 10px 12px;
-                  position: relative;
-                  border: 1px solid #f0f0f0;
-
-                  p {
-                    position: relative;
-                    padding: 4px 0;
-                    margin: 0;
-                    font-size: 12px;
-                    color: #666;
-                    line-height: 1.4;
-                    white-space: nowrap;
-                    overflow: visible;
-
-                    &:first-child {
-                      border-top: 1px dotted #e8e8e8;
-                    }
-
-                    &:not(:last-child) {
-                      border-bottom: 1px dashed #f0f0f0;
-                    }
-
-                    &:last-child {
-                      padding-bottom: 0;
-                    }
-                  }
-                }
-              }
-            }
-
-            /deep/ .ant-steps-item-title {
-              font-size: 14px;
-              line-height: 22px;
-              margin-bottom: 6px;
-              font-weight: 500;
-            }
-          }
-
-          .branch-step-title {
-            font-size: 14px;
-            font-weight: 500;
-            color: #262626;
-            cursor: pointer;
-
-            &:hover {
-              color: #1890ff;
-            }
-          }
-
-          .branch-step-desc {
-            p {
-              margin: 0;
-              padding: 4px 0;
-              font-size: 12px;
-              color: #666;
-              border: none !important;
-            }
-          }
+      margin: 0 12px;
+      background: #fff;
+      padding-bottom: 14px;
+
+      /* 为并行节点容器添加小标题 */
+      .parallel-node-title {
+        position: absolute;
+        bottom: -10px;  /* 调整标题的上下位置 */
+        left: 50%;  /* 水平居中 */
+        transform: translateX(-50%);  /* 精确水平居中 */
+        background: #fff;  /* 背景色与容器一致 */
+        font-size: 12px;  /* 标题的字体大小 */
+        border-radius: 4px;
+      }
+    }
 
-          // 移除固定的分支颜色，改为动态状态颜色
-          // &:nth-child(1) {
-          //   border-left-color: #52c41a;
-          // }
+    .branch-row {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      position: relative;
+      gap: 16px;
 
-          // &:nth-child(2) {
-          //   border-left-color: #1890ff;
-          // }
+      .branch-timeline {
+        padding: 12px 16px;
+        position: relative;
+        min-width: 80px;
+        text-align: center;
+        transition: all 0.3s ease;  /* 平滑过渡 */
+      }
 
-          // &:nth-child(3) {
-          //   border-left-color: #722ed1;
-          // }
+      .branch-timeline:hover {
+        transform: scale(1.05);  /* 鼠标悬停时放大 */
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+      }
 
-          &:hover {
-            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
-            transform: translateY(-2px);
-            transition: all 0.3s ease;
-          }
+      .branch-step-title {
+        font-size: 14px;
+        font-weight: 500;
+        color: #262626;
+        cursor: pointer;
+      }
 
-          /deep/ .ant-steps-icon {
-            color: #f0f0f0;
-          }
+      .branch-step-desc {
+        p {
+          margin: 0;
+          padding: 4px 0;
+          font-size: 12px;
+          color: #666;
+        }
+      }
 
-          // 分支步骤状态颜色
-          /deep/ .branch-step-gray .ant-steps-item-icon {
-            background-color: #d9d9d9 !important;
-            border-color: #d9d9d9 !important;
-          }
+      /deep/ .ant-steps-icon {
+        color: #fefefe;
+      }
 
-          /deep/ .branch-step-blue .ant-steps-item-icon {
-            background-color: #1890ff !important;
-            border-color: #1890ff !important;
-          }
+      // 分支步骤节点样式
+      /deep/ .ant-steps-item-icon {
+        width: 20px;
+        height: 20px;
+        line-height: 20px;
+        border-radius: 20px;
+      }
 
-          /deep/ .branch-step-green .ant-steps-item-icon {
-            background-color: #52c41a !important;
-            border-color: #52c41a !important;
-          }
+      /deep/ .ant-steps-item-title {
+        line-height: 20px;
+      }
 
-          /deep/ .branch-step-red .ant-steps-item-icon {
-            background-color: #ff4d4f !important;
-            border-color: #ff4d4f !important;
-          }
+      // 分支步骤状态颜色
+      /deep/ .branch-step-gray .ant-steps-item-icon {
+        background-color: #bfbfbf !important;
+        border-color: #bfbfbf !important;
+      }
 
-          /deep/ .branch-step-yellow .ant-steps-item-icon {
-            background-color: #faad14 !important;
-            border-color: #faad14 !important;
-          }
+      /deep/ .branch-step-blue .ant-steps-item-icon {
+        background-color: #1890ff !important;
+        border-color: #1890ff !important;
+      }
 
-          // 分支时间轴左侧边框颜色
-          &.branch-timeline-gray {
-            border-left-color: #d9d9d9;
-          }
+      /deep/ .branch-step-green .ant-steps-item-icon {
+        background-color: #52c41a !important;
+        border-color: #52c41a !important;
+      }
 
-          &.branch-timeline-green {
-            border-left-color: #52c41a;
-          }
+      /deep/ .branch-step-red .ant-steps-item-icon {
+        background-color: #ff4d4f !important;
+        border-color: #ff4d4f !important;
+      }
 
-          &.branch-timeline-blue {
-            border-left-color: #1890ff;
-          }
-        }
+      /deep/ .branch-step-yellow .ant-steps-item-icon {
+        background-color: #faad14 !important;
+        border-color: #faad14 !important;
       }
     }
   }

package/src/pages/userInfoDetailManage/uploadFilesHistory/ImagePreview.vue

@@ -22,7 +22,7 @@
 <script setup>
 import { ref, computed } from 'vue'
 
-const props = defineProps({
+ defineProps({
   src: String,
   visible: Boolean
 })
@@ -38,10 +38,13 @@ const imgStyle = computed(() => ({
   transform: `scale(${scale.value}) rotate(${rotate.value}deg) translate(${offset.value.x}px, ${offset.value.y}px)`,
   cursor: dragging.value ? 'grabbing' : 'grab'
 }))
-
+// eslint-disable-next-line no-return-assign
 const zoomIn = () => scale.value += 0.2
+// eslint-disable-next-line no-return-assign
 const zoomOut = () => scale.value = Math.max(0.2, scale.value - 0.2)
+// eslint-disable-next-line no-return-assign
 const rotateLeft = () => rotate.value -= 90
+// eslint-disable-next-line no-return-assign
 const rotateRight = () => rotate.value += 90
 const close = () => emits('close')
 
@@ -95,4 +98,4 @@ const stopDrag = () => {
   justify-content: center;
   gap: 10px;
 }
-</style> 
+</style>

package/src/router/async/router.map.js

@@ -54,13 +54,13 @@ routerResource.example = {
 path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),

package/vue.config.js

@@ -15,8 +15,8 @@ const v3Server = 'http://aote-office.8866.org:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
-// const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://127.0.0.1:31467'
+const revenue = 'http://aote-office.8866.org:31567'
+// const revenue = 'http://127.0.0.1:31467'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川