From 1ad8334fa579f1746efe55303a7773ad85aeee51 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 20 六月 2025 08:17:44 +0800
Subject: [PATCH] 1.生产补料优化 2.生产退料优化
---
H5/LLJ/Add.aspx | 352 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 298 insertions(+), 54 deletions(-)
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index 27d6478..cc9e1fe 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -11,32 +11,50 @@
vertical-align: middle;
}
- .van-popup__close-icon--top-right {
- top: .25rem;
- right: -.01rem;
- }
-
- .content-wrapper-jymx {
- margin: 27px;
- background: #ffffff;
- border-radius: 8px;
- padding: 3px;
- box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
- }
</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 v-if="formData.fcheckResu === 'N:涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</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 === '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 === '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'"
+ 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-cell-group >
+<%-- <van-field label="妫�楠屽崟鍙�" colon="true" v-model="formData.releaseNo" readonly ></van-field>--%>
+
<!-- 鑷畾涔夊瓧娈电敤浜庢樉绀轰袱涓爣璇� -->
<van-field label="鏍囪瘑" colon="true" readonly>
@@ -47,47 +65,112 @@
</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 == "N:涓嶅悎鏍�"' 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>
- <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-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
+ <!-- 鏂瑰紡 -->
+ <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"
+ @delete="handleDelete"
+ />
+ </div>
+ </div>
+</div>
+ <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">妫�楠岄」鐩�</van-col>
- <van-col span="6">鏄惁鍚堟牸</van-col>
- <van-col span="8">璁板綍(鐐瑰嚮)</van-col>
+ <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-row>
- <van-row v-for="(item,index) in tableData" :key="index" type="flex" justify="center">
+ <van-row v-for="(item,index) in tableData" :key="index" type="flex" justify="left">
<van-col span="10" center class="text-left padding-left" >
<van-cell center
center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
</van-col>
- <van-col center span="6">
+ <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.ybslIn ?? 0 + '/' + item.ybsl" @click="togglePopup(index)"></van-cell>
+ </van-col>
+ <van-col center span="6" >
<van-cell center
- center :title="item.fcheckResu"></van-cell>
- </van-col>
- <van-col span="8">
- <van-cell center :url="'detail.aspx?id='+ item.guid + '&gid=' + formData.guid+'&fsubmit='+formData.fsubmit"
- v-if="item.fenterQty >=item.checkQyt"
- center :title="item.checkQyt + '/' + item.fenterQty"></van-cell>
- <van-cell v-else center is-link :url="'detail.aspx?id='+ item.guid + '&gid=' + formData.guid+'&fsubmit='+formData.fsubmit">
- <!-- 浣跨敤 title 鎻掓Ы鏉ヨ嚜瀹氫箟鏍囬 -->
- <template #title>
- <span class="custom-title">{{item.checkQyt + '/' + item.fenterQty}}</span>
- <van-tag type="danger" style="font-size:15px">鏈畬鎴�</van-tag>
- </template>
+ 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 === '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-cell>
</van-col>
+
</van-row>
</van-tab>
</van-tabs>
@@ -98,11 +181,13 @@
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 ="init"
>
<!-- 寮瑰嚭鍐呭 -->
<div class="content-wrapper-jymx">
@@ -113,32 +198,191 @@
<van-cell-group>
<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.inspectionMethod" 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.sampleSizeNo" readonly ></van-field>
- <van-field label="妫�楠屾按骞�" colon="true" v-model="jymxData.fcheckLevel" readonly ></van-field>
- <van-field label="鎺ユ敹姘村钩" colon="true" v-model="jymxData.facLevel" 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="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.fngQty" readonly ></van-field>
- <van-field label="棰勮缁撴灉" colon="true" v-model="jymxData.result" readonly ></van-field>
- <van-field label="涓嶅悎鏍兼弿杩�" colon="true" v-model="jymxData.remarks" readonly ></van-field>
- <van-field label="妫�娴嬬粨鏋�" colon="true" v-model="jymxData.fcheckResu" placeholder="娌℃湁鏈�澶у�煎拰鏈�灏忓�兼椂濉啓0锛堟湭閫氳繃妫�楠岋級鎴�1锛堥�氳繃妫�楠岋級" ></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>
+ <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 -->
+ <template>
+ <div class="si-container">
+ <!-- 鐘舵�佹樉绀鸿 -->
+ <div class="si-status-group">
+ <div class="si-status-box si-status--ok">
+ <div class="si-status__left">
+ <span class="si-status__label">鍚堟牸鏁�</span>
+ </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">{{ngNum}}</div>
+ </div>
+ </div>
+ </div>
+ </template>
+ <template>
+ <!-- 杈撳叆妗� -->
+ <div class="si-input-box">
+ <div class="si-input__left">
+ <span class="si-input__label">鐗瑰緛鍊艰緭鍏�</span>
+ </div>
+ <div class="si-status__right">
+ <van-field
+ :ref="'inputValue' + tabActive"
+ v-model="inputValue"
+ placeholder="璇疯緭鍏ョ壒寰佸��"
+ :border="false"
+ class="si-input-field"
+ @input="handleNumberInput3"
+ @keyup.enter.native="getInputTZZ"
+ />
+ </div>
+ </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-row>
+ <van-row v-for="(item,index) in tableMxData.list2" :key="index" type="flex" justify="left">
+
+ <van-col span="6" >
+ <van-cell center
+ 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="6" >
+ <van-cell center
+ center v-if="item.fstand === '鈭�'">
+ <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 round plain type="danger" style="font-size:15px">涓嶅悎鏍�</van-tag>
+ </van-cell>
+ <van-cell center
+ center v-else >
+ <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>
+
</van-tab>
- </van-tabs
+ </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?<%=116 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=119997112 %>"></script>
</asp:Content>
--
Gitblit v1.9.3