From d9004dd77540b0633b12a41323ba2006c362fb8e Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 07 七月 2025 19:54:52 +0800 Subject: [PATCH] 测试完成 --- src/views/followvisit/tasklist/index.vue | 22 +++---- src/views/followvisit/outpatient/index.vue | 4 src/views/patient/patient/physical.vue | 6 +- dist.zip | 0 vue.config.js | 7 - src/views/patient/propaganda/Missionotice.vue | 4 src/views/patient/patient/outpatient.vue | 6 +- src/views/patient/patient/profile/index.vue | 6 +- src/views/patient/subsequent/index.vue | 4 src/api/AiCentre/external.js | 15 ++++- src/views/patient/propaganda/QuestionnaireTask.vue | 65 +++++++++++---------- 11 files changed, 73 insertions(+), 66 deletions(-) diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..7656255 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js index 153ec2c..cba2ebd 100644 --- a/src/api/AiCentre/external.js +++ b/src/api/AiCentre/external.js @@ -84,11 +84,20 @@ data: data }); } -// 鏇存柊璇煶鏈嶅姟锛堝唴锛� -export function sendMsg(data) { +// 鑾峰彇360绯荤粺token +export function gitzerotoken(data) { return request({ - url: "/smartor/smsaccount/sendMsg", + url: "https://9.0.124.104:13021/mediinfo-lyra-authserver/connect/token", method: "post", data: data }); } +// 鏂板鏈嶅姟 +export function addserviceSubtask(data) { + return request({ + url: "/smartor/serviceSubtask/addSubTaskAgain", + method: "post", + data: data + }); +} + diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue index e5a5e8a..93dd91a 100644 --- a/src/views/followvisit/outpatient/index.vue +++ b/src/views/followvisit/outpatient/index.vue @@ -241,11 +241,11 @@ label="灏辫瘖鏃堕棿" sortable align="center" - prop="admindate" + prop="admitdate" width="160" > <template slot-scope="scope"> - <span>{{ formatTime(scope.row.admindate) }}</span> + <span>{{ formatTime(scope.row.admitdate) }}</span> </template> </el-table-column> <el-table-column diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue index 3a1d415..037ab3d 100644 --- a/src/views/followvisit/tasklist/index.vue +++ b/src/views/followvisit/tasklist/index.vue @@ -471,10 +471,10 @@ }, ], taskoptions: [ - { - value: "1", - label: "鐩戞祴璇勪及", - }, + // { + // value: "1", + // label: "鐩戞祴璇勪及", + // }, { value: "2", label: "鍑洪櫌闅忚", @@ -491,17 +491,13 @@ value: "5", label: "澶嶈瘖绠$悊", }, - { - value: "6", - label: "婊℃剰搴﹁皟鏌�", - }, + // { + // value: "6", + // label: "婊℃剰搴﹁皟鏌�", + // }, { value: "7", - label: "鎮h�呮棩甯告姤鍛�", - }, - { - value: "9", - label: "鎮h�呭紓甯告姤鍛�", + label: "鎮h�呮姤鍛�", }, { value: "8", diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue index 69f8809..4a0139f 100644 --- a/src/views/patient/patient/outpatient.vue +++ b/src/views/patient/patient/outpatient.vue @@ -159,12 +159,12 @@ <el-table-column label="灏辫瘖鏃堕棿" align="center" - key="admindate" - prop="admindate" + key="admitdate" + prop="admitdate" width="160" > <template slot-scope="scope"> - <span>{{ formatTime(scope.row.admindate) }}</span> + <span>{{ formatTime(scope.row.admitdate) }}</span> </template> </el-table-column> diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue index 9111f53..796f7fa 100644 --- a/src/views/patient/patient/physical.vue +++ b/src/views/patient/patient/physical.vue @@ -252,12 +252,12 @@ <el-table-column label="灏辫瘖鏃堕棿" align="center" - key="admindate" - prop="admindate" + key="admitdate" + prop="admitdate" width="160" > <template slot-scope="scope"> - <span>{{ formatTime(scope.row.admindate) }}</span> + <span>{{ formatTime(scope.row.admitdate) }}</span> </template> </el-table-column> <el-table-column diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue index 53838c1..678fe67 100644 --- a/src/views/patient/patient/profile/index.vue +++ b/src/views/patient/patient/profile/index.vue @@ -372,12 +372,12 @@ <el-table-column label="灏辫瘖鏃堕棿" align="center" - key="admindate" - prop="admindate" + key="admitdate" + prop="admitdate" width="160" > <template slot-scope="scope"> - <span>{{ formatTime(scope.row.admindate) }}</span> + <span>{{ formatTime(scope.row.admitdate) }}</span> </template> </el-table-column> diff --git a/src/views/patient/propaganda/Missionotice.vue b/src/views/patient/propaganda/Missionotice.vue index c5e091d..617d6fd 100644 --- a/src/views/patient/propaganda/Missionotice.vue +++ b/src/views/patient/propaganda/Missionotice.vue @@ -198,8 +198,8 @@ <el-table-column label="灏辫瘖鏃堕棿" align="center" - key="admindate" - prop="admindate" + key="admitdate" + prop="admitdate" width="160" > </el-table-column> diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue index ea80cb5..81be5bc 100644 --- a/src/views/patient/propaganda/QuestionnaireTask.vue +++ b/src/views/patient/propaganda/QuestionnaireTask.vue @@ -87,7 +87,7 @@ </el-radio-group> </el-form-item> <el-row :gutter="20" v-if="form.longTask"> - <el-col :span="8"> + <el-col :span="6"> <el-form-item label="鍛ㄦ湡鏃堕棿" prop="name"> <el-input v-model="form.sendDay" @@ -1063,34 +1063,38 @@ ], tasktypes: [ + // { + // value: "1", + // label: "鐩戞祴璇勪及", + // }, { - value: 1, - label: "蹇冪數闅忚", - }, - { - value: 2, + value: "2", label: "鍑洪櫌闅忚", }, { - value: 3, - label: "褰卞儚闅忚", + value: "3", + label: "闂ㄨ瘖闅忚", }, { - value: 4, + value: "4", label: "瀹f暀鍏虫��", }, { - value: 5, - label: "浣撴闅忚", + value: "5", + label: "澶嶈瘖绠$悊", }, { - value: 11, - label: "鍖绘妧闅忚", + value: "6", + label: "婊℃剰搴﹁皟鏌�", }, { - value: 10, - label: "涓撶闅忚", + value: "7", + label: "鎮h�呮姤鍛�", }, + // { + // value: "8", + // label: "鍏朵粬閫氱煡", + // }, ], // 绉戝/鐥呭尯 belongWards: [], @@ -1990,25 +1994,13 @@ "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛淇濆瓨浠诲姟锛�", "鍔熻兘鎻愮ず", { - confirmButtonText: "淇濆瓨浠诲姟", - cancelButtonText: "鏆傚瓨妯℃澘", + confirmButtonText: "鏆傚瓨妯℃澘", + cancelButtonText: "淇濆瓨浠诲姟", type: "warning", } ) .then(() => { - if (Array.isArray(this.objyl.suitway)) { - this.objyl.suitway = this.objyl.suitway.join(","); - } - this.objyl.templateid = this.objyl.svyid; - this.form.libtemplateid = this.objyl.svyid; - this.objyl.isoperation = 1; - this.objyl.svyTaskTemplateScriptVOS = - this.objyl.svyTemplateLibScripts; - this.form.svyTaskTemplateVO = this.objyl; - this.submitForm(); - }) - .catch(() => { - if (Array.isArray(this.objyl.suitway)) { + if (Array.isArray(this.objyl.suitway)) { this.objyl.suitway = this.objyl.suitway.join(","); } this.objyl.templateid = this.objyl.svyid; @@ -2021,6 +2013,19 @@ this.$modal.msgSuccess("鏆傚瓨鎴愬姛淇濆瓨浠诲姟鍚庢ā鏉垮け鏁�"); this.drawermb = false; this.previewtf = false; + }) + .catch(() => { + + if (Array.isArray(this.objyl.suitway)) { + this.objyl.suitway = this.objyl.suitway.join(","); + } + this.objyl.templateid = this.objyl.svyid; + this.form.libtemplateid = this.objyl.svyid; + this.objyl.isoperation = 1; + this.objyl.svyTaskTemplateScriptVOS = + this.objyl.svyTemplateLibScripts; + this.form.svyTaskTemplateVO = this.objyl; + this.submitForm(); }); } else { setTimeout(() => { diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue index 544c3e0..f72a02d 100644 --- a/src/views/patient/subsequent/index.vue +++ b/src/views/patient/subsequent/index.vue @@ -236,11 +236,11 @@ label="灏辫瘖鏃堕棿" sortable align="center" - prop="admindate" + prop="admitdate" width="160" > <template slot-scope="scope"> - <span>{{ formatTime(scope.row.admindate) }}</span> + <span>{{ formatTime(scope.row.admitdate) }}</span> </template> </el-table-column> <el-table-column diff --git a/vue.config.js b/vue.config.js index 9ca0004..6062c0f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,12 +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://192.168.101.135:8095`, - // target: `http://192.168.101.166:8093`, - // target: `http://192.168.191.181:8095`, + target:`http://localhost:8095`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' -- Gitblit v1.9.3