From 5108857c79350f00ed0ee7bb6fa6fd5d58beabe6 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 11 八月 2025 13:51:47 +0800
Subject: [PATCH] 1、蓝牙打印连接 2、平板来料检验新增未审核标识
---
H5/My.aspx | 14 +++-
Scripts/config.js | 12 ++-
H5/Js/My.js | 8 ++
H5/LLJ/List.aspx | 92 ++++++++++++++++++++++++++++++
4 files changed, 115 insertions(+), 11 deletions(-)
diff --git a/H5/Js/My.js b/H5/Js/My.js
index 3e71506..f0f72bd 100644
--- a/H5/Js/My.js
+++ b/H5/Js/My.js
@@ -71,9 +71,15 @@
// on cancel
});
},
- goMsg() {
+ /* goMsg() {
var that = this;
window.location.href = "/H5/Message.aspx";
+ },*/
+ goMsg() {
+ var that = this;
+ uni.navigateTo({
+ url: "/pages/index/test/PrintInit?type=1",
+ })
},
goOrg() {
var that = this;
diff --git a/H5/LLJ/List.aspx b/H5/LLJ/List.aspx
index a49f79c..969af79 100644
--- a/H5/LLJ/List.aspx
+++ b/H5/LLJ/List.aspx
@@ -17,6 +17,89 @@
text-align: left;
}
+ /* 瀹℃牳鐘舵�佹き鍦嗙嚎浣撴牱寮� */
+ .audit-stamp {
+ position: absolute;
+ top: 6px;
+ right: 6px;
+ width: 80px;
+ height: 28px;
+ border-radius: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 10px;
+ font-weight: 500;
+ text-align: center;
+ z-index: 10;
+ border: 1.5px solid;
+ backdrop-filter: blur(8px);
+ -webkit-backdrop-filter: blur(8px);
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+ transform: rotate(-8deg);
+ letter-spacing: 1px;
+ transition: all 0.3s ease;
+ }
+
+ .audit-stamp--approved {
+ background: rgba(82, 196, 26, 0.12);
+ border-color: rgba(82, 196, 26, 0.5);
+ color: #52c41a;
+ animation: stamp-approved 0.6s cubic-bezier(0.34, 1.56, 0.64, 1);
+ }
+
+ .audit-stamp--pending {
+ background: rgba(255, 159, 67, 0.12);
+ border-color: rgba(255, 159, 67, 0.5);
+ color: #ff9f43;
+ animation: stamp-pending 0.6s cubic-bezier(0.34, 1.56, 0.64, 1);
+ }
+
+ .audit-stamp:hover {
+ transform: rotate(-8deg) scale(1.05);
+ box-shadow: 0 6px 25px rgba(0, 0, 0, 0.15);
+ }
+
+ @keyframes stamp-approved {
+ 0% {
+ transform: rotate(-8deg) scale(0) translateX(30px);
+ opacity: 0;
+ filter: blur(3px);
+ }
+ 70% {
+ transform: rotate(-8deg) scale(1.1) translateX(-3px);
+ opacity: 0.8;
+ filter: blur(0.5px);
+ }
+ 100% {
+ transform: rotate(-8deg) scale(1) translateX(0);
+ opacity: 1;
+ filter: blur(0);
+ }
+ }
+
+ @keyframes stamp-pending {
+ 0% {
+ transform: rotate(-8deg) scale(0) translateX(30px);
+ opacity: 0;
+ filter: blur(3px);
+ }
+ 70% {
+ transform: rotate(-8deg) scale(1.1) translateX(-3px);
+ opacity: 0.8;
+ filter: blur(0.5px);
+ }
+ 100% {
+ transform: rotate(-8deg) scale(1) translateX(0);
+ opacity: 1;
+ filter: blur(0);
+ }
+ }
+
+ .van-cell-group {
+ position: relative;
+ }
+
</style>
</asp:Content>
@@ -50,6 +133,13 @@
<van-cell v-for="item in data" :key="item">
<div>
<van-cell-group>
+ <!-- 瀹℃牳鐘舵�佺洊绔� -->
+ <div v-if="item.fsubmit == 1" class="audit-stamp audit-stamp--approved">
+ 宸插鏍�
+ </div>
+ <div v-else-if="!item.fsubmit || item.fsubmit == 0" class="audit-stamp audit-stamp--pending">
+ 鏈鏍�
+ </div>
<van-cell :title="item.releaseNo" is-link :url="'Add.aspx?id='+item.guid+'&lotNo='+item.lotNo+'&releaseNo='+item.releaseNo" ></van-cell>
<van-field label="鍒拌揣鍗曞彿" colon="true" v-model="item.lotNo" readonly ></van-field>
<!-- 鑷畾涔夊瓧娈电敤浜庢樉绀轰袱涓爣璇� -->
@@ -133,5 +223,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/List.js?<%=116 %>"></script>
+ <script src="../Js/LLJ/List.js?<%=117 %>"></script>
</asp:Content>
diff --git a/H5/My.aspx b/H5/My.aspx
index 91a2481..bd7e030 100644
--- a/H5/My.aspx
+++ b/H5/My.aspx
@@ -37,9 +37,15 @@
placeholder="15鏉�"
@click="goMsg()"
></van-field>--%>
-
- <van-field
- readonly
+
+ <van-field readonly
+ is-link
+ v-model="cardType"
+ label="鎵撳嵃閰嶇疆"
+ placeholder=""
+ @click="goMsg()"
+ ></van-field>
+ <van-field readonly
is-link
v-model="cardType"
label="閫�鍑�"
@@ -53,6 +59,6 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
<script src="Js/comWebNav.js"></script>
- <script src="Js/My.js?<%=12345 %>"></script>
+ <script src="Js/My.js?<%=123456 %>"></script>
</asp:Content>
diff --git a/Scripts/config.js b/Scripts/config.js
index 3a79a61..faebfc4 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,8 +1,10 @@
-锘�/*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 = "http://192.168.1.187:83/api/";
-//var APIURL_PC = "http://116.148.211.203:8081/";//
+锘�//var APIURL = "http://192.168.1.187:8083/api/";//PDA鍚庣鍙戝竷娴嬭瘯鍦板潃锛堝唴缃戯級
+//var APIURL = "http://192.168.1.187:83/api/";//PDA鍚庣鍙戝竷姝ｅ紡鍦板潃锛堝唴缃戯級
+var APIURL = "http://localhost:5204/api/";//鏈湴璋冭瘯鍦板潃
+
+//var APIURL_PC = "http://192.168.1.187:81/"; //PC鍚庣鐨勬寮忓湴鍧�锛堝唴缃戯級
+var APIURL_PC = "http://116.148.211.203:8081/"; //PC鍚庣鐨勬祴璇曞湴鍧�锛堝缃戯級
+
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {
--
Gitblit v1.9.3