vue2-client 1.20.63 → 1.20.65

package/.idea/CopilotChatHistory.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CopilotChatHistory">
+    <option name="conversations">
+      <list>
+        <Conversation>
+          <option name="createTime" value="1751936027311" />
+          <option name="id" value="0197e7864aaf7383abd8fcc579d97f0e" />
+          <option name="title" value="新对话 2025年7月08日 08:53:47" />
+          <option name="updateTime" value="1751936027311" />
+        </Conversation>
+        <Conversation>
+          <option name="createTime" value="1751504039181" />
+          <option name="id" value="0197cdc6ad0d74de92481b3b338ef77d" />
+          <option name="title" value="新对话 2025年7月03日 08:53:59" />
+          <option name="updateTime" value="1751504039181" />
+        </Conversation>
+        <Conversation>
+          <option name="createTime" value="1751417570211" />
+          <option name="id" value="0197c89f43a37f5aa39c941d198784ba" />
+          <option name="title" value="新对话 2025年7月02日 08:52:50" />
+          <option name="updateTime" value="1751417570211" />
+        </Conversation>
+        <Conversation>
+          <option name="createTime" value="1750899191763" />
+          <option name="id" value="0197a9b96fd37d9e8fb5269c9fc6f3ec" />
+          <option name="title" value="新对话 2025年6月26日 08:53:11" />
+          <option name="updateTime" value="1750899191763" />
+        </Conversation>
+        <Conversation>
+          <option name="createTime" value="1750380684498" />
+          <option name="id" value="01978ad1a4d27fcbab7810685ef316e7" />
+          <option name="title" value="新对话 2025年6月20日 08:51:24" />
+          <option name="updateTime" value="1750380684498" />
+        </Conversation>
+      </list>
+    </option>
+  </component>
+</project>

package/.idea/MarsCodeWorkspaceAppSettings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="com.codeverse.userSettings.MarscodeWorkspaceAppSettingsState">
+    <option name="chatAppRouterInfo" value="builder/691d37a10c28806eaf3d4104" />
+    <option name="ckgOperationStatus" value="SUCCESS" />
+    <option name="progress" value="1.0" />
+  </component>
+</project>

package/.idea/af-vue2-client.iml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

package/.idea/migrateChatHistory.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MigrateChatHistoryStorage">
+    <option name="migratedHistories">
+      <list>
+        <option value="361d659190747ec3ba09aff10517e3b0" />
+      </list>
+    </option>
+  </component>
+</project>

package/package.json

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

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

@@ -25,7 +25,7 @@
       </a-upload>
     </template>
     <a-upload-dragger
-      v-else-if="model.type === 'file'"
+      v-else-if="model.type === 'file' || model.type === 'signature'"
       :accept="model.accept?.join('')"
       :customRequest="uploadFiles"
       :file-list="uploadedFileList"
@@ -156,6 +156,21 @@ export default {
     readOnly: {
       type: Boolean,
       default: false
+    },
+    // 兼容图片(新的image类型的表单项的字段名可自定义了，不再固定为Images，该属性为传入的新的图片列表)
+    // 如果字段名依旧为Images，则不需要该属性，而是使用images属性（兼容旧版的代码）
+    compatibleImages: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    // 兼容签名(PC端没有签名功能，只做展示，归属到文件上传中，该属性为传入的签名列表)
+    signs: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   computed: {
@@ -163,7 +178,22 @@ export default {
     ...mapState('setting', ['compatible'])
   },
   created () {
-    const list = this.model.type === 'file' ? [...this.files] : [...this.images]
+    // const list = this.model.type === 'file' ? [...this.files] : [...this.images]
+    let list = []
+    if (this.model.type === 'file') {
+      list = [...this.files]
+    } else if (this.model.type === 'signature') {
+      list = [...this.signs]
+    } else {
+      if (this.model.type === 'image' && this.model.model === 'Images') {
+        list = [...this.images]
+      } else if (this.model.type === 'image' && this.model.model !== 'Images') {
+        list = [...this.compatibleImages]
+      } else {
+        list = []
+      }
+    }
+
     if (this.model.useType) {
       // {uid,url,name,f_use_type?,f_form_type?}
       this.uploadedFileList = list.filter(item => item.f_use_type === this.model.useType)

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

@@ -29,6 +29,7 @@
               :disabled="itemDisabled(item.formItem)"
               :read-only="readonly(item.formItem)"
               :files="files"
+              :signs="signs"
               :form="form"
               :images="images"
               :service-name="serviceName"
@@ -83,6 +84,7 @@
               :disabled="itemDisabled(item)"
               :read-only="readonly(item)"
               :files="files"
+              :signs="signs"
               v-bind="formItemLayoutGen"
               :style="layout === 'inline' ? { marginTop: '5px' } : undefined"
               :form="form"
@@ -111,6 +113,7 @@
             :disabled="itemDisabled(item)"
             :readonly="readonly(item)"
             :files="files"
+            :signs="signs"
             v-bind="formItemLayoutGen"
             :style="layout === 'inline' ? { marginTop: '5px' } : undefined"
             :form="form[groupItem.model]"
@@ -145,6 +148,7 @@
             :disabled="itemDisabled(formItem)"
             :readonly="readonly(formItem)"
             :files="files"
+            :signs="signs"
             :enablePopupToBody="enablePopupToBody"
             v-bind="formItemLayoutGen"
             :style="layout === 'inline' ? { marginTop: '5px' } : undefined"
@@ -260,6 +264,8 @@ export default {
       // 修改有文件的表单时使用
       files: [],
       images: [],
+      // 签名
+      signs: [],
       // 校验
       rules: {},
       // 调用logic获取数据源的追加参数
@@ -621,6 +627,9 @@ export default {
       if (modifyModelData && modifyModelData.images) {
         this.images = modifyModelData.images
       }
+      if (modifyModelData && modifyModelData.signs) {
+        this.signs = modifyModelData.signs
+      }
       this.loaded = true
       this._emitConfigEnd()
     },

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -380,7 +380,7 @@
   </x-form-col>
   <!-- 文件上传 -->
   <x-form-col
-    v-else-if="(attr.type === 'file' || attr.type === 'image') && show"
+    v-else-if="(attr.type === 'file' || attr.type === 'image' || attr.type === 'signature') && show"
     :labelCol="labelCol"
 
     :mode="mode"
@@ -396,8 +396,10 @@
     >
       <upload
         :files="files"
+        :signs="signs"
         :read-only="readOnly"
         :images="images"
+        :compatible-images="form[attr.model]"
         :model="attr"
         v-bind="attr"
         :service-name="serviceName"
@@ -765,6 +767,12 @@ export default {
         return []
       }
     },
+    signs: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
     images: {
       type: Array,
       default: () => {

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

@@ -88,7 +88,7 @@ export default {
       if (this.mode === '新增/修改') {
         if (
           ['horizontal', 'vertical'].includes(this.layout) ||
-          ['textarea', 'file', 'image'].includes(this.attrType)
+          ['textarea', 'file', 'image','signature'].includes(this.attrType)
         ) {
           // 新增修改表单 horizontal 模式下默认为一行
           return {

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

@@ -2,31 +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"
-      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',
@@ -42,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)
@@ -72,45 +98,115 @@ 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,
+              fixedAddForm: {
+                Images:[
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+                f_image1:[
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+                signs: [
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+              },
+              modifyModelData: {
+                data: {
+                  Images:[
+                    {
+                      'uid': 1850,
+                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                    }
+                  ],
+                  f_image1:[
+                    {
+                      'uid': 1850,
+                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                    }
+                  ],
+                  f_image2: [
+                    {
+                      'uid': 1850,
+                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                    }
+                  ],
+                },
+                signs: [
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+              },
+            })
+          })
+      })
+      // 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) {
-      console.log('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/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>