vue2-client 1.14.71 → 1.14.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.71",
+  "version": "1.14.73",
   "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/XHisEditor/XHisEditor.vue

@@ -169,6 +169,7 @@ export default {
     runLogic,
     /* eslint-disable */
     async initDiagnosisAutocomplete (dropDownBoxParams) {
+      console.log('dropDownBoxParams',dropDownBoxParams)
       if (!this.editorRef || !this.editorRef.document) {
         return
       }
@@ -272,6 +273,7 @@ export default {
       this.loadFile(fileUrl, bindObject, currResData).then(async () => {
         // 文件加载完成后再初始化自动完成
         await this.initDiagnosisAutocomplete(dropDownBoxParams)
+        console.log("bindObject",bindObject)
       })
       this.loadResList()
     },
@@ -288,6 +290,12 @@ export default {
               }
             }
           }
+          // 拿取多于模板中的数据
+          const diff = Object.fromEntries(
+            Object.entries(this.bindObject)
+              .filter(([key]) => !(key in this.editorRef.getBindObject()))
+          )
+          this.codeData = {...this.codeData,...diff}
           this.changeMode()
           this.fileUrl = fileUrl
           if (!currResData.f_file_name) {
@@ -365,6 +373,7 @@ export default {
           logicExtraParams: this.logicExtraParams,
           dropDownBoxParams: this.dropDownBoxParams
         })
+        console.log('bindObject33',res.bindObject)
       })
     },
     // 切换文档
@@ -394,6 +403,7 @@ export default {
       // 验证必须输入项
       if (this.editorRef.validate()) {
         // 获取HTML文档和结构化数据(JSON)
+        console.log('save',this.editorRef.getBindObject())
         const data = {
           doc: this.editorRef.getHtml(),
           dataObject: {

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

@@ -302,14 +302,12 @@ export default {
         return false
       }
       const step = this.stepsForChild[this.currentStepId - 1]
+      // 检查handler是否包含当前用户
+      if (step && step.handler) {
+        return step.handler.includes(this.currUser.name)
+      }
       // 检查角色和部门权限
       if (step && step.properties && step.properties.chargePerson) {
-        // chargePerson 改造  旧数据类型是 {chrgePerson: {role: '1', department: '1'}}
-        // 如果是旧的格式 转换成新的格式后再作处理
-        if (step.properties.chargePerson.role || step.properties.chargePerson.department) {
-          step.properties.chargePerson.needSelectPerson = true
-          step.properties.chargePerson.personList = [{ type: step.properties.chargePerson.role ? 'role' : 'department', name: step.properties.chargePerson.role || step.properties.chargePerson.department }]
-        }
         if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
           // 使用some方法判断当前人员是否满足任一条件
           return step.properties.chargePerson.personList.some(item => {
@@ -325,12 +323,6 @@ export default {
           })
         }
       }
-
-      // 检查handler是否包含当前用户
-      if (step && step.handler) {
-        return step.handler.includes(this.currUser.name)
-      }
-
       return false
     },
     formPreviewNoFileData () {

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 铜川