vue2-client 1.14.70 → 1.14.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.70",
+  "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/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' }],
       }
@@ -168,6 +169,7 @@ export default {
     runLogic,
     /* eslint-disable */
     async initDiagnosisAutocomplete (dropDownBoxParams) {
+      console.log('dropDownBoxParams',dropDownBoxParams)
       if (!this.editorRef || !this.editorRef.document) {
         return
       }
@@ -188,6 +190,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} }
         }
       });
 
@@ -270,6 +273,7 @@ export default {
       this.loadFile(fileUrl, bindObject, currResData).then(async () => {
         // 文件加载完成后再初始化自动完成
         await this.initDiagnosisAutocomplete(dropDownBoxParams)
+        console.log("bindObject",bindObject)
       })
       this.loadResList()
     },
@@ -286,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) {
@@ -363,6 +373,7 @@ export default {
           logicExtraParams: this.logicExtraParams,
           dropDownBoxParams: this.dropDownBoxParams
         })
+        console.log('bindObject33',res.bindObject)
       })
     },
     // 切换文档
@@ -392,9 +403,13 @@ export default {
       // 验证必须输入项
       if (this.editorRef.validate()) {
         // 获取HTML文档和结构化数据(JSON)
+        console.log('save',this.editorRef.getBindObject())
         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/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 () {