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 | 451 ++++++++++++++++++++------------------------------------ 1 files changed, 161 insertions(+), 290 deletions(-) diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue index 5d4f164..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" --> @@ -274,12 +274,14 @@ <!-- 鍔ㄦ�佺敓鎴愬涓潯褰㈢爜鐨勫鍣� --> <div v-for="(item, index) in selectList" :key="index"> <svg :id="'barcode' + index"></svg> - <!-- <div class="name">{{ item.proName }}</div> - <div class="name1">{{ item.proName }}</div> --> <div class="name">{{ getTruncatedName(item.proName).truncated }}</div> <div class="name1"> {{ getTruncatedName(item.proName).remaining }} </div> + <!-- <div class="name">{{ item.proName.slice(0, msg) }}</div> + <div class="name1"> + {{ item.proName.slice(msg) }} + </div> --> <div class="last"> <p>{{ item.cusName }}</p> <div> @@ -289,7 +291,9 @@ </div> <div class="tj"> <span>浣撴涓績</span> - <span>{{ 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> @@ -369,6 +373,8 @@ name: "Sampling", data() { return { + msg: "", + getNumbr: null, list: [], selectList: [], selectedRows: [], @@ -404,7 +410,7 @@ pageNum: 1, pageSize: 20, name: null, - tjNum: null, + tjNumber: null, applicationTime: null, isSignFor: null, tjTime: null, @@ -452,7 +458,9 @@ }, created() { // this.getNowTime(); - + getTxmmccd().then((res) => { + this.msg = Number(res.msg); + }); this.getdate(); }, mounted() { @@ -467,76 +475,50 @@ this.selectList[this.selectList.length - 1].isMerge === 1 ); }, + qiehuan() { + return ( + this.selectList.length > 0 + ); + }, + disabledId() { + return ( + this.tjStatus == "1" ? 1 : 0 + ); + }, }, methods: { - async getTruncatedName(proName) { - try { - const res = await getTxmmccd(); // 纭繚浣跨敤 async/await - console.log(res, 4545); + + getTruncatedName(proName) { + // 鍘绘帀鎵�鏈夌┖鏍� + const trimmedProName = proName.replace(/\s+/g, ""); - // 鍘绘帀鎵�鏈夌┖鏍� - const trimmedProName = proName.replace(/\s+/g, ""); + const number = this.msg; - // 妫�鏌� res 鏄惁鏈夋晥 - if (res && res.msg) { - const number = Number(res.msg); - console.log(number, 4444); + const truncated = + trimmedProName.length > number + ? trimmedProName.slice(0, number) + : trimmedProName; + let remaining = + trimmedProName.length > number ? trimmedProName.slice(number) : ""; - const truncated = - trimmedProName.length > number - ? trimmedProName.slice(0, number) - : trimmedProName; - const remaining = - trimmedProName.length > number ? trimmedProName.slice(number) : ""; - - return { truncated, remaining }; // 杩斿洖缁撴灉 - } else { - // 濡傛灉 res 鏃犳晥锛屼娇鐢ㄩ粯璁ゅ�� - const truncated = - trimmedProName.length > 35 - ? trimmedProName.slice(0, 35) - : trimmedProName; - const remaining = - trimmedProName.length > 35 ? trimmedProName.slice(35) : ""; - - return { truncated, remaining }; // 纭繚杩斿洖 - } - } catch (error) { - console.error("Error fetching data:", error); - return { truncated: "", remaining: "" }; // 鎹曡幏閿欒鏃剁殑杩斿洖鍊� + if (remaining.length > number) { + remaining = remaining.slice(0, number) + "..."; } + return { truncated, remaining }; // 杩斿洖缁撴灉 }, - /* getTruncatedName(proName) { - getTxmmccd().then((res) => { - console.log(res, 4545); - const number = Number(res.msg); - console.log(number, 4444); - if (res) { - const trimmedProName = proName.replace(/\s+/g, ""); // 鍘绘帀鎵�鏈夌┖鏍� - const truncated = - trimmedProName.length > res.msg - ? trimmedProName.slice(0, res.msg) - : trimmedProName; - const remaining = - trimmedProName.length > res.msg - ? trimmedProName.slice(res.msg) - : ""; - return { truncated, remaining }; - } else { - res.msg == "35"; - } - }); */ - /* const trimmedProName = proName.replace(/\s+/g, ""); // 鍘绘帀鎵�鏈夌┖鏍� - const truncated = - trimmedProName.length > 35 - ? trimmedProName.slice(0, 35) - : trimmedProName; - const remaining = - trimmedProName.length > 35 ? trimmedProName.slice(35) : ""; - return { truncated, remaining }; */ - // }, + /* getTruncatedName(proName) { + const trimmedProName = proName.replace(/\s+/g, ""); // 鍘绘帀鎵�鏈夌┖鏍� + const truncated = + trimmedProName.length > 35 + ? trimmedProName.slice(0, 35) + : trimmedProName; + const remaining = + trimmedProName.length > 35 ? trimmedProName.slice(35) : ""; + return { truncated, remaining }; + }, */ + // 绀轰緥鐨勬棩鏈熸牸寮忓寲鏂规硶 formatDate(date) { const options = { year: "numeric", month: "2-digit", day: "2-digit" }; @@ -612,11 +594,11 @@ return; } else { this.samplingList = response.data.list; - console.log(this.samplingList, 888); + // console.log(this.samplingList, 888); // 鍒ゆ柇鏄惁闇�瑕佸埛鏂板彸杈硅〃鏍� 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; @@ -666,7 +648,7 @@ this.form = { id: null, samplingNumber: null, - cusId: null, + tjNumber: null, applicationTime: null, isSignFor: null, tjTime: null, @@ -679,11 +661,9 @@ updateTime: null, deleted: null, }; - this.resetForm("form"); }, hb() { - // console.log(this.queryParams.tjNum); - if (this.queryParams.tjNum != null) { + if (this.queryParams.tjNumber != null) { this.handleQuery(); } }, @@ -695,7 +675,6 @@ /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { this.createTimeList = []; - this.resetForm("queryForm"); this.handleQuery(); }, // 鍗曢�夋閫変腑鏁版嵁 @@ -729,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) { @@ -747,16 +727,15 @@ this.selectedRows = selection; }, - fetchData(cusId) { + fetchData(tjNumber) { this.loading = true; // 鏄剧ず鍔犺浇鐘舵�� - console.log(this.tjStatus, 999); - - 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 = []; @@ -770,35 +749,6 @@ }); }, - /* 鐐瑰嚮鍚堝苟鎸夐挳 */ - /* Merging() { - // 妫�鏌ユ槸鍚﹂�変腑浜嗘暟鎹� - if (this.selectedRows.length === 0) { - this.$message.error("鑷冲皯閫変腑涓�涓汉"); - return; - } - - if (this.selectList.length === 0) { - this.$message.error("璇烽�夋嫨瑕佸悎骞堕」鐩�"); - return; - } - - // 鑾峰彇 tableList 绗竴琛岀殑 specimenTypeCode 浣滀负鍩哄噯 - const baseSpecimenTypeCode = this.selectList[0].specimenTypeCode; - - // 妫�鏌� specimenTypeCode 鏄惁涓�鑷� - const canMergeBySpecimenTypeCode = this.selectList.every( - (row) => row.specimenTypeCode === baseSpecimenTypeCode - ); - - // 鏍规嵁 canMergeBySpecimenTypeCode 鍒ゆ柇鏄惁鍚堝苟 - if (canMergeBySpecimenTypeCode) { - this.$message.success("鍚堝苟鎴愬姛銆�"); - console.log("鍚堝苟鐨勮:", this.selectedRows); - } else { - this.$message.error("椤圭洰鐨� 涓嶄竴鑷达紝鏃犳硶鍚堝苟锛�"); - } - }, */ /* 鐐瑰嚮鍚堝苟鎸夐挳 */ Merging() { // 妫�鏌ユ槸鍚﹂�変腑浜嗘暟鎹� @@ -824,7 +774,7 @@ mergeCaiYang(data).then((response) => { this.$message.success("鍚堝苟鎴愬姛銆�"); - console.log("鍚堝苟鐨勮:", this.selectedRows); + // console.log("鍚堝苟鐨勮:", this.selectedRows); // this.getList(); this.fetchData(this.selectedRows[0].cusId); }); @@ -846,7 +796,7 @@ return; } - console.log("鎾ら攢鐨勫凡鍚堝苟椤圭洰ID:", data); + // console.log("鎾ら攢鐨勫凡鍚堝苟椤圭洰ID:", data); // 璋冪敤鎾ら攢閲囨牱鐨勬帴鍙� chexiaoCaiYang(data) @@ -867,16 +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(); - console.log("浠� getTxmkd 杩斿洖鐨勫搷搴�:", widthResponse); // 鎵撳嵃鍚庣杩斿洖鍊� const barcodeWidth = `${Number(widthResponse.msg)}%` || "70%"; // 鑾峰彇瀹藉害鍊硷紝榛樿浣跨敤 70% - const jyxh = this.selectList.map((item) => item.jyxh); - console.log(this.selectList, 999); + // const jyxh = this.selectList.map((item) => item.jyxh); - await this.$nextTick(); // 纭繚 DOM 鏇存柊 + // await this.$nextTick(); // 纭繚 DOM 鏇存柊 jyxh.forEach((number, index) => { const barcodeContent = number; // 纭繚 jyxh 鏄湁鏁堢殑 @@ -892,7 +843,7 @@ } }); - await this.$nextTick(); // 纭繚鏉″舰鐮佺敓鎴愬畬鎴� + // await this.$nextTick(); const barcodeElements = jyxh.map((_, index) => document.querySelector(`#barcode${index}`) @@ -911,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> @@ -922,6 +873,10 @@ margin: 0; padding: 0; /* 閲嶇疆鎵�鏈夊厓绱犵殑 margin 鍜� padding */ box-sizing: border-box; /* 浣垮唴杈硅窛鍜岃竟妗嗗寘鍚湪鍏冪礌鐨勬�诲搴﹀拰楂樺害鍐� */ + } + .name, .name1, .last, .tj, .last div span, .last p, .tj span { + font-family: Arial, sans-serif !important; /* 閲嶆柊鎸囧畾瀛椾綋 */ + font-weight: bold !important; /* 寮哄埗鍔犵矖 */ } body { margin: 0; @@ -935,6 +890,7 @@ padding: 0; font-size: 18px; width: 70%; + font-family: "Arial Black", sans-serif; /* 璁剧疆榛戜綋 */ } p { margin: 0; @@ -952,20 +908,31 @@ display: flex; font-size: 19px; justify-content: space-between; - font-family: "Arial Black", sans-serif; /* 璁剧疆榛戜綋 */ + // font-weight: bold; + // font-family: "Arial Black", sans-serif !important; } .last div span { + // font-weight: bold; margin-left: 10px; + // font-family: "Arial Black", sans-serif !important; } .last p { - margin-left: 10px; + // font-weight: bold; + margin-left: 10px; + // font-family: "Arial Black", sans-serif !important; + } + p { + margin-left: 10px; + // font-weight: bold; + // font-family: "Arial Black", sans-serif !important; } .tj { width: 70%; display: flex; font-size: 19px; justify-content: space-between; - font-family: "Arial Black", sans-serif; /* 璁剧疆榛戜綋 */ + // font-weight: bold; + font-family: "Arial Black", sans-serif !important; } .tj span { margin-left: 10px; @@ -985,129 +952,6 @@ } }, - // Collection() { - // const jyxh = this.selectList.map((item) => item.jyxh); - // const selectedData = this.selectList.map((item) => ({ - // jyxh: item.jyxh, - // })); - // console.log(this.selectList, 999); - // console.log(selectedData, 888); - - /* this.$nextTick(() => { - jyxh.forEach((number, index) => { - const barcodeContent = number; // 纭繚 jyxh 鏄湁鏁堢殑 - if (barcodeContent && barcodeContent !== "鏈彁渚涗綋妫�鍙�") { - JsBarcode(`#barcode${index}`, barcodeContent, { - format: "CODE128", - width: 2, - height: 50, - displayValue: false, - }); - } else { - console.log(`鏉″舰鐮佸唴瀹规棤鏁�: ${barcodeContent}`); // 璋冭瘯杈撳嚭 - } - }); - }); */ - - /* this.$nextTick(() => { - const barcodeElement = document.querySelector("#barcode"); - // const barcodeElements = selectedData.map((_, index) => - // document.querySelector(`#barcode${index}`) - // ); - - if (barcodeElement) { - barcodeElement.forEach((element) => { - if (element) { - console.log(element.innerHTML); // 鎵撳嵃鏉″舰鐮佺殑鍐呭锛岀湅鐪嬫槸鍚︾敓鎴愭垚鍔� - } - }); - } else { - console.log("鏉″舰鐮佸厓绱犳湭鎵惧埌"); - } - const newWindow = window.open("", "_blank", "width=800,height=600"); - const printContents = document.getElementById("printSection").innerHTML; - - console.log(printContents); */ - // newWindow.document.write(` - // <html> - // <head> - // <title>Print Barcode</title> - // <style> - // @media print { - // * { - // margin: 0; - // padding: 0; /* 閲嶇疆鎵�鏈夊厓绱犵殑 margin 鍜� padding */ - // box-sizing: border-box; /* 浣垮唴杈硅窛鍜岃竟妗嗗寘鍚湪鍏冪礌鐨勬�诲搴﹀拰楂樺害鍐� */ - // } - // body { - // margin: 0; - // padding: 0; - // } - // .barcode-container { - // // width: 100%; /* 鏍规嵁闇�瑕佽皟鏁� */ - // // text-align: center; /* 纭繚鏉″舰鐮佸眳涓� */ - // } - // .name,.name1 { - // padding: 0; - // // margin: -5px auto 0; - // // padding-left: 20px; - // font-size: 18px; - // width: 70%; - // // max-height: 3.6em; - // // display: -webkit-box; - // // -webkit-box-orient: vertical; - // // -webkit-line-clamp: 2; - // // overflow: hidden; - // // white-space: normal; - // } - // p { - // margin: 0; - // padding: 0; - // } - // svg { - // display: block; - // width: 70%; - // margin-left: 10mm; - // // margin: 0 auto; - // height: auto; - // margin-bottom: 0; - // } - // .last { - // width: 66%; - // display: flex; - // font-size: 19px; - // // margin-left: 20px; - // justify-content: space-between; - // } - // .last div span{ - // margin-left: 10px - // } - // .last p{ - // margin-left: 10px - // } - // .tj{ - // width: 70%; - // display: flex; - // font-size: 19px; - // // margin-left: 10px; - // justify-content: space-between; - // } - // .tj span{ - // margin-left:10px; - // } - // } - // </style> - // </head> - // <body>${printContents}</body> - // </html> - // `); - // newWindow.document.close(); - // newWindow.focus(); - // newWindow.print(); - // newWindow.close(); - // }); - // }, - tableRowClassName({ row, rowIndex }) { for (let i = 0; i < this.selectList.length; i++) { if (row === this.selectList[i]) { @@ -1117,9 +961,10 @@ }, handleChange(selection) { - console.log(selection); + // console.log(selection); this.selectList = selection; + console.log(this.selectList, 5555); this.ids = selection.map((item) => item.id); }, @@ -1139,46 +984,71 @@ // 纭閲囨牱 Confirmreceipt() { let data = this.ids; - if (data.length === 0) { - // 濡傛灉娌℃湁宸插悎骞剁殑椤圭洰锛岀粰鍑烘彁绀轰俊鎭� - this.$message.error("娌℃湁宸插悎骞剁殑椤圭洰鍙互鎾ら攢锛�"); - return; - } - confirmSampling(data).then((res) => { - this.$modal.msgSuccess("閲囨牱鎴愬姛"); - this.getList(); + console.log(this.ids, 999); + + const loadingInstance = this.$loading({ + lock: true, // 閿佸畾灞忓箷 + text: "鍔犺浇涓�...", // 鍔犺浇鏂囨湰 + spinner: "el-icon-loading", // 鑷畾涔夊姞杞藉浘鏍� + background: "rgba(255, 255, 255, 0.7)", // 鑳屾櫙棰滆壊 }); + confirmSampling(this.ids) + .then((res) => { + if (res.code === 200) { + // this.$modal.msgSuccess("閲囨牱鎴愬姛"); + + this.Collection(); + this.getList(); + } else { + this.$message.error(res.msg); + } + // this.getList(); + }) + .catch((error) => { + this.$message.error("閲囨牱澶辫触"); + }) + .finally(() => { + loadingInstance.close(); + }); }, // 鍗曢�夋寜閽� 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; - } - }); + }); + } }, // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 } @@ -1215,5 +1085,6 @@ .el-table .warning-row { background-color: #e5f3ff !important; + /* font-weight: bold; */ } </style> -- Gitblit v1.8.0