From ba57b519a005cd816f1a178f2c062426cff13f7c Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期二, 15 七月 2025 11:09:07 +0800 Subject: [PATCH] 测试完成 --- src/views/followvisit/record/detailpage/index.vue | 1 src/views/patient/patient/profile/index.vue | 38 +++++++----- src/views/patient/follow/index.vue | 87 ++++++++++++++++++++++++---- 3 files changed, 96 insertions(+), 30 deletions(-) diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue index fc69406..609d2d1 100644 --- a/src/views/followvisit/record/detailpage/index.vue +++ b/src/views/followvisit/record/detailpage/index.vue @@ -842,7 +842,6 @@ }, // 鍙戦�侀殢璁垮悗鐭俊 setupsubtask() { - sendMsg({ phoneNumber: this.userform.telcode, content: this.form.content, diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue index 50d9526..7cbabad 100644 --- a/src/views/patient/follow/index.vue +++ b/src/views/patient/follow/index.vue @@ -246,20 +246,34 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="鎮h�呰寖鍥�" prop="tagId"> - <el-select - v-model="filtrqueryParams.searchscope" - placeholder="璇烽�夋嫨鎮h�呰寖鍥�" + <el-form-item label="浠诲姟绫诲瀷"> + <el-select + v-model="filtrqueryParams.allhosp" + placeholder="璇烽�夋嫨鏂板绫诲瀷" + > + <el-option + v-for="item in taskoptions" + :key="item.value" + :label="item.label" + :value="item.value" > - <el-option - v-for="item in source" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> + </el-option> + </el-select> + </el-form-item> + <el-form-item label="鎮h�呰寖鍥�" prop="tagId"> + <el-select + v-model="filtrqueryParams.searchscope" + placeholder="璇烽�夋嫨鎮h�呰寖鍥�" + > + <el-option + v-for="item in source" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-form-item> <el-form-item> <el-button @@ -521,6 +535,20 @@ { papersname: "涓浗娓境灞呮皯韬唤璇�" }, { papersname: "涓浗鍙版咕灞呮皯韬唤璇�" }, ], + source: [ + { + value: 0, + label: "鍏ㄩ儴鎮h��", + }, + { + value: 1, + label: "绉戝鎮h��", + }, + { + value: 2, + label: "鐥呭尯鎮h��", + }, + ], // 琛ㄥ崟鍙傛暟 form: { name: "", @@ -537,6 +565,7 @@ pageNum: 1, pageSize: 10, allhosp: 0, + searchscope:0, }, //瀵煎叆杩涘害 dractive: 1, @@ -569,6 +598,24 @@ { value: 2, label: "鐥呭尯鎮h��", + }, + ], + taskoptions: [ + { + value: "4", + label: "鍑洪櫌鐥呬汉", + }, + { + value: "1", + label: "鍦ㄩ櫌鐥呬汉", + }, + { + value: "2", + label: "闂ㄨ瘖鐥呬汉", + }, + { + value: 0, + label: "鍏ㄩ儴", }, ], whether: [ @@ -691,7 +738,19 @@ distribute() { this.distributeVisible = true; this.filtrloading = true; - + if (this.filtrqueryParams.searchscope == 1) { + this.filtrqueryParams.deptcodes = store.getters.belongDepts.map( + (obj) => obj.deptCode + ); + this.filtrqueryParams.hospitaldistrictcodes = []; + } else if (this.filtrqueryParams.searchscope == 2) { + this.filtrqueryParams.hospitaldistrictcodes = + store.getters.belongWards.map((obj) => obj.districtCode); + this.filtrqueryParams.deptcodes = []; + } else { + this.filtrqueryParams.deptcodes = []; + this.filtrqueryParams.hospitaldistrictcodes = []; + } messagelistpatient(this.filtrqueryParams).then((response) => { this.filtruserList = response.rows; this.filtrtotal = response.total; diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue index 0376149..0a68933 100644 --- a/src/views/patient/patient/profile/index.vue +++ b/src/views/patient/patient/profile/index.vue @@ -16,11 +16,11 @@ {{ userform.sex == 1 ? "鐢�" : "濂�" }} </div> <div style="margin-left: 10px" class="text-title"> - <span v-if="userform.age" - >{{ userform.age }}{{ userform.ageUnit }}</span - ><span v-if="userform.age2" - >{{ userform.age2 }}{{ userform.ageUnit2 }}</span - > + <span v-if="userform.age" + >{{ userform.age }}{{ userform.ageUnit }}</span + ><span v-if="userform.age2" + >{{ userform.age2 }}{{ userform.ageUnit2 }}</span + > </div> <div style="margin-left: 10px" class="text-title"> {{ userform.birthdate }} @@ -127,11 +127,21 @@ disabled ></el-input> </el-form-item ></el-col> + </el-row> + <el-row :gutter="20"> <el-col :span="12" ><el-form-item label="鑱旂郴鏂瑰紡" prop="telcode"> <el-input v-model="userform.telcode" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" + maxlength="30" + /> </el-form-item + ></el-col> + <el-col :span="12" + ><el-form-item label="棰勭暀鐢佃瘽" prop="reservedPhone"> + <el-input + v-model="userform.reservedPhone" + placeholder="璇疯緭鍏ラ鐣欑數璇�" maxlength="30" /> </el-form-item ></el-col> @@ -313,9 +323,8 @@ <el-radio label="MCT濂�">MCT濂�</el-radio> <el-radio label="鍏跺畠鐗规畩濂剁矇">鍏跺畠鐗规畩濂剁矇</el-radio> </el-radio-group> - </el-form-item> </el-col - > - + </el-form-item> + </el-col> </el-row> </el-form> </div> @@ -1326,7 +1335,7 @@ if (tab.index == "1") { this.getList(1); } else if (tab.index == "2") { - this.newbornList(); + this.newcharts(); } else if (tab.index == "3") { this.handleClickfw(); } @@ -1384,7 +1393,7 @@ this.$refs["borninfoform"].validate((valid) => { if (valid) { this.borninfoform.patId = this.id; - + this.borninfoform.sex = this.userform.sex; newborninfoadd(this.borninfoform).then((res) => { if (res.code == 200) { this.$modal.msgSuccess("鏂板鎴愬姛"); @@ -1787,18 +1796,17 @@ // 鑾峰彇鏂扮敓鍎挎暟鎹� newbornList() { - return newborninfolist({ patId: this.id }) + newborninfolist({ patId: this.id }) .then((response) => { this.borninfooptions = response.rows || []; - - this.newcharts(); + // this.newcharts(); console.log("鍔犺浇鐨勬柊鐢熷効鏁版嵁:", this.borninfooptions); - return Promise.resolve(); + // return Promise.resolve(); }) .catch((error) => { console.error("璇锋眰鏁版嵁澶辫触:", error); this.borninfooptions = []; - return Promise.reject(error); + // return Promise.reject(error); }); }, // 蹇冪巼 -- Gitblit v1.9.3