vue2-client 1.14.35 → 1.14.36

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

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

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

@@ -123,39 +123,54 @@
               <div style="text-align: center">
                 <a-radio-group style="margin-top: 20px">
                   <a-space>
-                    <a-popover v-if="operationType === 'submit'">
-                      <template slot="content">
-                        <p>{{ nextBtnTitle }}</p>
-                      </template>
+                    <!-- 动态按钮渲染 -->
+                    <template v-if="buttonGroup && buttonGroup.actionArr">
                       <a-button
-                        v-show="!lastStep"
-                        :disabled="!showNextBtn && !stepDone"
-                        type="primary"
-                        @click="nextClick"
+                        v-for="(button, index) in buttonGroup.actionArr"
+                        :key="index"
+                        v-show="checkButtonVisible(button)"
+                        :type="button.type ? button.type : 'default'"
+                        @click="handleCustomButtonClick(button)"
                       >
-                        提交
-                        <a-icon type="right"/>
+                        {{ button.text }}
                       </a-button>
-                    </a-popover>
-                    <a-popover v-else :title="stepNextBtnTitle">
-                      <template slot="content">
-                        <p v-for="(item,index) in stepNextBtnText" :key="index">{{ item }}</p>
-                      </template>
+                    </template>
+                    <!-- 原有的按钮逻辑 -->
+                    <template>
+                      <a-popover v-if="operationType === 'submit'">
+                        <template slot="content">
+                          <p>{{ nextBtnTitle }}</p>
+                        </template>
+                        <a-button
+                          v-show="!lastStep"
+                          :disabled="!showNextBtn && !stepDone"
+                          type="primary"
+                          @click="nextClick"
+                        >
+                          提交
+                          <a-icon type="right"/>
+                        </a-button>
+                      </a-popover>
+                      <a-popover v-else :title="stepNextBtnTitle">
+                        <template slot="content">
+                          <p v-for="(item,index) in stepNextBtnText" :key="index">{{ item }}</p>
+                        </template>
+                        <a-button
+                          v-if="showStepNextBtn && !lastStep"
+                          type="primary"
+                          @click="stepNextClick"
+                        >
+                          跳跃
+                        </a-button>
+                      </a-popover>
                       <a-button
-                        v-if="showStepNextBtn && !lastStep"
+                        v-show="lastStep"
                         type="primary"
-                        @click="stepNextClick"
+                        @click="lastStepNextClick"
                       >
-                        跳跃
+                        确认完工
                       </a-button>
-                    </a-popover>
-                    <a-button
-                      v-show="lastStep"
-                      type="primary"
-                      @click="lastStepNextClick"
-                    >
-                      确认完工
-                    </a-button>
+                    </template>
                   </a-space>
                 </a-radio-group>
               </div>
@@ -220,6 +235,9 @@ import WorkFlowTimeline from './WorkFlowTimeline.vue'
 import { FileItem, ImageItem } from '@vue2-client/components/FileImageItem'
 import WorkflowListResolution from './WorkflowListResolution'
 import { commonApi } from '@vue2-client/services/api'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import * as util from '@vue2-client/utils/util'
+import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'WorkFlowHandle',
@@ -350,7 +368,9 @@ export default {
       // 是否需要选择人员
       needSelectPerson: true,
       // 下一环节人员信息
-      chargePerson: {}
+      chargePerson: {},
+      // 动态按钮配置
+      buttonGroup: null
     }
   },
   async mounted () {
@@ -410,6 +430,21 @@ export default {
       this.formCompletedDataPreview = null
       this.operationType = 'submit'
     },
+    async showQueryFormItemFunc () {
+      if (this.attr.showQueryFormItemFunc) {
+        const obj = executeStrFunctionByContext(this, this.attr.showQueryFormItemFunc, [this.form, this.setForm, this.attr, util, this.mode])
+        // 判断是 bool 还是  obj  兼容
+        if (typeof obj === 'boolean') {
+          this.show = obj
+        } else if (obj && typeof obj === 'object') {
+          // obj 是一个对象，并且不是数组
+          this.show = obj?.show
+          this.readOnly = obj?.readOnly
+        }
+      } else {
+        this.show = true
+      }
+    },
     // 获取单个步骤的定义
     getSingleStepDefine (name) {
       for (const step of this.stepsDefine) {
@@ -677,6 +712,13 @@ export default {
     },
     // 加载完成
     resolveStep () {
+      // 获取当前步骤的按钮组配置
+      const currentStep = this.stepsDefine[this.currentStepId - 1]
+      if (currentStep && currentStep.properties && currentStep.properties.buttonGroup) {
+        this.buttonGroup = currentStep.properties.buttonGroup
+      } else {
+        this.buttonGroup = null
+      }
       this.loading = false
     },
     // 流程图组件给当前组件传值用，stepNo为用户点击的非当前步骤
@@ -928,6 +970,38 @@ export default {
       if (this.chargePersonOptions.length === 1) {
         this.checkedChargePerson = this.chargePersonOptions[0].value
       }
+    },
+    // 处理动态按钮点击
+    handleCustomButtonClick (button) {
+      try {
+        // 执行自定义函数
+        if (button.func) {
+          const result = executeStrFunctionByContext(this, button.func, [this.details, this.$refs.xAddForm.form, util, runLogic, getConfigByNameAsync])
+          if (result) {
+            // 如果返回true，执行对应的操作
+            if (button.text === '提交') {
+              this.nextClick()
+            } else if (button.text === '取消') {
+              this.$emit('cancel')
+            }
+          }
+        }
+      } catch (error) {
+        console.error('执行自定义按钮函数失败:', error)
+        this.$message.error('执行操作失败')
+      }
+    },
+    // 检查按钮是否显示
+    checkButtonVisible (button) {
+      try {
+        if (button.customFunction) {
+          return executeStrFunctionByContext(this, button.customFunction, [this.details, this.$refs.xAddForm.form, util, runLogic, getConfigByNameAsync])
+        }
+        return true
+      } catch (error) {
+        console.error('执行按钮显示函数失败:', error)
+        return false
+      }
     }
   },
   watch: {}

package/Users/objecrt/af-vue2-client/src/base-client/components/his/XShiftSchedule/XShiftSchedule.vue

@@ -1,36 +0,0 @@
-<script>
-export default {
-  props: {
-    weekDays: {
-      type: Array,
-      default: () => []
-    }
-  },
-  computed: {
-    columns () {
-      const baseColumns = [
-        { title: '序号', dataIndex: 'index', width: 60 },
-        { title: '科室', dataIndex: 'department', width: 120 },
-        { title: '医生', dataIndex: 'doctor', width: 100 },
-        { title: '上/下/晚', dataIndex: 'shiftType', width: 80 },
-      ]
-
-      // 增加防御判断，确保 weekDays 存在
-      const dayColumns = this.weekDays.length > 0
-        ? this.weekDays.map((day, dayIndex) => ({
-            title: `${day.label} ${day.date}`,
-            dataIndex: `shifts-${dayIndex}`, // 改为字符串形式
-            dayIndex: dayIndex,
-            width: 120,
-          }))
-        : []
-
-      const tailColumns = [
-        { title: '排班数', dataIndex: 'count', width: 80 }
-      ]
-
-      return [...baseColumns, ...dayColumns, ...tailColumns]
-    }
-  }
-}
-</script>

package/src/base-client/components/TreeList/TreeList.vue

@@ -1,91 +0,0 @@
-<template>
-  <div class="tree-container">
-    <div class="tree-list">
-      <tree-node 
-        v-for="node in treeData" 
-        :key="node.id"
-        :node="node"
-        @toggle="toggleNode"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import TreeNode from './TreeNode.vue'
-
-export default {
-  name: 'TreeList',
-  components: {
-    TreeNode
-  },
-  data() {
-    return {
-      treeData: [
-        {
-          id: '1',
-          title: '体征',
-          expanded: false,
-          children: [
-            {
-              id: '1-1',
-              title: '一般情况'
-            },
-            {
-              id: '1-2',
-              title: '皮肤粘膜'
-            },
-            {
-              id: '1-3',
-              title: '头颈',
-              expanded: false,
-              children: [
-                {
-                  id: '1-3-1',
-                  title: '头部'
-                },
-                {
-                  id: '1-3-2',
-                  title: '颈部'
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  },
-  methods: {
-    toggleNode(node) {
-      node.expanded = !node.expanded
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tree-container {
-  width: 240px;
-  height: 400px;
-  border: 1px solid #e8e8e8;
-  overflow-y: auto;
-  padding: 8px;
-}
-
-/* 自定义滚动条样式 */
-.tree-container::-webkit-scrollbar {
-  width: 6px;
-}
-
-.tree-container::-webkit-scrollbar-thumb {
-  background-color: #ccc;
-  border-radius: 3px;
-}
-
-.tree-container::-webkit-scrollbar-track {
-  background-color: #f5f5f5;
-}
-
-.tree-list {
-  font-size: 14px;
-}
-</style> 

package/src/base-client/components/TreeList/TreeNode.vue

@@ -1,81 +0,0 @@
-<template>
-  <div class="tree-node">
-    <div class="node-content" @click="handleClick">
-      <span v-if="hasChildren" class="toggle-icon">
-        {{ node.expanded ? '-' : '+' }}
-      </span>
-      <span class="node-title">{{ node.title }}</span>
-    </div>
-    <div v-if="hasChildren && node.expanded" class="node-children">
-      <tree-node
-        v-for="child in node.children"
-        :key="child.id"
-        :node="child"
-        @toggle="$emit('toggle', $event)"
-        :level="level + 1"/>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'TreeNode',
-  props: {
-    node: {
-      type: Object,
-      required: true
-    },
-    level: {
-      type: Number,
-      default: 0
-    }
-  },
-  computed: {
-    hasChildren() {
-      return this.node.children && this.node.children.length > 0
-    }
-  },
-  methods: {
-    handleClick() {
-      if (this.hasChildren) {
-        this.$emit('toggle', this.node)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tree-node {
-  margin: 2px 0;
-}
-
-.node-content {
-  display: flex;
-  align-items: center;
-  padding: 4px 0;
-  user-select: none;
-}
-
-.toggle-icon {
-  width: 16px;
-  text-align: center;
-  font-size: 14px;
-  color: #666;
-  margin-right: 4px;
-  cursor: pointer;
-}
-
-.node-title {
-  flex: 1;
-  cursor: default;
-}
-
-.node-content:hover {
-  background-color: #f5f5f5;
-}
-
-.node-children {
-  padding-left: 20px;
-}
-</style> 

package/src/base-client/components/common/XCardSet/XTiltle.vue

@@ -1,191 +0,0 @@
-<template>
-  <a-row
-    class="title_box"
-    :style="{backgroundColor: requiredParameters.backgroundColor,height:requiredParameters.height}"
-    type="flex"
-    v-model="requiredParameters">
-    <a-col class="title_col_left" :flex="3">
-      <div class="title_img_box">
-        <img src="../img/header10086.png" class="title_img" alt="">
-      </div>
-      <div class="title_name">{{ requiredParameters.title }}</div>
-    </a-col>
-    <a-col class="title_col_right" id="titleSelect" :flex="3" style="padding-right: 3%" v-model="dateData">
-      <div class="title_date_box">
-        <div class="title_data">{{ dateData.date }}</div>
-        <div class="title_week">{{ dateData.dayOfWeek }}</div>
-      </div>
-      <div class="title_time">{{ dateData.time }}</div>
-      <div style="font-size: x-large;margin-left: 1%">|</div>
-      <div class="title_refresh" @click="refreshTitle"><a-icon type="undo" style="font-size: x-large;"/></div>
-      <div class="title_refresh_box">
-        <div class="title_refresh_time">{{ dateData.refreshTime }}</div>
-        <div class="latest_update_time">最新更新时间</div>
-      </div>
-    </a-col>
-  </a-row>
-</template>
-
-<script>
-
-export default {
-  name: 'TitleComponent',
-  components: {},
-  data () {
-    return {
-      dateData: {
-        date: '',
-        dayOfWeek: '',
-        time: '',
-        refreshTime: ''
-      },
-      timer: null
-    }
-  },
-  props: {
-    requiredParameters: {
-      type: Object,
-      default: () => ({
-        title: '',
-        backgroundColor: '',
-        height: ''
-      }),
-    }
-  },
-  created () {
-    this.updateDateData()
-    this.startTimer()
-  },
-  beforeDestroy () {
-    this.stopTimer()
-  },
-  methods: {
-    // 刷新页面
-    refreshTitle () {
-      this.$forceUpdate()
-      const now = new Date()
-      this.dateData.refreshTime = now.toLocaleTimeString()
-      this.$emit('refreshTitle')
-    },
-    updateDateData () {
-      const now = new Date()
-      const options = { weekday: 'long' }
-      this.dateData.date = this.formatDate(now)
-      this.dateData.time = this.formatTime(now)
-      this.dateData.dayOfWeek = now.toLocaleDateString(undefined, options)
-      this.dateData.refreshTime = now.toLocaleTimeString()
-    },
-    formatDate (date) {
-      const month = date.getMonth() + 1
-      const day = date.getDate()
-      return `${month}月${day}日`
-    },
-    formatTime (date) {
-      const hours = String(date.getHours()).padStart(2, '0')
-      const minutes = String(date.getMinutes()).padStart(2, '0')
-      return `${hours}:${minutes}`
-    },
-    startTimer () {
-      this.timer = setInterval(() => {
-        const now = new Date()
-        this.dateData.time = this.formatTime(now)
-      }, 10000) // 每秒更新一次
-    },
-    stopTimer () {
-      if (this.timer) {
-        clearInterval(this.timer)
-        this.timer = null
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.title_box {
-  width: 100%;
-  min-height:42px;
-}
-.title_col_left {
-  height: 100%;
-  color: white;
-  display: flex;
-  align-content: center;
-  align-items: center;
-}
-.title_col_right {
-  height: 100%;
-  color: white;
-  display: flex;
-  align-content: center;
-  align-items: center;
-  justify-content: flex-end;
-}
-.title_img_box {
-  height: 80%;
-  width: auto;
-  margin-left: 1%;
-  border-radius: 50%;
-  background-color: #35baf6;
-}
-.title_img{
-  width: 100%;
-  height: 100%;
-}
-.title_name {
-  font-size: medium !important;
-  font-weight: bold;
-  margin-left: 1%;
-}
-.title_date_box{
-  width: 20%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-.title_data{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: smaller;
-}
-.title_week{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: smaller;
-}
-.title_time{
-  font-size: x-large;
-}
-.title_refresh{
-  margin-left: 1%;
-  height: 100%;
-  align-content: center;
-  align-items: center;
-  cursor: pointer;
-  display: flex;
-  width: 7%;
-  justify-content: center;
-  min-width: 31px;
-}
-.title_refresh:hover{
-  background-color: rgb(31, 138, 137);
-}
-.title_refresh:active{
-  background-color: rgb(26, 129, 128);
-}
-.title_refresh_box{
-  margin-right: 1%;
-}
-.latest_update_time{
-  font-size: x-small;
-}
-.title_refresh_time{
-  display: flex;
-  font-size: x-small;
-  align-content: center;
-  justify-content: center;
-}
-</style>