From 81f0a7c8b364fe7b8d566b27bfc9c8ef11d2be7f Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 05 十二月 2024 11:59:12 +0800
Subject: [PATCH] 12.05
---
src/views/sampling/sampling/index.vue | 161 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 97 insertions(+), 64 deletions(-)
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 1d411b0..4836242 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -8,10 +8,10 @@
v-show="showSearch"
label-width="68px"
>
- <el-form-item label="浣撴鍙�" prop="tjNum">
+ <el-form-item label="浣撴鍙�" prop="tjNumber">
<el-input
ref="inputName"
- v-model="queryParams.tjNum"
+ v-model="queryParams.tjNumber"
placeholder="璇疯緭鍏ヤ綋妫�鍙�"
clearable
@keyup.enter.native="handleQuery"
@@ -86,8 +86,8 @@
@input="radioChange"
style="margin: 10px 15px"
>
- <el-radio-button label="1">鏈噰鏍�</el-radio-button>
- <el-radio-button label="0">宸查噰鏍�</el-radio-button>
+ <el-radio-button label="1" :disabled="qiehuan && disabledId === 0">鏈噰鏍�</el-radio-button>
+ <el-radio-button label="0" :disabled="qiehuan && disabledId === 1">宸查噰鏍�</el-radio-button>
</el-radio-group>
</el-col>
<el-col
@@ -96,23 +96,18 @@
v-if="samplingList.length > 0 && tjStatus == 1"
>
<el-button type="primary" @click="Merging">鍚堝苟椤圭洰</el-button>
- <el-button
+ <!-- <el-button
type="primary"
icon="el-icon-thumb"
style="margin: 0 15px"
v-hasPermi="['hosp:detail:add']"
@click="Confirmreceipt"
>纭閲囨牱</el-button
- >
+ > -->
<el-button type="primary" :disabled="!disabled" @click="Cancellation"
>鎾ら攢鍚堝苟</el-button
>
- <el-button
- type="primary"
- :disabled="!selectList.length"
- @click="Collection"
- >閲囨牱鎵撶爜</el-button
- >
+ <el-button type="primary" @click="Confirmreceipt">閲囨牱鎵撶爜</el-button>
</el-col>
<el-col
:span="12"
@@ -190,15 +185,20 @@
</el-table>
</div>
<div style="width: 50%">
+ <!-- :default-sort="{ prop: 'specimenType', order: 'ascending' }" :default-sort="{ prop: 'specimenType', order: 'ascending' }"
+ @sort-change="handleSortChange"
+ :span-method="objectSpanMethod"
+ @selection-change="handleChange" ref="tab1"
+ :row-class-name="tableRowClassName"-->
<el-table
v-loading="loading"
:data="tableList"
- :span-method="objectSpanMethod"
@selection-change="handleChange"
- border
- height="520px"
+ :span-method="objectSpanMethod"
ref="tab1"
:row-class-name="tableRowClassName"
+ border
+ height="520px"
>
<el-table-column type="selection" width="40" align="center" />
<!-- :selectable="selectEnable" -->
@@ -291,8 +291,9 @@
</div>
<div class="tj">
<span>浣撴涓績</span>
- <span>{{ item.cardId.substring(0, 14) }}</span>
- <!-- <span>{{ item.cardId ? item.cardId.substring(0, 14) : '' }}</span> -->
+ <!-- <span>{{ item.cardId.slice(0, 14) }}</span> -->
+ <!-- <span>{{ item.cardId }}</span> -->
+ <span>{{ item.cardId ? item.cardId.substring(0, 14) : "" }}</span>
</div>
<div class="tj">
<span>{{ item.jyxh }}</span>
@@ -409,7 +410,7 @@
pageNum: 1,
pageSize: 20,
name: null,
- tjNum: null,
+ tjNumber: null,
applicationTime: null,
isSignFor: null,
tjTime: null,
@@ -474,20 +475,36 @@
this.selectList[this.selectList.length - 1].isMerge === 1
);
},
+ qiehuan() {
+ return (
+ this.selectList.length > 0
+ );
+ },
+ disabledId() {
+ return (
+ this.tjStatus == "1" ? 1 : 0
+ );
+ },
},
methods: {
+
getTruncatedName(proName) {
// 鍘绘帀鎵�鏈夌┖鏍�
const trimmedProName = proName.replace(/\s+/g, "");
+
const number = this.msg;
const truncated =
trimmedProName.length > number
? trimmedProName.slice(0, number)
: trimmedProName;
- const remaining =
+ let remaining =
trimmedProName.length > number ? trimmedProName.slice(number) : "";
+
+ if (remaining.length > number) {
+ remaining = remaining.slice(0, number) + "...";
+ }
return { truncated, remaining }; // 杩斿洖缁撴灉
},
@@ -581,7 +598,7 @@
// 鍒ゆ柇鏄惁闇�瑕佸埛鏂板彸杈硅〃鏍�
this.$nextTick(() => {
this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- this.fetchData(this.samplingList[0].cusId);
+ // this.fetchData(this.samplingList[0].tjNumber);
});
}
this.total = response.data.total;
@@ -631,7 +648,7 @@
this.form = {
id: null,
samplingNumber: null,
- cusId: null,
+ tjNumber: null,
applicationTime: null,
isSignFor: null,
tjTime: null,
@@ -644,10 +661,9 @@
updateTime: null,
deleted: null,
};
- this.resetForm("form");
},
hb() {
- if (this.queryParams.tjNum != null) {
+ if (this.queryParams.tjNumber != null) {
this.handleQuery();
}
},
@@ -659,7 +675,6 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.createTimeList = [];
- this.resetForm("queryForm");
this.handleQuery();
},
// 鍗曢�夋閫変腑鏁版嵁
@@ -693,9 +708,10 @@
// 鍙湁涓�涓汉琚�変腑鏃惰繘琛屾搷浣�
if (selection.length === 1) {
const selectedPerson = selection[0]; // 鑾峰彇閫変腑鐨勯偅涓汉
- const cusId = selectedPerson.cusId; // 鍋囪cusId鍦ㄩ�変腑鐨勫璞′腑
+ const tjNumber = selectedPerson.tjNumber;
+ console.log(selectedPerson.tjNumber, 6363);
- this.fetchData(cusId);
+ this.fetchData(tjNumber);
} else {
// 濡傛灉閫変腑澶氫汉锛屽垯鍙栨秷閫変腑
if (selection.length > 1) {
@@ -711,14 +727,15 @@
this.selectedRows = selection;
},
- fetchData(cusId) {
+ fetchData(tjNumber) {
this.loading = true; // 鏄剧ず鍔犺浇鐘舵��
- getCusCyList(cusId, this.tjStatus) // 璋冪敤API鑾峰彇鏁版嵁
+ getCusCyList(tjNumber, this.tjStatus) // 璋冪敤API鑾峰彇鏁版嵁
.then((response) => {
if (response.data) {
+ console.log(response, 2525);
+
this.tableList = response.data; // 纭 list 瀛樺湪鍚庡啀杩涜璧嬪��
- // console.log(this.tableList, 123);
} else {
// 濡傛灉娌℃湁鏁版嵁鎴� list 涓虹┖锛屾竻绌鸿〃鏍煎苟鎻愮ず
this.tableList = [];
@@ -800,14 +817,17 @@
/** 鐐瑰嚮琛ユ墦鏉＄爜鎸夐挳 **/
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);
+ // const jyxh = this.selectList.map((item) => item.jyxh);
- await this.$nextTick(); // 纭繚 DOM 鏇存柊
+ // await this.$nextTick(); // 纭繚 DOM 鏇存柊
jyxh.forEach((number, index) => {
const barcodeContent = number; // 纭繚 jyxh 鏄湁鏁堢殑
@@ -823,7 +843,7 @@
}
});
- await this.$nextTick(); // 纭繚鏉″舰鐮佺敓鎴愬畬鎴�
+ // await this.$nextTick();
const barcodeElements = jyxh.map((_, index) =>
document.querySelector(`#barcode${index}`)
@@ -842,7 +862,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>
@@ -944,6 +964,7 @@
// console.log(selection);
this.selectList = selection;
+ console.log(this.selectList, 5555);
this.ids = selection.map((item) => item.id);
},
@@ -963,21 +984,25 @@
// 纭閲囨牱
Confirmreceipt() {
let data = this.ids;
- if (data.length === 0) {
- // 濡傛灉娌℃湁宸插悎骞剁殑椤圭洰锛岀粰鍑烘彁绀轰俊鎭�
- this.$message.error("娌℃湁宸插悎骞剁殑椤圭洰鍙互鎾ら攢锛�");
- return;
- }
+ console.log(this.ids, 999);
+
const loadingInstance = this.$loading({
lock: true, // 閿佸畾灞忓箷
text: "鍔犺浇涓�...", // 鍔犺浇鏂囨湰
spinner: "el-icon-loading", // 鑷畾涔夊姞杞藉浘鏍�
background: "rgba(255, 255, 255, 0.7)", // 鑳屾櫙棰滆壊
});
- confirmSampling(data)
+ confirmSampling(this.ids)
.then((res) => {
- this.$modal.msgSuccess("閲囨牱鎴愬姛");
- this.getList();
+ if (res.code === 200) {
+ // this.$modal.msgSuccess("閲囨牱鎴愬姛");
+
+ this.Collection();
+ this.getList();
+ } else {
+ this.$message.error(res.msg);
+ }
+ // this.getList();
})
.catch((error) => {
this.$message.error("閲囨牱澶辫触");
@@ -989,33 +1014,41 @@
// 鍗曢�夋寜閽�
radioChange(value) {
- this.loading = true;
- this.queryParams.isSignFor = value;
- getList(this.queryParams).then((response) => {
- if (response.data) {
- if (response.data.list == null) {
+
+ if (this.selectList.length > 0) {
+ alert("宸查�変腑鍚庣姝㈠垏鎹�");
+
+ } else {
+ console.log("鍒囨崲");
+
+ 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;
- } 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;
- }
- });
+ });
+ }
},
// 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
--
Gitblit v1.8.0