From 5a887c8deab92cdaa3f0617f05a04d126fb194b6 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Thu, 19 Jun 2025 19:06:50 +0800 Subject: [PATCH] 6.19 --- app.json | 4 +- case/pages/createCase/createCase.js | 75 +++++--- case/pages/createCase/createCase.json | 1 + case/pages/createCase/createCase.wxml | 99 ++++------ case/pages/createCase/createCase.wxss | 27 ++- case/pages/paintCanvas/paintCanvas.js | 1 + case/pages/paintCanvas/paintCanvas.wxml | 2 +- case/pages/paintCanvas/paintCanvas.wxss | 1 + case/pages/paintDraw/paintDraw.wxss | 1 + case/utils/data.js | 168 +++++++++++++++++ components/navBar/navBar.js | 2 +- components/navBar/navBar.wxml | 8 +- components/navBar/navBar.wxss | 2 +- components/paintCanvas/paintCanvas.js | 225 +++++++++++++++++++++++ components/paintCanvas/paintCanvas.json | 7 + components/paintCanvas/paintCanvas.wxml | 73 ++++++++ components/paintCanvas/paintCanvas.wxss | 150 ++++++++++++++++ utils/utils.js | 230 ++++++++++++++++++++++++ 18 files changed, 985 insertions(+), 91 deletions(-) create mode 100644 case/utils/data.js create mode 100644 components/paintCanvas/paintCanvas.js create mode 100644 components/paintCanvas/paintCanvas.json create mode 100644 components/paintCanvas/paintCanvas.wxml create mode 100644 components/paintCanvas/paintCanvas.wxss create mode 100644 utils/utils.js diff --git a/app.json b/app.json index 3e5a23d..2f2f51c 100644 --- a/app.json +++ b/app.json @@ -16,8 +16,8 @@ "pages/pwdLogin/pwdLogin", "pages/privacy/privacy", "pages/bankCard/bankCard", - "pages/paintCanvas/paintCanvas", - "pages/paintDraw/paintDraw" + "pages/paintDraw/paintDraw", + "pages/paintCanvas/paintCanvas" ] } ], diff --git a/case/pages/createCase/createCase.js b/case/pages/createCase/createCase.js index 08cd2c9..c79a3e9 100644 --- a/case/pages/createCase/createCase.js +++ b/case/pages/createCase/createCase.js @@ -3,12 +3,21 @@ import {addCase,caseDetail,editCase,getOssSign} from "../../../api/api" const dayjs = require("../../../utils/dayjs"); import {throttle} from "../../../utils/util" import { FileUtil } from '../../../utils/fileutil' +import {diagnoseOption,patientSickOption,ganneiOption,ganwaiOption,moshiOption,hospitalOption,kangningOption} from "../../utils/data" const app=getApp(); Page({ /** * 页面的初始数据 */ data: { + value:[], + kangningOption:kangningOption, + diagnoseOption:diagnoseOption, + patientSickOption:patientSickOption, + ganneiOption:ganneiOption, + ganwaiOption:ganwaiOption, + moshiOption:moshiOption, + hospitalOption:hospitalOption, active:0, wordLength:0, showSaveBtn:true, @@ -101,6 +110,40 @@ Page({ } return value; }, + + }, + onChangeCheck(event){ + console.log(event); + let arr=event.detail; + this.setData({ + value:arr + }) + if(arr[arr.length-1]=="-1"){ + this.setData({ + value:["-1"] + }) + }else{ + let index=arr.indexOf("-1"); + if(index>-1){ + arr.splice(index, 1); + this.setData({ + value:arr + }) + } + } + console.log(this.data.value) + }, + onChangeOther(event){ + let {detail,currentTarget}=event; + this.setData({ + [currentTarget.dataset.type]:detail.value + }) + }, + toggleCheck(event){ + console.log(event); + }, + dealImg(e){ + console.log(e); }, save:throttle(function(){ this.data.medicalRecordId?this.handleEditCase():this.handleAddCase(); @@ -209,7 +252,6 @@ Page({ headTime:dayjs(headTime).format('YYYY-MM-DD HH:mm:ss'), afterTime:dayjs(afterTime).format('YYYY-MM-DD HH:mm:ss') }) - addCase({...caseObj}).then(res=>{ wx.showToast({ title: '病例创建成功', @@ -300,26 +342,19 @@ Page({ ['case.'+key]:res[key]?dayjs(res[key]).format('YYYY-MM-DD'):'' }) }else if(key=='caseType'){ - let {columns}=this.data; - for (let i = 0; i < columns.length; i++) { - if(columns[i].value==res[key]){ - this.setData({ - ['case.'+key]:res[key], - 'typeName': columns[i].text - }) - break; - } - - } - }else if(key=='baseImg'){ - if(res[key]){ - let imgList=res[key].split(','); + + }else if(key=='main_diagnose'){ + this.setData({ + 'case.main_diagnose.select':res[key].select, + 'case.main_diagnose.otherValue':res[key].otherValue + }) + if(res[key].main_diagnose_img.length>0){ + let arr=res[key].main_diagnose_img.map(item=>{ + url:item + }) this.setData({ - ['case.'+key]:res[key], - fileList_basic:imgList.map(item=>{ - return {url:item} - }) - }) + 'case.main_diagnose.main_diagnose_img':arr + }) } }else if(key=='abstractImg'){ diff --git a/case/pages/createCase/createCase.json b/case/pages/createCase/createCase.json index 976ece3..93b4c3f 100644 --- a/case/pages/createCase/createCase.json +++ b/case/pages/createCase/createCase.json @@ -13,6 +13,7 @@ "van-datetime-picker": "@vant/weapp/datetime-picker/index", "van-radio": "@vant/weapp/radio/index", "van-field": "@vant/weapp/field/index", + "paintCanvas":"../../../components/paintCanvas/paintCanvas", "van-radio-group": "@vant/weapp/radio-group/index" }, "navigationStyle":"custom" diff --git a/case/pages/createCase/createCase.wxml b/case/pages/createCase/createCase.wxml index 0da4005..ccefd24 100644 --- a/case/pages/createCase/createCase.wxml +++ b/case/pages/createCase/createCase.wxml @@ -59,7 +59,7 @@ 治疗类型(多选)* - + DPMAS及联合模式 CA280及联合模式 @@ -72,16 +72,16 @@ 主要诊断(多选)* - - 肝衰竭 - 肿瘤 - 胆汁淤积性肝病 - 移植围手术期支持治疗 - 伴黄疸的MODS或脓毒症、重症中毒等 - 其他 + + {{item.name}} -