vue2-client 1.16.7 → 1.16.8

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

@@ -1,54 +1,54 @@
-<template>
-  <div class="h-tab-demo">
-<!--    &lt;!&ndash; XTab &ndash;&gt;-->
-<!--    <a-card title="XTab">-->
-<!--      <h-tab-->
-<!--        configName="openPrescriptionTab"-->
-<!--        serverName="af-his"-->
-<!--      />-->
-<!--    </a-card>-->
-
-    <!-- HFormTable -->
-    <a-card title="HFormTable" style="margin-top: 20px;">
-      <h-form-table
-        queryParamsName="outpatientAdviceAllCRUD"
-        serviceName="af-his"
-      />
-    </a-card>
-
-    <!-- HForm -->
-    <a-card title="HAddNativeForm" style="margin-top: 20px;">
-      <h-add-native-form
-        queryParamsName="TCMAdviceFormConfig"
-        serviceName="af-his"
-      />
-    </a-card>
-
-<!--    &lt;!&ndash; HButtons &ndash;&gt;-->
-<!--    <a-card title="HButtons" style="margin-top: 20px;">-->
-<!--      <h-buttons-->
-<!--        queryParamsName="outpatientAdviceGroup"-->
-<!--        serviceName="af-his"-->
-<!--      />-->
-<!--    </a-card>-->
-  </div>
-</template>
-
-<script setup>
-// import HTab from './HTab/HTab.vue'
-import HFormTable from './HFormTable/HFormTable.vue'
-// import HButtons from './HButtons/HButtons.vue'
-import HAddNativeForm from '@vue2-client/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue'
-</script>
-
-<style scoped lang="less">
-.h-tab-demo {
-  padding: 20px;
-
-  h4 {
-    color: #333;
-    margin-bottom: 10px;
-    font-size: 14px;
-  }
-}
-</style>
+<template>
+  <div class="h-tab-demo">
+<!--    &lt;!&ndash; XTab &ndash;&gt;-->
+<!--    <a-card title="XTab">-->
+<!--      <h-tab-->
+<!--        configName="openPrescriptionTab"-->
+<!--        serverName="af-his"-->
+<!--      />-->
+<!--    </a-card>-->
+
+    <!-- HFormTable -->
+    <a-card title="HFormTable" style="margin-top: 20px;">
+      <h-form-table
+        queryParamsName="outpatientAdviceAllCRUD"
+        serviceName="af-his"
+      />
+    </a-card>
+
+    <!-- HForm -->
+    <a-card title="HAddNativeForm" style="margin-top: 20px;">
+      <h-add-native-form
+        queryParamsName="TCMAdviceFormConfig"
+        serviceName="af-his"
+      />
+    </a-card>
+
+<!--    &lt;!&ndash; HButtons &ndash;&gt;-->
+<!--    <a-card title="HButtons" style="margin-top: 20px;">-->
+<!--      <h-buttons-->
+<!--        queryParamsName="outpatientAdviceGroup"-->
+<!--        serviceName="af-his"-->
+<!--      />-->
+<!--    </a-card>-->
+  </div>
+</template>
+
+<script setup>
+// import HTab from './HTab/HTab.vue'
+import HFormTable from './HFormTable/HFormTable.vue'
+// import HButtons from './HButtons/HButtons.vue'
+import HAddNativeForm from '@vue2-client/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue'
+</script>
+
+<style scoped lang="less">
+.h-tab-demo {
+  padding: 20px;
+
+  h4 {
+    color: #333;
+    margin-bottom: 10px;
+    font-size: 14px;
+  }
+}
+</style>

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -1063,6 +1063,12 @@ export default {
           continue
         }
         const item = this.realJsonData[i]
+        // 地址选择器 需要传递 经纬度字段, 配置中添加 `${item.model}_lng_lat` CRUD 只需勾选 SQL生成查询项
+        if (['addressSearch'].includes(item.type)) {
+          this.form[item.model] = modifyModelData.data[item.model] + ''
+          this.form[`${item.model}_lng_lat`] = modifyModelData.data[`${item.model}_lng_lat`] + ''
+          continue
+        }
         if (modifyModelData.data[item.model] || modifyModelData.data[item.model] === 0) {
           if (modifyModelData.data[item.model] instanceof Array) {
             this.form[item.model] = modifyModelData.data[item.model]

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

@@ -1,15 +1,15 @@
 <template>
   <a-card :bordered="false">
+    <x-add-native-form ref="nativeForm"/>
+    <hr>
+    <hr>
+    <hr>
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
-      :x-tree-config-name="xTreeConfigName"
       :externalSelectedRowKeys="selectedKeys"
-      @action="action"
-      @selectRow="selectRow"
-      @columnClick="columnClick"
-      serviceName="af-revenue"
+      serviceName="af-linepatrol"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -17,19 +17,20 @@
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { microDispatch } from '@vue2-client/utils/microAppUtils'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '@/services/api/common'
 
 export default {
   name: 'Demo',
   components: {
-    XFormTable
+    XFormTable,
+    XAddNativeForm
   },
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'address_management',
-      // 查询配置左侧tree
-      xTreeConfigName: 'addressType',
+      queryParamsName: 'crud_device_base_manage',
+      // queryParamsName: 'crud_patroltask_manage',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉
@@ -44,42 +45,12 @@ export default {
       }
     }
   },
+  mounted () {
+    getConfigByName('editAdjustableTableForm', 'af-revenue', (res) => {
+      this.$refs.nativeForm.init(res)
+    })
+  },
   methods: {
-    test () {
-      this.$refs.xFormTable.setTableData([])
-    },
-    defaultF () {
-      this.$refs.xFormTable.setTableSize('default')
-    },
-    middleF () {
-      this.$refs.xFormTable.setTableSize('middle')
-    },
-    smallF () {
-      this.$refs.xFormTable.setTableSize('small')
-    },
-    columnClick (key, value, record) {
-      microDispatch({
-        type: 'v3route',
-        path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id }
-      })
-    },
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    },
-    selectRow (selectedRowKeys, selectedRows) {
-      this.selected = {
-        keys: selectedRowKeys,
-        rows: selectedRows
-      }
-      console.log('selectedDemo', this.selected)
-    },
   },
   computed: {},
 }

package/src/base-client/components/common/XReport/print.js

@@ -1,186 +1,186 @@
-// print.js
-
-export function printElement (elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement (elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}