vue2-client 1.14.69 → 1.14.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/base-client/components/common/XUploadFilesView/index.vue +485 -485
- package/src/base-client/components/his/XCharge/XCharge.vue +1 -0
- package/src/base-client/components/his/XHisEditor/XHisEditor.vue +6 -1
- package/src/base-client/components/his/XHisEditor/diagnosisAutocomplete.js +1 -1
- package/src/pages/WorkflowDetail/WorkFlowDemo.vue +1 -1
- package/src/pages/WorkflowDetail/WorkflowPageDetail/LeaveMessage.vue +388 -388
- package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue +27 -21
- package/src/router/async/router.map.js +2 -2
|
@@ -157,6 +157,7 @@ export default {
|
|
|
157
157
|
toggleResId: undefined,
|
|
158
158
|
// 待提交的修改信息
|
|
159
159
|
modifyResModel: {},
|
|
160
|
+
codeData: {},
|
|
160
161
|
resRules: {
|
|
161
162
|
f_file_name: [{ required: true, message: '请输入文档名', trigger: 'blur' }],
|
|
162
163
|
}
|
|
@@ -188,6 +189,7 @@ export default {
|
|
|
188
189
|
this.editorRef.document.addEventListener('diagnosis-selected', function(e) {
|
|
189
190
|
if (e && e.detail) {
|
|
190
191
|
that.$emit('selected', { item: e.detail, editor: that.editorRef });
|
|
192
|
+
that.codeData = { ...that.codeData, ...{[e.detail.codeKey]: e.detail.code} }
|
|
191
193
|
}
|
|
192
194
|
});
|
|
193
195
|
|
|
@@ -394,7 +396,10 @@ export default {
|
|
|
394
396
|
// 获取HTML文档和结构化数据(JSON)
|
|
395
397
|
const data = {
|
|
396
398
|
doc: this.editorRef.getHtml(),
|
|
397
|
-
dataObject:
|
|
399
|
+
dataObject: {
|
|
400
|
+
...this.editorRef.getBindObject(),
|
|
401
|
+
...this.codeData // 合并 codeData 数据
|
|
402
|
+
},
|
|
398
403
|
dataMode: this.dataMode,
|
|
399
404
|
resId: this.resId,
|
|
400
405
|
modifyResModel: this.modifyResModel,
|
|
@@ -225,7 +225,7 @@ export function initDiagnosisDropdown (editor, data, identificationCode, emitFun
|
|
|
225
225
|
// 使用传入的emit函数触发事件
|
|
226
226
|
if (typeof emitFunc === 'function') {
|
|
227
227
|
// 只传递数据参数,不再传递事件名
|
|
228
|
-
emitFunc(selectedItem)
|
|
228
|
+
emitFunc(Object.assign(selectedItem,{codeKey :identificationCode.replace(/^#/, '') + '_code'}))
|
|
229
229
|
}
|
|
230
230
|
} else {
|
|
231
231
|
// 如果找不到完整数据,至少打印出已知信息
|