From d1b215ff8c4f14c6274315e4fd0f81e9fcebee3a Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 04 八月 2025 14:52:00 +0800
Subject: [PATCH] 1.内箱核对 2.其他出库优化，新增子表仓库 3.登录菜单逻辑调整 4.巡检优化 5.核对送检线体选择 6.打印配置界面优化
---
H5/My.aspx | 2
H5/Js/My.js | 1
H5/Nxhd.aspx | 159 ++++++++++++++++++++++++++
H5/Js/Cpbdsj.js | 14 ++
H5/Cpdbsj.aspx | 6
H5/Nxhd.aspx.cs | 14 ++
H5/Qtck.aspx | 4
H5/Js/Nxhd.js | 129 +++++++++++++++++++++
8 files changed, 323 insertions(+), 6 deletions(-)
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index ce50fb4..23846ff 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -144,8 +144,8 @@
</van-field>
<van-field
- ref="LsBar"
- v-model="LsBar"
+ ref="xt"
+ v-model="xt"
label="绾垮埆"
placeholder="璇烽�夋嫨绾垮埆"
autofocus="true"
@@ -223,5 +223,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=1211111141 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=1211111142 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index cab435f..47681a5 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -29,6 +29,7 @@
DAA001: [],
show: false,//鍒楄〃灞曠ず
actions: [],//鍒楄〃鐨勫��
+ xt:"",
}
},
mounted() {
@@ -347,6 +348,19 @@
});
},
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+ console.log(item);
+ // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
+ const regex = /\[([^\]]+)\]/;
+ const matchResult = item.name.match(regex);
+ this.xt = item.name;
+ //this.$toast(item.name);
+
+ },
+
}
})
\ No newline at end of file
diff --git a/H5/Js/My.js b/H5/Js/My.js
index f1a936a..8dd73e0 100644
--- a/H5/Js/My.js
+++ b/H5/Js/My.js
@@ -81,6 +81,7 @@
url: "/pages/index/test/PrintInit?type=1",
});
+ },
goOrg() {
var that = this;
this.$dialog.confirm({
diff --git a/H5/Js/Nxhd.js b/H5/Js/Nxhd.js
new file mode 100644
index 0000000..c761c81
--- /dev/null
+++ b/H5/Js/Nxhd.js
@@ -0,0 +1,129 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ ZsBar: "",//杩芥函鏉＄爜
+ LsBar: "",//鍚庣洊娴佹按鏉＄爜
+ UserName: Cookies.get('loginName'),//鐢ㄦ埛鍚嶇О
+ ZsBarInfo: [],
+ Traceability: [],
+ GX: "G006:鍐呯鏍稿",
+
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ getHgBarInfo() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/getHgBarInfo', {
+ Xt: that.GX,
+ Zsbarcode: that.ZsBar
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ZsBarInfo = json.data.tbBillList.zsBarInfo[0];
+ that.Traceability = json.data.tbBillList.traceability;
+ that.$refs.LsBar.focus();
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.ZsBar.focus();
+ that.ZsBar = "";
+ that.ZsBarInfo = [];
+ that.Traceability = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.ZsBar.focus();
+ that.ZsBar = "";
+ that.ZsBarInfo = [];
+ that.Traceability = [];
+ });
+ },
+ ScanNxhd() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (that.ZsBar.length <= 0) {
+ that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+ return;
+ }
+ if (that.LsBar.length <= 0) {
+ that.$toast.fail("绠辩爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/ScanNxhd', {
+ ZsBar: that.ZsBar,
+ LsBar: that.LsBar,
+ userName: that.userInfo.loginAccount,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.scanInfo = json.data.tbBillList;
+ that.$notify({ type: 'success', message: json.message });
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.LsBar = null;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.LsBar = null;
+ }
+
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.LsBar = null;
+ });
+ },
+ //鎵撳嵃鏈烘敞閲�
+ //selectPrinter(printer) {
+ // this.selectedPrinter = printer.printerId; // 鏇存柊閫変腑鐨勬墦鍗版満缂栧彿
+ //},
+ //confirmSelection() {
+ // if (this.selectedPrinter) {
+ // alert(`鎮ㄩ�夋嫨浜嗘墦鍗版満锛�${this.selectedPrinter}`);
+ // // 鍦ㄨ繖閲屽鐞嗛�夋嫨缁撴灉锛屼緥濡傝皟鐢ㄦ帴鍙ｆ垨鏇存柊鐘舵��
+ // this.isPrinterPopupVisible = false; // 鍏抽棴寮圭獥
+ // } else {
+ // alert('璇烽�夋嫨涓�涓墦鍗版満锛�');
+ // }
+ //},
+ //onPrinterSelected(value) {
+ // console.log('褰撳墠閫変腑鐨勬墦鍗版満缂栧彿:', value);
+ //},
+ }
+})
\ No newline at end of file
diff --git a/H5/My.aspx b/H5/My.aspx
index b1cc18a..3815e0f 100644
--- a/H5/My.aspx
+++ b/H5/My.aspx
@@ -55,6 +55,6 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
<script src="Js/comWebNav.js"></script>
- <script src="Js/My.js?<%=123451 %>"></script>
+ <script src="Js/My.js?<%=123452 %>"></script>
</asp:Content>
diff --git a/H5/Nxhd.aspx b/H5/Nxhd.aspx
new file mode 100644
index 0000000..44d803a
--- /dev/null
+++ b/H5/Nxhd.aspx
@@ -0,0 +1,159 @@
+锘�
+<%@ Page Title="鍐呯鏍稿" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Nxhd.aspx.cs" Inherits="H5_Nxhd" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <style>
+ .si-status-box,
+ .si-status__left
+ {
+ background-color: transparent !important; /* 閫忔槑鑳屾櫙 */
+ border: 1px solid #000 !important; /* 榛戣壊澶栨 */
+ color: #000 !important; /* 鍏ㄥ眬鏂囧瓧棰滆壊 */
+ height: 0.5rem;
+ }
+
+ .si-status__left::after {
+ content: none !important;
+ }
+
+ .si-status__label,
+ .si-status__right {
+ font-size: 0.33rem !important; /* 缁熶竴瀛椾綋澶у皬 */
+ color: inherit !important; /* 缁ф壙鐖剁骇鏂囧瓧棰滆壊 */
+ }
+</style>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <div class="content-wrapper">
+ <van-nav-bar
+ title="鍐呯鏍稿"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()">
+ </van-nav-bar>
+
+ <div class="mySolid">
+ <van-cell-group>
+ <van-field
+ ref="ZsBar"
+ v-model="ZsBar"
+ label="鍚庣洊鏉＄爜"
+ clearable
+ placeholder="璇锋壂鍚庣洊鏉＄爜"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getHgBarInfo"
+ autofocus="true">
+ </van-field>
+
+ <van-field
+ v-model="UserName"
+ label="浣滀笟浜哄憳"
+ clearable
+ :right-icon-size="19"
+ placeholder=""
+ readonly >
+ </van-field>
+
+ <van-field
+ ref="barcode"
+ v-model="ZsBarInfo.lineName"
+ label="浜х嚎"
+ clearable
+ placeholder="浜х嚎鍚嶇О"
+ :right-icon-size="19"
+ readonly >
+ </van-field>
+
+ <van-field
+ ref="LsBar"
+ v-model="LsBar"
+ label="绠辨潯鐮�"
+ placeholder="璇锋壂绠辨潯鐮�"
+ @keyup.enter.native="ScanNxhd"
+ autofocus="true">
+ </van-field>
+
+<%-- <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">{{ZsBarInfo.sumQty}}</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">{{ZsBarInfo.finQty}}</div>
+ </div>--%>
+
+<%-- <van-button
+ slot="button"
+ type="info"
+ size="small"
+ @click="productBinding">
+ 鎻愪氦
+ </van-button>--%>
+ </div>
+
+ </van-cell-group>
+ </div>
+
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="浜у搧淇℃伅" class="mySolid font">
+ <van-cell-group >
+ <van-field label="鎸囦护鍗曞彿" colon="true" v-model="ZsBarInfo.daa001" readonly style="background: #ffa53b"></van-field>
+ <van-field label="鏉＄爜鏁伴噺" colon="true" v-model="ZsBarInfo.barQty" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="杩芥函鐮�" colon="true" v-model="ZsBarInfo.zsBarcode" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="浜у搧缂栫爜" colon="true" v-model="ZsBarInfo.item_no" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="浜у搧鍚嶇О" colon="true" v-model="ZsBarInfo.item_name" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="浜у搧瑙勬牸" colon="true" v-model="ZsBarInfo.item_model" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="鍓嶄竴宸ュ簭" colon="true" v-model="ZsBarInfo.lastGx" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="褰撳墠宸ュ簭" colon="true" v-model="GX" readonly style="background: #ffa53b" ></van-field>
+ </van-cell-group>
+ </van-tab>
+
+ <van-tab title="鐢熶骇灞ュ巻" class="mySolid font">
+ <van-row>
+ <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="(itm,index) in Traceability" :key="index">
+ <van-col span="6" >{{itm.useR_NAME}}</van-col>
+ <van-col span="6" >{{itm.line_no}}</van-col>
+ <van-col span="6" class="blue-text">{{itm.processNo}}</van-col>
+ <van-col span="6" >{{itm.checkResult}}</van-col>
+ </van-row>
+ </van-tab>
+
+<%-- <van-tab title="宸茬粦鏉＄爜" class="mySolid font">
+ <van-row>
+ <van-col span="5">浜哄憳</van-col>
+ <van-col span="5">浜х嚎</van-col>
+ <van-col span="5">宸ュ簭</van-col>
+ <van-col span="4">鑹搧</van-col>
+ <van-col span="5">涓嶈壇鍝�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in Traceability" :key="index">
+ <van-col span="5" >{{itm.fQty}}</van-col>
+ <van-col span="5" >{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.fQty}}</van-col>
+ <van-col span="4" >{{itm.fQty}}</van-col>
+ <van-col span="5" >{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>--%>
+ </van-tabs>
+ </div>
+</asp:Content>
+
+<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
+ <comloading v-if="isLoading"></comloading>
+</asp:Content>
+
+<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
+ <script src="Js/Nxhd.js?<%=111 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/Nxhd.aspx.cs b/H5/Nxhd.aspx.cs
new file mode 100644
index 0000000..9c07ce2
--- /dev/null
+++ b/H5/Nxhd.aspx.cs
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class H5_Nxhd : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Qtck.aspx b/H5/Qtck.aspx
index d1cdb55..e6d4fe2 100644
--- a/H5/Qtck.aspx
+++ b/H5/Qtck.aspx
@@ -62,9 +62,9 @@
label="鍙戞枡鏁伴噺"
placeholder="鍙戞枡鏁伴噺"
disabled
-><template #button>
+><%--<template #button>
<van-button size="small" type="info" plain @click="tmcf" >鏉＄爜鎷嗗垎</van-button>
- </template></van-field>
+ </template>--%></van-field>
</van-cell-group>
</div>
--
Gitblit v1.9.3