From 9d26234c1d5f760fcab4adea68984c02485bcf82 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 11 十二月 2023 16:48:28 +0800
Subject: [PATCH] qxtj
---
src/views/system/tijianall/index.vue | 112 +++++++++++++++++++++----------------------------------
1 files changed, 43 insertions(+), 69 deletions(-)
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index d53d886..4cfc314 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -35,17 +35,21 @@
</el-select>
</el-form-item>
<el-form-item label="璇佷欢鍙�" prop="cusIdcard">
+ :required="showHidden.has_idcard === 'Y'" style="display: flex">
+ <span slot="label" style="display:inline-block;border-bottom: 2px solid blue;" @click="handleQuery">
+ 璇佷欢鍙�
+ </span>
<el-input
style="width: 186px"
v-model="form.cusIdcard"
placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
@input="inputChange"
/>
- <i
+ <!-- <i
style="font-size: 17px; margin-left: 3px"
class="el-icon-search"
@click="handleQuery"
- ></i>
+ ></i> -->
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
<el-input style="width: 55px" v-model="form.age" />
@@ -469,7 +473,7 @@
>
<el-button
type="primary"
- @click="inputChange"
+ @click="inputChanges"
v-show="lishi"
size="mini"
:disabled="confirm"
@@ -557,7 +561,7 @@
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
- <el-table-column prop="isEat" label="绌鸿吂">
+ <el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
</el-table>
</el-collapse-item>
@@ -639,40 +643,7 @@
></iframe>
</div>
</el-dialog>
- <el-drawer
- title="鍘嗗彶浣撴璁板綍"
- :visible.sync="table"
- direction="rtl"
- size="50%"
- >
- <el-table :data="HistoryList" style="width: 95%; margin-left: 20px">
- <el-table-column
- property="tjNum"
- label="浣撴鍙�"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- property="userName"
- label="濮撳悕"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- property="tjTime"
- label="浣撴鏃堕棿"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- property="tjProName"
- label="浣撴椤圭洰"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- </el-table>
- </el-drawer>
- <el-dialog
+ <el-dialog
title="鎻愮ず"
:visible.sync="dialogVisiblese"
width="30%"
@@ -684,6 +655,7 @@
<el-button type="primary" @click="copes">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
</div>
</template>
@@ -704,9 +676,10 @@
} from "@/api/system/tijian";
import { MessageBox } from "element-ui";
import VTreeTransfer from "../tijian/TreeTransfer.vue";
+import historyTj from "@/components/historyTj/index";
export default {
components: {
- VTreeTransfer,
+ VTreeTransfer,historyTj
},
dicts: [
"dict_user_national",
@@ -748,6 +721,7 @@
// }
// };
return {
+ proIdList: [],
tableDatas: [],
dialogVisiblese: false,
lishi: false,
@@ -892,24 +866,24 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- cusName: [{ required: true, message: "濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
+ cusName: [{ required: true, message: "", trigger: "blur" }],
cusSex: [
- { required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "change" },
+ { required: true, message: "", trigger: "change" },
],
cusBrithday: [
- { required: true, message: "鍑虹敓鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "", trigger: "blur" },
],
// cusAddr: [
// { required: true, message: "鐜板眳浣忓湴鍧�涓嶈兘涓虹┖", trigger: "blur" },
// ],
cusPhone: [
- { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "", trigger: "blur" },
],
reservationTime: [
- { required: true, message: "棰勭害鏃ユ湡涓嶈兘涓虹┖", trigger: "change" },
+ { required: true, message: "", trigger: "change" },
],
timeRegion: [
- { required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "", trigger: "blur" },
],
// cusIdcard: [
// { required: true, message: "璇疯緭鍏ヨ韩浠借瘉鍙�", trigger: "blur" },
@@ -920,10 +894,10 @@
// },
// ],
cusIdcard: [
- { required: true, message: "韬唤璇佸彿涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "", trigger: "blur" },
{
pattern: /^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$/,
- message: "璇疯緭鍏ユ纭殑韬唤璇佸彿",
+ message: "",
trigger: "blur",
validator: this.validSjh,
},
@@ -970,24 +944,27 @@
this.form.cusBrithday = birthday;
this.form.age = age;
}
- let cusIdCard = this.form.cusIdcard;
- getHistryTjOrderByCusIdCard(cusIdCard).then((res) => {
- if (res.code == 200) {
+
+ // let cusIdCard = this.form.cusIdcard;
+ // getHistryTjOrderByCusIdCard(cusIdCard).then((res) => {
+ // if (res.code == 200) {
this.table = true;
this.lishi = true;
- this.HistoryList = res.data;
- }
- });
+ // this.HistoryList = res.data;
+ // }
+ // });
} else {
// return this.$message.error("璇疯緭鍏ユ纭殑韬唤璇佸彿锛�");;
}
},
+ inputChanges(){
+ this.$refs.historyTj.getlist();
+ },
cope() {
let cusIdCard = this.form.cusIdcard;
getHistryTjOrderProByCusIdCard(cusIdCard).then((res) => {
- console.log(res);
this.copeList = res.data;
- if (res.data.length != 0) {
+ if (res.msg !="鏆傛棤鍘嗗彶璁板綍") {
this.dialogVisiblese = true;
} else {
this.$message.warning("鏆傛棤鍘嗗彶浣撴璁板綍锛�");
@@ -1005,21 +982,24 @@
}
let _this = this;
- console.log(this.tableDatas.length);
if (this.tableDatas.length != 0) {
- this.tableDatas.forEach((item) => {
- _this.pacId = this.tableDatas.pacId;
- _this.proId = this.tableDatas.proId;
- console.log(_this.pacId, 888);
- });
-
+ this.tableDatas.forEach((item) => {
+ if (item.pacId != null) {
+ _this.pacId = item.pacId;
+ } else {
+ item.list.forEach((items) => {
+ _this.proIdList.push(items.proId);
+ console.log(_this.pacId, 888);
+ });
+ }
+ });
} else {
_this.pacId = "";
}
let data = {
cusId,
pacId: _this.pacId,
- proIds: _this.proId,
+ proIds: _this.proIdList,
};
getaddtTransition(data).then((response) => {
if (response.msg === "鎿嶄綔鎴愬姛") {
@@ -1339,7 +1319,6 @@
// 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
handleSelectionChange(selection, row) {
this.tableData = selection;
- console.log(this.tableData);
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
@@ -1452,15 +1431,11 @@
// 鏈�鍚庢彁浜ゆ寜閽�
submitPrice() {
let _this = this;
- console.log(_this.tableData1.length, 111);
if (_this.tableData1.length > 0) {
let userId = this.form.cusIdcard;
- console.log(userId, 222);
let tjType = this.form.tjType == 2 ? "涓汉" : "鍥㈤槦";
- console.log(this.tableData[0], 444);
if (this.tableData[0]) {
var pacId = this.tableData[0].pacId;
- console.log(pacId, 333);
}
// let copeWith = this.TotalPrice1;
// let paidIn = this.TotalPrice;
@@ -1474,7 +1449,6 @@
// }
let data;
if (pacId) {
- console.log(pacId);
data = {
pacId,
department: this.form.department,
--
Gitblit v1.8.0