From 1a090a490d8fc93224a0e3ad0fd7fe16c9fe63a8 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期二, 21 一月 2025 19:01:11 +0800 Subject: [PATCH] 测试完成 --- src/utils/request.js | 5 vue.config.js | 6 src/views/repositoryai/templateku/configurat/index.vue | 2 src/api/AiCentre/Qtemplate.js | 15 + src/store/getters.js | 16 src/views/patient/propaganda/Missioncreation.vue | 18 src/views/patient/propaganda/particty.vue | 391 +++++++++++---------------- src/views/patient/propaganda/QuestionnaireTask.vue | 384 +++++++++----------------- 8 files changed, 326 insertions(+), 511 deletions(-) diff --git a/src/api/AiCentre/Qtemplate.js b/src/api/AiCentre/Qtemplate.js index 55d9e46..a29da63 100644 --- a/src/api/AiCentre/Qtemplate.js +++ b/src/api/AiCentre/Qtemplate.js @@ -158,6 +158,14 @@ params: data, }); } + //浠诲姟绉戝鐥呭尯妯℃澘鍏宠仈鏌ヨ + export function taskdepthospgetsonlist(data) { + return request({ + url: "/smartor/taskdept/list", + method: "get", + params: data, + }); +} // 鍒犻櫎绉戝鐥呭尯妯℃澘鍒嗙被 export function depthospgetsondel(id) { return request({ @@ -165,6 +173,13 @@ method: "get", }); } + // 鍒犻櫎浠诲姟绉戝鍏宠仈 + export function taskdepthospgetsondel(id) { + return request({ + url: "/smartor/taskdept/remove/" + id, + method: "get", + }); + } // 鍖绘姢淇濆瓨鏁版嵁 export function serviceSubtaskDetailedit(data) { diff --git a/src/store/getters.js b/src/store/getters.js index d7540b0..9a197fa 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -450,14 +450,14 @@ listClass: "", }, }, - { - value: "8", - label: "鏅鸿兘鏈哄櫒浜�", - raw: { - cssClass: "", - listClass: "", - }, - }, + // { + // value: "8", + // label: "鏅鸿兘鏈哄櫒浜�", + // raw: { + // cssClass: "", + // listClass: "", + // }, + // }, ], // 璇█ languagelist: (state) => [ diff --git a/src/utils/request.js b/src/utils/request.js index 05dcfc1..57969d4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -110,10 +110,7 @@ } ) .then(() => { - isRelogin.show = false; - store.dispatch("LogOut").then(() => { - location.href = "/index"; - }); + }) .catch(() => { isRelogin.show = false; diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue index e50cc2b..876fb54 100644 --- a/src/views/patient/propaganda/Missioncreation.vue +++ b/src/views/patient/propaganda/Missioncreation.vue @@ -817,7 +817,7 @@ { label: "鐭俊", value: 4 }, { label: "寰俊鍏紬", value: 5 }, { label: "閽夐拤", value: 6 }, - { label: "鏅鸿兘鏈哄櫒浜�", value: 7 }, + // { label: "鏅鸿兘鏈哄櫒浜�", value: 7 }, ], upload: { // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛� @@ -1042,10 +1042,10 @@ label: "寰俊灏忕▼搴�", }, - { - value: "8", - label: "鏅鸿兘鏈哄櫒浜�", - }, + // { + // value: "8", + // label: "鏅鸿兘鏈哄櫒浜�", + // }, ]; } else if (this.form.serviceType == 8) { this.checkboxlist = [ @@ -1062,10 +1062,10 @@ label: "寰俊灏忕▼搴�", }, - { - value: "8", - label: "鏅鸿兘鏈哄櫒浜�", - }, + // { + // value: "8", + // label: "鏅鸿兘鏈哄櫒浜�", + // }, { value: "9", label: "閽夐拤", diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue index f8220ea..a02534f 100644 --- a/src/views/patient/propaganda/QuestionnaireTask.vue +++ b/src/views/patient/propaganda/QuestionnaireTask.vue @@ -70,22 +70,32 @@ /> </el-form-item> <el-form-item label="鏈嶅姟褰㈠紡"> - <el-checkbox-group v-model="checkList"> - <el-checkbox + <el-radio-group v-model="checkList"> + <el-radio v-for="(item, index) in checkboxlist" :key="index" :label="item.value" > - {{ item.label }}</el-checkbox + {{ item.label }}</el-radio > - </el-checkbox-group> + </el-radio-group> </el-form-item> - <el-form-item label="鏄惁闀挎湡" prop="longTask"> + <el-form-item label="鎵ц鍛ㄦ湡" prop="longTask"> <el-radio-group v-model="form.longTask"> - <el-radio :label="0">鏅�氫换鍔�</el-radio> + <el-radio :label="0">鑷畾涔夊懆鏈�</el-radio> <el-radio :label="1">闀挎湡浠诲姟</el-radio> </el-radio-group> </el-form-item> + <el-row :gutter="20" v-if="form.longTask"> + <el-col :span="8"> + <el-form-item label="鍛ㄦ湡鏃堕棿" prop="name"> + <el-input + v-model="form.sendDay" + placeholder="榛樿5澶╁悗" + ></el-input> + </el-form-item> + </el-col> + </el-row> <el-form-item label="鎵ц璁剧疆" prop="sendType" @@ -190,9 +200,11 @@ <el-col :span="20" ><el-form-item label="閫傜敤绉戝" prop="region"> <el-select - v-model="form.deptcode" + v-model="deptcodesWards" + @remove-tag="removetag" style="width: 400px" size="medium" + multiple filterable placeholder="璇烽�夋嫨绉戝" > @@ -210,25 +222,12 @@ <el-row> <el-col :span="20" ><el-form-item label="閫傜敤鐥呭尯" prop="region"> - <!-- <el-cascader - style="width: 400px" - v-model="form.leavehospitaldistrictcode" - :options="topicoptions" - :props="propstask" - :show-all-levels="false" - clearable - > - <template slot-scope="{ node, data }"> - <span>{{ data.deptName }}</span> - <span v-if="!node.isLeaf"> - ({{ data.children.length }}) - </span> - </template> - </el-cascader> --> <el-select - v-model="form.leavehospitaldistrictcode" + v-model="leavehospitaldistrictcodes" style="width: 400px" + @remove-tag="removehpsp" size="medium" + multiple filterable placeholder="璇烽�夋嫨鐥呭尯" > @@ -501,7 +500,7 @@ /> </el-row> <pagination - v-show="patienttotal > 0&&this.patientqueryParams.allhosp != 6" + v-show="patienttotal > 0 && this.patientqueryParams.allhosp != 6" :total="patienttotal" @pagination="handleAddpatient" /> @@ -588,90 +587,6 @@ <el-input v-model="objyl.svyname"></el-input> </div> </el-form-item> - <el-form-item label="闂嵎鏂瑰紡" prop="suitway"> - <el-select - style="width: 400px" - v-model="objyl.suitway" - size="medium" - multiple - filterable - placeholder="璇烽�夋嫨鍒嗙被" - > - <el-option - class="ruleFormaa" - v-for="item in mode" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-row :gutter="20" v-if="form.longTask"> - <el-col :span="14"> - <el-form-item label="闀挎湡浠诲姟" prop="longTemp"> - <el-radio-group v-model="objyl.longTemp"> - <el-radio - v-for="(item, index) in longtype" - :label="item.value" - >{{ item.label }}</el-radio - > - </el-radio-group> - </el-form-item> - </el-col> - <el-col :span="8"> - <el-form-item label="浠诲姟鍛ㄦ湡" prop="name"> - <el-input - v-model="objyl.sendDay" - placeholder="榛樿5澶╁悗" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20" - ><el-form-item label="閫傜敤绉戝" prop="region"> - <el-select - style="width: 400px" - v-model="tempDetpRelevanceslist" - size="medium" - multiple - filterable - placeholder="璇烽�夋嫨绉戝" - > - <el-option - class="ruleFormaa" - v-for="item in belongDepts" - :key="item.deptCode" - :label="item.deptName" - :value="item.deptCode" - > - </el-option> - </el-select> </el-form-item - ></el-col> - </el-row> - <!-- <el-row> - <el-col :span="20" - ><el-form-item label="閫傜敤鐥呭尯" prop="region"> - <el-select - v-model="tempbelongWards" - style="width: 400px" - size="medium" - multiple - filterable - placeholder="璇烽�夋嫨绉戝" - > - <el-option - class="ruleFormaa" - v-for="item in belongWards" - :key="item.districtCode" - :label="item.districtName" - :value="item.districtCode" - > - </el-option> - </el-select> </el-form-item - ></el-col> - </el-row> --> <div class="xinz-infs"> <el-form-item> @@ -885,9 +800,12 @@ Editsingletask, getQtemplateclassify, depthospgetsonlist, + taskdepthospgetsondel, + taskdepthospgetsonlist, } from "@/api/AiCentre/index"; import SFtable from "@/components/SFtable"; //琛ㄦ牸缁勪欢 +import { MessageBox, } from "element-ui"; export default { name: "ServiceDetails", @@ -898,6 +816,7 @@ id: "", // previewid: "", //浠诲姟妯℃澘浼犻�抜d libName: "", + templateor: false, objyl: {}, overallCase: [], //閫夋嫨鎮h�呮�� allpids: [], @@ -912,6 +831,8 @@ loading: false, // 閬僵灞� patientloading: false, // 閬僵灞� dialogVisiblepatient: false, //娣诲姞鎮h�呭脊妗� + deptcodesWards: [], //绉戝鏁版嵁 + leavehospitaldistrictcodes: [], //鐥呭尯鏁版嵁 radio: 1, checkboxlist: [], tableLabel: [], @@ -967,7 +888,7 @@ preachform: [ { label: "澶氬獟浣�", value: 1 }, { label: "绾歌川", value: 2 }, - { label: "鐢佃瘽", value: 3 }, + { label: "鏅鸿兘璇煶", value: 3 }, { label: "鐭俊", value: 4 }, { label: "寰俊鍏紬鍙�", value: 5 }, { label: "寰俊灏忕▼搴�", value: 6 }, @@ -988,7 +909,7 @@ pageNum: 1, // pageSize: 10, }, - checkList: [], + checkList: "", deliverytopqueryParams: { pageNum: 1, // pageSize: 10, @@ -1018,7 +939,7 @@ sonuserList: [], //閫変腑鎮h�呭垪琛� delvariableList: [], //鍒犻櫎鍙橀噺涓存椂瀛樺偍 longtype: [ - { value: 0, label: "鏅�氫换鍔�" }, + { value: 0, label: "鑷畾涔夊懆鏈�" }, { value: 1, label: "闀挎湡浠诲姟" }, ], variableList: [ @@ -1035,7 +956,7 @@ default: true, }, { - name: "鐢佃瘽", + name: "鏅鸿兘璇煶", value: "${dhh}", fill: "娲惧彂鏃惰嚜鍔ㄥ尮閰�", default: true, @@ -1055,7 +976,7 @@ default: true, }, { - name: "鐢佃瘽", + name: "鏅鸿兘璇煶", value: "${dhh}", fill: "娲惧彂鏃惰嚜鍔ㄥ尮閰�", default: true, @@ -1152,7 +1073,6 @@ ], // 绉戝/鐥呭尯 belongWards: [], - belongWards: [], deptlist: [], hosplist: [], tempDetpRelevanceslist: [], //绉戝鏁版嵁 @@ -1179,11 +1099,9 @@ // { required: true, message: "閫傜敤鐥呭尯涓嶈兘涓虹┖", trigger: "blur" }, // ], }, + belongDepts:[], // 绉戝闄㈠尯鏌ヨ鍏ュ弬 - queryParamsdept: { - tempid: "", - type: 11, - }, + queryParamsdept: {}, quote: false, serviceType: null, }; @@ -1277,7 +1195,7 @@ this.checkboxlist = [ { value: "3", - label: "鐢佃瘽", + label: "鏅鸿兘璇煶", }, { value: "4", @@ -1292,10 +1210,10 @@ label: "寰俊灏忕▼搴�", }, - { - value: "8", - label: "鏅鸿兘鏈哄櫒浜�", - }, + // { + // value: "8", + // label: "鏅鸿兘鏈哄櫒浜�", + // }, ]; } else if (this.form.serviceType == 7 || this.form.serviceType == 9) { this.checkboxlist = [ @@ -1309,7 +1227,7 @@ }, { value: "3", - label: "鐢佃瘽", + label: "鏅鸿兘璇煶", }, { value: "4", @@ -1337,7 +1255,7 @@ }, { value: "3", - label: "鐢佃瘽", + label: "鏅鸿兘璇煶", }, { value: "4", @@ -1352,10 +1270,10 @@ label: "寰俊灏忕▼搴�", }, - { - value: "8", - label: "鏅鸿兘鏈哄櫒浜�", - }, + // { + // value: "8", + // label: "鏅鸿兘鏈哄櫒浜�", + // }, ]; } getQtemplatelist(this.topqueryParams).then((response) => { @@ -1385,21 +1303,28 @@ xh: 1, }, ]; - - if (this.checkList[0]) { - this.form.preachform = this.checkList.join(","); + if (this.checkList) { + this.form.preachform = this.checkList; } else { this.$modal.msgError("璇烽�夋嫨鏈嶅姟绫诲瀷"); return; } + if (this.deptcodesWards[0]||this.leavehospitaldistrictcodes[0]) { + } else { + this.$modal.msgError("璇烽�夋嫨绉戝鎴栫梾鍖�"); + return; + } + if (!this.form.patTaskRelevances[0] && !this.form.longTask) { this.$modal.msgError("璇烽�夋嫨鐥呬汉"); return; } - if (!this.form.templatename) { + + if (!this.form.templatename && !this.templateor) { this.$modal.msgError("鏈�夋嫨妯℃澘"); return; } + if ((this.form.sendType == 1 && this.time1) || this.form.sendType == 2) { } else if ( (this.form.sendType == 3 && this.time4) || @@ -1422,28 +1347,19 @@ this.form.type = this.$route.query.type; } this.form.serviceType = this.serviceType; - this.form.leaveldeptcodes = store.getters.belongDepts.map( - (obj) => obj.deptCode - ); - this.form.leavehospitaldistrictcodes = store.getters.belongWards.map( - (obj) => obj.districtCode - ); - console.log(this.form.longTask); - console.log(this.form.preachform); + this.form.deptcode = this.deptcodesWards.join(","); + this.form.leavehospitaldistrictcode = + this.leavehospitaldistrictcodes.join(","); - if (this.form.longTask && this.form.preachform == 6) { - this.form.patCycle = 1; - } - // - this.form.labelinfo = 1; Editsingletask(this.form).then((res) => { if (res.code == 200) { if (this.form.taskid) { this.$modal.msgSuccess("淇敼鎴愬姛"); } else { - this.puttaskid(res.data); this.$modal.msgSuccess("鏂板鎴愬姛"); } + this.$modal.closeLoading(); + this.$router.push({ path: "/followvisit/tasklist", query: { tasktopic: this.form.serviceType }, @@ -1451,33 +1367,8 @@ } }); }, - // 缁欎换鍔℃ā鏉胯祴鍊间换鍔d - puttaskid(data) { - getTaskQuestioncomit(this.form.templateid).then((res) => { - if (res.code == 200) { - this.objyl = res.data; - if (this.objyl.taskid == data.taskId) { - this.objyl.isoperation = 2; - } else { - this.objyl.isoperation = 1; - } - this.objyl.taskid = data.taskId; - if (!this.objyl.sendDay) { - this.objyl.sendDay = "5"; - } - TaskQuestioncomit(this.objyl).then((response) => { - this.previewtf = false; - this.form.libtemplateid = this.objyl.svyid; - this.form.templateid = response.data; - // this.putbelongDepts(response.data); - this.form.templatename = this.objyl.svyname; - this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛"); - }); - } - }); - }, - // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠� + // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠� // 閫夋嫨棰勮 selectfn(row, type) { // 妯℃澘鎯呭喌涓嬭幏鍙栨ā鏉夸俊鎭� @@ -1491,10 +1382,9 @@ if (this.form.longTask) { this.objyl.longTemp = 1; } - this.queryParamsdept.type = 1; - this.queryParamsdept.tempid = row.svyid; - this.listDept(); + this.tempDetpRelevanceslist = []; + this.tempbelongWards = []; this.objyl.suitway = this.objyl.suitway.split(","); this.questionList = res.rows[0].svyTemplateLibScripts; this.getillness(row.svyid); @@ -1516,11 +1406,9 @@ this.objyl = res.data; if (this.objyl.suitway) this.objyl.suitway = this.objyl.suitway.split(","); - this.queryParamsdept.tempid = this.form.templateid; - this.queryParamsdept.type = 11; + this.getillness(this.form.libtemplateid); - // 鎵ц鑾峰彇璇ヤ换鍔℃ā鏉縤d - this.listDept(); + this.previewtf = true; getQtemplateobj({ svyid: this.form.libtemplateid }).then((res) => { if (res.code == 200) { @@ -1803,6 +1691,7 @@ this.form = { patTaskRelevances: [], sendType: 1, + sendDay: 5, templatename: "", templateid: null, libtemplateid: null, @@ -1821,7 +1710,7 @@ ? this.form.patTaskRelevances : []; this.overallCase = this.form.patTaskRelevances.concat(); - this.checkList = this.form.preachform.split(","); + this.checkList = this.form.preachform; this.overallCase.forEach((item) => { if (item.endtime) { @@ -1836,6 +1725,10 @@ } else { this.time1 = this.form.showTimeMorn.split(","); } + } + // 鑾峰彇浠诲姟绉戝 + if (this.form.taskid) { + this.listDept(); } if (this.form.showTimeNoon) this.time2 = this.form.showTimeNoon.split(","); @@ -1867,24 +1760,50 @@ this.time3 = ""; //鏅氫笂鏃堕棿娈� this.time4 = ""; //鏅氫笂鏃堕棿娈� }, - // 鑾峰彇绉戝鍒楄〃 + // 鑾峰彇浠诲姟绉戝鍒楄〃 listDept() { - this.tempDetpRelevanceslist = []; - this.tempbelongWards = []; - depthospgetsonlist(this.queryParamsdept).then((res) => { + this.leavehospitaldistrictcodes = []; + this.deptcodesWards = []; + this.queryParamsdept.taskId = this.form.taskid; + taskdepthospgetsonlist(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); + this.deptcodesWards.push(item.deptCode); } else if (item.deptType == 2) { this.hosplist.push(item); - this.tempbelongWards.push(item.deptCode); + this.leavehospitaldistrictcodes.push(item.deptCode); } }); } }); + }, + // 浠诲姟绉戝鍒犻櫎瑙﹀彂 + removetag(row) { + let result = this.deptlist + .filter((item) => item.deptCode == row) + .map((item) => item.id); + + if (result.length) { + taskdepthospgetsondel(result).then((res) => { + if (res.code) { + } + }); + } + }, + // 闄㈠尯鍒犻櫎鍒犻櫎瑙﹀彂 + removehpsp(row) { + let result = this.hosplist + .filter((item) => item.deptCode == row) + .map((item) => item.id); + if (result.length) { + taskdepthospgetsondel(result).then((res) => { + if (res.code) { + } + }); + } }, getQtemplateclassify() { getQtemplateclassify({}).then((res) => { @@ -1906,6 +1825,7 @@ row.isoperation = 3; this.delvariableList.push(row); }, + // 鏃堕棿---------- changeTime(row) { this.processingTime(); @@ -1986,17 +1906,10 @@ if (Array.isArray(this.objyl.suitway)) { this.objyl.suitway = this.objyl.suitway.join(","); } - this.objyl.svyTemplateLibScripts.forEach((item) => { - item.svyTaskTemplateTargetoptions = item.svyLibTemplateTargetoptions; - }); - this.objyl.svyTaskTemplateScriptVOS = this.objyl.svyTemplateLibScripts; this.objyl.templateid = this.objyl.svyid; this.objyl.isoperation = 1; - console.log(this.objyl.id); - if (!this.objyl.sendDay) { - this.objyl.sendDay = "5"; - } + this.objyl.taskid = this.form.taskid; if (this.objyl.id) { deleteTaskQuestioncomit(this.objyl.id).then((res) => { @@ -2006,7 +1919,6 @@ this.previewtf = false; this.form.libtemplateid = this.objyl.svyid; this.form.templateid = response.data; - this.putbelongDepts(response.data); this.form.templatename = this.objyl.svyname; this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛"); }); @@ -2017,7 +1929,6 @@ this.previewtf = false; this.form.libtemplateid = this.objyl.svyid; this.form.templateid = response.data; - this.putbelongDepts(response.data); this.form.templatename = this.objyl.svyname; this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛"); }); @@ -2044,60 +1955,35 @@ } }); }, - // 澶勭悊鏈嶅姟褰㈠紡 - formatFn(type) { - let list = []; - let formlist = []; - if (type == 1) { - this.preachform.forEach((item) => { - this.checkList.forEach((obj) => { - if (item.label == obj) { - list.push(item.value); - } - }); - }); - console.log(list, "list"); - this.form.preachform = list.join(","); - } else { - console.log(this.form.preachform, "this.form.preachform"); - formlist = this.form.preachform.split(","); - console.log(11); - this.preachform.forEach((item) => { - formlist.forEach((obj) => { - if (item.value == obj) { - list.push(item.label); - } - }); - }); - this.checkList = list; - } - }, + // 绉戝澶勭悊 Departmenttreatment() { - this.tempDetpRelevanceslist.forEach((item) => { - this.tempDetpRelevanceslistform.push({ - deptType: 1, - longTemp: this.form.longTask, - deptCode: item, - tempid: null, - type: 11, - }); - }); - - this.tempbelongWards.forEach((item) => { - this.tempbelongWardsform.push({ - deptType: 2, - longTemp: this.form.longTask, - deptCode: item, - tempid: null, - type: 11, - }); - }); - console.log(33); - - setTimeout(() => { - this.previewFn(); - }, 1000); + if (!this.form.taskid) { + this.templateor = true; + MessageBox.confirm( + "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛淇濆瓨浠诲姟锛�", + "鍔熻兘鎻愮ず", + { + 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.objyl.isoperation = 1; + this.form.svyTaskTemplateVO=this.objyl; + this.submitForm(); + }) + .catch(() => {}); + } else { + setTimeout(() => { + this.previewFn(); + }, 1000); + } }, }, }; diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue index 6fbf96d..bb507f6 100644 --- a/src/views/patient/propaganda/particty.vue +++ b/src/views/patient/propaganda/particty.vue @@ -70,21 +70,21 @@ /> </el-form-item> <el-form-item label="鏈嶅姟褰㈠紡"> - <el-checkbox-group + <el-radio-group v-model="checkList" @change="handleCheckedCitiesChange" > - <el-checkbox + <el-radio v-for="(item, index) in checkboxlist" :key="index" :label="item.value" @change="checkboxChange($event, item.value)" > - {{ item.label }}</el-checkbox + {{ item.label }}</el-radio > - </el-checkbox-group> + </el-radio-group> </el-form-item> - <div class="xinz-infs"> + <!-- <div class="xinz-infs"> <el-form-item label="鏈嶅姟鎵ц椤哄簭" prop="daytime"> <el-tag :key="tag.label" @@ -97,13 +97,23 @@ ({{ index + 1 }}){{ tag.label }} </el-tag> </el-form-item> - </div> - <el-form-item label="鏄惁闀挎湡" prop="longTask"> + </div> --> + <el-form-item label="鎵ц鍛ㄦ湡" prop="longTask"> <el-radio-group v-model="form.longTask"> - <el-radio :label="0">鏅�氫换鍔�</el-radio> + <el-radio :label="0">鑷畾涔夊懆鏈�</el-radio> <el-radio :label="1">闀挎湡浠诲姟</el-radio> </el-radio-group> </el-form-item> + <el-row :gutter="20" v-if="form.longTask"> + <el-col :span="8"> + <el-form-item label="鍛ㄦ湡鏃堕棿" prop="name"> + <el-input + v-model="form.sendDay" + placeholder="榛樿5澶╁悗" + ></el-input> + </el-form-item> + </el-col> + </el-row> <el-form-item label="鎵ц璁剧疆" prop="sendType" @@ -208,17 +218,19 @@ <el-col :span="20" ><el-form-item label="閫傜敤绉戝" prop="region"> <el-select - v-model="form.deptcode" + v-model="deptcodesWards" + @remove-tag="removetag" style="width: 400px" size="medium" filterable + multiple placeholder="璇烽�夋嫨绉戝" > <el-option class="ruleFormaa" v-for="item in belongDepts" :key="item.deptCode" - :label="item.label" + :label="item.deptName" :value="item.deptCode" > </el-option> @@ -228,34 +240,21 @@ <el-row> <el-col :span="20" ><el-form-item label="閫傜敤鐥呭尯" prop="region"> - <!-- <el-cascader - style="width: 400px" - v-model="form.leavehospitaldistrictcode" - :options="topicoptions" - :props="propstask" - :show-all-levels="false" - clearable - > - <template slot-scope="{ node, data }"> - <span>{{ data.deptName }}</span> - <span v-if="!node.isLeaf"> - ({{ data.children.length }}) - </span> - </template> - </el-cascader> --> <el-select - v-model="form.leavehospitaldistrictcode" + v-model="leavehospitaldistrictcodes" style="width: 400px" + @remove-tag="removehpsp" size="medium" filterable + multiple placeholder="璇烽�夋嫨鐥呭尯" > <el-option class="ruleFormaa" v-for="item in belongWards" - :key="item.deptCode" - :label="item.label" - :value="item.deptCode" + :key="item.districtCode" + :label="item.districtName" + :value="item.districtCode" > </el-option> </el-select> </el-form-item @@ -448,7 +447,7 @@ </div> </div> <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button> - <el-button type="success" @click="submitForm('ruleForm')">{{ + <el-button type="success" @click="submitForm('11')">{{ quote ? "绔嬪嵆鍒涘缓" : "纭浠诲姟閰嶇疆" }}</el-button> <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button> @@ -595,90 +594,6 @@ <el-input v-model="objyl.templateName"></el-input> </div> </el-form-item> - <el-form-item label="闅忚鏂瑰紡" prop="suitway"> - <el-select - style="width: 400px" - v-model="objyl.suitway" - size="medium" - multiple - filterable - placeholder="璇烽�夋嫨鍒嗙被" - > - <el-option - class="ruleFormaa" - v-for="item in mode" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-row :gutter="20" v-if="form.longTask"> - <el-col :span="14"> - <el-form-item label="闀挎湡浠诲姟" prop="longTemp"> - <el-radio-group v-model="objyl.longTemp"> - <el-radio - v-for="(item, index) in longtype" - :label="item.value" - >{{ item.label }}</el-radio - > - </el-radio-group> - </el-form-item> - </el-col> - <el-col :span="8"> - <el-form-item label="浠诲姟鍛ㄦ湡" prop="name"> - <el-input - v-model="objyl.sendDay" - placeholder="榛樿5澶╁悗" - ></el-input> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="20" - ><el-form-item label="閫傜敤绉戝" prop="region"> - <el-select - style="width: 400px" - v-model="tempDetpRelevanceslist" - size="medium" - multiple - filterable - placeholder="璇烽�夋嫨绉戝" - > - <el-option - class="ruleFormaa" - v-for="item in belongDepts" - :key="item.deptCode" - :label="item.label" - :value="item.deptCode" - > - </el-option> - </el-select> </el-form-item - ></el-col> - </el-row> - <!-- <el-row> - <el-col :span="20" - ><el-form-item label="閫傜敤鐥呭尯" prop="region"> - <el-select - v-model="tempbelongWards" - style="width: 400px" - size="medium" - multiple - filterable - placeholder="璇烽�夋嫨鐥呭尯" - > - <el-option - class="ruleFormaa" - v-for="item in belongWards" - :key="item.deptCode" - :label="item.label" - :value="item.deptCode" - > - </el-option> - </el-select> </el-form-item - ></el-col> - </el-row> --> <div class="xinz-infs"> <el-form-item> @@ -804,13 +719,13 @@ @click="Departmenttreatment" >{{ form.templateid ? "鏇挎崲浣跨敤" : "閫夋嫨浣跨敤" }}</el-button > - <el-button + <!-- <el-button :type="previewtftype ? 'success' : 'warning'" @click="Modifytemplate" >{{ previewtftype ? "鍓嶅線淇敼宸查�夋嫨妯℃澘" : "鏂板淇濆瓨骞跺墠寰�淇敼" }}</el-button - > + > --> </span> </el-dialog> <el-drawer @@ -904,14 +819,17 @@ getillness, Editsingletask, getFollowupclassify, + taskdepthospgetsonlist, + taskdepthospgetsondel, depthospgetsonlist, } from "@/api/AiCentre/index"; import { deptTreeSelect } from "@/api/system/user"; +import { MessageBox } from "element-ui"; import SFtable from "@/components/SFtable"; //琛ㄦ牸缁勪欢 export default { - name: "Particty", + name: "particty", data() { return { title: "瀹f暀鍐呭鍒楄〃", @@ -920,6 +838,7 @@ previewid: "", //浠诲姟妯℃澘浼犻�抜d libName: "", username: "", + templateor: false, objyl: {}, overallCase: [], //閫夋嫨鎮h�呮�� allpids: [], @@ -935,6 +854,8 @@ loading: false, // 閬僵灞� patientloading: false, // 閬僵灞� dialogVisiblepatient: false, //娣诲姞鎮h�呭脊妗� + deptcodesWards: [], //绉戝鏁版嵁 + leavehospitaldistrictcodes: [], //鐥呭尯鏁版嵁 radio: 1, checkboxlist: [], tableLabel: [], @@ -993,7 +914,7 @@ preachform: [ { label: "澶氬獟浣�", value: 1 }, { label: "绾歌川", value: 2 }, - { label: "鐢佃瘽", value: 3 }, + { label: "鏅鸿兘璇煶", value: 3 }, { label: "鐭俊", value: 4 }, { label: "寰俊鍏紬鍙�", value: 5 }, { label: "寰俊灏忕▼搴�", value: 6 }, @@ -1014,7 +935,7 @@ pageNum: 1, // pageSize: 10, }, - checkList: [], + checkList: "", foncheckList: [], formatvalue: { format1: "", @@ -1050,7 +971,7 @@ sonuserList: [], //閫変腑鎮h�呭垪琛� delvariableList: [], //鍒犻櫎鍙橀噺涓存椂瀛樺偍 longtype: [ - { value: 0, label: "鏅�氫换鍔�" }, + { value: 0, label: "鑷畾涔夊懆鏈�" }, { value: 1, label: "闀挎湡浠诲姟" }, ], variableList: [ @@ -1195,9 +1116,9 @@ sendType: [ { required: true, message: "鍙戦�佽缃笉鑳戒负绌�", trigger: "blur" }, ], - deptcode: [ - { required: true, message: "閫傜敤绉戝涓嶈兘涓虹┖", trigger: "blur" }, - ], + // deptcode: [ + // { required: true, message: "閫傜敤绉戝涓嶈兘涓虹┖", trigger: "blur" }, + // ], // leavehospitaldistrictcode: [ // { required: true, message: "閫傜敤鐥呭尯涓嶈兘涓虹┖", trigger: "blur" }, // ], @@ -1216,8 +1137,8 @@ created() { this.appraiselist = store.getters.appraiselist; - // this.belongWards = store.getters.belongWards; - // this.belongDepts = store.getters.belongDepts; + this.belongWards = store.getters.belongWards; + this.belongDepts = store.getters.belongDepts; this.username = store.getters.name; this.mode = store.getters.Askmode; this.id = this.$route.query.id; @@ -1228,7 +1149,6 @@ this.form.serviceType = Number(this.$route.query.serviceType); this.Acquisitiontype(); this.Getdetails(); - this.getDeptTree(); this.getFollowupclassify(); }, activated() { @@ -1243,7 +1163,6 @@ this.Acquisitiontype(); this.Getdetails(); - this.getDeptTree(); this.getFollowupclassify(); } }, @@ -1272,14 +1191,7 @@ }); return result; }, - getDeptTree() { - // 绉戝鍒楄〃 - deptTreeSelect().then((response) => { - let flatArray = this.flattenArray(response.data); - this.belongWards = flatArray; - this.belongDepts = flatArray; - }); - }, + flattenArray(multiArray) { let result = []; @@ -1322,7 +1234,6 @@ { value: "4", label: "鐭俊", - }, { value: "5", @@ -1333,12 +1244,11 @@ this.checkboxlist = [ { value: "3", - label: "鐢佃瘽", + label: "鏅鸿兘璇煶", }, { value: "4", label: "鐭俊", - }, { value: "5", @@ -1349,10 +1259,10 @@ label: "寰俊灏忕▼搴�", }, - { - value: "8", - label: "鏅鸿兘鏈哄櫒浜�", - }, + // { + // value: "8", + // label: "鏅鸿兘鏈哄櫒浜�", + // }, ]; } else if (this.form.serviceType == 7 || this.form.serviceType == 5) { this.checkboxlist = [ @@ -1366,12 +1276,11 @@ }, { value: "3", - label: "鐢佃瘽", + label: "鏅鸿兘璇煶", }, { value: "4", label: "鐭俊", - }, { value: "5", @@ -1390,12 +1299,11 @@ }, { value: "3", - label: "鐢佃瘽", + label: "鏅鸿兘璇煶", }, { value: "4", label: "鐭俊", - }, { value: "5", @@ -1406,10 +1314,10 @@ label: "寰俊灏忕▼搴�", }, - { - value: "8", - label: "鏅鸿兘鏈哄櫒浜�", - }, + // { + // value: "8", + // label: "鏅鸿兘鏈哄櫒浜�", + // }, ]; } getFollowuplist(this.topqueryParams).then((response) => { @@ -1429,7 +1337,8 @@ }); }, // 淇濆瓨 - submitForm(formName) { + submitForm(type) { + if (this.templateor && type) this.templateor = false; if (this.time4 && this.form.sendType == 3) this.form.showTimeMorn = this.time4; this.form.sendTimeslot = [ @@ -1439,30 +1348,29 @@ xh: 1, }, ]; - if ( - (this.belongWards[0] || this.belongWards[0]) && - this.username == "andmin" - ) { - if (this.tempbelongWards[0] || this.tempbelongWards[0]) { - } else { - this.$modal.msgError("璇烽�夋嫨绉戝鎴栫梾鍖�"); - return; - } - } - if (this.checkList[0]) { - this.form.preachform = this.checkList.join(","); + + if (this.checkList) { + this.form.preachform = this.checkList; } else { this.$modal.msgError("璇烽�夋嫨鏈嶅姟绫诲瀷"); + return; + } + + if (this.deptcodesWards[0] || this.leavehospitaldistrictcodes[0]) { + } else { + this.$modal.msgError("璇烽�夋嫨绉戝鎴栫梾鍖�"); return; } if (!this.form.patTaskRelevances[0] && !this.form.longTask) { this.$modal.msgError("璇烽�夋嫨鐥呬汉"); return; } - if (!this.form.templatename) { + + if (!this.form.templatename && !this.templateor) { this.$modal.msgError("鏈�夋嫨妯℃澘"); return; } + if ((this.form.sendType == 1 && this.time1) || this.form.sendType == 2) { } else if ( (this.form.sendType == 3 && this.time4) || @@ -1485,18 +1393,14 @@ this.form.type = this.$route.query.type; } this.form.serviceType = this.serviceType; - this.form.leaveldeptcodes = store.getters.belongDepts.map( - (obj) => obj.deptCode - ); - this.form.leavehospitaldistrictcodes = store.getters.belongWards.map( - (obj) => obj.districtCode - ); + this.form.deptcode = this.deptcodesWards.join(","); + this.form.leavehospitaldistrictcode = + this.leavehospitaldistrictcodes.join(","); Editsingletask(this.form).then((res) => { if (res.code == 200) { if (this.form.taskid) { this.$modal.msgSuccess("淇敼鎴愬姛"); } else { - this.puttaskid(res.data); this.$modal.msgSuccess("鏂板鎴愬姛"); } this.$router.push({ @@ -1506,29 +1410,7 @@ } }); }, - // 缁欎换鍔℃ā鏉胯祴鍊间换鍔d - puttaskid(data) { - getTaskparticty(this.form.templateid).then((res) => { - if (res.code == 200) { - this.objyl = res.data; - this.objyl.isoperation = 2; - this.objyl.taskid = data.taskId; - if (!this.objyl.sendDa) { - this.objyl.sendDay = "5"; - } - console.log(this.objyl.sendDay, "this.objyl.sendDay"); - Taskparticty(this.objyl).then((response) => { - this.previewtf = false; - this.form.libtemplateid = this.objyl.id; - this.form.templateid = response.data; - // this.putbelongDepts(response.data); - this.form.templatename = this.objyl.templateName; - this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛"); - }); - } - }); - }, // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠� // 閫夋嫨棰勮 @@ -1541,13 +1423,13 @@ getvFollowup({ id: row.id }).then((res) => { if (res.code == 200) { this.objyl = res.data; - if (this.form.longTask) { - this.objyl.sendDay = 5; - } + // if (this.form.longTask) { + // this.objyl.sendDay = 5; + // } this.queryParamsdept.type = 2; this.queryParamsdept.tempid = row.id; - this.listDept(); - + this.tempDetpRelevanceslist = []; + this.tempbelongWards = []; this.objyl.suitway = this.objyl.suitway.split(","); this.questionList = res.data.ivrLibaTemplateScriptVOList; this.getillness(row.id); @@ -1571,8 +1453,7 @@ this.queryParamsdept.type = 21; // 鐤剧梾 this.getillness(this.form.libtemplateid); - // 鎵ц鑾峰彇璇ヤ换鍔℃ā鏉縤d - this.listDept(); + getvFollowup({ id: this.form.libtemplateid }).then((res) => { if (res.code == 200) { this.previewtf = true; @@ -1757,8 +1638,6 @@ this.$modal .confirm('鏄惁纭鍒犻櫎鎮h��"' + row.name + '"鐨勬湇鍔¢」锛�') .then(() => { - console.log(); - let indexa = this.overallCase.indexOf(row); let indexb = this.form.patTaskRelevances.indexOf(row); this.overallCase.splice(indexa, 1); @@ -1784,9 +1663,15 @@ store.getters.leavehospitaldistrictcodes; this.patientqueryParams.leaveldeptcodes = null; } - if (!this.patientqueryParams.leavehospitaldistrictcodes||!this.patientqueryParams.leavehospitaldistrictcodes[0]) + if ( + !this.patientqueryParams.leavehospitaldistrictcodes || + !this.patientqueryParams.leavehospitaldistrictcodes[0] + ) this.patientqueryParams.leavehospitaldistrictcodes = null; - if (!this.patientqueryParams.leaveldeptcodes||!this.patientqueryParams.leaveldeptcodes[0]) + if ( + !this.patientqueryParams.leaveldeptcodes || + !this.patientqueryParams.leaveldeptcodes[0] + ) this.patientqueryParams.leaveldeptcodes = null; this.handleAddpatient(); }, @@ -1818,6 +1703,7 @@ this.form = { patTaskRelevances: [], sendType: 1, + sendDay: 5, templatename: "", templateid: null, libtemplateid: null, @@ -1836,7 +1722,7 @@ ? this.form.patTaskRelevances : []; this.overallCase = this.form.patTaskRelevances.concat(); - this.checkList = this.form.preachform.split(","); + this.checkList = this.form.preachform; this.overallCase.forEach((item) => { if (item.endtime) { @@ -1851,6 +1737,9 @@ } else { this.time1 = this.form.showTimeMorn.split(","); } + } + if (this.form.taskid) { + this.listDept(); } if (this.form.showTimeNoon) this.time2 = this.form.showTimeNoon.split(","); @@ -1885,22 +1774,48 @@ }, // 鑾峰彇绉戝鍒楄〃 listDept() { - this.tempDetpRelevanceslist = []; - this.tempbelongWards = []; - depthospgetsonlist(this.queryParamsdept).then((res) => { + this.leavehospitaldistrictcodes = []; + this.deptcodesWards = []; + this.queryParamsdept.taskId = this.form.taskid; + taskdepthospgetsonlist(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); + this.deptcodesWards.push(item.deptCode); } else if (item.deptType == 2) { this.hosplist.push(item); - this.tempbelongWards.push(item.deptCode); + this.leavehospitaldistrictcodes.push(item.deptCode); } }); } }); + }, + // 浠诲姟绉戝鍒犻櫎瑙﹀彂 + removetag(row) { + let result = this.deptlist + .filter((item) => item.deptCode == row) + .map((item) => item.id); + + if (result.length) { + taskdepthospgetsondel(result).then((res) => { + if (res.code) { + } + }); + } + }, + // 闄㈠尯鍒犻櫎鍒犻櫎瑙﹀彂 + removehpsp(row) { + let result = this.hosplist + .filter((item) => item.deptCode == row) + .map((item) => item.id); + if (result.length) { + taskdepthospgetsondel(result).then((res) => { + if (res.code) { + } + }); + } }, getFollowupclassify() { getFollowupclassify({}).then((res) => { @@ -2005,9 +1920,9 @@ if (this.form.id) { this.objyl.taskid = this.form.id; } - if (!this.objyl.sendDay) { - this.objyl.sendDay = "5"; - } + // if (!this.objyl.sendDay) { + // this.objyl.sendDay = "5"; + // } if (this.form.templateid) { deleteTaskparticty(this.form.templateid).then((res) => { if (res.code == 200) { @@ -2087,34 +2002,36 @@ this.foncheckList = this.foncheckList.filter( (obj) => obj.value !== tag.value ); - console.log(this.checkList, "checkList"); }, // 绉戝澶勭悊 Departmenttreatment() { - this.tempDetpRelevanceslist.forEach((item) => { - this.tempDetpRelevanceslistform.push({ - deptType: 1, - longTemp: this.form.longTask, - deptCode: item, - tempid: null, - type: 21, - }); - }); + if (!this.form.taskid) { + this.templateor = true; + MessageBox.confirm( + "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛淇濆瓨浠诲姟锛�", + "鍔熻兘鎻愮ず", + { + confirmButtonText: "淇濆瓨浠诲姟", + cancelButtonText: "鍙栨秷", + type: "warning", + } + ) + .then(() => { + if (Array.isArray(this.objyl.suitway)) { + this.objyl.suitway = this.objyl.suitway.join(","); + } + this.objyl.templateid = this.objyl.id; + this.objyl.isoperation = 1; + this.form.ivrTaskTemplateVO = this.objyl; - this.tempbelongWards.forEach((item) => { - this.tempbelongWardsform.push({ - deptType: 2, - longTemp: this.form.longTask, - deptCode: item, - tempid: null, - type: 21, - }); - }); - console.log(33); - - setTimeout(() => { - this.previewFn(); - }, 1000); + this.submitForm(); + }) + .catch(() => {}); + } else { + setTimeout(() => { + this.previewFn(); + }, 1000); + } }, // 鍓嶅線淇敼 Modifytemplate() { diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue index a7023e7..291ccc4 100644 --- a/src/views/repositoryai/templateku/configurat/index.vue +++ b/src/views/repositoryai/templateku/configurat/index.vue @@ -1806,7 +1806,7 @@ if (!this.ruleForm.assortid) { this.ruleForm.assortid = -1; } - this.ruleForm.labelInfo = JSON.stringify(this.dynamicTags); + // this.ruleForm.labelInfo = JSON.stringify(this.dynamicTags); if (Array.isArray(this.ruleForm.suitway)) this.ruleForm.suitway = this.ruleForm.suitway.join(","); if (Array.isArray(this.ruleForm.campus)) diff --git a/vue.config.js b/vue.config.js index 21f5d7c..bc98d12 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,13 +35,13 @@ proxy: { // 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.2.13:8095`, // target: `http://10.202.20.185:8095`, // target: `http://192.168.100.184:8095`, // target:`http://localhost:8095`, - // target: `http://192.168.101.135:8095`, + target: `http://192.168.101.135:8095`, // target: `http://192.168.101.166:8093`, - target: `http://192.168.191.181:8095`, + // target: `http://192.168.191.181:8095`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' -- Gitblit v1.9.3