vue2-client 1.14.35 → 1.14.37

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/src/pages/XTreeOneProExample/index.vue

@@ -1,67 +1,67 @@
-<template>
-  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
-    <x-add-native-form ref="nativeForm" />
-  </x-tree-view>
-</template>
-
-<script>
-
-import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
-import { mapState } from 'vuex'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm,
-    XTreeView,
-  },
-  data () {
-    return {
-      currentItem: undefined,
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', ['isMobile'])
-  },
-  mounted () {
-    this.initView()
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$refs.xTreeView.init({
-        configName: 'templateTreeConfig',
-        serviceName: 'af-his',
-        env: 'dev',
-      })
-    },
-    itemChecked (node) {
-      this.currentItem = node
-      if (node.type === 'all' || node.type === 'folder') {
-        this.$refs.nativeForm.close()
-        return
-      }
-      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          showSubmitBtn: false,
-          title: '收费',
-          businessType: '新增',
-          getDataParams: {
-            content: {
-              pms_patient_id: 1,
-              template_id: node.id
-            }
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style>
-</style>
+<template>
+  <x-tree-view ref="xTreeView" @itemChecked="itemChecked">
+    <x-add-native-form ref="nativeForm" />
+  </x-tree-view>
+</template>
+
+<script>
+
+import XTreeView from '@vue2-client/base-client/components/layout/XTreeView'
+import { mapState } from 'vuex'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm,
+    XTreeView,
+  },
+  data () {
+    return {
+      currentItem: undefined,
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', ['isMobile'])
+  },
+  mounted () {
+    this.initView()
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$refs.xTreeView.init({
+        configName: 'templateTreeConfig',
+        serviceName: 'af-his',
+        env: 'dev',
+      })
+    },
+    itemChecked (node) {
+      this.currentItem = node
+      if (node.type === 'all' || node.type === 'folder') {
+        this.$refs.nativeForm.close()
+        return
+      }
+      getConfigByName('编辑模板数据Form', 'af-his', (res) => {
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          showSubmitBtn: false,
+          title: '收费',
+          businessType: '新增',
+          getDataParams: {
+            content: {
+              pms_patient_id: 1,
+              template_id: node.id
+            }
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style>
+</style>

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

@@ -13,7 +13,6 @@
 
 <script>
 import { mapState } from 'vuex'
-import { getConfigByName } from '@vue2-client/services/api/common'
 
 export default {
   name: 'FillCardRecordQuery',
@@ -39,16 +38,12 @@ export default {
     }
   },
   created () {
-    getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { f_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { f_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { f_f_user_id: this.currUserInfo.f_user_id }
-      }
-      this.$refs.xFormTable.refresh(true)
-    })
+    this.fixedQueryForm = {
+      f_f_userfiles_id: this.currUserInfo.f_userfiles_id,
+      f_f_userinfo_id: this.currUserInfo.f_userinfo_id,
+      f_f_user_id: this.currUserInfo.f_user_id
+    }
+    this.$refs.xFormTable.refresh(true)
   },
   mounted () {
   },

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

@@ -13,7 +13,6 @@
 
 <script>
 import { mapState } from 'vuex'
-import { getConfigByName } from '@vue2-client/services/api/common'
 
 export default {
   name: 'FillGasRecordQuery',
@@ -39,16 +38,12 @@ export default {
     }
   },
   mounted () {
-    getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { f_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { f_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { f_f_user_id: this.currUserInfo.f_user_id }
-      }
-      this.$refs.xFormTable.refresh(true)
-    })
+    this.fixedQueryForm = {
+      f_f_userfiles_id: this.currUserInfo.f_userfiles_id,
+      f_f_userinfo_id: this.currUserInfo.f_userinfo_id,
+      f_f_user_id: this.currUserInfo.f_user_id
+    }
+    this.$refs.xFormTable.refresh(true)
   },
   methods: {
     action (record, id, actionType) {

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

@@ -13,7 +13,6 @@
 
 <script>
 import { mapState } from 'vuex'
-import { getConfigByName } from '@vue2-client/services/api/common'
 
 export default {
   name: 'MachineUserRecordQuery',
@@ -39,15 +38,11 @@ export default {
     }
   },
   mounted () {
-    getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { mr_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { mr_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { mr_f_user_id: this.currUserInfo.f_user_id }
-      }
-    })
+    this.fixedQueryForm = {
+      mr_f_userfiles_id: this.currUserInfo.f_userfiles_id,
+      mr_f_userinfo_id: this.currUserInfo.f_userinfo_id,
+      mr_f_user_id: this.currUserInfo.f_user_id
+    }
     this.$refs.xFormTable.refresh(true)
   },
   methods: {

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

@@ -13,7 +13,6 @@
 
 <script>
 import { mapState } from 'vuex'
-import { getConfigByName } from '@vue2-client/services/api/common'
 
 export default {
   name: 'OtherChargeRecordQuery',
@@ -39,16 +38,12 @@ export default {
     }
   },
   mounted () {
-    getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { o_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { o_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { o_f_user_id: this.currUserInfo.f_user_id }
-      }
-      this.$refs.xFormTable.refresh(true)
-    })
+    this.fixedQueryForm = {
+      o_f_userfiles_id: this.currUserInfo.f_userfiles_id,
+      o_f_userinfo_id: this.currUserInfo.f_userinfo_id,
+      o_f_user_id: this.currUserInfo.f_user_id
+    }
+    this.$refs.xFormTable.refresh(true)
   },
   methods: {
     action (record, id, actionType) {

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

@@ -14,7 +14,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import { getConfigByName, getConfigByNameAsync } from '@vue2-client/services/api/common'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 
 export default {
   name: 'UserChargeRecordQuery',
@@ -46,16 +46,12 @@ export default {
     } else {
       this.queryParamsName = 'UserChargeRecordQueryCRUD'
     }
-    getConfigByName('revenueConfig', 'af-revenue', (res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else {
-        this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
-      }
-      this.$refs.xFormTable.refresh(true)
-    })
+    this.fixedQueryForm = {
+      uc_f_userfiles_id: this.currUserInfo.f_userfiles_id,
+      uc_f_userinfo_id: this.currUserInfo.f_userinfo_id,
+      uc_f_user_id: this.currUserInfo.f_user_id
+    }
+    this.$refs.xFormTable.refresh(true)
   },
   methods: {
     async getBillUrl (type) {

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

@@ -41,6 +41,7 @@ export default {
   mounted () {
     getConfigByName('revenueConfig', 'af-revenue', (res) => {
       console.log(res)
+      const queryCondition = res.handQueryCondition ? res.handQueryCondition : res.queryCondition
       if (this.currUserInfo.f_meter_type === '物联网表') {
         if (res.newHand) {
           this.queryParamsName = 'WebUserHandRecordQueryCRUD'
@@ -52,12 +53,11 @@ export default {
       } else {
         this.queryParamsName = 'HandRecordQueryCRUD'
       }
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { h_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { h_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { h_f_user_id: this.currUserInfo.f_user_id }
+
+      this.fixedQueryForm = {
+        h_f_userfiles_id: this.currUserInfo.f_userfiles_id,
+        h_f_userinfo_id: this.currUserInfo.f_userinfo_id,
+        h_f_user_id: this.currUserInfo.f_user_id
       }
       this.$refs.xFormTable.refresh(true)
     })

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

@@ -13,7 +13,6 @@
 
 <script>
 import { mapState } from 'vuex'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 
 export default {
   name: 'UserRecordQuery',
@@ -39,15 +38,11 @@ export default {
     }
   },
   async mounted () {
-    await getConfigByNameAsync('revenueConfig', 'af-revenue').then((res) => {
-      if (res.queryCondition === 'f_userfiles_id') {
-        this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
-      } else if (res.queryCondition === 'f_userinfo_id') {
-        this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
-      } else if (res.queryCondition === 'f_user_id') {
-        this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
-      }
-    })
+    this.fixedQueryForm = {
+      uc_f_userfiles_id: this.currUserInfo.f_userfiles_id,
+      uc_f_userinfo_id: this.currUserInfo.f_userinfo_id,
+      uc_f_user_id: this.currUserInfo.f_user_id
+    }
     this.$refs.xFormTable.refresh(true)
   },
   methods: {

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

@@ -34,6 +34,7 @@
 
 <script>
 import { post } from '@vue2-client/services/api'
+import { del } from '@vue2-client/services/api/restTools'
 export default {
   props: {
     currUserInfo: {
@@ -53,22 +54,13 @@ export default {
   methods: {
     async getfusetypes () {
       this.fusetypes = [{ label: '全部', value: '' }]
-      const res = await post('/api/af-revenue/sql/singleTable_OrderBy', {
-        data: {
-          items: 'fusetype',
-          tablename: 't_files',
-          condition: `fusetype is not null GROUP BY fusetype`,
-          orderitem: 'fusetype'
-        }
-      })
+      const res = await post('/api/af-revenue/logic/getFileUseType', {})
       this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
-      console.log('123456', this.fusetypes)
     },
     async getFiles () {
-      console.log('999', this.currUserInfo)
       if (!this.currUserInfo) return
       this.files = []
-      let condition = `CONVERT(varchar(200),f_blobid) = '${this.currUserInfo.f_userinfo_id}'`
+      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
       if (this.upload_date) {
         condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
       }
@@ -76,15 +68,13 @@ export default {
         condition += ` and fusetype = '${this.fusetype}'`
       }
       const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
-      console.log('7777', res)
-      console.log('7777', res.days)
       this.files = res.days.map(day => ({
         days: day.uploadday,
         arrays: res.array.filter(file => file.uploadday === day.uploadday)
       }))
     },
     async delet (fileId) {
-      await this.$resetdelete('rs/entity/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
+      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
       this.getFiles()
     },
     selfSearch () {

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>