From d6704ad70b8e28d3dfe84b2e4f17f1c0aeb84c21 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 05 十二月 2024 16:16:34 +0800
Subject: [PATCH] 111
---
src/views/system/tijian/index.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 1ea1d2c..65631ab 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1619,10 +1619,11 @@
pacName: null,
pacRemark: null,
},
- valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://127.0.0.1:18890",
+ valueUrl: "ws://127.0.0.1:6789/websocket",
valueUrls: "ws://127.0.0.1:6789/websocket",
// valueUrls: "ws://"+getIp() +":6789/websocket",
- WebSocket: null,
+ webSocket: null,
// 韬唤璇侀渶瑕�
// socket: null,
// value: 1,
@@ -1652,12 +1653,13 @@
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
+ obj: {},
form: {
cusIdcard: "",
- tjType: "2",
+ tjType: "3",
cusSex: 1,
cusNational: "1",
- cusMarryStatus: "1",
+ cusMarryStatus: "5",
idType: "1",
ageUnit: "0",
},
@@ -1689,6 +1691,10 @@
this.startTimer();
this.getList1();
// this.getData();
+ },
+ mounted(){
+ console.log(this.dict.type.dict_user_marry,555);
+
},
methods: {
@@ -2196,7 +2202,7 @@
this.discount = this.form.discount;
}
if (this.form.tjType === null) {
- this.form.tjType = "2";
+ this.form.tjType = "3";
}
if (this.form.reservationId != null) {
if (this.form.groupingId) {
@@ -2279,6 +2285,7 @@
} else {
let configKey = "getInfoFromSqlData";
getconfigKey(configKey).then((res) => {
+ console.log(res);
if (res.code == 200) {
if (res.msg == "N") {
var websocket = null;
@@ -2305,16 +2312,17 @@
this.websocket = websocket;
// 杩炴帴璁惧
var jsonObj = {
- name: "connect",
+ // name: "connect",
+ type: "1",
};
var jStr = JSON.stringify(jsonObj);
this.websocket.send(jStr);
alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
var jsonObj = {
- name: "readCert",
+ // name: "readCert",
};
- var jStr = JSON.stringify(jsonObj);
- this.websocket.send(jStr);
+ // var jStr = JSON.stringify(jsonObj);
+ // this.websocket.send(jStr);
this.dialogVisible = false;
};
@@ -2322,6 +2330,7 @@
websocket.onmessage = function (event) {
var resultObj = eval("(" + event.data + ")");
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
+
if (
resultObj.name == "readCard" ||
resultObj.name == "readCert" ||
@@ -2967,10 +2976,10 @@
let proId = this.packagedataList[i].proId;
this.checkedListkey1.push(proId);
// this.DataLists.push(this.packagedataList[i]);
- getProSonDxList(proId).then((res) => {
+ getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
- console.log(this.TreedataList,888);
-
+ console.log(this.TreedataList, 888);
+
this.TreedataList.forEach((item) => {
// this.checkedListkey1.push(item.proId);
@@ -2980,7 +2989,7 @@
this.marryalls = 0;
this.DataLists.forEach((item1) => {
this.marryalls += item1.proPrice;
-
+
this.packagedataList.forEach((item3) => {
if (item1.proParentId == item3.proId) {
item1.propinName = item3.proName;
--
Gitblit v1.8.0