vue2-client 1.20.22 → 1.20.23

package/.eslintrc.js

@@ -69,12 +69,6 @@ module.exports = {
       env: {
         jest: true
       }
-    },
-    {
-      files: ['src/base-client/components/common/XReportGrid/XReport.vue'],
-      rules: {
-        'vue/no-reserved-keys': 'off'
-      }
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.20.22",
+  "version": "1.20.23",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -486,6 +486,8 @@ export default {
       }
       // 更新 allFormData
       this.$set(this.allFormData, groupName, formData)
+      // 抛出表单组数据
+      this.$emit('x-form-group-data-change', groupName, formData)
       // 触发其他表单的刷新
       this.$nextTick(() => {
         this.groups.forEach((item, index) => {

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

@@ -2,32 +2,51 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      :queryParamsName="queryParamsName"
+      queryParamsName="scanCodeAndNFCRUD"
       :fixedAddForm="fixedAddForm"
       :externalSelectedRowKeys="selectedKeys"
+      :defaultPageSize="100"
+      :pageSizeArray="['100','200']"
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
       @ceshi="ceshi"
-      @rowDblClick="rowDblClick"
-      :defaultPageSize="5"
-      serviceName="af-revenue"
+      @startService="startService"
+      serviceName="af-safecheck"
       ref="xFormTable"
       :reserveSpaceForButtons="true"
-      @addFormSubmit="addFormSubmit"
-    ></x-form-table>
+    >
+    </x-form-table>
+    <a-modal
+      v-model="formModalVisible"
+      title="工单回访"
+      :zIndex="1002"
+      width="50vw"
+      :destroy-on-close="true"
+      @cancel="formModalVisible = false"
+      @ok="ok"
+    >
+      <x-add-native-form
+        ref="xForm"
+      />
+    </a-modal>
+    <button @click="backDealData">提交</button>
   </a-card>
 </template>
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
+import {getConfigByNameAsync, runLogic} from '@vue2-client/services/api/common'
+
 export default {
   name: 'Demo',
   components: {
-    XFormTable
+    XFormTable,
+    XAddNativeForm,
   },
-  data() {
+  data () {
     return {
       // 查询配置文件名
       queryParamsName: 'ceshiCRUD',
@@ -43,26 +62,32 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: []
-      }
+        rows: [],
+      },
+      formModalVisible: false,
     }
   },
-
   methods: {
-    handleCustomQuery() {
-      this.$refs.xFormTable.queryTable({
-        uf_f_alias: 'XianFeng',
-        uf_f_card_id: '10500030'
+    backDealData () {
+      this.$refs.xFormTable.$refs.xForm.backDealData().then(data => {
+        console.log('backDealData', data)
+        console.log('selected', this.$refs.xFormTable.$refs.xForm?.form)
       })
     },
-    rowDblClick(record) {
-      console.log('rowDblClick', record)
-    },
     // input框 行編輯參數傳遞
-    ceshi(...args) {
+    ceshi (...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
-      console.log('ceshi', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] =
+        args
+      console.log(
+        'ceshi',
+        attr,
+        value,
+        currentRecord,
+        currentIndex,
+        nextRecord,
+        nextIndex
+      )
       // 示例：当按下 Enter 键且有下一行时，跳转到下一行的同一列
       // 可以在这里执行业务逻辑（例如：保存数据）
       console.log('当前行:', currentIndex, '下一行:', nextIndex)
@@ -73,44 +98,61 @@ export default {
       // 跳转到下一行的同一列
       this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
     },
-    test() {
+    test () {
       this.$refs.xFormTable.setTableData([])
     },
-    defaultF() {
+    defaultF () {
       this.$refs.xFormTable.setTableSize('default')
     },
-    middleF() {
+    middleF () {
       this.$refs.xFormTable.setTableSize('middle')
     },
-    smallF() {
+    smallF () {
       this.$refs.xFormTable.setTableSize('small')
     },
-    columnClick(key, value, record) {
+    columnClick (key, value, record) {
       microDispatch({
         type: 'v3route',
         path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id }
+        props: { selected: arguments[0].his_f_admission_id },
       })
     },
-    action(record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
+    startService (record, id, actionType) {
+      getConfigByNameAsync('测试Form', 'af-safecheck').then(config => {
+        this.formModalVisible = true
+        this.$nextTick(
+          () => {
+            this.formModalVisible = true
+            this.$refs.xForm.init({
+              formItems: config.formJson,
+              title: '工单回访',
+              businessType: '新增',
+              ...config,
+              modifyModelData: { data: { id: 1 } },
+            })
+          })
+      })
+      // this.detailVisible = true
+      // console.log('触发了详情操作', record, id, actionType)
+    },
+    async ok () {
+      const res = await this.$refs.xForm.asyncSubmit()
+      await runLogic('ceshwewei', res.realForm)
     },
-    onClose() {
+    onClose () {
       this.detailVisible = false
       // 关闭详情之后重新查询表单
       this.$refs.xFormTable.refreshTable(true)
     },
-    selectRow(selectedRowKeys, selectedRows) {
+    selectRow (selectedRowKeys, selectedRows) {
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows
+        rows: selectedRows,
       }
+      console.log('selectedDemo', this.selected)
     },
-    addFormSubmit(params, callback){
-      callback()
-    }
-  }
+  },
+  computed: {},
 }
 </script>
 

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

@@ -75,8 +75,8 @@ export default {
      * 可选值：
      * - 'default': 返回原始 sections 数组
      * - 'xlist-default': 返回 XList 默认模式格式 [{ number, name }, ...]
-       * - 'xlist-card': 返回 XList 卡片模式格式二维数组
-       */
+     * - 'xlist-card': 返回 XList 卡片模式格式二维数组
+     */
     outputFormat: {
       type: String,
       default: 'default',

package/src/base-client/components/common/XMarkdownSectionExtractor/index.js

@@ -1,6 +1,6 @@
-import XMarkdownSectionExtractor from './XMarkdownSectionExtractor'
-
-export default XMarkdownSectionExtractor
-
-export * from './markdownSectionExtractor'
-
+import XMarkdownSectionExtractor from './XMarkdownSectionExtractor'
+
+export default XMarkdownSectionExtractor
+
+export * from './markdownSectionExtractor'
+

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>