vue2-client 1.17.37 → 1.17.38

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

@@ -1,89 +1,89 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="示例表单"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      :externalSelectedRowKeys="selectedKeys"
-      @action="action"
-      @selectRow="selectRow"
-      @columnClick="columnClick"
-      serviceName="af-system"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { microDispatch } from '@vue2-client/utils/microAppUtils'
-
-export default {
-  name: 'Demo',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
-      // 查询配置左侧tree
-      xTreeConfigName: 'addressType',
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {},
-      // 选中的行keys
-      selectedKeys: [],
-      selected: {
-        keys: [],
-        rows: []
-      }
-    }
-  },
-  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: {},
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例表单"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      :externalSelectedRowKeys="selectedKeys"
+      @action="action"
+      @selectRow="selectRow"
+      @columnClick="columnClick"
+      serviceName="af-system"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
+
+export default {
+  name: 'Demo',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ceshiCRUD',
+      // 查询配置左侧tree
+      xTreeConfigName: 'addressType',
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {},
+      // 选中的行keys
+      selectedKeys: [],
+      selected: {
+        keys: [],
+        rows: []
+      }
+    }
+  },
+  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: {},
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -72,7 +72,7 @@ export default {
   },
   data () {
     return {
-      activeKey: 0,
+      activeKey: -1,
       // 配置
       config: undefined,
       tabBarExtraContent: undefined,
@@ -85,10 +85,10 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   mounted () {
-    this.activeKey = this.defaultActiveKey
+    // this.activeKey = this.defaultActiveKey
     // 标记默认激活的页签为已加载
-    this.markTabAsLoaded(this.defaultActiveKey)
-    this.tabPaneChange('initTabLoading', true)
+    // this.markTabAsLoaded(this.defaultActiveKey)
+    this.tabPaneChange(this.defaultActiveKey, true)
   },
   methods: {
     // 自定义函数中调用的方法  这个不能删
@@ -113,7 +113,7 @@ export default {
         this.markTabAsLoaded(newKey)
       }
 
-      if (this.config && this.config.changeFunc) {
+      if (this.config && this.config.changeFunc && this.config.data[newKey] !== undefined) {
         let oldRef
         let oldTabName
         let newRef
@@ -148,7 +148,6 @@ export default {
 
         // 关键修改：确保新组件实例存在
         if (!newRef || !newRef[0]) {
-          console.log('等待新页签组件初始化...')
           // 等待组件挂载完成
           await this.waitForComponentReady(newKey)
           newRef = this.$refs[newTabName]
@@ -158,7 +157,7 @@ export default {
           args.push(newRef[0])
         } else {
           args.push(null)
-          console.warn('新页签组件实例获取失败')
+          console.error('新页签组件实例获取失败')
         }
 
         args.push(this.extraData)
@@ -203,7 +202,7 @@ export default {
       }
     },
 
-// 新增：等待组件就绪的方法
+    // 新增：等待组件就绪的方法
     waitForComponentReady (index) {
       return new Promise((resolve) => {
         const checkComponent = () => {

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

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

package/src/pages/WorkflowDetail/WorkFlowDemo4.vue

@@ -0,0 +1,127 @@
+<template>
+  <a-card :bordered="false">
+    <a-tabs default-active-key="1" @change="changeTab">
+      <a-tab-pane key="1" tab="待办">
+        <x-form-table
+          title="站点工单(待办)"
+          ref="xFormTable"
+          queryParamsName="teleProcessCRUD"
+          :fixed-query-form="{
+            wo_f_department_id: currUser.depids,
+          }"
+          serviceName="af-telephone"
+          @toDeal="toDetail"
+          @updateInfo="updateInfo"
+          @transfer="transfer"
+          @toFinish="toFinish"
+        >
+        </x-form-table>
+      </a-tab-pane>
+      <a-tab-pane key="2" tab="已办">
+        <x-form-table
+          title="站点工单(已办)"
+          ref="xFormTableDone"
+          queryParamsName="teleProcessDoneCRUD"
+          :fixed-query-form="{
+            wo_f_department_id: currUser.depids,
+          }"
+          serviceName="af-telephone"
+          @action="toView"
+          @reminder="toReminder"
+        >
+        </x-form-table>
+      </a-tab-pane>
+    </a-tabs>
+    <WorkflowDetail
+      ref="workFlow"
+      @preClick="preClick"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+  </a-card>
+</template>
+
+<script>
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import { mapState } from 'vuex'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+
+export default {
+  name: 'Telephone',
+  components: {
+    XFormTable,
+    WorkflowDetail,
+    XAddNativeForm
+  },
+  // 透传给子组件的方法（目前XFormTable接了）
+  provide () {
+    return {
+      generalFunction: {}
+    }
+  },
+  data () {
+    return {
+      // 当前工单id
+      currentWorkOrderId: '',
+      // 提交加载动画
+      confirmLoading: false,
+      chargeVisible: false,
+      // 环节人员信息
+      chargePerson: {},
+      chargePersonOptions: [],
+      transferData: {
+        optionsValue: '',
+        remark: ''
+      },
+      record: {},
+      define: {},
+      // 是否展示催单结案弹窗
+      showReminder: false,
+      // 弹窗类型 催单/ 结案
+      modelType: ''
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  methods: {
+    changeTab (key) {
+      console.log('切换tab', key)
+      if (key === '1') {
+        this.$refs.xFormTable.refreshTable(true)
+      } else if (key === '2') {
+        this.$refs.xFormTableDone.refreshTable(true)
+      }
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record) {
+      // 修改第一步的工单
+      if (record.ws_f_step_id === 1 && record.w_f_state === 0) {
+        console.log('进入工单详情')
+        if (record.w_f_workflow_define_name === '报修单处理流程') {
+          this.$refs.dealOrUpdate.dealOrUpdate(record, '处理工单')
+        } else if (record.w_f_workflow_define_name === '投诉单处理流程') {
+          this.$refs.dealComplaint.dealComplaintOrder(record)
+        } else if (record.w_f_workflow_define_name === '咨询单处理流程') {
+          this.$refs.dealConsultation.dealConsultationOrder(record)
+        } else {
+          this.$message.warn('未知流程类型')
+        }
+      } else {
+        // 记录流程节点名称
+        this.currentWorkOrderId = record.wo_id
+        // 进入流程详情
+        this.$refs.workFlow.init({
+          workflowId: record.wo_f_workflow_id,
+          stepId: record.ws_f_step_id
+        })
+      }
+    },
+  }
+}
+</script>