From ae93592f70846480e937999b897a6e6151aab13f Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 06 十二月 2024 16:37:42 +0800
Subject: [PATCH] 666
---
src/views/system/tijian/index.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index c6f3d7d..b1f4f3f 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1014,6 +1014,7 @@
v-for="(item, index) in tableData1"
:key="'info1-' + index"
>
+
<el-collapse-item :name="index">
<template slot="title">
<div style="width: 70%">
@@ -1044,7 +1045,7 @@
style="width: 100%"
height="270"
>
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table-column prop="s" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
<template
@@ -1620,6 +1621,7 @@
pacRemark: null,
},
// valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://192.168.1.3:6789/websocket",
valueUrl: "ws://127.0.0.1:6789/websocket",
valueUrls: "ws://127.0.0.1:6789/websocket",
// valueUrls: "ws://"+getIp() +":6789/websocket",
@@ -1694,6 +1696,9 @@
},
mounted() {
console.log(this.dict.type.dict_user_marry, 555);
+ console.log(this.dict.type.dict_user_national, 666);
+
+
},
methods: {
@@ -2203,6 +2208,12 @@
if (this.form.tjType === null) {
this.form.tjType = "3";
}
+ if (this.form.cusMarryStatus === "null") {
+ this.form.cusMarryStatus = "5";
+ }
+ if (this.form.cusNational === "null") {
+ this.form.cusNational = "1";
+ }
if (this.form.reservationId != null) {
if (this.form.groupingId) {
_this.tcShow = true;
@@ -2316,7 +2327,7 @@
};
var jStr = JSON.stringify(jsonObj);
this.websocket.send(jStr);
- alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+ // alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
var jsonObj = {
// name: "readCert",
};
@@ -2382,7 +2393,9 @@
// 鏈�鏂颁娇鐢╳ebSocket閫氫俊
readCardWebSocket(resultObj){
let _this = this;
- if (resultObj.code === 200) {
+ if (resultObj.code === 200 && resultObj.data.name != null) {
+ console.log('213131');
+
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.data.name;
_this.form.cusSex =
@@ -2404,7 +2417,9 @@
"data:image/jpeg;base64," +
resultObj.data.img;
}
- } else if (resultObj.resultFlag == "-1") {
+ } else {
+ this.$message.warning('璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇')
+ }/* if (resultObj.resultFlag == "-1") {
if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
//alert("璇诲崱鍣ㄦ湭杩炴帴");
} else {
@@ -2412,7 +2427,7 @@
}
} else if (resultObj.resultFlag == "-2") {
//alert(resultObj.errorMsg);
- }
+ } */
},
// TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
jingChuanHandlerWebSocketResult(resultObj) {
@@ -3304,6 +3319,9 @@
}
this.list1 = false;
this.list3 = true;
+ this.list2 = false;
+ console.log(this.list1)
+ console.log(this.list3)
} else {
this.list1 = true;
this.TotalPrice = "0.00";
--
Gitblit v1.8.0