From 0b3b3c54a8a6e4012cea104f1c63965215daeff2 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 30 五月 2025 14:46:32 +0800
Subject: [PATCH] 1.首检检验表格生成
---
H5/IPQC_SJ/Add.aspx | 54 +++++++++++++-----
H5/Js/IPQC_SJ/Add.js | 102 +++++++++++++++++++++++++++++++--
2 files changed, 133 insertions(+), 23 deletions(-)
diff --git a/H5/IPQC_SJ/Add.aspx b/H5/IPQC_SJ/Add.aspx
index c1ac48c..4a554d8 100644
--- a/H5/IPQC_SJ/Add.aspx
+++ b/H5/IPQC_SJ/Add.aspx
@@ -32,12 +32,12 @@
}
- /* 鏍囬鏍峰紡 */
.custom-label .van-cell__title {
font-size: 0.28rem !important;
line-height: 1.0;
- color: #fff !important;
- background-color: #1989fa; /* 鍝佺墝钃濊壊 */
+ color: #1989fa !important; /* 淇敼涓鸿摑鑹� */
+ background-color: transparent !important; /* 閫忔槑鑳屾櫙 */
+ border: 1px solid #1989fa; /* 娣诲姞钃濊壊杈规 */
padding: 0.1rem 0.1rem;
border-radius: 0.12rem;
margin: 0.1rem 0;
@@ -92,7 +92,7 @@
}
.van-field__control {
- text-align: center;
+ text-align: left;
padding: 4px 8px;
/* border: 1px solid #ccc;*/
border-radius: 4px;
@@ -101,6 +101,7 @@
/* 鏂板灞�閮ㄦ牱寮� */
.temperature-input .van-field__control,
.flow-input .van-field__control {
+ text-align: center;
font-size: 0.16rem !important;
color: blue !important;
}
@@ -181,7 +182,7 @@
</template>
</van-field>
<!-- 鏂板鐐欑儹鎬ц兘鎸夐挳 -->
- <van-tag type="primary" style="font-size:15px" @click="openZrPopup">鐐欑儹鎬ц兘</van-tag>
+ <!-- <van-tag type="primary" style="font-size:15px" @click="openZrPopup">鐐欑儹鎬ц兘</van-tag> -->
<van-dialog v-model="showDialog" title="涓嶅悎鏍兼弿杩�" :show-cancel-button="false" @confirm="remarksConfirm">
<van-field
v-model="remarks"
@@ -228,24 +229,31 @@
<van-col span="10" center class="text-left padding-left" >
<van-cell center
- center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
+ center
+ :title="item.fcheckItem"
+ @click="togglePopup(index)">
+ </van-cell>
</van-col>
<van-col span="8" >
<van-cell center
- center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
+ center :title="item.fenterQty + '/' + item.checkQyt"
+ @click="togglePopup(index)"></van-cell>
</van-col>
<van-col center span="6" >
<van-cell center
center v-if="item.fcheckResu === 'Y:鍚堟牸'">
- <van-tag round plain type="success" style="font-size:15px" @click="togglePopup(index)">鍚堟牸</van-tag>
+ <van-tag round plain type="success"
+ @click="togglePopup(index)">鍚堟牸</van-tag>
</van-cell>
<van-cell center
center v-else-if="item.fcheckResu === 'N:涓嶅悎鏍�'">
- <van-tag round plain type="danger" style="font-size:15px" @click="togglePopup(index)">涓嶅悎鏍�</van-tag>
+ <van-tag round plain type="danger"
+ @click="togglePopup(index)">涓嶅悎鏍�</van-tag>
</van-cell>
<van-cell center
center v-else >
- <van-tag round plain type="warning" style="font-size:15px" @click="togglePopup(index)">杩涜涓�</van-tag>
+ <van-tag round plain type="warning"
+ @click="togglePopup(index)">杩涜涓�</van-tag>
</van-cell>
</van-col>
@@ -289,9 +297,11 @@
<van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
<template #input>
- <van-tag round plain v-if="jymxData.fcheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else-if="jymxData.fcheckResu === 'N:涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
- <van-tag round plain v-else type="warning">杩涜涓�</van-tag>
+ <div style="text-align: center;">
+ <van-tag round plain v-if="jymxData.fcheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
+ <van-tag round plain v-else-if="jymxData.fcheckResu === 'N:涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+ <van-tag round plain v-else type="warning">杩涜涓�</van-tag>
+ </div>
</template>
</van-field>
@@ -314,6 +324,14 @@
show-word-limit
/>
</van-dialog>
+ <van-button
+ block
+ type="info"
+ @click="openZrPopup"
+ :loading="ttrre"
+ loading-text="鍔犺浇涓�..."
+ v-if="jymxData.fcheckItem === '鍒剁儹鎬ц兘'"
+ >鍒剁儹鎬ц兘褰曞叆</van-button>
</template>
<template>
@@ -474,7 +492,7 @@
</div>
<van-button
block
- type="danger"
+ type="info"
@click="createTb"
style="margin-top: 8px;"
>鐢熸垚琛ㄦ牸</van-button>
@@ -523,6 +541,12 @@
</div>
</van-cell-group>
</div>
+ <van-button
+ block
+ type="primary"
+ @click="saveTableConfig"
+ style="margin-top: 8px;"
+ >淇濆瓨</van-button>
</div>
</van-popup>
@@ -532,7 +556,7 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_SJ/Add.js?<%=111112111146 %>"></script>
+ <script src="../Js/IPQC_SJ/Add.js?<%=111112111148 %>"></script>
</asp:Content>
diff --git a/H5/Js/IPQC_SJ/Add.js b/H5/Js/IPQC_SJ/Add.js
index d33e4f4..a279da8 100644
--- a/H5/Js/IPQC_SJ/Add.js
+++ b/H5/Js/IPQC_SJ/Add.js
@@ -6,6 +6,7 @@
formTbData: { // 琛ㄥ崟鏁版嵁
temperatureData: {} // 瀛樺偍鐨勫疄闄呮俯搴︺�佸疄闄呮祦閲忔暟鎹�
},
+ indexZrxx:0,//鍒剁儹鎬ц兘index
headers: [],
showZr: false,
waterOptions: [
@@ -39,8 +40,8 @@
{ value: '550ml', text: '550ml' },
{ value: '750ml', text: '750ml' },
{ value: '999ml', text: '999ml' },
- { value: '1min', text: '涓�鍒嗛挓娴侀噺' },
- { value: '3min', text: '涓夊垎閽熸祦閲�' }
+ { value: '涓�鍒嗛挓娴侀噺', text: '涓�鍒嗛挓娴侀噺' },
+ { value: '涓夊垎閽熸祦閲�', text: '涓夊垎閽熸祦閲�' }
],//娴侀噺閫夐」
selectedWater: [],// 宸查�夋按娓╁��
selectedFlow: [], // 宸查�夋祦閲忓��
@@ -129,16 +130,16 @@
},
- openZrPopup() {
+ openZrPopup(index) {
this.showZr = true;
+ this.indexZrxx = this.tabActive;
+ this.loadTableConfig();
},
closeZrPopup() {
this.showZr = false;
- this.selectedWater = []; // 鍏抽棴鏃舵竻绌洪�夋嫨
- this.selectedFlow = []; // 鍏抽棴鏃舵竻绌洪�夋嫨
+ // this.selectedWater = []; // 鍏抽棴鏃舵竻绌洪�夋嫨
+ // this.selectedFlow = []; // 鍏抽棴鏃舵竻绌洪�夋嫨
},
-
-
//閽堝娌℃湁涓婁笅闄愬�肩殑鏁版嵁锛屽彧闇�閫夋嫨鍚堟牸鎴栦笉鍚堟牸.鎸夐挳瑙﹀彂
handleQualified(isQualified) {
var input = "";
@@ -548,7 +549,7 @@
const headers = [
'璁惧畾娓╁害',
'瀹為檯娓╁害锛堚剝锛�',
- ...this.selectedFlow.sort().map(f => `娴侀噺${f}`)
+ ...this.selectedFlow.sort().map(f => `${f}`)
];
this.headers = headers;
console.log(this.headers);
@@ -580,5 +581,90 @@
}, 100);
console.log(this.formTbData);
},
+ // 鏂板淇濆瓨閰嶇疆鏂规硶
+ saveTableConfig() {
+ const that = this;
+ that.isLoading = true;
+
+ that.AxiosHttp("post", 'Ipqc/SaveTableConfig', {
+ selectedWater: (that.selectedWater),
+ selectedFlow: (that.selectedFlow),
+ tableData: (that.formTbData.temperatureData),
+ mxguid: that.tableData[that.indexZrxx].guid // 浣跨敤涓昏〃ID鍏宠仈
+ }, true).then(res1 => {
+ if (res1.status === 0) {
+ that.$notify({ type: 'success', message: '閰嶇疆淇濆瓨鎴愬姛' });
+ } else {
+ that.$toast.fail(res1.rtnMsg);
+ }
+ that.isLoading = false;
+ }).catch(error => {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.isLoading = false;
+ });
+ },
+ // 鏂板鍔犺浇閰嶇疆鏂规硶
+ loadTableConfig() {
+ const that = this;
+ that.isLoading = true;
+ var mxguid = that.tableData[that.indexZrxx].guid;
+
+
+ that.AxiosHttp("post", 'Ipqc/GetTableConfig', {
+ mxguid: mxguid,
+ }, true).then(res1 => {
+ if (res1.status === 0 && res1.data) {
+ // 瑙ｆ瀽瀛樺偍鐨勬暟鎹�
+ that.selectedWater = JSON.parse(res1.data.selectedWater || '[]');
+ that.selectedFlow = JSON.parse(res1.data.selectedFlow || '[]');
+ that.formTbData.temperatureData = JSON.parse(res1.data.tableData || '{}');
+
+ // 璋冪敤鏂扮殑娓叉煋鏂规硶
+ this.renderExistingTable();
+ }
+ that.isLoading = false;
+ }).catch(error => {
+ that.isLoading = false;
+ that.$toast.fail("鍔犺浇閰嶇疆澶辫触");
+ });
+ },
+
+ // 鏂板娓叉煋宸叉湁鏁版嵁琛ㄦ牸鐨勬柟娉�
+ renderExistingTable() {
+ const that = this;
+ console.log(that.formTbData.temperatureData);
+ // 浠庣幇鏈夋暟鎹弽鍚戞帹瀵奸�夋嫨椤�
+ const existingWaters = Object.keys(that.formTbData.temperatureData);
+ const existingFlows = existingWaters.length > 0
+ ? Object.keys(that.formTbData.temperatureData[existingWaters[0]])
+ .filter(k => k !== 'temp')
+ : [];
+
+ // 鐢熸垚琛ㄥご锛堜繚鐣欏師濮媍reateTb鐨勬牸寮忥級
+ that.headers = [
+ '璁惧畾娓╁害',
+ '瀹為檯娓╁害锛堚剝锛�',
+ ...existingFlows.map(f => `${f}`)
+ ];
+
+ // 鐢熸垚琛屾暟鎹紙淇濈暀鍘熷缁撴瀯锛�
+ that.tableTbData = existingWaters.map(water => {
+ const values = that.formTbData.temperatureData[water];
+ return {
+ temperature: water,
+ values: Object.fromEntries([
+ ['temp', values.temp || ''],
+ ...existingFlows.map(flow => [flow, values[flow] || ''])
+ ])
+ };
+ });
+ console.log(that.formTbData.temperatureData);
+ // 淇濈暀鍘熷婊氬姩閫昏緫
+ setTimeout(() => {
+ const tableEl = document.getElementById('temperature-table');
+ if (tableEl) tableEl.scrollIntoView({ behavior: 'smooth' });
+ }, 100);
+ console.log(that.formTbData.temperatureData);
+ },
}
})
--
Gitblit v1.9.3