vue2-client 1.9.141 → 1.9.142

package/package.json

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

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

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

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="templateManageView2"
+        config-name="medicalRecordView"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

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

@@ -3,20 +3,39 @@
     <div v-show="ready">
       <a-row class="editor-action-container" type="flex" justify="space-between">
         <a-col class="editor-tools">
-          <a-radio-group
-            v-show="showModeChoose"
-            button-style="solid"
-            @change="changeMode"
-            v-model="modeType">
-            <a-radio-button v-for="item of modeList" :key="item.value" :value="item.value">
-              {{ item.label }}
-            </a-radio-button>
-          </a-radio-group>
+          <a-space>
+            <template v-if="resList.length > 0">
+              <a-select
+                style="width: 200px"
+                v-model="toggleResId"
+                placeholder="请选择文档"
+                show-search
+                @change="changeRes"
+              >
+                <a-select-option v-for="item of resListCp" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
+              </a-select>
+              <template v-if="this.modeType !== 'readonly' && this.resId !== -1">
+                <a-button icon="plus" @click="addRes"/>
+              </template>
+            </template>
+            <a-radio-group
+              v-show="showModeChoose"
+              button-style="solid"
+              @change="changeMode"
+              v-model="modeType">
+              <a-radio-button v-for="item of modeList" :key="item.value" :value="item.value">
+                {{ item.label }}
+              </a-radio-button>
+            </a-radio-group>
+          </a-space>
         </a-col>
         <a-col class="editor-action">
           <a-space>
             <template v-if="this.modeType !== 'readonly'">
-              <a-button type="primary" @click="save">
+              <a-button type="primary" @click="openRenameModal" v-if="this.resId !== -1">
+                重命名
+              </a-button>
+              <a-button type="primary" @click="() => this.resId !== -1 ? save() : openAddResModal()">
                 保存
               </a-button>
             </template>
@@ -51,19 +70,46 @@
     <div v-show="!ready">
       <a-empty description="请选择文书" />
     </div>
-  </div>
+    <a-modal
+      :destroyOnClose="true"
+      :title="this.resDataModalMode === 'modify' ? '修改文档' : '新建文档'"
+      :visible="resDataModalVisible"
+      okText="提交"
+      @cancel="resDataModalVisible = false"
+      @ok="onSubmit">
+      <a-form-model ref="resModifyForm" :model="modifyResModel" :rules="resRules">
+        <a-form-model-item prop="f_file_name" label="文档名">
+          <a-input v-model="modifyResModel.f_file_name" placeholder="请输入文档名"/>
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal></div>
 </template>
 
 <script>
 
 import { runLogic } from '@vue2-client/services/api/common'
+import XAddNativeForm from '@/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 
 export default {
   name: 'XHisEditor',
+  components: { XAddNativeForm },
+  computed: {
+    resListCp () {
+      const list = this.resList
+      if (this.resId === -1) {
+        list.push({
+          label: '未保存文档*', value: -1
+        })
+      }
+      return list
+    }
+  },
   data () {
     return {
       ready: false,
       loading: false,
+      resDataModalMode: 'modify',
+      resDataModalVisible: false,
       objectOfAttrs: {
         width: '100%',
         height: '650vh',
@@ -79,6 +125,10 @@ export default {
           label: '预览',
           value: 'readonly'
         },
+        {
+          label: '表单',
+          value: 'form'
+        },
         {
           label: '设计',
           value: 'design'
@@ -86,6 +136,8 @@ export default {
       ],
       // 编辑器实例
       editorRef: null,
+      // 文档资源列表
+      resList: [],
       // 文档资源ID
       resId: undefined,
       // 文档链接
@@ -99,7 +151,16 @@ export default {
       // 保存数据调用Logic传入的额外参数
       logicExtraParams: undefined,
       // 服务名
-      serviceName: undefined
+      serviceName: undefined,
+      // 当前文档信息
+      currResData: {},
+      // 切换的文档id
+      toggleResId: undefined,
+      // 待提交的修改信息
+      modifyResModel: {},
+      resRules: {
+        f_file_name: [{ required: true, message: '请输入文档名', trigger: 'blur' }],
+      }
     }
   },
   methods: {
@@ -113,6 +174,7 @@ export default {
       const {
         fileUrl,
         resId,
+        currResData,
         bindObject,
         saveDataLogicName,
         logicExtraParams,
@@ -133,10 +195,11 @@ export default {
       this.showModeChoose = showModeChoose
       this.modeType = modeType
       this.ready = true
-      this.loadFile(fileUrl, bindObject)
+      this.loadFile(fileUrl, bindObject, currResData)
+      this.loadResList()
     },
     // 加载文档
-    loadFile (fileUrl, bindObject) {
+    loadFile (fileUrl, bindObject, currResData) {
       this.loading = true
       this.editorRef.loadUrl(fileUrl).then(() => {
         if (bindObject) {
@@ -149,14 +212,101 @@ export default {
         }
         this.changeMode()
         this.fileUrl = fileUrl
+        if (!currResData.f_file_name) {
+          currResData.f_file_name = '未命名'
+        }
+        this.currResData = currResData
         this.loading = false
         this.$emit('afterLoadFile', {})
       })
     },
+    // 加载文档列表
+    loadResList () {
+      runLogic('getMedicalList', this.logicExtraParams, this.serviceName).then(res => {
+        this.resList = res
+        this.toggleResId = this.resId
+      })
+    },
     // 修改模式
     changeMode (e) {
       this.editorRef.execCommand(this.modeType)
     },
+    // 打开文档信息修改面板
+    openRenameModal () {
+      this.resDataModalMode = 'modify'
+      this.modifyResModel = {
+        f_file_name: this.currResData.f_file_name
+      }
+      this.resDataModalVisible = true
+    },
+    // 提交文档信息修改
+    onSubmit () {
+      this.$refs.resModifyForm.validate(valid => {
+        if (valid) {
+          if (this.resDataModalMode === 'modify' && this.modifyResModel.f_file_name === this.currResData.f_file_name) {
+            this.$message.warn('新文档名不能与原文档名一致！')
+            return false
+          }
+          this.save()
+          return true
+        } else {
+          return false
+        }
+      })
+    },
+    // 打开文档新建面板
+    openAddResModal () {
+      this.resDataModalMode = 'add'
+      this.modifyResModel = {
+        f_file_name: undefined
+      }
+      this.resDataModalVisible = true
+    },
+    // 新建文档
+    addRes () {
+      const params = Object.assign({
+        isAddForce: true
+      }, this.logicExtraParams)
+      this.reload(params)
+    },
+    // 重新加载
+    reload (params) {
+      runLogic('getMedicalRecord', params, this.serviceName).then(res => {
+        this.resDataModalVisible = false
+        this.init({
+          modeType: this.modeType,
+          fileUrl: res.url,
+          resId: res.id,
+          currResData: res.currResData,
+          bindObject: res.bindObject,
+          saveDataLogicName: this.saveDataLogicName,
+          serviceName: this.serviceName,
+          logicExtraParams: this.logicExtraParams
+        })
+      })
+    },
+    // 切换文档
+    changeRes (value) {
+      if (this.resId === -1) {
+        const that = this
+        this.$confirm({
+          title: '确认切换文档吗？',
+          content: '您有尚未保存的文档，切换文档将丢失所有的修改',
+          onOk () {
+            that.reload({
+              resId: value
+            })
+          },
+          onCancel () {
+            that.toggleResId = that.resId
+          },
+        })
+      } else {
+        this.reload({
+          resId: value
+        })
+      }
+    },
     // 保存文档
     save () {
       // 验证必须输入项
@@ -167,12 +317,15 @@ export default {
           dataObject: this.editorRef.getBindObject(),
           dataMode: this.dataMode,
           resId: this.resId,
+          modifyResModel: this.modifyResModel,
           logicExtraParams: this.logicExtraParams
         }
         // 保存HTML文档和结构化数据到后端服务
         runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
-          this.loadFile(res.url, res.bindObject)
           this.$message.success('保存成功')
+          this.changeRes(res.currResData.id)
+        }).finally(() => {
+          this.resDataModalVisible = false
         })
       } else {
         this.$message.error('请检查未填写的项目')
@@ -188,7 +341,7 @@ export default {
     },
     // 刷新文档
     refresh () {
-      this.loadFile(this.fileUrl, this.bindObject)
+      this.loadFile(this.fileUrl, this.bindObject, this.currResData)
     },
     // 导出下拉菜单
     handleExportMenuClick (e) {

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,50 +1,50 @@
-<template>
-  <div>
-    <a-list v-show="!loading" size="small" :data-source="data">
-      <a-list-item slot="renderItem" slot-scope="item">
-        <div>
-          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
-          <p>{{ item.date }}</p>
-        </div>
-        <a class="delete_item">
-          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
-        </a>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'FavoriteList',
-  data () {
-    return {
-      data: [],
-      loading: false
-    }
-  },
-  mounted () {
-    this.loadData()
-  },
-  methods: {
-    loadData () {
-      indexedDB.getAll((data) => {
-        const realData = data.filter(item => item.data && item.data.uuid)
-          .map(item => item.data)
-        this.data = realData
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.delete_item {
-  margin-left: 8px;
-  color: #333;
-}
-p {
-  margin: 0
-}
-</style>
+<template>
+  <div>
+    <a-list v-show="!loading" size="small" :data-source="data">
+      <a-list-item slot="renderItem" slot-scope="item">
+        <div>
+          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
+          <p>{{ item.date }}</p>
+        </div>
+        <a class="delete_item">
+          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
+        </a>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'FavoriteList',
+  data () {
+    return {
+      data: [],
+      loading: false
+    }
+  },
+  mounted () {
+    this.loadData()
+  },
+  methods: {
+    loadData () {
+      indexedDB.getAll((data) => {
+        const realData = data.filter(item => item.data && item.data.uuid)
+          .map(item => item.data)
+        this.data = realData
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.delete_item {
+  margin-left: 8px;
+  color: #333;
+}
+p {
+  margin: 0
+}
+</style>

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

@@ -87,9 +87,9 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/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/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }

package/src/services/api/workFlow.js

@@ -1,63 +1,63 @@
-// 工单专用api
-const workFlowViewApi = {
-  // 查询：获取工作流基本数据
-  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
-  // 保存工作流流程定义
-  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
-  // 获取工作流流程定义
-  getWorkFlowDefine: '/logic/getWorkFlowDefine',
-  // 获取工作流当前步骤
-  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
-  // 保存用户每一步输入的表单内容
-  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
-  // 获取已经完成步骤的用户填写数据
-  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
-  // 改变工作流进度
-  updateWorkFlowState: '/logic/updateWorkFlowState',
-  // 完工确认后更改工作流状态
-  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
-  // 获取步骤留言和表单填写人姓名
-  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
-  // 更新步骤信息
-  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
-  // 保存工作流日志
-  saveWorkFlowLog: '/logic/saveWorkFlowLog',
-  // 获取工作流日志
-  getWorkFlowLog: '/logic/getWorkFlowLog',
-  // 获取员工任务详情信息
-  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
-  // 根据条件查询任务
-  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
-  // 根据流程名称获取所有步骤名称
-  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
-  // 获取工作流任务留言
-  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
-  // 更新任务完成时间
-  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
-  // 获取任务完成时间更改记录
-  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
-  // 修改工单
-  updateWorkFlow: '/logic/updateWorkFlow',
-  // 获取工作流流程图设计
-  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
-  // 简单添加字典项
-  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
-  // 删除工作流项目
-  deleteWorkFlow: '/logic/deleteWorkFlow',
-  // 获取流程分类数据
-  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
-  // 创建任务
-  createWorkflowTask: '/logic/createWorkflowTask',
-  // 获取部门选择框数据
-  getDepartmentList: '/logic/getDepartmentList',
-  // 获取人员任务汇总数据
-  getEmployeeSummary: '/logic/getEmployeeSummary',
-  // 获取逾期任务排行榜
-  getOverdueRanking: '/logic/getOverdueRanking',
-  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
-  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
-  // 表单提交到下一步
-  submitToNextStep: '/logic/submitToNextStep'
-}
-
-export { workFlowViewApi }
+// 工单专用api
+const workFlowViewApi = {
+  // 查询：获取工作流基本数据
+  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
+  // 保存工作流流程定义
+  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
+  // 获取工作流流程定义
+  getWorkFlowDefine: '/logic/getWorkFlowDefine',
+  // 获取工作流当前步骤
+  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
+  // 保存用户每一步输入的表单内容
+  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
+  // 获取已经完成步骤的用户填写数据
+  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
+  // 改变工作流进度
+  updateWorkFlowState: '/logic/updateWorkFlowState',
+  // 完工确认后更改工作流状态
+  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
+  // 获取步骤留言和表单填写人姓名
+  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
+  // 更新步骤信息
+  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
+  // 保存工作流日志
+  saveWorkFlowLog: '/logic/saveWorkFlowLog',
+  // 获取工作流日志
+  getWorkFlowLog: '/logic/getWorkFlowLog',
+  // 获取员工任务详情信息
+  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
+  // 根据条件查询任务
+  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
+  // 根据流程名称获取所有步骤名称
+  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
+  // 获取工作流任务留言
+  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
+  // 更新任务完成时间
+  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
+  // 获取任务完成时间更改记录
+  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
+  // 修改工单
+  updateWorkFlow: '/logic/updateWorkFlow',
+  // 获取工作流流程图设计
+  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
+  // 简单添加字典项
+  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
+  // 删除工作流项目
+  deleteWorkFlow: '/logic/deleteWorkFlow',
+  // 获取流程分类数据
+  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
+  // 创建任务
+  createWorkflowTask: '/logic/createWorkflowTask',
+  // 获取部门选择框数据
+  getDepartmentList: '/logic/getDepartmentList',
+  // 获取人员任务汇总数据
+  getEmployeeSummary: '/logic/getEmployeeSummary',
+  // 获取逾期任务排行榜
+  getOverdueRanking: '/logic/getOverdueRanking',
+  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
+  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
+  // 表单提交到下一步
+  submitToNextStep: '/logic/submitToNextStep'
+}
+
+export { workFlowViewApi }

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}