From 03ff743705dd64f67e6e4aabd03ec5591b922ff9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 09 六月 2025 12:28:50 +0800
Subject: [PATCH] 1.生产补料/超领优化 2.委外补料/超领优化 3.巡检检验新增工单查询选择 4.巡检优化新增时间段字段
---
H5/IPQC_SJ/Add.aspx | 306 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 254 insertions(+), 52 deletions(-)
diff --git a/H5/IPQC_SJ/Add.aspx b/H5/IPQC_SJ/Add.aspx
index d7d8e2d..6603364 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,11 +92,75 @@
}
.van-field__control {
- text-align: center;
+ text-align: left;
padding: 4px 8px;
- border: 1px solid #ccc;
+/* border: 1px solid #ccc;*/
border-radius: 4px;
}
+
+ /* 鏂板灞�閮ㄦ牱寮� */
+ .temperature-input .van-field__control,
+ .flow-input .van-field__control {
+ text-align: center;
+ font-size: 0.16rem !important;
+ color: blue !important;
+ }
+
+ /* 姝ヨ繘鍣ㄦ牱寮� */
+ .van-stepper__input
+ {
+ width: .5rem;
+ height: .4rem;
+ }
+ .van-stepper__minus,.van-stepper__plus
+ {
+ width: .5rem;
+ height: .4rem;
+ }
+ /* 鍗曢�夋澶у皬 */
+ .van-radio__icon
+ {
+ -webkit-box-flex: 0;
+ -webkit-flex: none;
+ flex: none;
+ height: 1em;
+ font-size: .3333rem
+ }
+
+ /* 璁よ瘉淇℃伅澶氶�夋牱寮� */
+ .rzxx-action-sheet {
+ height: 70%;
+ }
+ .rzxx-action-sheet .checkbox-group-wrapper {
+ padding: 16px;
+ max-height: calc(100% - 60px);
+ overflow-y: auto;
+ }
+ .action-sheet-footer {
+ position: sticky;
+ bottom: 0;
+ background: white;
+ padding: 8px 16px;
+ box-shadow: 0 -2px 12px rgba(0, 0, 0, 0.1);
+ }
+ .confirm-btn {
+ border-radius: 20px;
+ }
+
+ /* 璁よ瘉淇℃伅涓撶敤鏍峰紡 */
+ .rzxx-checkbox-group .rzxx-checkbox {
+ font-size: 0.5rem !important;
+ }
+
+ .rzxx-checkbox .van-checkbox__label {
+ font-size: 0.5rem !important;
+ line-height: 1.2;
+ }
+
+ .rzxx-checkbox .van-checkbox__icon {
+ font-size: 0.5rem !important;
+ }
+ /* 璁よ瘉淇℃伅澶氶�夋牱寮� */
</style>
</asp:Content>
@@ -121,7 +185,7 @@
<%-- <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 v-else type="danger">鏈煡</van-tag>
<%-- <van-tag round plain
:type="formData.fCheckResu === '涓嶅悎鏍�' ? 'danger' :
formData.fCheckResu === '妫�楠屼腑' ? 'warning' :
@@ -174,7 +238,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"
@@ -221,24 +285,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>
@@ -270,33 +341,127 @@
<van-field label="椤圭洰鍚嶇О" colon="true" v-model="jymxData.fcheckItem" readonly ></van-field>
<van-field label="瑙勬牸瑕佹眰" colon="true" v-model="jymxData.fspecRequ" readonly ></van-field>
<van-field label="妫�楠屽伐鍏�" colon="true" v-model="jymxData.fcheckTool" readonly ></van-field>
- <van-field label="妫�楠屾暟" colon="true" v-model="jymxData.checkQyt" readonly ></van-field>
+ <!-- <van-field label="妫�楠屾暟" colon="true" v-model="jymxData.checkQyt" readonly ></van-field> -->
<van-field label="涓嬮檺" colon="true" v-model="jymxData.fdownAllow" readonly ></van-field>
<van-field label="鏍囧噯鍊�" colon="true" v-model="jymxData.fstand" readonly ></van-field>
<van-field label="涓婇檺" colon="true" v-model="jymxData.fupAllow" readonly ></van-field>
<%--<van-field label="AC鏁�" colon="true" v-model="jymxData.facQty" readonly ></van-field>--%>
- <van-field label="RE鏁�" colon="true" v-model="jymxData.freQty" readonly ></van-field>
- <van-field label="鏍锋湰鏁�" colon="true" v-model="jymxData.ybsl" readonly ></van-field>
+ <!-- <van-field label="RE鏁�" colon="true" v-model="jymxData.freQty" readonly ></van-field> -->
+ <!-- <van-field label="鏍锋湰鏁�" colon="true" v-model="jymxData.ybsl" readonly ></van-field> -->
<%--<van-field label="棰勮缁撴灉" colon="true" v-model="jymxData.result" readonly ></van-field>--%>
<%--<van-field label="缁撴灉褰曞叆" colon="true" v-model="resultValue" placeholder="璇疯緭鍏K-鏁板瓧鎴朜G-鏁板瓧"></van-field>--%>
- <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>
- </template>
- </van-field>
+ <van-field label="鐢熶骇鏃ユ湡" v-if="jymxData.fcheckType === '鍏抽敭閮ㄤ欢涓�鑷存��'" colon readonly class="wrap-field">
+ <template #input>
+ <div class="wrap-content" @click="showScDatePicker = true">{{ jymxData.ipqcrzxxDate || '璇烽�夋嫨鏃ユ湡' }}</div>
+ </template>
+ <!-- <template #button>
+ <van-tag type="primary" style="font-size:15px" @click="showScDatePicker = true">閫夋嫨</van-tag>
+ </template> -->
+ </van-field>
+ <!-- 鍙湁褰� jymxData.fcheckType 绛変簬 "鍝佹按娴嬭瘯" 鏃舵墠鏄剧ず璇ュ瓧娈� -->
+ <van-field v-if="jymxData.fcheckType === '鍝佹按娴嬭瘯'" label="鏄惁鏈夊紓鍛�" colon="true" readonly>
+ <template #input>
+ <van-radio-group
+ v-model="jymxData.ipqCpscs"
+ direction="horizontal"
+ class="custom-radio-group"
+ @change="updateCpscs">
+ <van-radio name="Y" shape="square">鏈�</van-radio>
+ <van-radio name="N" shape="square">鏃�</van-radio>
+ </van-radio-group>
+ </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
+ label="浣跨敤鏁伴噺"
+ colon="true"
+ v-if="jymxData.fcheckType === '鍏抽敭閮ㄤ欢涓�鑷存��'">
+ <template #input>
+ <van-stepper
+ v-model="jymxData.ipqcrzxxNum"
+ integer
+ @change="updateRzxxNum(jymxData.ipqcrzxxNum)"
+ />
+ </template>
+ </van-field>
+
+ <van-field
+ label="璁よ瘉淇℃伅"
+ v-if="jymxData.fcheckType === '鍏抽敭閮ㄤ欢涓�鑷存��'"
+ colon
+ readonly
+ class="multi-line-field">
+ <template #input>
+ <div class="flex-container">
+ <div class="wrap-content scrollable-text" style="white-space: pre-line;">
+ {{ jymxData.ipqcrzxx }}
+ </div>
+ </div>
+ </template>
+ </van-field>
+ <van-button
+ block
+ type="info"
+ @click="selectRzxx"
+ :loading="ttrre"
+ loading-text="鍔犺浇涓�..."
+ v-if="jymxData.fcheckType === '鍏抽敭閮ㄤ欢涓�鑷存��'"
+ >璁よ瘉淇℃伅閫夋嫨</van-button>
+ <!-- <van-tag
+ type="primary"
+ style="font-size:15px; flex-shrink:0"
+ @click="selectRzxx">
+ 閫夋嫨
+ </van-tag> -->
+ <van-action-sheet
+ v-model="showRzxx"
+ title="璇烽�夋嫨璁よ瘉淇℃伅"
+ class="rzxx-action-sheet">
+ <div class="checkbox-group-wrapper">
+ <van-checkbox-group
+ v-model="selectedRzxx"
+ ref="checkboxGroup"
+ :max="5"
+ class="rzxx-checkbox-group">
+ <van-checkbox
+ v-for="(item, index) in rzxxOptions"
+ :key="index"
+ :name="item.value"
+ class="rzxx-checkbox">
+ {{ item.text }}
+ </van-checkbox>
+ </van-checkbox-group>
+ </div>
+ <div class="action-sheet-footer">
+ <van-button
+ block
+ type="primary"
+ @click="confirmMultiRzxx"
+ class="confirm-btn">纭閫夋嫨</van-button>
+ </div>
+ </van-action-sheet>
+
+
+ <van-popup v-model="showScDatePicker" position="bottom">
+ <van-datetime-picker
+ v-model="currentDate"
+ type="date"
+ title="閫夋嫨鐢熶骇鏃ユ湡"
+ :min-date="minDate"
+ :max-date="maxDate"
+ @confirm="confirmScDate"
+ @cancel="showScDatePicker = false"
+ />
+ </van-popup>
+ <template #input>
+ <div class="wrap-content">{{ rzxxValue }}</div>
+ </template>
+ <template #button>
+ <van-tag type="primary" style="font-size:15px" @click="selectRzxx()">閫夋嫨</van-tag>
+ </template>
+ </van-field>
+ <!-- <van-dialog v-model="showDialogRzxx" title="璁よ瘉淇℃伅" :show-cancel-button="false" @confirm="rzxxConfirm">
<van-field
v-model="rzxxValue"
rows="5"
@@ -306,7 +471,25 @@
placeholder="璇疯緭鍏ヨ璇佷俊鎭�"
show-word-limit
/>
- </van-dialog>
+ </van-dialog> -->
+ <van-button
+ block
+ type="info"
+ @click="openZrPopup"
+ :loading="ttrre"
+ loading-text="鍔犺浇涓�..."
+ v-if="jymxData.fcheckType === '鍒剁儹鎬ц兘'"
+ >鍒剁儹鎬ц兘褰曞叆</van-button>
+
+ <van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
+ <template #input>
+ <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>
</template>
<template>
@@ -467,42 +650,61 @@
</div>
<van-button
block
- type="danger"
+ type="info"
@click="createTb"
style="margin-top: 8px;"
>鐢熸垚琛ㄦ牸</van-button>
</van-cell-group>
- <div v-if="tableData.length > 0" id="temperature-table" style="margin-top: 20px;">
+ <div v-if="tableTbData.length > 0" id="temperature-table" style="margin-top: 20px;">
<van-cell-group>
<!-- 琛ㄥご -->
<van-cell>
- <div class="grid-header">
+ <div class="grid-header" style="display: flex; align-items: center; justify-content: center;">
<div v-for="(header, index) in [headers[0], ...headers.slice(1)]"
:key="index"
- :style="index === 0 ? 'width: 100px' : 'flex: 1'">
+ :style="`${index === 0 ? 'flex: 2' : 'flex: 2'}; display: flex; align-items: center; justify-content: center;`">
{{ header }}
</div>
</div>
</van-cell>
<!-- 鏁版嵁琛� -->
- <van-cell v-for="(row, rowIndex) in tableData" :key="rowIndex">
- <div class="grid-row">
- <div style="width: 100px">{{ row.temperature }}</div>
- <div v-for="(cell, colIndex) in row.values"
- :key="colIndex"
- class="input-cell">
- <van-field
- v-model="formData.temperatureData[row.temperature.replace('鈩�','')][cell.flow]"
- type="number"
- input-align="center"
- placeholder="鈩�"
- :style="{ width: '80px' }"/>
- </div>
- </div>
- </van-cell>
+ <div v-for="(row, rowIndex) in tableTbData" :key="rowIndex">
+ <div class="grid-row">
+ <!-- 姘存俯鍒� -->
+ <div style="flex: 2; text-align: center; display: flex; align-items: center; justify-content: center;">{{ row.temperature }}</div>
+ <!-- 瀹為檯娓╁害鍒� -->
+ <div style="flex: 2">
+ <van-field
+ class="temperature-input"
+ style="font-size: 0.16rem !important; color: blue !important;"
+ v-model="formTbData.temperatureData[row.temperature].temp"
+ placeholder="杈撳叆娓╁害鍊�"
+ type="number"
+ />
+ </div>
+ <!-- 鍔ㄦ�佸垪 -->
+ <div v-for="(header, colIndex) in headers.slice(2)"
+ :key="colIndex"
+ style="flex: 2">
+ <van-field
+ class="flow-input"
+ style="font-size: 0.16rem !important; color: blue !important;"
+ v-model="formTbData.temperatureData[row.temperature][header]"
+ :placeholder="`杈撳叆${header}鍊糮"
+ type="number"
+ />
+ </div>
+ </div>
+ </div>
</van-cell-group>
</div>
+ <van-button
+ block
+ type="primary"
+ @click="saveTableConfig"
+ style="margin-top: 8px;"
+ >淇濆瓨</van-button>
</div>
</van-popup>
@@ -512,7 +714,7 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_SJ/Add.js?<%=111112111145 %>"></script>
+ <script src="../Js/IPQC_SJ/Add.js?<%=111112111156 %>"></script>
</asp:Content>
--
Gitblit v1.9.3