From d84cde7ed98bf0c562a8631e660fd494de9a7d0b Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 25 三月 2024 10:11:33 +0800 Subject: [PATCH] 指标完成 --- src/views/patient/propaganda/particty.vue | 493 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 393 insertions(+), 100 deletions(-) diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue index 9d84531..c60ded7 100644 --- a/src/views/patient/propaganda/particty.vue +++ b/src/views/patient/propaganda/particty.vue @@ -14,6 +14,7 @@ title="瀹f暀瀵硅薄" description="鍦ㄦ湰閮ㄩ�夋嫨瀹f暀鐥呬汉" ></el-step> + <el-step icon="el-icon-user" title="妯$増纭"></el-step> </el-steps> </div> </div> @@ -35,21 +36,88 @@ </div> <div class="jic-value"> <el-form ref="form" :model="form" label-width="105px"> - <el-form-item label="鍙戦�佹椂闂达細" v-if="currenttype != 2"> + <el-form-item label="妯$増鍚嶇О锛�"> + <el-input + style="width: 220px" + v-model="form.templatename" + placeholder="璇峰湪涓嬪垪閫夋嫨" + /> + </el-form-item> + <el-form-item label="鍙戦�佽缃細" v-if="currenttype != 2"> + <el-radio-group v-model="form.sendType"> + <el-radio :label="1">鏃堕棿娈靛彂閫�</el-radio> + <el-radio :label="3">鍗冲埢鍙戦��</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item + label="鍙戦�佹棩鏈燂細" + v-if="currenttype != 2 && form.sendType == 1" + > <el-date-picker - v-model="form.name" - type="date" - placeholder="閫夋嫨鏃ユ湡" + v-model="daytime" + @change="changeTimeday" + type="daterange" + range-separator="鑷�" + start-placeholder="寮�濮嬫棩鏈�" + end-placeholder="缁撴潫鏃ユ湡" + value-format="yyyy-MM-dd" > </el-date-picker> </el-form-item> - <el-form-item label="鍙戦�佹椂闂存锛�" v-if="currenttype != 2"> - <el-checkbox-group v-model="checkList"> - <el-checkbox label="涓婂崍锛�8:30-11:30锛�"></el-checkbox> - <el-checkbox label="涓嬪崍锛�14:30-16:30锛�"></el-checkbox> - <el-checkbox label="澶滈棿锛�18:30-20:30锛�"></el-checkbox> - <el-checkbox label="涓嶅畾鏃�"></el-checkbox> - </el-checkbox-group> + <el-form-item + label="鍙戦�佹椂闂存锛�" + v-if="currenttype != 2 && form.sendType == 1" + > + <div style="display: flex"> + <div style="margin-right: 10px"> + <span style="font-size: 18px; margin-right: 10px" + >涓婂崍</span + > + <el-time-picker + is-range + @change="changeTime" + v-model="time1" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + value-format="HH:mm:ss" + > + </el-time-picker> + </div> + <div style="margin-right: 10px"> + <span style="font-size: 18px; margin-right: 10px" + >涓嬪崍</span + > + <el-time-picker + is-range + @change="changeTime" + v-model="time2" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + value-format="HH:mm:ss" + > + </el-time-picker> + </div> + <div style="margin-right: 10px"> + <span style="font-size: 18px; margin-right: 10px" + >鏅氶棿</span + > + <el-time-picker + is-range + @change="changeTime" + v-model="time3" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + value-format="HH:mm:ss" + > + </el-time-picker> + </div> + </div> </el-form-item> <el-form-item label="鏈嶅姟褰㈠紡"> <el-checkbox-group v-model="checkList"> @@ -59,18 +127,6 @@ :label="item" ></el-checkbox> </el-checkbox-group> - </el-form-item> - <el-form-item label="缁勭粐褰㈠紡"> - <el-radio-group v-model="form.radio"> - <el-radio :label="3">鍗曚汉瀹f暀</el-radio> - <el-radio :label="6">澶氫汉闆嗕腑瀹f暀</el-radio> - </el-radio-group> - </el-form-item> - <el-form-item label="璇煶妯$増" prop="region"> - <el-select v-model="form.region" placeholder="璇烽�夋嫨妯$増"> - <el-option label="涓�鍙锋ā鐗�" value="shanghai"></el-option> - <el-option label="浜屽彿妯$増" value="beijing"></el-option> - </el-select> </el-form-item> </el-form> </div> @@ -237,14 +293,14 @@ </el-form-item> </el-form> <el-divider></el-divider> - <!-- 閫夋嫨浠诲姟鍒楄〃 --> + <!-- 閫夋嫨妯$増鍒楄〃 --> <SFtable - @handleUpdate="handleUpdate" - @handleSelectionChange="handleSelectionChange" + @selectfn="selectfn" :currentList="userList" - :tableLabel="tableLabelxj" + :tableLabel="tableLabel" :controlsc="false" :multiplechoice="false" + :typeinfo="1" /> <pagination v-show="total > 0" @@ -258,7 +314,7 @@ </div> </div> </div> - <el-button type="success" @click="submitForm('ruleForm')">{{ + <el-button type="success" @click="nextstep('ruleForm')">{{ quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏璁剧疆" }}</el-button> <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button> @@ -269,6 +325,54 @@ <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark"> </el-alert> <div class="leftvlue-jbxx"> + <div class="examine-jic"> + <div class="headline"> + <div>鍙橀噺鍖归厤閲忓弬</div> + </div> + <div class="examine-jic"> + <div class="jic-value"> + <el-row :gutter="20"> + <el-table :data="variableList" style="width: 100%"> + <el-table-column + prop="variablename" + align="center" + label="鍙橀噺鍚嶇О" + > + </el-table-column> + <el-table-column + prop="character" + align="center" + label="鍖归厤绗�" + > + </el-table-column> + <el-table-column label="鏇挎崲鍊�" align="center"> + <template slot-scope="scope"> + <el-input + v-model="scope.row.Replacementvalue" + placeholder="璇疯緭鍏ュ唴瀹�" + ></el-input> + </template> + </el-table-column> + <el-table-column label="鎿嶄綔" align="center"> + <template slot-scope="scope"> + <el-button + size="mini" + @click="variableEdit(scope.$index, scope.row)" + >缂栬緫</el-button + > + <el-button + size="mini" + type="danger" + @click="variableDelete(scope.$index, scope.row)" + >鍒犻櫎</el-button + > + </template> + </el-table-column> + </el-table> + </el-row> + </div> + </div> + </div> <div class="examine-jic"> <div class="headline"> <div>鎮h�呭垪琛�</div> @@ -361,7 +465,7 @@ <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-select - v-model="tasktopic" + v-model="patientqueryParams.allhosp" placeholder="璇烽�夋嫨鏂板绫诲瀷" > <el-option @@ -379,7 +483,7 @@ plain icon="el-icon-plus" size="medium" - :disabled="!tasktopic" + :disabled="!patientqueryParams.allhosp" @click="handleAddpatient" >鏂板</el-button > @@ -403,9 +507,10 @@ <SFtable @handleUpdate="handleUpdate" @handleSelectionChange="handleSelectionChange" - :currentList="sonuserList" + :currentList="form.patTaskRelevances" :tableLabel="tableLabelhz" :controlxz="false" + :typeinfo="2" /> <pagination v-show="total > 0" @@ -513,7 +618,9 @@ @handleSelectionChange="handleSelectionChange" :currentList="patientuserList" :tableLabel="tableLabelhz" + :serialnumber="false" :controlsc="false" + :typeinfo="3" /> </el-row> <pagination @@ -536,10 +643,19 @@ </template> <script> -import { listsvr_prjtask, Addpatienttask } from "@/api/smartorpor/svr_prjtask"; -import { listpat_archive } from "@/api/smartorpor/pat_archive"; -import { listsvr_prjtaskline } from "@/api/smartorpor/svr_prjtaskline"; import { messagelistpatient } from "@/api/patient/homepage"; +import store from "@/store"; +import { + getTaskpatient, + getlibrarylist, + getFollowuplist, + getQtemplatelist, + edithetask, + addhetask, + gethetaskinfo, + delhetaskinfo, + Editsingletask, +} from "@/api/AiCentre/index"; import SFtable from "@/components/SFtable"; //琛ㄦ牸缁勪欢 export default { @@ -548,58 +664,74 @@ return { title: "瀹f暀鍐呭鍒楄〃", currenttype: 1, //1瀹f暀2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎 + id: "", Editprogress: 1, //缂栬緫杩涘害 loading: false, // 閬僵灞� patientloading: false, // 閬僵灞� dialogVisiblepatient: false, //娣诲姞鎮h�呭脊妗� + radio: 1, checkboxlist: [], tableLabel: [], // 鎮h�呰〃鍗� tableLabelhz: [ + { label: "搴忓彿", width: "", prop: "patid" }, { label: "鎮h�呭悕绉�", width: "", prop: "name" }, { label: "鎬у埆", width: "", prop: "sex" }, { label: "骞撮緞", width: "", prop: "age" }, { label: "灏辫瘖绉戝", width: "", prop: "impTemplate" }, - { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "create_time" }, - { label: "鍒涘缓浜�", width: "", prop: "update_by" }, + { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "uploadTime" }, + { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "update_by" }, ], tableLabelxj: [ - { label: "瀹f暀鍚嶇О", width: "", prop: "name" }, - { label: "瀹f暀绫诲瀷", width: "", prop: "nametype" }, - { label: "瀹f暀妯$増", width: "", prop: "impTemplate" }, - { label: "鍒涘缓鏃ユ湡", width: "", prop: "create_time" }, - { label: "鍒涘缓浜�", width: "", prop: "update_by" }, + { label: "瀹f暀鍚嶇О", width: "", prop: "preachname" }, + { label: "瀹f暀鎻忚堪", width: "", prop: "note" }, + { label: "瀹f暀褰㈠紡", width: "", prop: "playType" }, + { label: "閫傜敤鏂瑰紡", width: "", prop: "suitway" }, + { label: "鍒涘缓鏃ユ湡", width: "", prop: "uploadTime" }, + { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "update_by" }, ], tableLabelmz: [ - { label: "闅忚鍚嶇О", width: "118", prop: "name" }, + { label: "闅忚鍚嶇О", width: "118", prop: "templateName" }, { label: "闅忚妯$増", width: "130", prop: "impTemplate" }, - { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" }, - { label: "鍒涘缓浜�", width: "130", prop: "update_by" }, + { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" }, + { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" }, ], tableLabelcy: [ - { label: "闅忚鍚嶇О", width: "118", prop: "name" }, + { label: "闅忚鍚嶇О", width: "118", prop: "templateName" }, { label: "闅忚璁″垝", width: "130", prop: "impTemplate" }, - { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" }, - { label: "鍒涘缓浜�", width: "130", prop: "update_by" }, + { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" }, + { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" }, ], tableLabelfz: [ - { label: "閫氱煡鍚嶇О", width: "118", prop: "name" }, + { label: "閫氱煡鍚嶇О", width: "118", prop: "templateName" }, { label: "閫氱煡妯$増", width: "130", prop: "impTemplate" }, - { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" }, - { label: "鍒涘缓浜�", width: "130", prop: "update_by" }, + { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" }, + { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" }, ], tableLabeltj: [ { label: "閫氱煡鍚嶇О", width: "118", prop: "name" }, { label: "閫氱煡妯$増", width: "130", prop: "impTemplate" }, - { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" }, - { label: "鍒涘缓浜�", width: "130", prop: "update_by" }, + { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" }, + { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" }, ], tableLabelwj: [ { label: "闂嵎鍚嶇О", width: "118", prop: "name" }, { label: "闂嵎妯$増", width: "130", prop: "impTemplate" }, - { label: "鍒涘缓鏃ユ湡", width: "136", prop: "create_time" }, - { label: "鍒涘缓浜�", width: "130", prop: "update_by" }, + { label: "鍒涘缓鏃ユ湡", width: "136", prop: "uploadTime" }, + { label: "鍒涘缓浜猴紙缂猴級", width: "130", prop: "update_by" }, ], + // 鍙橀噺 + tableLabelvariable: [ + { label: "鍙橀噺鍚嶇О", width: "", prop: "variablename" }, + { label: "鍖归厤绗�", width: "", prop: "character" }, + { label: "鏇挎崲鍊�", width: "", prop: "Replacementvalue" }, + ], + // 鏃堕棿澶勭悊 + daytime: [], //鏃ユ湡 + applydaytime: [], //璁$畻鏃ユ湡 + time1: "", //涓婂崍鏃堕棿娈� + time2: "", //涓嬪崍鏃堕棿娈� + time3: "", //鏅氫笂鏃堕棿娈� topqueryParams: { pageNum: 1, // pageSize: 10, @@ -628,31 +760,33 @@ userList: [], //妯$増鍒楄〃 patientuserList: [], //閫夋嫨鎮h�呭垪琛� sonuserList: [], //閫変腑鎮h�呭垪琛� + variableList: [ + { + variablename: "濮撳悕", + character: "${name}", + Replacementvalue: "榫欏偛澶�", + }, + { + variablename: "鍦板潃", + character: "${dzz}", + Replacementvalue: "榫欏", + }, + { + variablename: "鐢佃瘽", + character: "${dhh}", + Replacementvalue: "鍏釜鍏�", + }, + ], //鍙橀噺鍒楄〃 + variableListTime: [], tasktopic: null, //鏂板绫诲瀷 + SelectPatientslist: [], form: { - name: "", - region: "", - date1: "", - date2: "", - delivery: false, - type: [], - resource: "", - desc: "", + serviceform: [], + patTaskRelevances: [], + sendType: 1, + templatename: "", + templateid: null, }, - options: [ - { - value: "閫夐」1", - label: "榛勯噾绯�", - }, - { - value: "閫夐」2", - label: "鍙岀毊濂�", - }, - { - value: "閫夐」5", - label: "鍖椾含鐑ら腑", - }, - ], taskoptions: [ { value: "1", @@ -673,67 +807,149 @@ components: { SFtable }, created() { + this.id = this.$route.query.id; + this.form.type = this.$route.query.type; this.Addsubtask(); this.Getsubtask(); this.Acquisitiontype(); }, methods: { + // { + // 濮撳悕: { "${name}": "榫欏偛澶�" }, + // 鍦板潃: { "${dzz}": "榫欏" }, + // 鐢佃瘽: { "${dhh}": "鍏釜鍏�" }, + // } + // 鍙橀噺杞崲瀵硅薄杞暟缁� + convertFormat1ToFormat2(data) { + let result = []; + for (let key in data) { + let innerKey = Object.keys(data[key])[0]; + result.push({ + name: key, + value: innerKey, + fill: data[key][innerKey], + }); + } + return result; + }, + // 鏁扮粍杞璞� + convertFormat2ToFormat1(data) { + let result = {}; + data.forEach((item) => { + let innerObj = {}; + innerObj[item.value] = item.fill; + result[item.name] = innerObj; + }); + return result; + }, // 鑾峰彇褰撳墠绫诲瀷 Acquisitiontype() { + let queryParams = { + pageNum: 1, + pageSize: 10, + isavailable: "", + }; this.currenttype = this.$route.query.type; - console.log(this.currenttype); + console.log(this.currenttype, "1"); if (this.currenttype == 1) { this.title = "瀹f暀鍐呭鍒楄〃"; this.tableLabel = this.tableLabelxj; this.checkboxlist = [ - "褰撻潰", - "澶氬獟浣�", + "绾夸笅", + "瑙嗛", "绾歌川", - "鐢佃瘽", + "璇煶", "鐭俊", "寰俊鍏紬鍙�", "寰俊灏忕▼搴�", "鏀粯瀹�", - "鏅鸿兘灏忕▼搴�", + "浜岀淮鐮�", "閽夐拤", ]; + getlibrarylist(queryParams).then((response) => { + this.userList = response.rows; + this.total = response.total; + }); } else if (this.currenttype == 2) { this.title = "闅忚鍐呭鍒楄〃"; this.tableLabel = this.tableLabelmz; - this.checkboxlist = ["褰撻潰", "绾歌川", "鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"]; + this.checkboxlist = ["绾夸笅", "绾歌川", "璇煶", "鐭俊", "寰俊鍏紬鍙�"]; + getFollowuplist(queryParams).then((response) => { + this.userList = response.rows; + this.total = response.total; + }); } else if (this.currenttype == 3) { this.title = "闅忚璁″垝鍒楄〃"; this.tableLabel = this.tableLabelcy; - this.checkboxlist = ["褰撻潰", "绾歌川", "鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"]; + this.checkboxlist = ["绾夸笅", "绾歌川", "璇煶", "鐭俊", "寰俊鍏紬鍙�"]; + getFollowuplist(queryParams).then((response) => { + this.userList = response.rows; + this.total = response.total; + }); } else if (this.currenttype == 4) { this.title = "閫氱煡鍐呭鍒楄〃"; this.tableLabel = this.tableLabelfz; - this.checkboxlist = ["鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"]; + this.checkboxlist = ["璇煶", "鐭俊", "寰俊鍏紬鍙�"]; + getFollowuplist(queryParams).then((response) => { + this.userList = response.rows; + this.total = response.total; + }); } else if (this.currenttype == 5) { this.title = "閫氱煡鍐呭鍒楄〃"; this.tableLabel = this.tableLabeltj; - this.checkboxlist = ["绾歌川", "鐢佃瘽", "鐭俊", "寰俊鍏紬鍙�"]; + this.checkboxlist = ["绾歌川", "璇煶", "鐭俊", "寰俊鍏紬鍙�"]; + getFollowuplist(queryParams).then((response) => { + this.userList = response.rows; + this.total = response.total; + }); } else if (this.currenttype == 6) { this.title = "闂嵎鍐呭鍒楄〃"; this.tableLabel = this.tableLabelwj; this.checkboxlist = [ - "褰撻潰", - "澶氬獟浣�", + "绾夸笅", + "瑙嗛", "绾歌川", - "鐢佃瘽", + "璇煶", "鐭俊", "寰俊鍏紬鍙�", "寰俊灏忕▼搴�", "閽夐拤", ]; + getQtemplatelist(queryParams).then((response) => { + this.userList = response.rows; + this.total = response.total; + }); } }, - // 涓嬩竴姝� - submitForm(formName) { + nextstep() { if (this.Editprogress <= 3) { return this.Editprogress++; } + }, + // 淇濆瓨 + submitForm(formName) { + this.form.serviceform = this.checkList.join(","); + this.form.textParam = { + 濮撳悕: { "${name}": "榫欏偛澶�" }, + 鍦板潃: { "${dzz}": "榫欏" }, + 鐢佃瘽: { "${dhh}": "鍏釜鍏�" }, + }; + if (this.form.id) { + this.form.isoperation = 2; + } else { + this.form.isoperation = 1; + } + Editsingletask(this.form).then((response) => { + if (res.code == 200) { + if (this.form.id) { + this.$modal.msgSuccess("鏂板鎴愬姛"); + } else { + this.$modal.msgSuccess("淇敼鎴愬姛"); + } + this.$router.go(-1); + } + }); // 鎻愪氦 // this.$refs[formName].validate((valid, object) => { // if (valid) { @@ -744,10 +960,21 @@ // } // }); }, + // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠� + // 閫夋嫨 + selectfn(row, type) { + console.log(row); + console.log(type); + if (type == 1) { + this.form.templatename = row.preachname; + this.form.templateid = row.templateid; + } else if (type == 2) { + } else if (type == 3) { + } + }, // 瀛愪换鍔′簩绾у脊妗� handleAddpatient(row) { - console.log(row, "瀛愮粍浠舵暟鎹�"); - messagelistpatient(this.patientqueryParams).then((response) => { + getTaskpatient(this.patientqueryParams).then((response) => { console.log(response); this.patientuserList = response.rows; this.patienttotal = response.total; @@ -760,6 +987,8 @@ handleExport() {}, // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { + console.log("澶氶�夋偅鑰�"); + this.SelectPatientslist = selection; this.ids = null; this.ids = selection.map((item) => item.patid).join(","); // let result = this.ids.join(","); @@ -794,26 +1023,90 @@ }, // 鏂板娲鹃�佹偅鑰� AddDispatchpatients() { - let objictpint = {}; - objictpint.patientes = this.ids; - objictpint.pguid = 2; - Addpatienttask(objictpint).then((res) => { - console.log(res); + this.SelectPatientslist.forEach((item) => { + item.isoperation = 1; }); + this.form.patTaskRelevances.push(...this.SelectPatientslist); this.dialogVisiblepatient = false; }, // 鏌ヨ瀛愪换鍔″垪琛� Getsubtask() { this.topqueryParams.pguid = 2; - console.log(this.topqueryParams); + console.log(this.topqueryParams, "aa"); messagelistpatient(this.topqueryParams).then((res) => { this.userList = res.rows; this.total = res.total; - console.log(this.userList); + console.log(this.userList, "ss"); }); }, - /** 鏌ヨ鎮h�呭垪琛� */ + // 鍙橀噺--------------- + variableEdit(index, row) { + console.log(index, row); + }, + variableDelete(index, row) { + console.log(index, row); + }, + // 鏃堕棿---------- + changeTime(row) { + console.log(row, "鏃堕棿"); + this.processingTime(); + }, + changeTimeday(row) { + const startDate = new Date(row[0]); + const endDate = new Date(row[1]); + this.applydaytime = this.getDates(startDate, endDate); + this.processingTime(); + }, + getDates(startDate, endDate) { + const dates = []; + let currentDate = new Date(startDate); + + while (currentDate <= endDate) { + dates.push(this.$moment(currentDate).format("YYYY-MM-DD")); + currentDate.setDate(currentDate.getDate() + 1); + } + + return dates; + }, + // 鏃堕棿鏈�缁堝鐞嗘柟娉� + processingTime() { + const combinedData = []; + let serialnumber = 1; + if (this.time3[0]) { + serialnumber = 3; + } else if (this.time2[0]) { + serialnumber = 2; + } else if (this.time1[0]) { + serialnumber = 1; + } else { + return; + } + + for (let i = 0; i < this.applydaytime.length; i++) { + combinedData.push({ + begantime: `${this.applydaytime[i]} ${this.time1[0]}`, + endtime: `${this.applydaytime[i]} ${this.time1[1]}`, + xh: serialnumber * i + 1, + }); + if (serialnumber >= 2) { + combinedData.push({ + begantime: `${this.applydaytime[i]} ${this.time2[0]}`, + endtime: `${this.applydaytime[i]} ${this.time2[1]}`, + xh: serialnumber * i + 2, + }); + } + if (serialnumber >= 3) { + combinedData.push({ + begantime: `${this.applydaytime[i]} ${this.time3[0]}`, + endtime: `${this.applydaytime[i]} ${this.time3[1]}`, + xh: serialnumber * i + 3, + }); + } + } + this.form.sendTimeslot = combinedData; + console.log(combinedData, "combinedData"); + }, }, }; </script> -- Gitblit v1.9.3