From cc936d421be2c9ed390e624d720753bd205b5548 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 25 七月 2025 17:06:15 +0800
Subject: [PATCH] 1.核对送检重置按钮开发 2.登录页面优化，保存账号信息 3.产品绑定送检重置按钮
---
H5/Js/UserLogin.js | 5 +-
UserLogin.aspx | 2
H5/Js/Cpbdsj.js | 2
H5/IPQC_XJ/List.aspx | 2
H5/Cpdbsj.aspx | 2
H5/IPQC_XJ/Add.aspx | 21 +++++++---
H5/Js/IPQC_XJ/Add.js | 31 ++++++++++++++-
H5/Js/IPQC_XJ/List.js | 2
8 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 66f9f12..6571905 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -155,7 +155,7 @@
<van-button
type="warning"
class="action-button reset-button"
-<%-- @click.native="handleClear"--%>
+ @click.native="handleClear"
>閲嶇疆</van-button>
<van-button
type="info"
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index 86cf8ec..5b6a04b 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -111,6 +111,7 @@
<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 == "N:涓嶅悎鏍�"' colon v-model="remarks" readonly class="wrap-field">
<template #input>
@@ -120,6 +121,7 @@
<van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>
</template>
</van-field>
+ <van-field label="妫�楠屽伐浣�" colon="true" v-model="jyGw" @keyup.enter.native="selIpqcItemsByGw" ></van-field>
<van-dialog v-model="showDialog" title="涓嶅悎鏍兼弿杩�" :show-cancel-button="false" @confirm="remarksConfirm">
<van-field
v-model="remarks"
@@ -158,19 +160,24 @@
<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="8">宸叉鏁�/鎶芥鏁�</van-col>
+ <van-col span="8" center class="text-left padding-left">妫�楠岄」鐩�</van-col>
+ <van-col span="5">宸叉鏁�/鎶芥鏁�</van-col>
+ <van-col span="5">宸ヤ綅</van-col>
<van-col span="6">妫�楠岀粨鏋�</van-col>
</van-row>
<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-col span="8" center class="text-left padding-left" >
<van-cell center
center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
</van-col>
- <van-col span="8" >
+ <van-col span="5" >
<van-cell center
center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
+ </van-col>
+ <van-col span="5" >
+ <van-cell center
+ center :title="item.stationName" @click="togglePopup(index)"></van-cell>
</van-col>
<van-col center span="6" >
<van-cell center
@@ -220,8 +227,8 @@
<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>--%>
@@ -351,5 +358,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_XJ/Add.js?<%=11111111111 %>"></script>
+ <script src="../Js/IPQC_XJ/Add.js?<%=111111111113 %>"></script>
</asp:Content>
diff --git a/H5/IPQC_XJ/List.aspx b/H5/IPQC_XJ/List.aspx
index 9775353..6feccb3 100644
--- a/H5/IPQC_XJ/List.aspx
+++ b/H5/IPQC_XJ/List.aspx
@@ -133,5 +133,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_XJ/List.js?<%=11 %>"></script>
+ <script src="../Js/IPQC_XJ/List.js?<%=111 %>"></script>
</asp:Content>
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index e6e21c6..4860244 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -252,7 +252,7 @@
that.LsBar = ""; // 娓呯┖杈撳叆妗�
},
- GetWeightByXt() {
+ handleClear() {
},
diff --git a/H5/Js/IPQC_XJ/Add.js b/H5/Js/IPQC_XJ/Add.js
index 5351162..954f9aa 100644
--- a/H5/Js/IPQC_XJ/Add.js
+++ b/H5/Js/IPQC_XJ/Add.js
@@ -24,6 +24,7 @@
mocode: "",
boardStyle: ""
},
+ jyGw:"",//妫�楠屽伐浣�
isShowTable: false,
tableData: [],//杩斿洖鐨勬楠岄」鐩�
jymxData: [],//灞曠ず鐨勬楠岄」鐩�
@@ -257,7 +258,7 @@
//妫�楠屾槑缁嗗埛鏂�
refreshJYItem() {
const that = this;
- return that.AxiosHttp("post", 'LLJ/getJYItem', {
+ return that.AxiosHttp("post", 'Ipqc/getJYItem', {
releaseNo: that.formData.releaseNo
}, false).then(res1 => {
const tableData = res1.data.tbBillList || [];
@@ -285,7 +286,7 @@
that.formData = data;
that.remarks = that.formData.fnGDesc;
that.lineId = data.lineId;
- that.AxiosHttp("post", 'LLJ/getJYItem', {
+ that.AxiosHttp("post", 'Ipqc/getJYItem', {
//id: that.formData.guid,
releaseNo: that.formData.releaseNo
}, false).then(function (res1) {
@@ -534,5 +535,31 @@
that.init();//鍒锋柊妫�楠岄」鐩�
})
},
+ //妫�楠岄」鐩壂鎻忓伐浣嶅彲鍋氭楠�
+ selIpqcItemsByGw() {
+ const that = this;
+ var guid1 = that.formData.guid;//涓昏〃id
+ return that.AxiosHttp("post", 'Ipqc/selIpqcItemsByGw', {
+ inOrderGuid1: guid1,
+ userAccount: that.userInfo.loginAccount,
+ gw: that.jyGw
+ }, false).then(res => {
+ var json = res;
+ if (json.status == 0) {
+ that.init();//鍒锋柊
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.jyGw = "";
+ }
+ that.isLoading = false;
+
+
+ }).catch(error => {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.error('Refresh error:', error);
+ });
+ },
}
})
\ No newline at end of file
diff --git a/H5/Js/IPQC_XJ/List.js b/H5/Js/IPQC_XJ/List.js
index 349aa26..31bfcdd 100644
--- a/H5/Js/IPQC_XJ/List.js
+++ b/H5/Js/IPQC_XJ/List.js
@@ -43,7 +43,7 @@
},
onLoad() {
-
+ this.pageIndex = 0;
if (this.refreshing) {
this.data = [];
this.refreshing = false;
diff --git a/H5/Js/UserLogin.js b/H5/Js/UserLogin.js
index 5a56fd9..8963a96 100644
--- a/H5/Js/UserLogin.js
+++ b/H5/Js/UserLogin.js
@@ -11,9 +11,10 @@
},
mounted() {
var that = this;
- if (typeof (Cookies.get('phone')) == "undefined") { }
+ if (typeof (Cookies.get('loginAccount')) == "undefined") {
+ }
else {
- that.phone = Cookies.get('phone');
+ that.phone = Cookies.get('loginAccount');
//that.passwd = Cookies.get('passwd');
}
//that.phone = "admin";
diff --git a/UserLogin.aspx b/UserLogin.aspx
index 5cba0d7..b2f2046 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?<%=1235 %>"></script>
+ <script src="/H5/Js/UserLogin.js?<%=1237 %>"></script>
</asp:Content>
--
Gitblit v1.9.3