From daede3be8445e09aa261e1362b5a88bf7bb9d5ec Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 21 三月 2025 17:33:31 +0800
Subject: [PATCH] 1.新增照片上传功能 2.新增图片配置
---
H5/LLJ/Add.aspx | 392 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 325 insertions(+), 67 deletions(-)
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index aae56a4..6e29016 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -29,10 +29,10 @@
text-align: center;
}
-
-
.si-container {
- padding: 0.16rem;
+/* padding: 0.16rem;*/
+ padding: 8px 12px;
+ height: 0.6rem;
}
/* 鐘舵�佹樉绀虹粍 */
@@ -76,7 +76,7 @@
align-items: center;
padding-left: 0.16rem;
background: #fff;
- font-weight: bold;
+ //font-weight: bold;
}
/* 鐘舵�佺被鍨嬩慨楗扮 */
@@ -104,6 +104,7 @@
overflow: hidden;
background: #fff;
box-shadow: 0 0.02rem 0.04rem rgba(0,0,0,0.05);
+ padding: 8px 12px;
}
.si-input__left {
@@ -138,51 +139,154 @@
color: #1890ff;
}
+ .si-status__label{
+ color: #ffffff;
+ }
+
+ .si-status__right{
+ justify-content: center; /* 鏂板灞呬腑 */
+ background: #e3edf7;
+ padding-right: 0.16rem;
+ padding: 8px 12px;
+ }
+
/* Vant杈撳叆妗嗘繁搴﹀畾鍒� */
- :deep(.si-input-field .van-field__control) {
+ /*:deep(.si-input-field .van-field__control) {
height: 0.6rem !important;
font-size: 0.20rem !important;
line-height: 0.23rem !important;
color: #333;
- }
-
-/* .van-dropdown-menu__bar {
- position: relative;
- display: -webkit-box;
- display: -webkit-flex;
- display: flex;
- height: 0.23rem;
- background-color: #fff;
- box-shadow: 0 .0533rem .32rem rgba(100, 101, 102, .12);
- }
-
- .van-dropdown-menu__title {
- position: relative;
- box-sizing: border-box;
- max-width: 100%;
- padding: 0 .2133rem;
- color: #323233;
- font-size: .20rem;
- line-height: .23rem;
- }
-*/
+ }*/
.van-icon-popup {
font-size: 0.5rem;
}
+
+ .inline-title {
+ display: flex;
+ align-items: center;
+ gap: 8px; /* 闂磋窛鎺у埗 */
+ max-width: 80vw;
+ }
+
+ .release-no {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ .status-tag {
+ flex-shrink: 0; /* 闃叉琚帇缂� */
+ font-size: 12px;
+ padding: 2px 6px;
+ }
+
+ /* 瑕嗙洊瀵艰埅鏍忛粯璁ゆ牱寮� */
+ :deep(.van-nav-bar__title) {
+ max-width: none !important;
+ }
+
+
+ /* 娣卞害瑕嗙洊vant鏍峰紡,鎹㈣ */
+ :deep(.wrap-field .van-field__control) {
+ white-space: pre-wrap !important;
+ word-break: break-all !important;
+ line-height: 1.5;
+ min-height: 24px; /* 鏈�灏忛珮搴︿繚闅� */
+ padding: 4px 0; /* 澧炲姞鍨傜洿闂磋窛 */
+ }
+
+ /* 涓撶敤鍐呭瀹瑰櫒,鎹㈣ */
+ .wrap-content {
+ width: 100%;
+ display: block;
+ }
+
+
+/* .si-input-box {
+ display: flex;
+ align-items: center;
+ padding: 12px 16px;
+ }*/
+
+ .input-container {
+ flex: 1;
+ display: flex;
+ gap: 2px; /* 鎺у埗涓や釜杈撳叆缁勪箣闂寸殑闂磋窛 */
+ align-items: center;
+ background: #e3edf7;
+ }
+
+ .input-group {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ flex: 1; /* 浣夸袱涓緭鍏ョ粍鍧囧垎鍓╀綑绌洪棿 */
+ padding: 8px 12px;
+ }
+
+ .si-input-field {
+ flex: 1; /* 杈撳叆妗嗗崰鎹墿浣欑┖闂� */
+ width: 100%; /* 鎺у埗鏈�澶у搴� */
+ background: #f7f8fa;
+ border-radius: 4px;
+ padding: 8px 12px;
+ }
+
+ /* 鍥剧墖涓婁紶澶у皬 */
+ .van-uploader__preview-image {
+ width: 80px;
+ height: 80px;
+ object-fit: cover;
+ }
+ .van-uploader__upload{
+ width: 80px;
+ height: 80px;
+ }
+ .uploader-container {
+ height: auto;
+ overflow-y: auto;
+ -webkit-overflow-scrolling: touch; /* 娴佺晠婊氬姩锛坕OS锛� */
+ }
+ .van-uploader__preview-delete-icon{
+ font-size: 1.8em;
+ }
+
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
- <van-nav-bar
- title="鏉ユ枡妫�楠屾槑缁�"
+<%-- <van-nav-bar
+ :title=formData.releaseNo
left-text="杩斿洖"
left-arrow
@click-left="GetBack1()"
- ></van-nav-bar>
+ ></van-nav-bar>--%>
+ <van-nav-bar
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GetBack1"
+ @click-right="showButton = true"
+ >
+ <template #title>
+ <div class="inline-title">
+ <span class="release-no">{{ formData.releaseNo }}</span>
+ <van-tag round plain
+ :type="formData.fcheckResu === '涓嶅悎鏍�' ? 'danger' :
+ formData.fcheckResu === '妫�楠屼腑' ? 'warning' : 'success'"
+ class="status-tag"
+ >
+ {{ formData.fcheckResu || '鍚堟牸' }}
+ </van-tag>
+ </div>
+ </template>
+ <template #right>
+ <van-icon name="ellipsis" />
+ </template>
+ </van-nav-bar>
<div class="content-wrapper">
<van-cell-group >
- <van-field label="妫�楠屽崟鍙�" colon="true" v-model="formData.releaseNo" readonly ></van-field>
- <van-field label="鍒拌揣鍗曞彿" colon="true" v-model="formData.lotNo" readonly ></van-field>
+<%-- <van-field label="妫�楠屽崟鍙�" colon="true" v-model="formData.releaseNo" readonly ></van-field>--%>
+
<!-- 鑷畾涔夊瓧娈电敤浜庢樉绀轰袱涓爣璇� -->
<van-field label="鏍囪瘑" colon="true" readonly>
@@ -193,26 +297,85 @@
</div>
</template>
</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.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.itemModel" readonly ></van-field>--%>
+ <van-field
+ label="瑙勬牸鍨嬪彿"
+ colon
+ v-model="formData.itemModel"
+ readonly
+ 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="true" v-model="formData.remarks" ></van-field>
- <van-field label="妫�娴嬬粨鏋�" colon="true" v-model="formData.fcheckResu" readonly ></van-field>
+ <van-field label="涓嶅悎鏍兼弿杩�" v-if='formData.fcheckResu == "涓嶅悎鏍�"' colon v-model="remarks" readonly class="wrap-field">
+ <template #input>
+ <div class="wrap-content">{{ remarks }}</div>
+ </template>
+ <template #button>
+ <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-dialog v-model="showDialog" title="涓嶅悎鏍兼弿杩�" :show-cancel-button="false" @confirm="remarksConfirm">
+ <van-field
+ v-model="remarks"
+ rows="5"
+ autosize
+ type="textarea"
+ maxlength="500"
+ placeholder="璇疯緭鍏ヤ笉鍚堟牸鎻忚堪"
+ show-word-limit
+ />
+ </van-dialog>
</van-cell-group>
</div>
+ <!-- 鏂瑰紡 -->
+ <div class="uploader-container">
+ <!-- 浣跨敤 field 鏍峰紡鍖呰９ -->
+ <div class="van-cell van-field" style="padding: 10px 16px">
+ <!-- 宸︿晶鏍囩 -->
+ <div class="van-field__label" style="width: 90px">鍥剧墖涓婁紶</div>
+
+ <!-- 鍙充晶涓婁紶鍖哄煙 -->
+ <div class="van-field__body" style="flex: 1">
+ <van-uploader
+ v-model="fileList"
+ :after-read="afterRead"
+ style="padding: 8px 0"
+ />
+ </div>
+ </div>
+</div>
<%-- <van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." v-if="!isShowTable && formData.fsubmit == 0" @click="submit">妫�楠屾彁浜�</van-button>
<van-button type="danger" v-if="!isShowTable && formData.fsubmit == 0" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>--%>
- <van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." @click="submit">妫�楠屾彁浜�</van-button>
- <van-button type="danger" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>
- <van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
+<%-- <van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." @click="submit">妫�楠屾彁浜�</van-button>
+ <van-button type="danger" @click="removeXJ">鍒锋柊閲嶅仛</van-button>--%>
+ <van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
<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="6">妫�楠岀粨鏋�</van-col>
- <van-col span="8">宸叉/寰呮</van-col>
</van-row>
<van-row v-for="(item,index) in tableData" :key="index" type="flex" justify="left">
@@ -220,25 +383,29 @@
<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-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 === '鍚堟牸'">
- <van-tag type="success" style="font-size:15px">鍚堟牸</van-tag>
+ <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 === '涓嶅悎鏍�'">
- <van-tag type="danger" style="font-size:15px">涓嶅悎鏍�</van-tag>
+ <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 type="warning" style="font-size:15px">鏈畬鎴�</van-tag>
+ <van-tag round plain type="warning" style="font-size:15px" @click="togglePopup(index)">妫�楠屼腑</van-tag>
</van-cell>
-
</van-col>
- <van-col span="8" >
- <van-cell center
- center :title="item.checkQyt + '/' + item.fenterQty"></van-cell>
- </van-col>
+
</van-row>
</van-tab>
</van-tabs>
@@ -255,6 +422,7 @@
height: '100%' ,
boxShadow: '-2px 0 12px rgba(0, 0, 0, 0.1)'
}"
+ @click-close-icon ="init"
>
<!-- 寮瑰嚭鍐呭 -->
<div class="content-wrapper-jymx">
@@ -270,17 +438,71 @@
<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="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="棰勮缁撴灉" 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" v-model="resultValue" placeholder="璇疯緭鍏K-鏁板瓧鎴朜G-鏁板瓧"></van-field>--%>
+
<van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
<template #input>
- <van-tag v-if="jymxData.fcheckResu === '鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag v-else-if="jymxData.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
- <van-tag v-else type="warning">鏈畬鎴�</van-tag>
+ <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>
</template>
</van-field>
+ <template>
+ <div class="si-input-box">
+ <!-- 宸︿晶鏍囬 -->
+ <div class="si-input__left">
+ <span class="si-input__label">缁撴灉褰曞叆</span>
+ </div>
+
+ <!-- 姘村钩鎺掑垪鐨勮緭鍏ュ鍣� -->
+ <div class="input-container">
+ <!-- OK杈撳叆缁� -->
+ <div class="input-group">
+ <van-tag
+ left
+ round
+ plain
+ type="success"
+ class="input-tag"
+ >OK</van-tag>
+ <van-field
+ :ref="'okValue_' + tabActive"
+ v-model="okValue"
+ class="si-input-field"
+ placeholder="杈撳叆OK鏁�"
+ :border="false"
+ @keyup.enter.native="getInputOK"
+ @input="handleNumberInput1"
+ />
+ </div>
+
+ <!-- NG杈撳叆缁� -->
+ <div class="input-group">
+ <van-tag
+ left
+ round
+ plain
+ type="danger"
+ class="input-tag"
+ >NG</van-tag>
+ <van-field
+ :ref="'ngValue_' + tabActive"
+ v-model="ngValue"
+ class="si-input-field"
+ placeholder="杈撳叆NG鏁�"
+ :border="false"
+ @keyup.enter.native="getInputNG"
+ @input="handleNumberInput2"
+ />
+ </div>
+ </div>
+ </div>
+ </template>
+
</van-cell-group>
</template>
<!-- StatsInput.vue -->
@@ -292,16 +514,17 @@
<div class="si-status__left">
<span class="si-status__label">鍚堟牸鏁�</span>
</div>
- <div class="si-status__right">256</div>
+ <div class="si-status__right">{{okNum}}</div>
</div>
<div class="si-status-box si-status--error">
<div class="si-status__left">
<span class="si-status__label">涓嶅悎鏍兼暟</span>
</div>
- <div class="si-status__right">32</div>
+ <div class="si-status__right">{{ngNum}}</div>
</div>
</div>
+ </div>
</template>
<template>
<!-- 杈撳叆妗� -->
@@ -311,43 +534,49 @@
</div>
<div class="si-status__right">
<van-field
+ :ref="'inputValue' + tabActive"
v-model="inputValue"
- placeholder="璇疯緭鍏�"
+ placeholder="璇疯緭鍏ョ壒寰佸��"
:border="false"
class="si-input-field"
+ @input="handleNumberInput3"
+ @keyup.enter.native="getInputTZZ"
/>
</div>
</div>
- </div>
</template>
<van-row type="flex" justify="center">
- <van-col span="10" center class="text-left padding-left">妫�楠岄」鐩�</van-col>
+ <van-col span="6">鏍锋湰闆�</van-col>
<van-col span="6">鏍锋湰鍊�</van-col>
- <van-col span="8">鍒ゅ畾鏍囧織</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-col span="10" center class="text-left padding-left" >
+ <van-col span="6" >
<van-cell center
- center :title="item.fcheckItemd5" @click="togglePopup(index)"></van-cell>
+ center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
</van-col>
<van-col span="6" >
<van-cell center
center :title="item.fcheckResu"></van-cell>
</van-col>
- <van-col center span="8" >
+ <van-col center span="6" >
<van-cell center
center v-if="item.fstand === '鈭�'">
- <van-tag type="success" style="font-size:15px">鍚堟牸</van-tag>
+ <van-tag round plain type="success" style="font-size:15px">鍚堟牸</van-tag>
</van-cell>
<van-cell center
center v-else-if="item.fstand === '脳'">
- <van-tag type="danger" style="font-size:15px">涓嶅悎鏍�</van-tag>
+ <van-tag round plain type="danger" style="font-size:15px">涓嶅悎鏍�</van-tag>
</van-cell>
<van-cell center
center v-else >
- <van-tag 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" >
+ <van-tag type="danger" style="font-size:15px" @click="deleteDetail13(item.guid)">鍒犻櫎</van-tag>
</van-col>
</van-row>
@@ -355,11 +584,40 @@
</van-tabs>
</div>
</van-popup>
+
+
+
+ <!-- 寮瑰嚭鑿滃崟 -->
+ <van-popup
+ v-model="showButton"
+ position="bottom"
+ :style="{ width: '100%' }"
+ >
+ <div style="padding: 12px;">
+ <van-button
+ block
+ type="info"
+ @click="submit"
+ :loading="ttrre"
+ loading-text="鍔犺浇涓�..."
+ >妫�楠屾彁浜�</van-button>
+
+ <van-button
+ block
+ type="danger"
+ @click="removeXJ"
+ style="margin-top: 8px;"
+ >鍒锋柊閲嶅仛</van-button>
+ </div>
+ </van-popup>
+
+
+
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
<comloading v-if="isLoading"></comloading>
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/Add.js?<%=118 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=119993 %>"></script>
</asp:Content>
--
Gitblit v1.9.3