vue2-client 1.14.68 → 1.14.70

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,47 +1,90 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例页面"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="add">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail ref="workFlow" @success="success"></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 XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
 
 export default {
-  name: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: '11'
-    })
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'applyCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
   },
   methods: {
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId
-     */
-    success ({ note, form, workflowId }) {
-      console.log('success', note, form, workflowId)
+    add () {
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
     },
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId 工作流id
-     * @param fromStepId 起ID
-     * @param toStepId 往ID
-     * @param successStepId 完成步骤id
-     * @param successStep 完成步骤名称
-     * @param fromStep 起步骤名称
-     * @param toStep 往步骤名称
-     */
-    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
-      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.twf_id
+      })
     }
   }
 }
 </script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>

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

@@ -37,7 +37,7 @@
           <a-tab-pane key="0" tab="步骤详情">
             <a-card :bordered="false" :loading="loadingHistory">
               <!--   当前步骤历史记录   -->
-              <template v-if="formCompletedDataPreview && formCompletedDataPreview.data.length > 0">
+              <template v-if="formCompletedDataPreview">
                 <a-descriptions
                   v-show="formCompletedDataPreview.data"
                   :column="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }"
@@ -48,11 +48,12 @@
                     填写历史
                   </p>
                   <a-descriptions-item
-                    v-for="(item, index) in formPreviewNoFileData"
-                    :key="`${item.label}-${index}`"
+                    v-for="(value,key) in formCompletedDataPreview.data"
+                    :key="key"
+                    v-show="key !== '附件上传'"
                   >
-                    <span slot="label" style="color: #000">{{ item.label }}</span>
-                    <div style="white-space: pre-wrap">{{ item.value }}</div>
+                    <span slot="label" style="color: #000">{{ key }}</span>
+                    <div style="white-space: pre-wrap">{{ value }}</div>
                   </a-descriptions-item>
                 </a-descriptions>
                 <a-descriptions
@@ -809,28 +810,33 @@ export default {
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         const formData = formCompletedDataPreview.data
-        // 新增：有序处理表单数据，保证顺序与formJson一致
-        const orderedFormData = []
-        for (const stepDefine of this.targetStepDefine) {
-          const key = stepDefine.model
-          if (formData && Object.prototype.hasOwnProperty.call(formData, key)) {
-            let value = formData[key]
-            // 读取字典值
-            if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
-              for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
-                if (item.value === value) {
-                  value = item.label
-                  break
+        for (const key in formData) {
+          for (let i = 0; i < this.targetStepDefine.length; i++) {
+            const stepDefine = this.targetStepDefine[i]
+            if (key === stepDefine.model) {
+              if (!['FilesId', 'Images'].includes(key)) {
+                // 读取字典值
+                if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
+                  for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
+                    if (item.value === formData[key]) {
+                      formData[stepDefine.name] = item.label
+                      break
+                    }
+                  }
+                } else {
+                  formData[stepDefine.name] = formData[key]
                 }
               }
+              if (key !== stepDefine.name) {
+                delete formData[key]
+              }
+              break
             }
-            orderedFormData.push({
-              label: stepDefine.name,
-              value
-            })
           }
         }
-        formCompletedDataPreview.data = orderedFormData
+        if (!Object.keys(formCompletedDataPreview.data).length) {
+          formCompletedDataPreview.data = null
+        }
         // 备注
         formCompletedDataPreview.note = this.stepsForChild[stepId - 1].note
         if (!formCompletedDataPreview.data && !formCompletedDataPreview.files.length && !formCompletedDataPreview.images.length && !formCompletedDataPreview.note) {

package/src/router/async/router.map.js

@@ -56,9 +56,9 @@ routerResource.example = {
   path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),

package/vue.config.js

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://aote-office.8866.org:31567'
+const v3Server = 'http://192.168.50.67:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
 // const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://aote-office.8866.org:31567'
+const revenue = 'http://192.168.50.67:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川

package/.history/public/his/editor/editor_20250606134713.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <link rel="shortcut icon" href="./favicon.svg" type="image/svg+xml"/>
-        <link rel="stylesheet" href="./vender/jquery/zTreeStyle/zTreeStyle.css" type="text/css">
-        <script src = "./vender/jquery/jquery.js"></script>
-        <script src = "./vender/date97/WdatePicker.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.core.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exedit.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exhide.min.js"></script>
-        <script src = "./vender/codemirror.js"></script>
-        <script src = "./vender/fabric.js"></script>
-        <script src="./vender/editor.js"></script>
-        <script>
-          $(function() {
-            //配置项可以不设置，会使用默认设置
-            let option = {
-                license:'QO1pepfLYwDNqGvW21ensj0psE9CxBxf5MSRD1q2sCvclYGGtk6clTZEIth12i4SvvvDC04ZNcHe3uQuNtBUFcAk7sHUwAdYvffM2aZis/jpZqrm1rDGk1NHYsheD6DroF+m3jZ5Izh/LxRjzZJfaHHejfrn5InFoSqErfPm4gY=',
-                mode:'form',  //默认模式 form:表单模式，design:设计模式
-                pdfUrl:'https://www.x-emr.cn/pdf/post',  //pdf生成服务
-                dictionary: [  //知识库
-                    {name: '体征', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '症状', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '卫生信息数据元', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=40', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '电子病历数据集', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=50', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '国家医保标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=80', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '省数据平台标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=90', itemUrl:'https://www.x-emr.cn/dictitem'},
-                ]
-            }
-
-            //从模块的Editor组件中获取mode，doc，lang属性 (该段代码可删除)
-            let mode = window.frameElement.getAttribute('mode')
-            let doc = window.frameElement.getAttribute('doc')
-            let lang = window.frameElement.getAttribute('lang')
-            mode? option.mode = mode: null
-            lang? option.lang = lang: null
-
-            //初始化编辑器（初始化代码可以放入组件的load事件中）
-            editor.init(option).then(()=>{
-                doc? editor.loadUrl(doc) : null
-            })
-
-          })
-      </script>
-    </head>
-    <body>
-        <!-- 默认id 为editor -->
-        <div id="editor" style="width:100%; height:100%;"></div>
-    </body>
-</html>