From 42bf8e8f07c0ed4288e8c847978112af0615d041 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 29 五月 2025 17:34:04 +0800
Subject: [PATCH] 1.生成表格
---
H5/IPQC_SJ/Add.aspx | 260 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 212 insertions(+), 48 deletions(-)
diff --git a/H5/IPQC_SJ/Add.aspx b/H5/IPQC_SJ/Add.aspx
index 76621a3..c2d9738 100644
--- a/H5/IPQC_SJ/Add.aspx
+++ b/H5/IPQC_SJ/Add.aspx
@@ -31,6 +31,73 @@
border-radius: 4px;
}
+
+ /* 鏍囬鏍峰紡 */
+ .custom-label .van-cell__title {
+ font-size: 0.28rem !important;
+ line-height: 1.0;
+ color: #fff !important;
+ background-color: #1989fa; /* 鍝佺墝钃濊壊 */
+ padding: 0.1rem 0.1rem;
+ border-radius: 0.12rem;
+ margin: 0.1rem 0;
+ }
+
+ /* 澶嶉�夋缁勫鍣� */
+ .checkbox-group-wrapper {
+ padding: 0 0.1rem;
+ margin: 0.15rem 0;
+ }
+
+ /* 澶嶉�夋鏂囧瓧鏍峰紡 */
+ .van-checkbox__label {
+ font-size: 0.20rem !important;
+ line-height: 0.85;
+ color: #333;
+ margin-left: 0.1rem;
+ }
+
+ /* 澶嶉�夋鎺掑垪浼樺寲 */
+ .van-checkbox-group--horizontal {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.2rem 0.3rem; /* 琛屽垪闂磋窛 */
+ }
+
+ /* 澶嶉�夋鍥炬爣璋冩暣 */
+ .van-checkbox__icon {
+ font-size: 0.2rem;
+ vertical-align: middle;
+
+ }
+
+ /* 閫変腑鐘舵�佹牱寮� */
+ .van-checkbox--checked .van-checkbox__label {
+ color: #1989fa;
+ }
+
+ .grid-header, .grid-row {
+ display: flex;
+ gap: 8px;
+ padding: 4px 0;
+ border-bottom: 1px solid #ebedf0;
+ font-size: 0.20rem;
+ }
+
+ .input-cell {
+ flex: 1;
+ display: flex;
+ justify-content: center;
+ font-size: 0.20rem;
+ }
+
+ .van-field__control {
+ text-align: center;
+ padding: 4px 8px;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ }
+
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
@@ -49,20 +116,20 @@
<template #title>
<div class="inline-title">
<span class="release-no">{{ formData.releaseNo }}</span>
- <van-tag round plain v-if="formData.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === '妫�楠屼腑'" type="warning">妫�楠屼腑</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === ''" type="warning">鏈楠�</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === '鍚堟牸'" type="warning">鍚堟牸</van-tag>
+ <van-tag round plain v-if="formData.fCheckResu === 'N:涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+ <van-tag round plain v-else-if="formData.fCheckResu === 'W:鏈煡'" type="warning">鏈煡</van-tag>
+<%-- <van-tag round plain v-else-if="formData.fCheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>--%>
+ <van-tag round plain v-else-if="formData.fCheckResu === 'I:杩涜涓�'" type="warning">杩涜涓�</van-tag>
+ <van-tag round plain v-else-if="formData.fCheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
<van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
<%-- <van-tag round plain
- :type="formData.fcheckResu === '涓嶅悎鏍�' ? 'danger' :
- formData.fcheckResu === '妫�楠屼腑' ? 'warning' :
- formData.fcheckResu === '鏈楠�' ? 'warning' :
- formData.fcheckResu === '鍚堟牸' ? 'success' :'danger'"
+ :type="formData.fCheckResu === '涓嶅悎鏍�' ? 'danger' :
+ formData.fCheckResu === '妫�楠屼腑' ? 'warning' :
+ formData.fCheckResu === '鏈楠�' ? 'warning' :
+ formData.fCheckResu === '鍚堟牸' ? 'success' :'danger'"
class="status-tag"
>
- {{ formData.fcheckResu }}
+ {{ formData.fCheckResu }}
</van-tag>--%>
</div>
</template>
@@ -73,32 +140,32 @@
<div class="content-wrapper">
<van-cell-group >
<!-- 鑷畾涔夊瓧娈电敤浜庢樉绀轰袱涓爣璇� -->
- <van-field label="鏍囪瘑" colon="true" readonly>
+<%-- <van-field label="鏍囪瘑" colon="true" readonly>
<template #input>
<div class="checkbox-container">
鎬ユ枡<van-checkbox v-model="formData.urgentFlag" disabled></van-checkbox>
</div>
</template>
- </van-field>
+ </van-field>--%>
<van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" readonly ></van-field>
<%-- <van-field label="鍒涘缓鏃堕棿" colon="true" v-model="formData.createDate" readonly ></van-field>
<van-field label="鍒涘缓浜�" colon="true" v-model="formData.createBy" readonly ></van-field>--%>
<van-field label="鐗╂枡缂栫爜" colon="true" v-model="formData.itemNo" readonly ></van-field>
<van-field label="鐗╂枡鍚嶇О" colon="true" v-model="formData.itemName" readonly ></van-field>
- <%--<van-field label="瑙勬牸鍨嬪彿" colon="true" v-model="formData.itemModel" readonly ></van-field>--%>
+ <van-field label="鐢熶骇杞﹂棿" colon="true" v-model="formData.departmentName" readonly ></van-field>
+ <van-field label="鐢熶骇绾垮埆" colon="true" v-model="formData.xtName" readonly ></van-field>
<van-field
label="瑙勬牸鍨嬪彿"
colon
v-model="formData.itemModel"
readonly
- class="wrap-field"
- >
+ class="wrap-field">
<template #input>
<div class="wrap-content">{{ formData.itemModel }}</div>
</template>
</van-field>
- <van-field label="鏁伴噺" colon="true" v-model="formData.fcovertQty" readonly ></van-field>
- <van-field label="涓嶅悎鏍兼弿杩�" v-if='formData.fcheckResu == "涓嶅悎鏍�"' colon v-model="remarks" readonly class="wrap-field">
+<%-- <van-field label="鏁伴噺" colon="true" v-model="formData.fcovertQty" readonly ></van-field>--%>
+ <van-field label="涓嶅悎鏍兼弿杩�" v-if='formData.fCheckResu == "N:涓嶅悎鏍�"' colon v-model="remarks" readonly class="wrap-field">
<template #input>
<div class="wrap-content">{{ remarks }}</div>
</template>
@@ -106,18 +173,8 @@
<van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>
</template>
</van-field>
-<%-- <van-field
- v-if='formData.fcheckResu == "涓嶅悎鏍�"' colon="true"
- v-model="formData.remarks"
- rows="2"
- autosize
- label="涓嶅悎鏍兼弿杩�"
- type="textarea"
- maxlength="50"
- placeholder="璇疯緭鍏ヤ笉鍚堟牸鎻忚堪"
- show-word-limit
- />--%>
- <!-- 涓嶅悎鏍艰〃杩拌緭鍏� -->
+ <!-- 鏂板鐐欑儹鎬ц兘鎸夐挳 -->
+ <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"
@@ -157,8 +214,7 @@
<van-tab title="妫�楠岄」鐩�" class="mySolid font">
<van-row type="flex" justify="center">
<van-col span="10" center class="text-left padding-left">妫�楠岄」鐩�</van-col>
- <van-col span="4">宸叉鏁�/鎶芥鏁�</van-col>
- <van-col span="4">鐗瑰緛鍊�</van-col>
+ <van-col span="8">宸叉鏁�/鎶芥鏁�</van-col>
<van-col span="6">妫�楠岀粨鏋�</van-col>
</van-row>
<van-row v-for="(item,index) in tableData" :key="index" type="flex" justify="left">
@@ -167,26 +223,22 @@
<van-cell center
center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
</van-col>
- <van-col span="4" >
- <van-cell center
- center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
- </van-col>
- <van-col span="4" >
+ <van-col span="8" >
<van-cell center
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 === '鍚堟牸'">
+ center v-if="item.fcheckResu === 'Y:鍚堟牸'">
<van-tag round plain type="success" style="font-size:15px" @click="togglePopup(index)">鍚堟牸</van-tag>
</van-cell>
<van-cell center
- center v-else-if="item.fcheckResu === '涓嶅悎鏍�'">
+ center v-else-if="item.fcheckResu === 'N:涓嶅悎鏍�'">
<van-tag round plain type="danger" style="font-size:15px" @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" style="font-size:15px" @click="togglePopup(index)">杩涜涓�</van-tag>
</van-cell>
</van-col>
@@ -230,11 +282,31 @@
<van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
<template #input>
- <van-tag round plain v-if="jymxData.fcheckResu === '鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else-if="jymxData.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
- <van-tag round plain v-else type="warning">妫�楠屼腑</van-tag>
+ <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>
</template>
</van-field>
+
+ <van-field label="璁よ瘉淇℃伅" v-if='jymxData.isrzxx == 1' colon v-model="rzxxValue" placeholder="璇疯緭鍏ヨ璇佷俊鎭�" readonly class="wrap-field">
+ <template #input>
+ <div class="wrap-content">{{ rzxxValue }}</div>
+ </template>
+ <template #button>
+ <van-tag type="primary" style="font-size:15px" @click="updateRzxx()">杈撳叆</van-tag>
+ </template>
+ </van-field>
+ <van-dialog v-model="showDialogRzxx" title="璁よ瘉淇℃伅" :show-cancel-button="false" @confirm="rzxxConfirm">
+ <van-field
+ v-model="rzxxValue"
+ rows="5"
+ autosize
+ type="textarea"
+ maxlength="500"
+ placeholder="璇疯緭鍏ヨ璇佷俊鎭�"
+ show-word-limit
+ />
+ </van-dialog>
</template>
<template>
@@ -251,7 +323,7 @@
:border="false"
class="si-input-field"
@input="handleNumberInput3"
- @keyup.enter.native="getInputTZZ"
+ @keyup.enter.native="getInputJYZ"
/>
</div>
</div>
@@ -281,12 +353,12 @@
</div>
</template>
<van-row type="flex" justify="center">
- <van-col span="6">鏍锋湰闆�</van-col>
+ <van-col span="6">椤圭洰</van-col>
<van-col span="6">妫�楠屽��</van-col>
<van-col span="6">鍒ゅ畾鏍囧織</van-col>
<van-col span="6">鎿嶄綔</van-col>
</van-row>
- <van-row v-for="(item,index) in tableMxData.list2" :key="index" type="flex" justify="left">
+ <van-row v-for="(item,index) in tableMxData.list" :key="index" type="flex" justify="left">
<van-col span="6" >
<van-cell center
@@ -307,7 +379,7 @@
</van-cell>
<van-cell center
center v-else >
- <van-tag round plain type="warning" style="font-size:15px">妫�楠屼腑</van-tag>
+ <van-tag round plain type="warning" style="font-size:15px">杩涜涓�</van-tag>
</van-cell>
</van-col>
<van-col center span="6" >
@@ -346,7 +418,94 @@
</div>
</van-popup>
-
+ <!-- 鏂板鐐欑儹鎬ц兘寮圭獥 -->
+ <van-popup
+ v-model="showZr"
+ closeable
+ overlay="true"
+ round
+ close-icon="close"
+ class="van-icon-popup"
+ position="right"
+ :style="{
+ width: '100%',
+ height: '100%',
+ boxShadow: '-2px 0 12px rgba(0, 0, 0, 0.1)'
+ }"
+ @click-close-icon="closeZrPopup">
+ <div class="content-wrapper-jymx">
+ <!-- 寮圭獥鍐呭鍖� -->
+ <van-cell-group>
+ <div><van-cell title="姘存俯閫夋嫨" class="custom-label" /></div>
+ <div class="checkbox-group-wrapper">
+ <van-checkbox-group
+ v-model="selectedWater"
+ :max="5"
+ direction="horizontal">
+ <van-checkbox
+ v-for="(item, index) in waterOptions"
+ :key="index"
+ :name="item.value">
+ {{ item.text }}
+ </van-checkbox>
+ </van-checkbox-group>
+ </div>
+
+ <div><van-cell title="娴侀噺閫夋嫨" class="custom-label" /></div>
+ <div class="checkbox-group-wrapper">
+ <van-checkbox-group
+ v-model="selectedFlow"
+ :max="5"
+ direction="horizontal">
+ <van-checkbox
+ v-for="(item, index) in flowOptions"
+ :key="index"
+ :name="item.value">
+ {{ item.text }}
+ </van-checkbox>
+ </van-checkbox-group>
+ </div>
+ <van-button
+ block
+ type="danger"
+ @click="createTb"
+ style="margin-top: 8px;"
+ >鐢熸垚琛ㄦ牸</van-button>
+ </van-cell-group>
+ <div v-if="tableData.length > 0" id="temperature-table" style="margin-top: 20px;">
+ <van-cell-group>
+ <!-- 琛ㄥご -->
+ <van-cell>
+ <div class="grid-header">
+ <div v-for="(header, index) in [headers[0], ...headers.slice(1)]"
+ :key="index"
+ :style="index === 0 ? 'width: 100px' : 'flex: 1'">
+ {{ header }}
+ </div>
+ </div>
+ </van-cell>
+
+ <!-- 鏁版嵁琛� -->
+ <div v-for="(row, rowIndex) in tableData" :key="rowIndex">
+ <div class="grid-row">
+ <!-- 姘存俯鍒� -->
+ <div style="width: 100px">{{ row.temperature }}</div>
+ <!-- 鍔ㄦ�佸垪 -->
+ <div v-for="(header, colIndex) in headers.slice(2)"
+ :key="colIndex"
+ style="flex: 1">
+ <van-field
+ v-model="formTbData.temperatureData[row.temperature][header]"
+ :placeholder="`杈撳叆${header}鍊糮"
+ type="number"
+ />
+ </div>
+ </div>
+ </div>
+ </van-cell-group>
+ </div>
+ </div>
+ </van-popup>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
@@ -354,5 +513,10 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_SJ/Add.js?<%=11 %>"></script>
+ <script src="../Js/IPQC_SJ/Add.js?<%=111112111145 %>"></script>
</asp:Content>
+
+
+
+
+
--
Gitblit v1.9.3