From a3350d3b221f68b00d7476b481455406cb6ddcc5 Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期一, 14 七月 2025 09:18:42 +0800 Subject: [PATCH] qx --- src/views/system/tijian/index.vue | 58 ++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 24 deletions(-) diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index b290a15..4a193d2 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -146,25 +146,14 @@ }, trigger: 'blur', }, -<<<<<<< HEAD + ]"> <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery"> 璇佷欢鍙风爜 </span> <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" - @input="handleIdCardInput" /> + @input="handleIdCardInput" maxlength="18" /> <!-- <i style=" -======= - trigger: 'blur', - }, - ]"> - <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery"> - 璇佷欢鍙风爜 - </span> - <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" - @input="handleIdCardInput" maxlength="18"/> - <!-- <i style=" ->>>>>>> 0c23ed71897641b9ee66d81082cbc999e0c5f0ae font-size: 1rem; position: absolute; right: -20px; @@ -478,10 +467,19 @@ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" /> </el-form-item> <el-form-item label="鎬у埆" prop="cusSex"> - <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px"> + <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 200px"> <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option> </el-select> + </el-form-item> + + + <el-form-item label="骞撮緞" prop="age"> + <el-input v-model="form.age" :disabled="isDisabled" style="width: 142px"/> + <!-- <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 15%"> + <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> + </el-select> --> </el-form-item> <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard"> <span slot="label"> 璇佷欢鍙风爜 </span> @@ -575,9 +573,9 @@ "> <span v-if="this.tableData1[0]">{{ this.tableData1[0].pacName || "" - }}</span> + }}</span> 宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0 - }}</span>鏉� + }}</span>鏉� </div> 宸查�夐」鐩垪琛� </div> @@ -1174,7 +1172,10 @@ .then(() => { this.TotalPrice1 = 0; getTransitionList1(row.cusId).then((response) => { - this.tableData1 = response.data; + this.tableData1 = response.data.list; + if (response.data.tjCategory != null) { + this.tjCategory = response.data.tjCategory; + } this.tableData1.forEach((item) => { this.TotalPrice1 += item.ordPrice; @@ -1495,7 +1496,10 @@ let cusId = this.form.cusIdcard; this.proIds = []; getTransitionList1(cusId).then((response) => { - this.tableData1 = response.data; + this.tableData1 = response.data.list; + if (response.data.tjCategory != null) { + this.tjCategory = response.data.tjCategory; + } this.TotalPrice1 = 0; if (this.tableData1) { this.tableData1.forEach((item) => { @@ -1869,7 +1873,10 @@ _this.tcShow = true; getTransitionList1(this.form.cusIdcard).then((res) => { - this.tableData1 = res.data; + this.tableData1 = res.data.list; + if (res.data.tjCategory != null) { + this.tjCategory = res.data.tjCategory; + } if (this.tableData1) { this.tableData1.forEach((item) => { this.TotalPrice1 += item.ordPrice; @@ -1894,7 +1901,10 @@ _this.formPacId = this.form.pacId; let cusId = this.form.cusIdcard; getTransitionList1(cusId).then((response) => { - this.tableData1 = response.data; + this.tableData1 = response.data.list; + if (response.data.tjCategory != null) { + this.tjCategory = response.data.tjCategory; + } if (this.tableData1) { this.TotalPrice1 = 0; this.tableData1.forEach((item) => { @@ -2400,7 +2410,10 @@ let cusId = this.form.cusIdcard; this.proIds = []; getTransitionList1(cusId).then((response) => { - this.tableData1 = response.data; + this.tableData1 = response.data.list; + if (response.data.tjCategory != null) { + this.tjCategory = response.data.tjCategory; + } this.TotalPrice1 = 0; if (this.tableData1.length >= 1) { this.list1 = false; @@ -3026,14 +3039,11 @@ // 澶勭悊璁㈠崟椤圭洰 processOrderItems(cusId) { - console.log(111112222233333) getTransitionList1(cusId).then((response) => { this.contentLoading = false; this.tableData1 = response.data.list; if (response.data.tjCategory != null) { this.tjCategory = response.data.tjCategory; - - } let Price = 0; if (this.tableData1) { -- Gitblit v1.8.0