From ed28eb2300839d7f080e99037fc1e736f17f19fc Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 19 七月 2025 09:21:35 +0800
Subject: [PATCH] 1、来料检优化样本值 2、登录优化
---
Scripts/config.js | 2
H5/Js/UserLogin.js | 6 +-
UserLogin.aspx | 2
H5/Default.aspx | 1
H5/Js/LLJ/Add.js | 44 +++++++++++++++++++++-
Mst.master | 2
H5/LLJ/Add.aspx | 16 +++++---
7 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/H5/Default.aspx b/H5/Default.aspx
index 3e610ca..6bb0572 100644
--- a/H5/Default.aspx
+++ b/H5/Default.aspx
@@ -28,6 +28,7 @@
</template>
</van-tab>
</van-tabs>
+ <div style="height:100px;"> </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" runat="Server">
<webnav :active="0"></webnav>
diff --git a/H5/Js/LLJ/Add.js b/H5/Js/LLJ/Add.js
index f602dc3..e329912 100644
--- a/H5/Js/LLJ/Add.js
+++ b/H5/Js/LLJ/Add.js
@@ -40,6 +40,8 @@
okValue: '',//OK-鏁伴噺
ngValue: '',//NG-鏁伴噺
showDialog: false,//涓嶈壇琛ㄨ堪杈撳叆妗�
+ ybsDialog: false,//鏍锋湰鍊艰緭鍏ユ
+ ybsValue: '',//鏍锋湰鏁伴噺
//鍥剧墖涓婁紶妗�
fileList: [
//{
@@ -82,6 +84,11 @@
this.inputValue = value.replace(/[^\d.]/g, '') // 1. 鍘婚櫎闈炴暟瀛楀拰灏忔暟鐐�
.replace(/(\..*)\./g, '$1') // 2. 绂佹澶氫釜灏忔暟鐐�
.replace(/^\./g, '');
+ },
+ handleNumberInput4(value) {
+ // 鍘婚櫎闈炴暟瀛楀苟纭繚棣栦綅涓嶄负0锛堥櫎闈炴槸鍗曠嫭鐨�0锛�
+ this.jymxData.ybsl = value.replace(/[^\d]/g, '') // 鍘婚櫎闈炴暟瀛楀瓧绗�
+ .replace(/^0+(?!$)/, ''); // 鍘婚櫎寮�澶寸殑0锛岄櫎闈炴暣涓瓧绗︿覆鏄�0
},
togglePopup(index) {
@@ -299,8 +306,7 @@
var that = this;
that.ttrre = true;
that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditModelSubmit', {
- guid: that.formData.guid,
- userGuid: this.GetLoginInfor().loginGuid // 鏂板鍙傛暟锛氱敤鎴峰敮涓�鏍囪瘑
+ guid: that.formData.guid
}, true, 1).then(function (res1) {
if (res1.rtnData.outSum == 1) {
that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
@@ -352,6 +358,40 @@
updateRemarks(guid) {
this.showDialog= true
},
+ EditYangLi(GUID) {
+ // 鍒囨崲鎸囧畾绱㈠紩鐨� popup 鐘舵��
+ var that = this;
+
+ if (!that.jymxData.ybsl) {
+ this.$toast.fail("鏍锋湰鏁颁笉鑳戒负绌�");
+ that.isLoading = false;
+ return;
+ }
+
+ var mxguid = that.tableData[that.tabActive].guid;//妫�楠岄」鐩殑guid
+ var input = that.jymxData.ybsl;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditYangLi', {
+ dt05Guid: mxguid,
+ fSeq: "鏍锋湰鏁�",
+ fVal: input,
+ }, true, 1).then(function (res1) {
+ if (res1.rtnData.outSum == 1) {
+ that.$notify({
+ type: 'success', message: res1.rtnMsg
+ });
+ that.okValue = null;
+ that.refreshJYItem();//鍒锋柊妫�楠岄」鐩�
+ } else {
+ that.$toast.fail(res1.rtnMsg);
+ }
+ that.isLoading = false;
+ }).catch(function (error) {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.isLoading = false;
+ });
+ },
+
deleteDetail13(guid13) {
const that = this;
diff --git a/H5/Js/UserLogin.js b/H5/Js/UserLogin.js
index 7ab253d..ad70e03 100644
--- a/H5/Js/UserLogin.js
+++ b/H5/Js/UserLogin.js
@@ -14,10 +14,10 @@
if (typeof (Cookies.get('phone')) == "undefined") { }
else {
that.phone = Cookies.get('phone');
- that.passwd = Cookies.get('passwd');
+ // that.passwd = Cookies.get('passwd');
}
- that.phone = "admin";
- that.passwd = "123456";
+ // that.phone = "admin";
+ // that.passwd = "123456";
},
methods: {
onSubmit(name) {
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index cc9e1fe..e76f383 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -83,7 +83,7 @@
</template>
</van-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">
+ <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>
@@ -103,7 +103,7 @@
show-word-limit
/>--%>
<!-- 涓嶅悎鏍艰〃杩拌緭鍏� -->
- <van-dialog v-model="showDialog" title="涓嶅悎鏍兼弿杩�" :show-cancel-button="false" @confirm="remarksConfirm">
+ <van-dialog v-model="showDialog" title="寮傚父鎻忚堪" :show-cancel-button="false" @confirm="remarksConfirm">
<van-field
v-model="remarks"
rows="5"
@@ -154,7 +154,7 @@
</van-col>
<van-col span="4" >
<van-cell center
- center :title="item.ybslIn ?? 0 + '/' + item.ybsl" @click="togglePopup(index)"></van-cell>
+ center :title="item.ybslIn + '/' + item.ybsl" @click="togglePopup(index)"></van-cell>
</van-col>
<van-col center span="6" >
<van-cell center
@@ -193,7 +193,7 @@
<div class="content-wrapper-jymx">
<van-tabs v-model="tabActive" sticky color="#000" round ellipsis="false" @click="handleTabClick">
<van-tab v-for="(itm,index) in tableData" round :key="index" :name="index" >
- <template #title > {{itm.fcheckItem}} <van-icon v-if="itm.fenterQty >=itm.checkQyt" name="success" color="#1989fa" class="badge-icon" ></van-icon></template>
+ <template #title > {{itm.fcheckItem}} <van-icon v-if="parseFloat(itm.fenterQty) >= parseFloat(itm.checkQyt) && parseFloat(itm.ybslIn) >= parseFloat(itm.ybsl)" name="success" color="#1989fa" class="badge-icon" ></van-icon></template>
<template>
<van-cell-group>
<van-field label="椤圭洰鍚嶇О" colon="true" v-model="jymxData.fcheckItem" readonly ></van-field>
@@ -205,7 +205,11 @@
<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="鏍锋湰鏁�" colon="true" v-model="jymxData.ybsl" @input="handleNumberInput4" >
+ <template #button>
+ <van-tag type="primary" style="font-size:15px" @click="EditYangLi(jymxData.guid)">淇敼</van-tag>
+ </template>
+ </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>--%>
@@ -384,5 +388,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/Add.js?<%=119997112 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=119997118%>"></script>
</asp:Content>
diff --git a/Mst.master b/Mst.master
index e21320a..7a4bb90 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,7 +11,7 @@
<script src="/Scripts/vue.min.js"></script>
<script src="/Scripts/js.cookie.min.js"></script>
<script src="/scripts/axios0.25.0.js"></script>
- <script src="/scripts/config.js?<%=123611121 %>"></script>
+ <script src="/scripts/config.js?<%=123611124 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
<link href="/Images/Style.css?<%=169950 %>" rel="stylesheet" />
diff --git a/Scripts/config.js b/Scripts/config.js
index 0a74c83..5308bad 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,7 +1,7 @@
锘�/*var APIURL = "http://192.168.1.187:8083/api/";*///鍚庣鍙戝竷娴嬭瘯鍦板潃
var APIURL = "http://localhost:5204/api/";
/*var APIURL_PC = "http://192.168.1.187:81/";*/ //PC鍚庣鐨勫湴鍧�
-var APIURL_PC = "http://192.168.1.187:8081/";//
+var APIURL_PC = "http://116.148.211.203:8081/";//
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {
diff --git a/UserLogin.aspx b/UserLogin.aspx
index 1ce1f07..5cba0d7 100644
--- a/UserLogin.aspx
+++ b/UserLogin.aspx
@@ -54,5 +54,5 @@
<comloading v-if="isLoading"></comloading>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="Server">
- <script src="/H5/Js/UserLogin.js?<%=1234 %>"></script>
+ <script src="/H5/Js/UserLogin.js?<%=1235 %>"></script>
</asp:Content>
--
Gitblit v1.9.3