From d0594c96b1905f461ebf4dbdcc49a5c6230f1102 Mon Sep 17 00:00:00 2001 From: su1124 <1583764726@qq.com> Date: 星期二, 26 十二月 2023 15:33:00 +0800 Subject: [PATCH] su --- src/views/system/bill/index.vue | 1 src/views/doctor/test/index.vue | 3 src/views/doctor/examination/index.vue | 12 ++ src/views/hosp/extension/index.vue | 1 src/views/picture/picture/index.vue | 8 + src/views/system/positive/index.vue | 1 src/views/hosp/history/index.vue | 1 src/views/system/tijian/index.vue | 3 src/views/doctor/checkAll/index.vue | 3 src/views/system/biol/index.vue | 1 src/views/system/visit/index.vue | 1 src/views/doctor/check/index.vue | 104 ++++++++++++++++++------- src/views/reservation/reservations/index.vue | 1 src/views/hosp/datacomparison/index.vue | 4 src/views/picture/other/index.vue | 8 + src/views/hosp/fuzhen/index.vue | 1 src/views/system/Checkout/index.vue | 5 + src/views/picture/music/index.vue | 8 + src/views/hosp/order/index.vue | 1 src/views/doctor/imaging/index.vue | 3 src/views/system/register/index.vue | 1 src/views/system/invoice/index.vue | 1 src/views/system/circle/index.vue | 1 src/views/system/package/index.vue | 19 ++-- src/views/sampling/sampling/index.vue | 9 + 25 files changed, 148 insertions(+), 53 deletions(-) diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue index 60241f2..0af36fa 100644 --- a/src/views/doctor/check/index.vue +++ b/src/views/doctor/check/index.vue @@ -230,7 +230,7 @@ ></el-option> </el-select> </el-form-item> - <el-form-item label="鐢宠浜�" prop="hzDoctorId"> + <el-form-item label="鐢宠浜�" prop="hzDoctorId" style="margin-top:22px"> <el-select v-model="form.hzDoctorId" placeholder="璇烽�夋嫨" @@ -853,7 +853,7 @@ name: null, }, rules: { - hzType: [{ required: true, message: "", trigger: "change" }], + hzType: [{ required: true, message: "浼氳瘖绉戝涓哄繀濉」", trigger: "change" }], }, }; }, @@ -1170,12 +1170,22 @@ }, hadleedit(row) { + console.log(row, 111); this.form.hzType = row.hzType; this.form.id = row.id; + this.form.hzDeptId = row.hzDeptNameList; + // row.hzDeptIdList.forEach(item=>{ + // console.log(item,222); + // this.deptList.forEach(items=>{ + // console.log(item,333); + // if(item == items.deptId){ + // this.form.hzDeptNameList = + // } + // }) + // }) }, submitFormapply() { - console.log(this.form); let data = {}; this.userList.forEach((item1) => { if (this.form.hzDoctorId == item1.userId) { @@ -1183,36 +1193,49 @@ } }); if (this.form.hzType != undefined) { - if (this.form.hzDeptId && this.form.id) { - // let hzDeptId = "" - // this.form.hzDeptId.forEach(item => { - // hzDeptId += item + ',' - // }) - data = { - tjNumber: this.form.tjNumber, - userId: this.form.cusId, - userName: this.form.cusName, - hzDeptIdList: this.form.hzDeptId, - hzDoctorId: this.form.hzDoctorId, - hzType: this.form.hzType, - orderId: this.form.orderId, - hzDoctorName: this.form.hzDoctorName, - id: this.form.id, - }; - } else { - data = { - tjNumber: this.form.tjNumber, - userId: this.form.cusId, - userName: this.form.cusName, - hzDoctorId: this.form.hzDoctorId, - hzType: this.form.hzType, - orderId: this.form.orderId, - hzDoctorName: this.form.hzDoctorName, - }; - } + // if (this.form.hzDeptId && this.form.id) { + // console.log(111); + // // let hzDeptId = "" + // // this.form.hzDeptId.forEach(item => { + // // hzDeptId += item + ',' + // // }) + // data = { + // tjNumber: this.form.tjNumber, + // userId: this.form.cusId, + // userName: this.form.cusName, + // hzDeptIdList: this.form.hzDeptId, + // hzDoctorId: this.form.hzDoctorId, + // hzType: this.form.hzType, + // orderId: this.form.orderId, + // hzDoctorName: this.form.hzDoctorName, + // id: this.form.id, + // }; + // } else { + // console.log(222); + // data = { + // tjNumber: this.form.tjNumber, + // userId: this.form.cusId, + // userName: this.form.cusName, + // hzDoctorId: this.form.hzDoctorId, + // hzType: this.form.hzType, + // orderId: this.form.orderId, + // hzDoctorName: this.form.hzDoctorName, + // }; + // } this.$refs["form"].validate((valid) => { if (valid) { if (this.form.id != null) { + data = { + tjNumber: this.form.tjNumber, + userId: this.form.cusId, + userName: this.form.cusName, + hzDeptIdList: this.form.hzDeptId, + hzDoctorId: this.form.hzDoctorId, + hzType: this.form.hzType, + orderId: this.form.orderId, + hzDoctorName: this.form.hzDoctorName, + id: this.form.id, + }; updateHzlog(data).then((res) => { if (res.code == 200) { this.$modal.msgSuccess("淇敼鎴愬姛"); @@ -1222,7 +1245,19 @@ } }); } else { - addHzlog(data).then((res) => { + data = { + tjNumber: this.form.tjNumber, + userId: this.form.cusId, + userName: this.form.cusName, + hzDeptIdList: this.form.hzDeptId, + hzDoctorId: this.form.hzDoctorId, + hzType: this.form.hzType, + orderId: this.form.orderId, + hzDoctorName: this.form.hzDoctorName, + id: this.form.id, + }; + if(this.form.hzDeptId.length != 0){ + addHzlog(data).then((res) => { if (res.code == 200) { this.$modal.msgSuccess("鐢宠鎴愬姛"); this.form = {}; @@ -1231,6 +1266,10 @@ } }); this.open = false; + }else{ + this.$modal.msgError("璇烽�夋嫨浼氳瘖绉戝"); + } + } } }); @@ -1351,6 +1390,9 @@ if (this.tableAll.cusSex === 1) { this.tableAll.cusSex = "濂�"; } + if (this.tableAll.cusSex === 2) { + this.tableAll.cusSex = "鏈煡"; + } this.tjNumber = row.tjNumber; let num = 0; getParentList(this.tjNumber).then((response) => { diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue index a559f30..c52dbc7 100644 --- a/src/views/doctor/checkAll/index.vue +++ b/src/views/doctor/checkAll/index.vue @@ -1361,6 +1361,9 @@ if (this.tableAll.cusSex === 1) { this.tableAll.cusSex = "濂�"; } + if (this.tableAll.cusSex === 2) { + this.tableAll.cusSex = "鏈煡"; + } this.tjNumber = this.tableAll.tjNumber; getState(this.tjNumber).then((res) => { this.status = res.data; diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue index 222dd06..c60cf48 100644 --- a/src/views/doctor/examination/index.vue +++ b/src/views/doctor/examination/index.vue @@ -95,11 +95,17 @@ prop="cusSex" width="60px" > - <template slot-scope="scope"> + <template slot-scope="scope"> + <span v-if="scope.row.cusSex == '0'">鐢�</span> + <span v-if="scope.row.cusSex == '1'">濂�</span> + <span v-if="scope.row.cusSex == '2'">鏈煡</span> + <span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span> + </template> + <!-- <template slot-scope="scope"> --> <!-- {{scope.row.customer.cusSex}} --> - {{ scope.row.cusSex === 0 ? "鐢�" : "濂�" }} + <!-- {{ scope.row.cusSex === 0 ? "鐢�" : "濂�" }} --> <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> --> - </template> + <!-- </template> --> </el-table-column> <el-table-column label="鎵嬫満鍙�" diff --git a/src/views/doctor/imaging/index.vue b/src/views/doctor/imaging/index.vue index 1f50e6b..540cda5 100644 --- a/src/views/doctor/imaging/index.vue +++ b/src/views/doctor/imaging/index.vue @@ -1288,6 +1288,9 @@ if (this.tableAll.cusSex === 1) { this.tableAll.cusSex = "濂�"; } + if (this.tableAll.cusSex === 2) { + this.tableAll.cusSex = "鏈煡"; + } this.tjNumber = row.tjNumber; let num = 0; getParentList(this.tjNumber).then((response) => { diff --git a/src/views/doctor/test/index.vue b/src/views/doctor/test/index.vue index ff61e4d..0282eaf 100644 --- a/src/views/doctor/test/index.vue +++ b/src/views/doctor/test/index.vue @@ -960,6 +960,9 @@ if (this.tableAll.cusSex === 1) { this.tableAll.cusSex = "濂�"; } + if (this.tableAll.cusSex === 2) { + this.tableAll.cusSex = "鏈煡"; + } this.tjNumber = row.tjNumber; let num = 0; getParentList(this.tjNumber).then((response) => { diff --git a/src/views/hosp/datacomparison/index.vue b/src/views/hosp/datacomparison/index.vue index 04b8e29..22f18de 100644 --- a/src/views/hosp/datacomparison/index.vue +++ b/src/views/hosp/datacomparison/index.vue @@ -134,8 +134,10 @@ this.model.tjCustomerSex = this.$route.query.tjCustomerSex if (this.model.tjCustomerSex == "0") { this.model.tjCustomerSex = "鐢�" - } else { + } else if(this.model.tjCustomerSex == "1"){ this.model.tjCustomerSex = "濂�" + } else if(this.model.tjCustomerSex == "2"){ + this.model.tjCustomerSex = "鏈煡" } this.model.tjCustomerPhone = this.$route.query.tjCustomerPhone } diff --git a/src/views/hosp/extension/index.vue b/src/views/hosp/extension/index.vue index 6bf6d94..f13ce17 100644 --- a/src/views/hosp/extension/index.vue +++ b/src/views/hosp/extension/index.vue @@ -42,6 +42,7 @@ <template slot-scope="scope"> <span v-if="scope.row.sex == '0'">鐢�</span> <span v-if="scope.row.sex == '1'">濂�</span> + <span v-if="scope.row.sex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="age" height="10px" /> diff --git a/src/views/hosp/fuzhen/index.vue b/src/views/hosp/fuzhen/index.vue index c6fb60a..90924b8 100644 --- a/src/views/hosp/fuzhen/index.vue +++ b/src/views/hosp/fuzhen/index.vue @@ -56,6 +56,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" /> diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue index 38fb2d3..06b4e6f 100644 --- a/src/views/hosp/history/index.vue +++ b/src/views/hosp/history/index.vue @@ -79,6 +79,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index d22ad20..cddafef 100644 --- a/src/views/hosp/order/index.vue +++ b/src/views/hosp/order/index.vue @@ -69,6 +69,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" /> diff --git a/src/views/picture/music/index.vue b/src/views/picture/music/index.vue index 5011586..0071915 100644 --- a/src/views/picture/music/index.vue +++ b/src/views/picture/music/index.vue @@ -75,9 +75,13 @@ /> <!-- <el-table-column label="韬唤璇�" align="center" prop="customer.cusIdcard" width="170px" /> --> <el-table-column label="鎬у埆" align="center" prop="customer.cusSex"> - <template slot-scope="scope"> + <!-- <template slot-scope="scope"> {{ scope.row.customer.cusSex === 0 ? "鐢�" : "濂�" }} - <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> --> + </template> --> + <template slot-scope="scope"> + <span v-if="scope.row.cusSex == '0'">鐢�</span> + <span v-if="scope.row.cusSex == '1'">濂�</span> + <span v-if="scope.row.cusSex == '2'">鏈煡</span> </template> </el-table-column> <!-- <el-table-column label="鐢熸棩" align="center" prop="customer.cusBrithday" width="110px" /> --> diff --git a/src/views/picture/other/index.vue b/src/views/picture/other/index.vue index e9c8d0d..806fb27 100644 --- a/src/views/picture/other/index.vue +++ b/src/views/picture/other/index.vue @@ -156,9 +156,13 @@ prop="customer.cusSex" width="60px" > - <template slot-scope="scope"> + <!-- <template slot-scope="scope"> {{ scope.row.customer.cusSex === 0 ? "鐢�" : "濂�" }} - <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> --> + </template> --> + <template slot-scope="scope"> + <span v-if="scope.row.cusSex == '0'">鐢�</span> + <span v-if="scope.row.cusSex == '1'">濂�</span> + <span v-if="scope.row.cusSex == '2'">鏈煡</span> </template> </el-table-column> <!-- <el-table-column label="鐢熸棩" align="center" prop="customer.cusBrithday" width="110px" /> --> diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue index 235a1c8..7804095 100644 --- a/src/views/picture/picture/index.vue +++ b/src/views/picture/picture/index.vue @@ -73,9 +73,13 @@ prop="customer.cusSex" width="60px" > - <template slot-scope="scope"> + <!-- <template slot-scope="scope"> {{ scope.row.customer.cusSex === 0 ? "鐢�" : "濂�" }} - <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> --> + </template> --> + <template slot-scope="scope"> + <span v-if="scope.row.cusSex == '0'">鐢�</span> + <span v-if="scope.row.cusSex == '1'">濂�</span> + <span v-if="scope.row.cusSex == '2'">鏈煡</span> </template> </el-table-column> <!-- <el-table-column label="鐢熸棩" align="center" prop="customer.cusBrithday" width="110px" /> --> diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue index 8da22f1..9a0020b 100644 --- a/src/views/reservation/reservations/index.vue +++ b/src/views/reservation/reservations/index.vue @@ -49,6 +49,7 @@ <template slot-scope="scope"> <span v-if="scope.row.sex == '0'">鐢�</span> <span v-if="scope.row.sex == '1'">濂�</span> + <span v-if="scope.row.sex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="age" width="60px" :show-overflow-tooltip="true" /> diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue index 8bfa04c..ed36df4 100644 --- a/src/views/sampling/sampling/index.vue +++ b/src/views/sampling/sampling/index.vue @@ -128,10 +128,13 @@ prop="customer.cusSex" width="60px" > - <template slot-scope="scope"> - <!-- {{scope.row.customer.cusSex}} --> + <!-- <template slot-scope="scope"> {{ scope.row.customer.cusSex === 0 ? "鐢�" : "濂�" }} - <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> --> + </template> --> + <template slot-scope="scope"> + <span v-if="scope.row.cusSex == '0'">鐢�</span> + <span v-if="scope.row.cusSex == '1'">濂�</span> + <span v-if="scope.row.cusSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column diff --git a/src/views/system/Checkout/index.vue b/src/views/system/Checkout/index.vue index 2807dab..62ba6da 100644 --- a/src/views/system/Checkout/index.vue +++ b/src/views/system/Checkout/index.vue @@ -46,6 +46,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" /> @@ -595,8 +596,10 @@ this.formIn = item if (this.formIn.tjCustomerSex === 0) { this.formIn.tjCustomerSex = "鐢�" - } else { + } else if(this.formIn.tjCustomerSex === 1) { this.formIn.tjCustomerSex = "濂�" + }else if(this.formIn.tjCustomerSex === 2){ + this.formIn.tjCustomerSex = "鏈煡" } this.tjNumber = item.tjNumber; }); diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue index 1032a8c..ad44a7e 100644 --- a/src/views/system/bill/index.vue +++ b/src/views/system/bill/index.vue @@ -170,6 +170,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue index 9703d07..ee71150 100644 --- a/src/views/system/biol/index.vue +++ b/src/views/system/biol/index.vue @@ -69,6 +69,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" height="10px" width="60px" diff --git a/src/views/system/circle/index.vue b/src/views/system/circle/index.vue index c688106..00d022d 100644 --- a/src/views/system/circle/index.vue +++ b/src/views/system/circle/index.vue @@ -58,6 +58,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" height="10px" width="60px" diff --git a/src/views/system/invoice/index.vue b/src/views/system/invoice/index.vue index 38aa7d2..82ac14b 100644 --- a/src/views/system/invoice/index.vue +++ b/src/views/system/invoice/index.vue @@ -77,6 +77,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" /> diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue index 3414381..d6f3f0f 100644 --- a/src/views/system/package/index.vue +++ b/src/views/system/package/index.vue @@ -130,6 +130,13 @@ fixed /> <!-- <el-table-column label="缂栧彿" align="center" prop="pacId" /> --> + <el-table-column + label="濂楅鍒嗙被" + width="100px" + align="center" + prop="categoryNames" + fixed + ></el-table-column> <el-table-column label="濂楅鍚嶇О" align="center" @@ -137,6 +144,8 @@ width="150px" fixed /> + <el-table-column label="浠锋牸" width="80px" align="center" prop="price" fixed> + </el-table-column> <el-table-column label="鍗曢」鍒楄〃" align="center" @@ -172,15 +181,9 @@ <image-preview :src="scope.row.pacPhone" :width="50" :height="50" /> </template> </el-table-column> --> - <el-table-column label="浠锋牸" width="80px" align="center" prop="price"> - </el-table-column> + - <el-table-column - label="濂楅鍒嗙被" - width="100px" - align="center" - prop="categoryNames" - ></el-table-column> + <el-table-column label="鍏抽敭瀛�" width="110px" diff --git a/src/views/system/positive/index.vue b/src/views/system/positive/index.vue index c0f7599..94b1e1e 100644 --- a/src/views/system/positive/index.vue +++ b/src/views/system/positive/index.vue @@ -62,6 +62,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" height="10px" /> diff --git a/src/views/system/register/index.vue b/src/views/system/register/index.vue index a36b2b7..da7ec29 100644 --- a/src/views/system/register/index.vue +++ b/src/views/system/register/index.vue @@ -90,6 +90,7 @@ <template slot-scope="scope"> <span v-if="scope.row.sex == '0'">鐢�</span> <span v-if="scope.row.sex == '1'">濂�</span> + <span v-if="scope.row.sex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="age" height="10px" :show-overflow-tooltip="true" width="55px"/> diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index 58fa984..834923d 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -896,6 +896,9 @@ cusPhone: [ { required: true, message: "", trigger: "change" }, ], + cusBrithday: [ + { required: true, message: "", trigger: "change" }, + ], // cusNational: [ // { required: true, message: "姘戞棌涓嶈兘涓虹┖", trigger: "change" }, // ], diff --git a/src/views/system/visit/index.vue b/src/views/system/visit/index.vue index 2fa1623..8f4464d 100644 --- a/src/views/system/visit/index.vue +++ b/src/views/system/visit/index.vue @@ -58,6 +58,7 @@ <template slot-scope="scope"> <span v-if="scope.row.tjCustomerSex == '0'">鐢�</span> <span v-if="scope.row.tjCustomerSex == '1'">濂�</span> + <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span> </template> </el-table-column> <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" height="10px" width="60px" -- Gitblit v1.8.0