From a8c0679305c980a9878bc44a44408de9c00d3a64 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 03 四月 2025 17:46:22 +0800
Subject: [PATCH] qx
---
src/views/sampling/sampling/index.vue | 244 +++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 118 deletions(-)
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index a6680b8..a6c2af3 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -104,9 +104,9 @@
</el-table>
</div>
<div style="width: 50%">
- <!-- v-if="this.rightTabShow" v-if="tableList.length > 0"-->
- <el-table v-loading="loading" :data="tableList" @selection-change="handleChange" :span-method="objectSpanMethod"
- ref="elTable" :row-class-name="tableRowClassName" border height="520px">
+ <!-- v-if="this.rightTabShow" -->
+ <el-table :row-key="getRowKey" v-if="tableList.length > 0" v-loading="loading" :data="tableList" @selection-change="handleChange"
+ :span-method="objectSpanMethod" ref="tab1" :row-class-name="tableRowClassName" border height="520px">
<el-table-column type="selection" width="40" align="center" />
<!-- :selectable="selectEnable" -->
<!-- <el-table-column label="鏄惁绛炬敹" align="center" prop="isSignFor" /> -->
@@ -197,7 +197,7 @@
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div> -->
- <div style="margin-right: 63%">
+ <div style="margin-right: 50%">
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
:page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> -->
@@ -211,7 +211,12 @@
<script>
import {
+ listSampling,
+ getSampling,
getList,
+ delSampling,
+ addSampling,
+ updateSampling,
confirmSampling,
getCusCyList,
mergeCaiYang,
@@ -222,8 +227,10 @@
import { getNewDateList } from "@/api/hosp/order";
import moment from "moment";
import {
+ SubmitCompany,
getCompany,
queryCompany,
+ addbatch,
} from "@/api/team/tuanti";
export default {
dicts: [
@@ -237,11 +244,12 @@
data() {
return {
CheckBox: {},
+
CompanyList: [],
piliangList: [],
msg: "",
getNumbr: null,
- valueUrl: "ws://127.0.0.1:6789/websocket",
+ valueUrl: "ws://127.0.0.1/websocket",
webSocket: null,
list: [],
selectList: [],
@@ -256,6 +264,7 @@
tjStatus: "1",
dayinData: [],
jsonObj: {},
+
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -324,17 +333,20 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {},
+ // rightTabShow: false
allSelected: false,
disableSelections: false, // 鎺у埗閫夋嫨绂佺敤鐘舵��
};
},
created() {
+ // this.getNowTime();
getTxmmccd().then((res) => {
this.msg = Number(res.msg);
console.log(res, 444);
});
getCompany(this.queryParams).then((response) => {
this.CompanyList = response.data;
+
this.loading = false;
});
this.getdate();
@@ -520,77 +532,42 @@
return ""; // 濡傛灉 applicationTime 鏃犳晥锛岃繑鍥炵┖瀛楃涓�
},
/** 鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃 */
- getList() {
- this.queryParams.compId = this.CheckBox.drugManufacturerId;
- this.loading1 = true;
- this.queryParams.isSignFor = this.tjStatus;
+ /** 鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃 */
+getList() {
+ this.queryParams.compId = this.CheckBox.drugManufacturerId;
+ this.loading1 = true;
+ this.queryParams.isSignFor = this.tjStatus;
- if (this.createTimeList) {
- this.queryParams.beginTime = this.createTimeList[0];
- this.queryParams.endTime = this.createTimeList[1];
- } else if (this.createTimeList == null) {
- this.queryParams.beginTime = null;
- this.queryParams.endTime = null;
+ if (this.createTimeList) {
+ this.queryParams.beginTime = this.createTimeList[0];
+ this.queryParams.endTime = this.createTimeList[1];
+ } else {
+ this.queryParams.beginTime = null;
+ this.queryParams.endTime = null;
+ }
+
+ getList(this.queryParams).then((response) => {
+ this.loading1 = false;
+ if (response.data && response.data.list && response.data.list.length > 0) {
+ this.samplingList = response.data.list;
+ this.total = response.data.total;
+ // 绉婚櫎榛樿閫変腑绗竴琛岀殑閫昏緫
+ // this.$nextTick(() => {
+ // this.$refs.tb.toggleRowSelection(this.samplingList[0], true); // 榛樿閫変腑绗竴琛�
+ // this.fetchData(this.samplingList[0].tjNumber); // 鍒锋柊鍙充晶琛ㄦ牸
+ // });
+ } else {
+ this.samplingList = [];
+ this.tableList = [];
+ this.selectList = []; // 娓呯┖ selectList
+ this.ids = []; // 娓呯┖ ids
+ if (this.$refs.tab1) {
+ this.$refs.tab1.clearSelection(); // 娓呯┖鍙充晶琛ㄦ牸閫変腑鐘舵��
}
- getList(this.queryParams).then((response) => {
- this.loading1 = false;
- if (response.data) {
- if (!response.data.list || response.data.list.length === 0) {
- this.samplingList = [];
- this.tableList = [];
- this.loading1 = false;
- this.loading = false;
- return;
- } else {
- this.samplingList = response.data.list;
- // 鍒ゆ柇鏄惁闇�瑕佸埛鏂板彸杈硅〃鏍�
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- // 妫�鏌ユ槸鍚﹀叏閫�
- if (this.samplingList.length === this.selectedRows.length) {
- this.disableSelections = true;
- } else {
- this.disableSelections = false;
- }
- });
- }
- this.total = response.data.total;
- this.loading1 = false;
- } else {
- this.samplingList = [];
- this.tableList = [];
- this.loading1 = false;
- }
- });
-
- /* getList(this.queryParams).then((response) => {
- if (response.data) {
- if (response.data.list == null) {
- this.samplingList = [];
- this.tableList = [];
- this.loading = false;
- } else {
- this.samplingList = response.data.list;
- console.log(this.samplingList,888);
-
- this.loading = false;
- if (this.samplingList.length != 0) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- });
- } else {
- this.$refs.tb.clearSelection();
- }
- }
- this.total = response.data.total;
- this.loading = false;
- } else {
- this.samplingList = [];
- this.tableList = [];
- this.loading = false;
- }
- }); */
- },
+ }
+ this.loading1 = false;
+ });
+},
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -627,8 +604,19 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.createTimeList = [];
- this.handleQuery();
+ this.createTimeList = []; // 娓呯┖鏃ユ湡鑼冨洿
+ this.queryParams.tjNumber = null; // 娓呯┖浣撴鍙�
+ this.queryParams.name = null; // 娓呯┖濮撳悕
+ this.queryParams.tjCompName = null; // 娓呯┖鍗曚綅鍚嶇О
+ this.selectList = []; // 娓呯┖鍙充晶閫変腑椤�
+ this.selectedRows = []; // 娓呯┖宸︿晶閫変腑椤�
+ this.tableList = []; // 娓呯┖鍙充晶琛ㄦ牸鏁版嵁
+ this.ids = []; // 娓呯┖閫変腑鐨� ID
+ this.$refs.tb.clearSelection(); // 娓呯┖宸︿晶琛ㄦ牸閫変腑鐘舵��
+ if (this.$refs.tab1) {
+ this.$refs.tab1.clearSelection(); // 娓呯┖鍙充晶琛ㄦ牸閫変腑鐘舵��
+ }
+ this.handleQuery(); // 閲嶆柊鏌ヨ
},
handleSelectionChange(selection) {
@@ -674,6 +662,10 @@
console.log(`鏄惁绂佺敤閫夋嫨: ${this.disableSelections}`);
},
+ getRowKey(row) {
+ return row.id; // 蹇呴』鍞竴涓旂ǔ瀹�
+ },
+
fetchData(tjNumber) {
return new Promise((resolve, reject) => {
this.loading = true;
@@ -682,11 +674,19 @@
if (response.data) {
this.tableList = response.data;
this.$nextTick(() => {
- this.$refs.elTable.doLayout(); // 閫氳繃 ref 璋冪敤琛ㄦ牸鏂规硶
- });
+ if (this.$refs.tab1) {
+ this.$refs.tab1.doLayout(); // 淇敼涓烘纭殑 ref 鍚嶇О
+ this.$refs.tab1.clearSelection(); // 娓呯┖閫変腑鐘舵��
+ }
+ });
resolve(this.tableList);
} else {
this.tableList = [];
+ this.selectList = [];
+ this.ids = [];
+ if (this.$refs.tab1) {
+ this.$refs.tab1.clearSelection();
+ }
resolve([]);
}
})
@@ -907,10 +907,7 @@
},
handleChange(selection) {
- // console.log(selection);
-
this.selectList = selection;
- console.log(this.selectList, 9977);
var array = selection;
this.ids = array.map((item) => item.id);
},
@@ -930,6 +927,7 @@
};
websocket.onopen = () => {
this.websocket = websocket;
+ console.log(this.selectList, "this.selectList")
this.dayinData = this.selectList.map((item) => ({
jyxh: item.jyxh,
proName: item.proName,
@@ -939,6 +937,8 @@
cardId: item.cardId,
tjTime: item.createTime,
}));
+
+
// 杩炴帴璁惧
this.jsonObj = {
type: "3",
@@ -947,7 +947,12 @@
},
};
var jStr = JSON.stringify(this.jsonObj);
+ console.log(jStr, "jStr");
+
this.websocket.send(jStr);
+ this.$refs.tab1.clearSelection(); // 娓呴櫎鍙充晶琛ㄦ牸鐨勯�変腑鐘舵��
+ this.selectList = []; // 娓呯┖ selectList
+ this.ids = []; // 娓呯┖ ids
this.jsonObj = {};
// this.dialogVisible = false;
};
@@ -956,23 +961,24 @@
// 纭閲囨牱
Confirmreceipt() {
const loadingInstance = this.$loading({
- lock: true, // 閿佸畾灞忓箷
- text: "鍔犺浇涓�...", // 鍔犺浇鏂囨湰
- spinner: "el-icon-loading", // 鑷畾涔夊姞杞藉浘鏍�
- background: "rgba(255, 255, 255, 0.7)", // 鑳屾櫙棰滆壊
+ lock: true,
+ text: "鍔犺浇涓�...",
+ spinner: "el-icon-loading",
+ background: "rgba(255, 255, 255, 0.7)",
});
confirmSampling(this.ids)
.then((res) => {
- console.log(this.selectList, 2222);
-
if (res.code === 200) {
- this.buda();
- this.getList();
+ this.buda(); // 鎵撳嵃鏉＄爜
+
+ this.getList(); // 鍒锋柊宸︿晶琛ㄦ牸
+ console.log("閲囨牱鍚� - selectList:", this.selectList, "qiehuan:", this.qiehuan);
} else {
this.$message.error(res.msg);
}
})
.catch((error) => {
+ console.error("閲囨牱澶辫触:", error);
})
.finally(() => {
loadingInstance.close();
@@ -995,35 +1001,37 @@
});
},
// 鍗曢�夋寜閽�
- radioChange(value) {
- this.loading = true;
- this.queryParams.isSignFor = value;
- getList(this.queryParams).then((response) => {
- if (response.data) {
- if (response.data.list == null) {
- this.samplingList = [];
- this.tableList = [];
- this.loading = false;
- } else {
- this.samplingList = response.data.list;
- this.loading = false;
- if (this.samplingList.length != 0) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- });
- } else {
- this.$refs.tb.clearSelection();
- }
- }
- this.total = response.data.total;
- this.loading = false;
- } else {
- this.samplingList = [];
- this.tableList = [];
- this.loading = false;
- }
- });
- },
+ // 鍗曢�夋寜閽�
+radioChange(value) {
+ this.loading = true;
+ this.queryParams.isSignFor = value;
+ getList(this.queryParams).then((response) => {
+ if (response.data) {
+ if (response.data.list == null) {
+ this.samplingList = [];
+ this.tableList = [];
+ this.loading = false;
+ } else {
+ this.samplingList = response.data.list;
+ this.loading = false;
+ // 绉婚櫎榛樿閫変腑绗竴琛岀殑閫昏緫
+ // if (this.samplingList.length != 0) {
+ // this.$nextTick(() => {
+ // this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
+ // });
+ // } else {
+ // this.$refs.tb.clearSelection();
+ // }
+ }
+ this.total = response.data.total;
+ this.loading = false;
+ } else {
+ this.samplingList = [];
+ this.tableList = [];
+ this.loading = false;
+ }
+ });
+},
// 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
--
Gitblit v1.8.0