From fe70ca5799b3b36a6d567464b545782728b2afed Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期五, 11 七月 2025 18:04:58 +0800 Subject: [PATCH] 测试完成 --- src/views/repositoryai/templateku/configurat/taskub.vue | 44 +++++----- src/views/patient/physical/index.vue | 2 vue.config.js | 4 src/views/repositoryai/templateku/configurat/index.vue | 96 ++++++++++++----------- src/views/knowledge/questionnaire/compilequer/index.vue | 36 ++++---- src/views/patient/patient/index.vue | 8 +- src/views/patient/patient/profile/index.vue | 6 + src/views/patient/questionnaire/index.vue | 2 src/views/patient/follow/index.vue | 15 ++- src/views/patient/ycquestionnaire/index.vue | 2 10 files changed, 111 insertions(+), 104 deletions(-) diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue index bc77600..dac734c 100644 --- a/src/views/knowledge/questionnaire/compilequer/index.vue +++ b/src/views/knowledge/questionnaire/compilequer/index.vue @@ -247,7 +247,7 @@ </el-select> </el-form-item> - <el-row> + <!-- <el-row> <el-col :span="20" ><el-form-item label="閫傜敤绉戝" prop="region"> <el-select @@ -292,7 +292,7 @@ </el-option> </el-select> </el-form-item ></el-col> - </el-row> + </el-row> --> <el-form-item label="缁撴潫璇�" prop="conclusion"> <el-input style="width: 55vw; line-height: 80px" @@ -1550,22 +1550,22 @@ }); this.tempDetpRelevanceslist = []; this.tempbelongWards = []; - if (this.queryParamsdept.tempid) { - depthospgetsonlist(this.queryParamsdept).then((res) => { - if (res.code == 200) { - let arr = res.rows; - arr.forEach((item) => { - if (item.deptType == 1) { - this.deptlist.push(item); - this.tempDetpRelevanceslist.push(item.deptCode); - } else if (item.deptType == 2) { - this.hosplist.push(item); - this.tempbelongWards.push(item.deptCode); - } - }); - } - }); - } + // if (this.queryParamsdept.tempid) { + // depthospgetsonlist(this.queryParamsdept).then((res) => { + // if (res.code == 200) { + // let arr = res.rows; + // arr.forEach((item) => { + // if (item.deptType == 1) { + // this.deptlist.push(item); + // this.tempDetpRelevanceslist.push(item.deptCode); + // } else if (item.deptType == 2) { + // this.hosplist.push(item); + // this.tempbelongWards.push(item.deptCode); + // } + // }); + // } + // }); + // } }, // 鑾峰彇绉戝鏍� getDeptTree() { diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue index 9ddcbc4..50d9526 100644 --- a/src/views/patient/follow/index.vue +++ b/src/views/patient/follow/index.vue @@ -246,7 +246,7 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <!-- <el-form-item label="鎮h�呰寖鍥�" prop="tagId"> + <el-form-item label="鎮h�呰寖鍥�" prop="tagId"> <el-select v-model="filtrqueryParams.searchscope" placeholder="璇烽�夋嫨鎮h�呰寖鍥�" @@ -259,7 +259,7 @@ > </el-option> </el-select> - </el-form-item> --> + </el-form-item> <el-form-item> <el-button @@ -272,7 +272,7 @@ </el-form-item> </el-form> <el-table v-loading="filtrloading" :data="filtruserList" height="660"> - <el-table-column type="selection" width="50" align="center" /> + <!-- <el-table-column type="selection" width="50" align="center" /> --> <el-table-column fixed label="濮撳悕" @@ -395,11 +395,11 @@ </el-table> <pagination - v-show="total > 0" - :total="total" + v-show="filtrtotal > 0" + :total="filtrtotal" :page.sync="filtrqueryParams.pageNum" :limit.sync="filtrqueryParams.pageSize" - @pagination="getList" + @pagination="distribute" /> </el-col> </el-row> @@ -536,6 +536,7 @@ notrequiredFlag: 0, pageNum: 1, pageSize: 10, + allhosp: 0, }, //瀵煎叆杩涘害 dractive: 1, @@ -604,7 +605,7 @@ queryParams: { pageNum: 1, pageSize: 10, - allhosp: "1", + allhosp: 0, notrequiredFlag: 1, idcardno: undefined, name: undefined, diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue index aaeebc6..270fb81 100644 --- a/src/views/patient/patient/index.vue +++ b/src/views/patient/patient/index.vue @@ -969,7 +969,7 @@ // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, - allhosp: "1", + allhosp: "0", pageSize: 10, searchscope: 2, notrequiredFlag: 0, @@ -1125,12 +1125,12 @@ /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { this.dateRange = []; - (this.queryParams = { + this.queryParams = { pageNum: 1, - allhosp: "1", + allhosp: "0", pageSize: 10, searchscope: 2, - }), + }; this.handleQuery(); }, // 澶氶�夋閫変腑鏁版嵁 diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue index 678fe67..0376149 100644 --- a/src/views/patient/patient/profile/index.vue +++ b/src/views/patient/patient/profile/index.vue @@ -16,7 +16,11 @@ {{ userform.sex == 1 ? "鐢�" : "濂�" }} </div> <div style="margin-left: 10px" class="text-title"> - {{ userform.age }}宀� + <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 }} diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue index 3cb8ebb..2d49c44 100644 --- a/src/views/patient/physical/index.vue +++ b/src/views/patient/physical/index.vue @@ -876,7 +876,7 @@ this.cardlist[2].value = response.rows[0].ysf; this.ycvalue = response.rows[0].yc; this.cardlist[3].value = response.rows[0].fssb; - this.cardlist[4].value = response.rows[0].dfs; + this.cardlist[4].value = response.rows[0].dsf; // this.cardlist[5].value = response.rows[0].yfs2; this.yfsvalue = response.rows[0].yfs; } diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue index 52fa1ab..4461c2b 100644 --- a/src/views/patient/questionnaire/index.vue +++ b/src/views/patient/questionnaire/index.vue @@ -876,7 +876,7 @@ this.cardlist[2].value = response.rows[0].ysf; this.ycvalue = response.rows[0].yc; this.cardlist[3].value = response.rows[0].fssb; - this.cardlist[4].value = response.rows[0].dfs; + this.cardlist[4].value = response.rows[0].dsf; // this.cardlist[5].value = response.rows[0].yfs2; this.yfsvalue = response.rows[0].yfs; } diff --git a/src/views/patient/ycquestionnaire/index.vue b/src/views/patient/ycquestionnaire/index.vue index aef6738..1628a5d 100644 --- a/src/views/patient/ycquestionnaire/index.vue +++ b/src/views/patient/ycquestionnaire/index.vue @@ -876,7 +876,7 @@ this.cardlist[2].value = response.rows[0].ysf; this.ycvalue = response.rows[0].yc; this.cardlist[3].value = response.rows[0].fssb; - this.cardlist[4].value = response.rows[0].dfs; + this.cardlist[4].value = response.rows[0].dsf; // this.cardlist[5].value = response.rows[0].yfs2; this.yfsvalue = response.rows[0].yfs; } diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue index 45c37f8..1d18b4d 100644 --- a/src/views/repositoryai/templateku/configurat/index.vue +++ b/src/views/repositoryai/templateku/configurat/index.vue @@ -272,7 +272,7 @@ </el-option> </el-select> </el-form-item> - <el-row> + <!-- <el-row> <el-col :span="20" ><el-form-item label="閫傜敤绉戝" prop="region"> <el-select @@ -317,7 +317,7 @@ </el-option> </el-select> </el-form-item ></el-col> - </el-row> + </el-row> --> <el-row> <el-col :span="12" ><el-form-item label="寮�鍦虹櫧" prop="revisitBefore"> @@ -1698,6 +1698,8 @@ }, // 鑾峰彇琛ㄥ崟鏁版嵁 getvFollowup() { + console.log(this.id,'id'); + if (this.id) { getvFollowup({ id: this.id }).then((res) => { if (res.code == 200) { @@ -1752,27 +1754,27 @@ this.tempDetpRelevanceslist = []; this.tempbelongWards = []; - if (this.id) { - depthospgetsonlist(this.queryParamsdept).then((res) => { - if (res.code == 200) { - let arr = res.rows; - console.log(arr, "arr"); + // if (this.id) { + // depthospgetsonlist(this.queryParamsdept).then((res) => { + // if (res.code == 200) { + // let arr = res.rows; + // console.log(arr, "arr"); - arr.forEach((item) => { - if (item.deptType == 1) { - console.log(this.deptlist, "11"); - this.deptlist.push(item); - console.log("22"); - this.tempDetpRelevanceslist.push(item.deptCode); - } else if (item.deptType == 2) { - this.hosplist.push(item); - this.tempbelongWards.push(item.deptCode); - console.log("33"); - } - }); - } - }); - } + // arr.forEach((item) => { + // if (item.deptType == 1) { + // console.log(this.deptlist, "11"); + // this.deptlist.push(item); + // console.log("22"); + // this.tempDetpRelevanceslist.push(item.deptCode); + // } else if (item.deptType == 2) { + // this.hosplist.push(item); + // this.tempbelongWards.push(item.deptCode); + // console.log("33"); + // } + // }); + // } + // }); + // } // 鐤剧梾 getillnesslist({ @@ -1899,32 +1901,32 @@ // 绉戝澶勭悊 Departmenttreatment() { this.$modal.loading("姝e湪淇淇濆瓨鏁版嵁锛岃绋嶅��..."); - this.tempDetpRelevanceslist.forEach((item) => { - let result = this.deptlist.some((obj) => obj.deptCode == item); + // this.tempDetpRelevanceslist.forEach((item) => { + // let result = this.deptlist.some((obj) => obj.deptCode == item); - if (!result) { - this.tempDetpRelevanceslistform.push({ - deptType: 1, - longTemp: this.ruleForm.longTemp, - deptCode: item, - tempid: this.id, - type: 2, - }); - } - }); - this.tempbelongWards.forEach((item) => { - let result = this.hosplist.some((obj) => obj.deptCode == item); - if (!result) { - this.tempbelongWardsform.push({ - deptType: 2, - longTemp: this.ruleForm.longTemp, - deptCode: item, - tempid: this.id, - type: 2, - // 1 : 闂嵎妯℃澘搴搃d銆�11锛氶棶鍗蜂换鍔℃ā鏉垮簱id锛�2 :璇煶闂嵎搴搃d銆�21锛氳闊充换鍔℃ā鏉垮簱id锛�3 : 瀹f暀妯℃澘搴搃d锛�33锛氬鏁欎换鍔℃ā鏉垮簱id - }); - } - }); + // if (!result) { + // this.tempDetpRelevanceslistform.push({ + // deptType: 1, + // longTemp: this.ruleForm.longTemp, + // deptCode: item, + // tempid: this.id, + // type: 2, + // }); + // } + // }); + // this.tempbelongWards.forEach((item) => { + // let result = this.hosplist.some((obj) => obj.deptCode == item); + // if (!result) { + // this.tempbelongWardsform.push({ + // deptType: 2, + // longTemp: this.ruleForm.longTemp, + // deptCode: item, + // tempid: this.id, + // type: 2, + // // 1 : 闂嵎妯℃澘搴搃d銆�11锛氶棶鍗蜂换鍔℃ā鏉垮簱id锛�2 :璇煶闂嵎搴搃d銆�21锛氳闊充换鍔℃ā鏉垮簱id锛�3 : 瀹f暀妯℃澘搴搃d锛�33锛氬鏁欎换鍔℃ā鏉垮簱id + // }); + // } + // }); setTimeout(() => { this.submitForm(); }, 1000); diff --git a/src/views/repositoryai/templateku/configurat/taskub.vue b/src/views/repositoryai/templateku/configurat/taskub.vue index 2421f41..db1bbe5 100644 --- a/src/views/repositoryai/templateku/configurat/taskub.vue +++ b/src/views/repositoryai/templateku/configurat/taskub.vue @@ -272,7 +272,7 @@ </el-option> </el-select> </el-form-item> - <el-row> + <!-- <el-row> <el-col :span="20" ><el-form-item label="閫傜敤绉戝" prop="region"> <el-select @@ -317,7 +317,7 @@ </el-option> </el-select> </el-form-item ></el-col> - </el-row> + </el-row> --> <el-row> <el-col :span="12" ><el-form-item label="寮�鍦虹櫧" prop="revisitBefore"> @@ -1750,27 +1750,27 @@ this.tempDetpRelevanceslist = []; this.tempbelongWards = []; - if (this.id) { - depthospgetsonlist(this.queryParamsdept).then((res) => { - if (res.code == 200) { - let arr = res.rows; - console.log(arr, "arr"); + // if (this.id) { + // depthospgetsonlist(this.queryParamsdept).then((res) => { + // if (res.code == 200) { + // let arr = res.rows; + // console.log(arr, "arr"); - arr.forEach((item) => { - if (item.deptType == 1) { - console.log(this.deptlist, "11"); - this.deptlist.push(item); - console.log("22"); - this.tempDetpRelevanceslist.push(item.deptCode); - } else if (item.deptType == 2) { - this.hosplist.push(item); - this.tempbelongWards.push(item.deptCode); - console.log("33"); - } - }); - } - }); - } + // arr.forEach((item) => { + // if (item.deptType == 1) { + // console.log(this.deptlist, "11"); + // this.deptlist.push(item); + // console.log("22"); + // this.tempDetpRelevanceslist.push(item.deptCode); + // } else if (item.deptType == 2) { + // this.hosplist.push(item); + // this.tempbelongWards.push(item.deptCode); + // console.log("33"); + // } + // }); + // } + // }); + // } // 鐤剧梾 getillnesslist({ diff --git a/vue.config.js b/vue.config.js index 0b35599..6062c0f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,9 +36,9 @@ // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://192.168.168.60:8095`, - target: `http://192.168.144.34:8095`, + // target: `http://192.168.144.34:8095`, // target: `http://192.168.100.100:8095`, - // target:`http://localhost:8095`, + target:`http://localhost:8095`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' -- Gitblit v1.9.3