vue2-client 1.14.70 → 1.14.71

package/package.json

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

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

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

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

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

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

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails

package/src/base-client/components/his/XCharge/XCharge.vue

@@ -88,6 +88,7 @@ export default {
   methods: {
     selectMethod (value) {
       this.selectedMethod = value
+      this.data.selectedMethod = value
       this.$emit('method', value)
     },
     getConfig (configName, param) {

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -157,6 +157,7 @@ export default {
       toggleResId: undefined,
       // 待提交的修改信息
       modifyResModel: {},
+      codeData: {},
       resRules: {
         f_file_name: [{ required: true, message: '请输入文档名', trigger: 'blur' }],
       }
@@ -188,6 +189,7 @@ export default {
       this.editorRef.document.addEventListener('diagnosis-selected', function(e) {
         if (e && e.detail) {
           that.$emit('selected', { item: e.detail, editor: that.editorRef });
+          that.codeData = { ...that.codeData, ...{[e.detail.codeKey]: e.detail.code} }
         }
       });
 
@@ -394,7 +396,10 @@ export default {
         // 获取HTML文档和结构化数据(JSON)
         const data = {
           doc: this.editorRef.getHtml(),
-          dataObject: this.editorRef.getBindObject(),
+          dataObject: {
+            ...this.editorRef.getBindObject(),
+            ...this.codeData // 合并 codeData 数据
+          },
           dataMode: this.dataMode,
           resId: this.resId,
           modifyResModel: this.modifyResModel,

package/src/base-client/components/his/XHisEditor/diagnosisAutocomplete.js

@@ -225,7 +225,7 @@ export function initDiagnosisDropdown (editor, data, identificationCode, emitFun
         // 使用传入的emit函数触发事件
         if (typeof emitFunc === 'function') {
           // 只传递数据参数，不再传递事件名
-          emitFunc(selectedItem)
+          emitFunc(Object.assign(selectedItem,{codeKey :identificationCode.replace(/^#/, '') + '_code'}))
         }
       } else {
         // 如果找不到完整数据，至少打印出已知信息

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,90 +1,47 @@
-<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: 'Apply',
-  components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'applyCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
+  name: 'WorkFlowDemo',
+  components: { WorkflowDetail },
+  mounted () {
+    this.$refs.workFlow.init({
+      workflowId: '11'
+    })
   },
   methods: {
-    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
+     */
+    success ({ note, form, workflowId }) {
+      console.log('success', note, form, workflowId)
     },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.twf_id
-      })
+    /**
+     * 流程详情页成功
+     * @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)
     }
   }
 }
 </script>
+
+<template>
+  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/vue.config.js

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://192.168.50.67:31567'
+const v3Server = 'http://aote-office.8866.org: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://192.168.50.67:31567'
+const revenue = 'http://aote-office.8866.org:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川