From c7b33db117fd2893d7d1c93bf5d46e87d33e44d0 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 16 十二月 2024 16:08:51 +0800
Subject: [PATCH] 初审结果查询
---
src/views/sampling/sampling/index.vue | 153 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 116 insertions(+), 37 deletions(-)
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 9908694..ba8ecc1 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -111,19 +111,22 @@
<el-button type="primary" :disabled="!disabled" @click="Cancellation"
>鎾ら攢鍚堝苟</el-button
>
- <el-button type="primary" @click="Confirmreceipt" :disabled="!selectList.length">閲囨牱鎵撶爜</el-button>
+ <el-button
+ type="primary"
+ @click="Confirmreceipt"
+ :disabled="!selectList.length"
+ >閲囨牱鎵撶爜</el-button
+ >
</el-col>
<el-col
:span="12"
style="margin: 10px 15px"
v-show="samplingList.length > 0 && tjStatus == 0"
>
- <el-button
- type="primary"
- :disabled="!selectList.length"
- @click="Collection"
+ <el-button type="primary" :disabled="!selectList.length" @click="buda"
>琛ユ墦鏉＄爜</el-button
>
+ <!-- @click="Collection" -->
<el-button type="primary" :disabled="!disabled" @click="Cancellation"
>鎾ら攢鍚堝苟</el-button
>
@@ -188,9 +191,9 @@
</el-table-column>
</el-table>
</div>
- <div style="width: 50%" v-if="this.rightTabShow">
+ <div style="width: 50%">
+ <!-- v-if="this.rightTabShow" -->
<el-table
-
v-loading="loading"
:data="tableList"
@selection-change="handleChange"
@@ -375,6 +378,8 @@
return {
msg: "",
getNumbr: null,
+ valueUrl: "ws://127.0.0.1:6789/websocket",
+ webSocket: null,
list: [],
selectList: [],
selectedRows: [],
@@ -386,6 +391,9 @@
ids: [],
// 缁戝畾鍗曢�夋寜閽�
tjStatus: "1",
+ dayinData: [],
+ jsonObj: {},
+
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -454,15 +462,14 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {},
- rightTabShow: false
+ // rightTabShow: false
};
},
created() {
// this.getNowTime();
getTxmmccd().then((res) => {
this.msg = Number(res.msg);
- console.log(res,444);
-
+ console.log(res, 444);
});
this.getdate();
},
@@ -470,7 +477,6 @@
this.$nextTick(() => {
this.$refs.inputName.focus();
});
-
},
computed: {
disabled() {
@@ -599,9 +605,8 @@
this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
// this.fetchData(this.samplingList[0].tjNumber);
// ddddddddddddddd
- this.rightTabShow = true
+ // this.rightTabShow = true
});
-
}
this.total = response.data.total;
this.loading1 = false;
@@ -819,17 +824,12 @@
/** 鐐瑰嚮琛ユ墦鏉＄爜鎸夐挳 **/
async Collection() {
- // console.log("selectList:", this.selectList);
const jyxh = this.selectList.map((item) => item.jyxh);
console.log("jyxh:", jyxh);
try {
// 璇锋眰鎺ュ彛骞惰幏鍙栧搴﹀��
const widthResponse = await getTxmkd();
const barcodeWidth = `${Number(widthResponse.msg)}%` || "70%"; // 鑾峰彇瀹藉害鍊硷紝榛樿浣跨敤 70%
-
- // const jyxh = this.selectList.map((item) => item.jyxh);
-
- // await this.$nextTick(); // 纭繚 DOM 鏇存柊
jyxh.forEach((number, index) => {
const barcodeContent = number; // 纭繚 jyxh 鏄湁鏁堢殑
@@ -864,7 +864,7 @@
const newWindow = window.open("", "_blank", "width=800,height=600");
const printContents = document.getElementById("printSection").innerHTML;
- // console.log(printContents);
+ console.log(printContents);
newWindow.document.write(`
<html>
<head>
@@ -920,11 +920,11 @@
}
.last p {
// font-weight: bold;
- margin-left: 10px;
+ margin-left: 1px;
// font-family: "Arial Black", sans-serif !important;
}
p {
- margin-left: 10px;
+ margin-left: 1px;
// font-weight: bold;
// font-family: "Arial Black", sans-serif !important;
}
@@ -937,7 +937,7 @@
font-family: "Arial Black", sans-serif !important;
}
.tj span {
- margin-left: 10px;
+ margin-left: 1px;
}
}
</style>
@@ -966,28 +966,62 @@
// console.log(selection);
this.selectList = selection;
- // console.log(this.selectList, 5555);
+ console.log(this.selectList, 9977);
var array = selection;
this.ids = array.map((item) => item.id);
},
- // 绂侀��
- // selectEnable(row, rowIndex) {
- // if(row.isSignFor === "0"){
- // return false
- // }else{
- // return true
- // }
- // },
-
// 纭畾鎸夐挳
submitForm() {},
+ buda() {
+ var websocket = null;
+ var url = this.valueUrl;
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ }
+ if (websocket == null) {
+ alert("鍒涘缓WebSocket瀵硅薄澶辫触");
+ }
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝ｅ父");
+ };
+ websocket.onopen = () => {
+ this.websocket = websocket;
+ this.dayinData = this.selectList.map((item) => ({
+ jyxh: item.jyxh,
+ proName: item.proName,
+ cusName: item.cusName,
+ cusSex: item.customer.cusSex,
+ age: item.customer.age,
+ cardId: item.cardId,
+ tjTime: item.createTime,
+ }));
+ console.log(this.dayinData, 2222);
+
+ // 杩炴帴璁惧
+ this.jsonObj = {
+ type: "3",
+ array: {
+ data: this.dayinData,
+ },
+ };
+ var jStr = JSON.stringify(this.jsonObj);
+ this.websocket.send(jStr);
+ this.jsonObj = {};
+ // this.dialogVisible = false;
+ };
+ // this.getList();
+ },
+
// 纭閲囨牱
Confirmreceipt() {
- let data = this.ids;
- console.log(this.ids, 999);
+ console.log(this.selectList, 999);
+
+ console.log(1111);
const loadingInstance = this.$loading({
lock: true, // 閿佸畾灞忓箷
@@ -997,10 +1031,55 @@
});
confirmSampling(this.ids)
.then((res) => {
- if (res.code === 200) {
- // this.$modal.msgSuccess("閲囨牱鎴愬姛");
+ console.log(this.selectList, 2222);
- this.Collection();
+ if (res.code === 200) {
+ // var websocket = null;
+ this.buda();
+
+ /* var url = this.valueUrl;
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ }
+ if (websocket == null) {
+ alert("鍒涘缓WebSocket瀵硅薄澶辫触");
+ }
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝ｅ父");
+ };
+ websocket.onopen = () => {
+ this.websocket = websocket;
+ var list = this.selectList;
+ var data = list.map((item) => ({
+ jyxh: item.jyxh,
+ proName: item.proName,
+ cusName: item.cusName,
+ cusSex: item.customer.cusSex,
+ age: item.customer.age,
+ cardId: item.cardId,
+ tjTime: item.createTime,
+ }));
+
+ // 杩炴帴璁惧
+ var jsonObj = {
+ type: "3",
+ array: {
+ data: data,
+ },
+ };
+ var jStr = JSON.stringify(jsonObj);
+ this.websocket.send(jStr);
+ var jsonObj = {};
+ this.dialogVisible = false;
+ };
+ websocket.onmessage = (event) => {
+ var resultObj = eval("(" + event.data + ")");
+ console.log(resultObj, 9988);
+ }; */
+
+ // this.Collection();
this.getList();
} else {
this.$message.error(res.msg);
--
Gitblit v1.8.0