vue2-client 1.17.39 → 1.17.41

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

@@ -1,97 +1,98 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="工作日志"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      :fixed-query-form="fixedQueryForm"
-      @afterSubmit="Submit"
-      @action="toDetail"
-    >
-    </x-form-table>
-    <!-- 抽屉 -->
-    <a-drawer
-      :visible="visible"
-      width="40vw"
-      placement="right"
-      title="查看附件"
-      @close="visible = false, previewFileVisible=false"
-    >
-      <div>
-        <file-item :files="fileList" @preview="handlePreviewFile"/>
-      </div>
-      <!-- 文件预览 -->
-      <a-modal v-model="previewFileVisible" :footer="null" :dialog-style="{ top: '20px' }" width="80%" :z-index="1001">
-        <file-preview :path="filePath"/>
-      </a-modal>
-    </a-drawer>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import { runLogic } from '@vue2-client/services/api/common'
-import fileItem from '@vue2-client/components/FileImageItem/FileItem.vue'
-import FilePreview from '@vue2-client/components/FilePreview/FilePreview.vue'
-import { mapState } from 'vuex'
-export default {
-  name: '工作日志',
-  components: {
-    XFormTable,
-    fileItem,
-    FilePreview
-  },
-  props: {
-    workflowId: {
-      type: String,
-      default: ''
-    },
-    details: {
-      type: Object,
-      required: true
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'worklogCRUD',
-      visible: false,
-      previewFileVisible: false,
-      filePath: '',
-      fileList: [],
-      fixedQueryForm: {},
-      fixedAddForm: {}
-    }
-  },
-  mounted () {
-    this.init()
-  },
-  methods: {
-    init () {
-      this.fixedQueryForm = { w_f_workflow_id: this.workflowId }
-      this.fixedAddForm = { w_defname: this.details.f_sub_state }
-      this.$refs.xFormTable.refreshTable(true)
-    },
-    toDetail (record, id) {
-      runLogic('getfiles', { id: id, f_table_name: 't_work_log' }, 'af-apply').then(res => {
-        this.fileList = res
-        this.visible = true
-      })
-    },
-    handlePreviewFile (url) {
-      this.filePath = url
-      this.previewFileVisible = true
-    },
-    Submit (record) {
-      record.form.id = record.id
-      record.form.f_workflow_id = this.workflowId
-      runLogic('updataworklogfiles', record, 'af-apply')
-      this.$refs.xFormTable.refreshTable(true)
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="工作日志"
+      ref="xFormTable"
+      service-name="af-system"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      :fixed-query-form="fixedQueryForm"
+      @afterSubmit="Submit"
+      @action="toDetail"
+    >
+    </x-form-table>
+    <!-- 抽屉 -->
+    <a-drawer
+      :visible="visible"
+      width="40vw"
+      placement="right"
+      title="查看附件"
+      @close="visible = false, previewFileVisible=false"
+    >
+      <div>
+        <file-item :files="fileList" @preview="handlePreviewFile"/>
+      </div>
+      <!-- 文件预览 -->
+      <a-modal v-model="previewFileVisible" :footer="null" :dialog-style="{ top: '20px' }" width="80%" :z-index="1001">
+        <file-preview :path="filePath"/>
+      </a-modal>
+    </a-drawer>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import { runLogic } from '@vue2-client/services/api/common'
+import fileItem from '@vue2-client/components/FileImageItem/FileItem.vue'
+import FilePreview from '@vue2-client/components/FilePreview/FilePreview.vue'
+import { mapState } from 'vuex'
+export default {
+  name: '工作日志',
+  components: {
+    XFormTable,
+    fileItem,
+    FilePreview
+  },
+  props: {
+    workflowId: {
+      type: String,
+      default: ''
+    },
+    details: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'worklogCRUD',
+      visible: false,
+      previewFileVisible: false,
+      filePath: '',
+      fileList: [],
+      fixedQueryForm: {},
+      fixedAddForm: {}
+    }
+  },
+  mounted () {
+    this.init()
+  },
+  methods: {
+    init () {
+      this.fixedQueryForm = { w_f_workflow_id: this.workflowId }
+      this.fixedAddForm = { w_defname: this.details.f_sub_state }
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    toDetail (record, id) {
+      runLogic('getfiles', { id: id, f_table_name: 't_work_log' }, 'af-system').then(res => {
+        this.fileList = res
+        this.visible = true
+      })
+    },
+    handlePreviewFile (url) {
+      this.filePath = url
+      this.previewFileVisible = true
+    },
+    Submit (record) {
+      record.form.id = record.id
+      record.form.f_workflow_id = this.workflowId
+      runLogic('updataworklogfiles', record, 'af-system')
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  }
+}
+</script>

package/src/pages/userInfoDetailManage/ExceptionRecordQuery/index.vue

@@ -1,45 +1,45 @@
-<script>
-export default {
-  name: 'ExceptionQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  mounted () {
-    this.$refs.xFormTable.refresh(true)
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'ExceptionRecordQueryCRUD',
-      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  }
-}
-</script>
-
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="异常查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<style scoped>
-
-</style>
+<script>
+export default {
+  name: 'ExceptionQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'ExceptionRecordQueryCRUD',
+      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  }
+}
+</script>
+
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="异常查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<style scoped>
+
+</style>

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

@@ -1,347 +0,0 @@
-<script setup lang="ts">
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { ref, computed, useAttrs } from 'vue'
-
-const xAddNativeFormRef = ref()
-
-const attrs = useAttrs()
-const wrapperClassObject = computed(() => {
-  const a = attrs
-  const classes = {}
-
-  // 1) 多个布尔型样式开关（存在且为真则生效）
-  const booleanStyleKeys = [
-    'query-conditions',
-    'padding-50',
-    'label-text-horizontal',
-    'label-text-justify',
-    'charge-form'
-  ]
-  for (const key of booleanStyleKeys) {
-    const val = a[key]
-    const truthy = val === true || val === '' || val === 'true'
-    if (truthy) classes[`h-form-${key}`] = true
-  }
-  return classes
-})
-
-defineExpose({
-  getXAddNativeFormInstance: () => xAddNativeFormRef.value,
-  init: (params) => xAddNativeFormRef.value && xAddNativeFormRef.value.init && xAddNativeFormRef.value.init(params),
-  asyncSubmit: () => xAddNativeFormRef.value && xAddNativeFormRef.value.asyncSubmit && xAddNativeFormRef.value.asyncSubmit(),
-  validateForm: () => xAddNativeFormRef.value && xAddNativeFormRef.value.validateForm && xAddNativeFormRef.value.validateForm()
-})
-
-</script>
-
-<template>
-  <div
-    class="h-form-wrapper"
-    :class="[
-      wrapperClassObject
-    ]"
-  >
-
-    <x-add-native-form
-      ref="xAddNativeFormRef"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <template v-for="(_, name) in $slots" #[name]="slotData">
-        <slot :name="name" v-bind="slotData" />
-      </template>
-    </x-add-native-form>
-  </div>
-</template>
-
-<style scoped lang="less">
-.h-form-wrapper {
-  // 基础样式
-  :deep(.ant-form-item) {
-    margin-bottom: 4px;
-  }
-
-  // query-conditions 样式
-  &.h-form-query-conditions {
-    // ant-card-body 样式
-    :deep(.ant-card-body) {
-      padding: 0px;
-    }
-
-    // ant-row-flex 样式
-    :deep(.ant-row-flex) {
-      // x-form-col-wrapper 样式
-      .x-form-col-wrapper {
-        .ant-form-item {
-          display: flex;
-          width: 100%;
-          margin-bottom: 4px;
-          justify-content: space-between;
-
-          .ant-form-item-label {
-            padding-left: 4px;
-            width: 100%;
-          }
-
-          .ant-form-item-control-wrapper {
-            padding-left: -6px;
-          }
-        }
-      }
-
-      // ant-col-24 样式
-      .ant-col-24 {
-        padding: 0px 4px !important;
-      }
-    }
-  }
-
-  &.h-form-padding-50 {
-    // ant-row-flex 样式
-    :deep(.ant-row-flex) {
-      padding-left: 50px;
-      padding-right: 50px
-    }
-  }
-
-  // charge-form 样式
-  &.h-form-charge-form {
-    margin-top: 2px !important;
-    // 定义变量
-    @font-common: {
-      font-family: 'Source Han Sans', sans-serif;
-      font-size: 16px;
-      font-weight: normal;
-      letter-spacing: 0em;
-      font-variation-settings: "opsz" auto;
-      font-feature-settings: "kern" on;
-    };
-
-    @color-primary: #313131;
-    @color-placeholder: #999999;
-
-    // 定义混合宏
-    .input-base() {
-      width: 100%;
-      height: 30px;
-      line-height: 30px;
-      vertical-align: top;
-      margin: 0;
-      text-align: left;
-      color: @color-primary;
-      opacity: 1;
-      @font-common();
-    }
-
-    .placeholder-base() {
-      color: @color-placeholder;
-      opacity: 1;
-      @font-common();
-    }
-
-    .option-group-base() {
-      height: 30px;
-      line-height: 30px;
-      display: flex;
-      align-items: center;
-
-      .ant-radio-wrapper,
-      .ant-checkbox-wrapper {
-        height: 30px;
-        line-height: 30px;
-        margin-right: 16px;
-      }
-    }
-
-    :deep(.ant-form-item) {
-      margin-bottom: 16px;
-      margin-top: 0;
-      padding: 0;
-      display: flex;
-      align-items: center;
-
-      .ant-form-item-label {
-        text-align: left;
-        margin: 0 16px 0 0 !important;
-        width: 64px;
-        min-width: 64px;
-        max-width: 64px;
-        flex-shrink: 0;
-
-        label {
-          height: 23px;
-          opacity: 1;
-          line-height: 23px;
-          color: @color-primary;
-          margin: 0;
-          padding: 0;
-          white-space: nowrap;
-          display: block;
-          @font-common();
-
-          // 移除冒号
-          &::after {
-            content: '';
-          }
-        }
-      }
-
-      .ant-form-item-control-wrapper {
-        margin: 0;
-        padding: 0;
-        flex: 1;
-        min-width: 0;
-        display: flex;
-        align-items: center;
-
-        .ant-form-item-control {
-          margin: 0;
-          padding: 0;
-          width: 100%;
-          text-align: left;
-          line-height: 30px !important;
-
-          // 输入框样式统一
-          .ant-input,
-          .ant-input-affix-wrapper,
-          .ant-select,
-          .ant-input-number,
-          .ant-picker,
-          .ant-radio-group,
-          .ant-checkbox-group {
-            .input-base();
-          }
-
-          // 选择器样式
-          .ant-select {
-            .ant-select-selector {
-              .input-base();
-              height: 30px;
-              line-height: 30px;
-
-              .ant-select-selection-item {
-                .input-base();
-                line-height: 30px;
-              }
-
-              .ant-select-selection-placeholder {
-                .placeholder-base();
-                line-height: 30px;
-              }
-            }
-          }
-
-          // 日期选择器样式
-          .ant-picker {
-            height: 30px;
-
-            .ant-picker-input {
-              height: 30px;
-              line-height: 30px;
-              .input-base();
-
-              input {
-                .input-base();
-                height: 30px;
-                line-height: 30px;
-              }
-            }
-          }
-
-          // 数字输入框样式
-          .ant-input-number {
-            height: 30px;
-
-            .ant-input-number-input {
-              .input-base();
-              height: 30px;
-              line-height: 30px;
-            }
-          }
-
-          // 单选框组样式
-          .ant-radio-group {
-            .option-group-base();
-          }
-
-          // 复选框组样式
-          .ant-checkbox-group {
-            .option-group-base();
-          }
-        }
-      }
-    }
-
-    // 重置可能的容器边距
-    :deep(.ant-row) {
-      margin: 0;
-      padding: 0;
-
-      .ant-col {
-        margin: 0;
-        padding: 0;
-      }
-    }
-
-    // 强制重置所有可能的表单项样式
-    :deep(.ant-form-item) {
-      margin: 0 0 16px 0 !important;
-
-      // 重置可能的内部边距
-      .ant-form-item-control-input,
-      .ant-form-item-control-input-content {
-        margin: 0 !important;
-        padding: 0 !important;
-      }
-    }
-  }
-
-  // label-text-horizontal 样式 - 只控制label文字从左到右排列
-  &.h-form-label-text-horizontal {
-    :deep(.ant-form-item-label) {
-      text-align: left;
-      direction: ltr;
-
-      // 标签文字水平排列
-      .ant-form-item-label-text {
-        display: inline-block;
-        text-align: left;
-        direction: ltr;
-        unicode-bidi: normal;
-      }
-
-      // 必填标识水平排列
-      .ant-form-item-required::before {
-        margin-right: 4px;
-        margin-left: 0;
-      }
-    }
-  }
-
-  // label-text-justify 样式 - 标签文字两端对齐分散占满 必填*可能会有问题
-  &.h-form-label-text-justify {
-    :deep(.ant-form-item-label) {
-      padding-left: 0;
-      padding-right: 8px;
-      label {
-        position: relative;
-        display: block;
-        width: 100%;
-        white-space: nowrap;
-        margin: 0;
-        text-indent: 0;
-        text-align: justify;
-        text-align-last: justify;
-        text-justify: inter-ideograph;
-        box-sizing: border-box;
-        padding-right: 12px; // 给绝对定位的冒号留出空间
-      }
-      // 将冒号绝对定位到最右侧，避免参与两端对齐计算
-      label::after {
-        position: absolute;
-        right: 0;
-      }
-    }
-  }
-}
-</style>