vue2-client 1.14.4 → 1.14.6

package/package.json

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

package/src/base-client/components/common/InvoiceComponent/index.vue

@@ -0,0 +1,81 @@
+<template>
+  <a-form :model="invoiceData" ref="invoiceForm" label-col="{ span: 4 }" wrapper-col="{ span: 14 }">
+    <!-- 卖方信息 -->
+    <a-form-item label="卖方信息">
+      <a-input v-model="invoiceData.seller" placeholder="请输入卖方信息"></a-input>
+    </a-form-item>
+
+    <!-- 买方信息 -->
+    <a-form-item label="买方信息">
+      <a-input v-model="invoiceData.buyer" placeholder="请输入买方信息"></a-input>
+    </a-form-item>
+
+    <!-- 项目明细 -->
+    <a-form-item label="项目明细">
+      <div v-for="(item, index) in invoiceData.items" :key="index" class="item-row">
+        <a-input v-model="item.name" placeholder="项目名称" style="width: 20%; margin-right: 10px;"></a-input>
+        <a-input v-model="item.quantity" placeholder="数量" style="width: 15%; margin-right: 10px;"></a-input>
+        <a-input v-model="item.price" placeholder="单价" style="width: 20%; margin-right: 10px;"></a-input>
+        <a-input v-model="item.tax" placeholder="税额" style="width: 20%;"></a-input>
+      </div>
+      <a-button type="dashed" @click="addItem" style="margin-top: 10px;">添加项目</a-button>
+    </a-form-item>
+
+    <!-- 合计金额 -->
+    <a-form-item label="合计金额">
+      <a-input v-model="invoiceData.total" placeholder="合计金额"></a-input>
+    </a-form-item>
+
+    <!-- 备注 -->
+    <a-form-item label="备注">
+      <a-input v-model="invoiceData.remarks" placeholder="请输入备注"></a-input>
+    </a-form-item>
+    <!-- 操作按钮 -->
+    <a-form-item wrapper-col="{ span: 14, offset: 4 }">
+      <a-button type="primary" @click="submitInvoice">开票</a-button>
+      <a-button style="margin-left: 8px;" @click="saveDraft">保存草稿</a-button>
+    </a-form-item>
+  </a-form>
+</template>
+
+<script>
+export default {
+  name: 'InvoiceComponent',
+  data () {
+    return {
+      // 发票数据模型
+      invoiceData: {
+        seller: '', // 卖方信息
+        buyer: '', // 买方信息
+        items: [ // 项目明细
+          { name: '', quantity: '', price: '', tax: '' }
+        ],
+        total: '', // 合计金额
+        remarks: '' // 备注
+      }
+    }
+  },
+  methods: {
+    // 添加项目明细
+    addItem () {
+      this.invoiceData.items.push({ name: '', quantity: '', price: '', tax: '' })
+    },
+    // 提交发票
+    submitInvoice () {
+      console.log('开票数据: ', this.invoiceData)
+      // 在此处执行发票提交的逻辑
+    },
+    // 保存草稿
+    saveDraft () {
+      console.log('保存草稿: ', this.invoiceData)
+      // 在此处执行保存草稿的逻辑
+    }
+  }
+}
+</script>
+
+<style scoped>
+.item-row {
+  margin-bottom: 10px;
+}
+</style>

package/src/base-client/components/common/XForm/XTreeSelect.vue

@@ -200,8 +200,7 @@ export default {
             const values = []
             if (extra.allCheckedNodes) {
               for (const item of extra.allCheckedNodes) {
-                if (item.node.key) {
-                // if (item.node.key && item.node?.data?.props?.label !== item.node?.data?.props?.value) {
+                if (item.node.key && (item.node?.data?.props?.label !== item.node?.data?.props?.value && item.children && item.children.length)) {
                   values.push(`${item.node.key}`)
                 }
                 if (item.children && item.children.length) {

package/src/base-client/components/his/XList/XList.vue

@@ -30,7 +30,7 @@
 
 <script>
 
-import { runLogic } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XList',
@@ -55,13 +55,16 @@ export default {
   },
   methods: {
     async getData (config) {
-        runLogic(config, {}, 'af-his').then(res => {
-          this.button = res.button
-          this.icon = res.icon
-          this.buttonNames = res.buttonNames || []
-          this.buttonMode = res.buttonMode || false
-          this.data = res.data
+      const that = this
+      getConfigByName(config, 'af-his', res => {
+        that.button = res.button
+        that.icon = res.icon
+        that.buttonNames = res.buttonNames || []
+        that.buttonMode = res.buttonMode || false
+        runLogic(res.data, {}, 'af-his').then(ress => {
+          that.data = ress
         })
+      })
     },
     handleClick (index) {
       this.$emit('listClick', this.data[index])

package/src/base-client/components/his/XSidebar/XSidebar.vue

@@ -132,14 +132,14 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              //  更新当前列的宽度
+              // 更新当前列的宽度
               const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
             max-width: ${drawerWidth}% !important;
             transition: all 0.3s;`
-              //  触发XTab组件重新计算宽度
+              // 触发XTab组件重新计算宽度
               this.$nextTick(() => {
                 const tabComponent = this.$el.querySelector('.ant-tabs')
                 if (tabComponent) {
@@ -147,7 +147,7 @@ export default {
                   window.dispatchEvent(new Event('resize'))
                 }
               })
-              //  更新其他列宽度
+              // 更新其他列宽度
               otherCols.forEach((col, index) => {
                 if (index < this.mainWithData.length) {
                   const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max

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

@@ -59,7 +59,7 @@ routerResource.example = {
   // 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'),
@@ -74,7 +74,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
   // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
   // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
-  component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
+  // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
 }
 // routerResource.example = () =>
 //    import('@vue2-client/pages/Example')