From 408b576b8aa155c9f7c8b919be3cd82be52a1da8 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 25 十一月 2025 08:52:44 +0800
Subject: [PATCH] 1.标准代码更新（2025-11-25）
---
H5/Dbck.aspx | 152
H5/Js/Strk.js | 16
H5/Js/Xcsl.js | 57
H5/Kwbg.aspx | 145 +
H5/Fgbd.aspx.cs | 14
H5/Cgyt.aspx.cs | 14
H5/Js/AgvCz.js | 320 ++
H5/Js/Kwcx.js | 172 +
H5/Js/UserLogin.js | 21
H5/BarCf.aspx | 16
H5/Js/LLJ/Add.js | 41
H5/PurchaseReturn.aspx | 40
H5/Js/Dbck.js | 160
H5/PurchaseInventory.aspx | 12
H5/Scbg.aspx | 2
H5/IPQC_XJ/Add.aspx | 80
H5/Nxhd.aspx.cs | 14
H5/LLJ/Add.aspx | 16
H5/Wwll.aspx | 154
H5/AgvCz.aspx | 145 +
H5/Js/Scbl.js | 117
H5/Cpbd.aspx | 11
H5/Js/My.js | 73
H5/Js/Cpbd.js | 41
H5/Dhdsh.aspx | 11
H5/Cpdbsj.aspx | 90
H5/Js/Wwck.js | 281 ++
Mst.master | 4
H5/Xsck.aspx | 102
H5/Js/IPQC_XJ/List.js | 2
H5/Xsth.aspx | 65
H5/BarCfBefore.aspx.cs | 14
H5/Wwck.aspx.cs | 14
Scripts/config.js | 11
H5/Dbrk.aspx | 79
UserLogin.aspx | 4
H5/Default.aspx | 3
H5/Js/Dbrk.js | 25
H5/Nxhd.aspx | 159 +
H5/Js/Qtck.js | 162 +
H5/Js/Cpbdsj.js | 411 +++
H5/Sctl.aspx | 8
H5/Js/BarCf.js | 49
H5/Cgyt.aspx | 164 +
H5/Js/Sttl.js | 101
H5/Wwtl.aspx | 56
H5/Js/Kwbg.js | 191 +
H5/BarCfBefore.aspx | 82
H5/Js/Qtrk.js | 12
H5/Qtrk.aspx | 28
H5/Js/Fgbd.js | 129 +
H5/Js/Scbg.js | 24
H5/Js/Nxhd.js | 160 +
H5/Kwcx.aspx.cs | 14
H5/Js/CpbdsjD.js | 683 +++++
H5/Js/Dhdsh.js | 8
H5/Wwck.aspx | 188 +
H5/CpbdsjD.aspx.cs | 14
H5/Js/Wwll.js | 138 +
H5/Js/BarCfBefore.js | 168 +
H5/Strk.aspx | 63
H5/Fgbd.aspx | 159 +
H5/Js/Sctl.js | 13
H5/My.aspx | 39
Images/Style.css | 44
H5/AgvCz.aspx.cs | 14
H5/CpbdsjD.aspx | 188 +
H5/Js/PurchaseReturn.js | 116
H5/Js/Xsck.js | 102
H5/Js/Cgyt.js | 166 +
H5/Scll.aspx | 89
H5/Js/Scll.js | 150
H5/IPQC_XJ/List.aspx | 9
H5/Kwbg.aspx.cs | 14
H5/Js/IPQC_XJ/Add.js | 132 +
H5/Qtck.aspx | 64
H5/Kwcx.aspx | 148 +
H5/Xcsl.aspx | 203 +
H5/Sttl.aspx | 91
H5/Scbl.aspx | 57
80 files changed, 6,712 insertions(+), 636 deletions(-)
diff --git a/H5/AgvCz.aspx b/H5/AgvCz.aspx
new file mode 100644
index 0000000..6810401
--- /dev/null
+++ b/H5/AgvCz.aspx
@@ -0,0 +1,145 @@
+锘�<%@ Page Title="AGV鎿嶄綔" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="AgvCz.aspx.cs" Inherits="H5_Cpdbsj" %>
+<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; /* 缁ф壙鐖剁骇鏂囧瓧棰滆壊 */
+ }
+
+
+ /* 灞呬腑鏍稿績鏍峰紡 */
+.centered-stepper-field {
+ .stepper-container {
+ display: flex;
+ justify-content: center; /* 姘村钩灞呬腑 */
+ width: 100%;
+ }
+
+ /* 璋冩暣姝ヨ繘鍣ㄦ寜閽棿璺� */
+ .van-stepper__minus {
+ margin-right: 12px;
+ }
+ .van-stepper__plus {
+ margin-left: 12px;
+ }
+}
+
+ /* 鏂板鏍峰紡 */
+ .button-container {
+ display: flex;
+ width: 100%;
+ gap: 12px; /* 鎸夐挳闂磋窛 */
+ padding: 0 16px; /* 宸﹀彸鐣欑櫧 */
+ box-sizing: border-box;
+ }
+
+ .action-button {
+ flex: 1; /* 绛夊垎鍓╀綑绌洪棿 */
+ min-width: 0; /* 闃叉鍐呭婧㈠嚭 */
+ }
+
+ .van-checkbox__icon--checked .van-icon
+ {
+ color: #ffffff !important;
+ }
+
+</style>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+ <div class="content-wrapper">
+ <van-nav-bar
+ title="AGV鎿嶄綔"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()">
+ </van-nav-bar>
+
+ <div class="mySolid">
+ <van-cell-group>
+ <van-field
+ ref="KbBar"
+ v-model="KbBar"
+ label="鍗℃澘鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getKbBarInfo"
+ autofocus="true">
+ </van-field>
+
+ <van-field
+ ref="jyz"
+ v-model="jyz"
+ label="妫�楠岀姸鎬�"
+ placeholder="璇烽�夋嫨妫�楠岀姸鎬�"
+ autofocus="true"
+ @click.native="selectJyz">
+ </van-field>
+
+ <van-field
+ ref="lcName"
+ v-model="lcName"
+ label="妤煎眰"
+ placeholder="璇烽�夋嫨妤煎眰"
+ autofocus="true"
+ @click.native="selectLc">
+ </van-field>
+ <div style="height: 10px"></div>
+ <!-- 淇敼鍚庣殑鎸夐挳瀹瑰櫒 -->
+ <div class="button-container">
+ <van-button
+ type="warning"
+ class="action-button reset-button"
+ @click.native="handleAgvSj"
+ >AGV閫佹</van-button>
+ <van-button
+ type="primary"
+ class="action-button"
+ @click.native="handleAgvJy"
+ >AGV妫�楠�</van-button>
+ <!-- style="background-color: #27f83f;border-color: #27f83f;color: white" -->
+ <van-button
+ type="info"
+ class="action-button submit-button"
+ @click.native="handleAgvRk"
+ >鍏ョ珛搴�</van-button>
+ </div>
+
+ </van-cell-group>
+ </div>
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+ <van-action-sheet v-model="show2" :actions="actions2" @select="onSelect2" ></van-action-sheet>
+
+
+ </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/AgvCz.js?<%=11 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/AgvCz.aspx.cs b/H5/AgvCz.aspx.cs
new file mode 100644
index 0000000..c84ddf3
--- /dev/null
+++ b/H5/AgvCz.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_Cpdbsj : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/BarCf.aspx b/H5/BarCf.aspx
index 130c8d0..e254a5a 100644
--- a/H5/BarCf.aspx
+++ b/H5/BarCf.aspx
@@ -1,4 +1,5 @@
-锘�<%@ Page Title="鍦ㄥ簱鍒嗘枡" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="BarCf.aspx.cs" Inherits="H5_Scll" %>
+锘�
+<%@ Page Title="鍦ㄥ簱鍒嗘枡" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="BarCf.aspx.cs" Inherits="H5_Scll" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
.bg-info {
@@ -8,6 +9,11 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<van-nav-bar
title="鍦ㄥ簱鍒嗘枡"
left-text="杩斿洖"
@@ -26,7 +32,11 @@
v-focus.noKeyboard
@keyup.enter.native="getScan"
<%-- @change="getScan"--%>
-></van-field>
+>
+ <template #button>
+ <van-button size="small" type="info" plain @click="BarRePrint" >鏉＄爜閲嶆墦</van-button>
+ </template>
+ </van-field>
<van-field
v-model="formData.itemNo"
label="鐗╂枡缂栫爜"
@@ -73,5 +83,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/BarCf.js?<%=121111 %>"></script>
+ <script src="Js/BarCf.js?<%=1211113 %>"></script>
</asp:Content>
diff --git a/H5/BarCfBefore.aspx b/H5/BarCfBefore.aspx
new file mode 100644
index 0000000..4affc2e
--- /dev/null
+++ b/H5/BarCfBefore.aspx
@@ -0,0 +1,82 @@
+锘�<%@ Page Title="鍏ュ簱鍓嶆媶鏂�" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="BarCfBefore.aspx.cs" Inherits="H5_Scll" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <style>
+ .bg-info {
+ background-color:#fff;
+ }
+
+</style>
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+ <van-nav-bar
+ title="鍏ュ簱鍓嶆媶鏂�"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()"
+></van-nav-bar>
+ <div class="mySolid">
+ <van-cell-group>
+ <van-field
+ ref="barcode"
+ v-model="formData.barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getScan"
+<%-- @change="getScan"--%>
+></van-field>
+ <van-field
+ v-model="formData.itemNo"
+ label="鐗╂枡缂栫爜"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.itemName"
+ label="鐗╂枡鍚嶇О"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.itemModel"
+ label="鐗╂枡瑙勬牸"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.sumQuantity"
+ label="鏉＄爜鏁伴噺"
+ placeholder="鏉＄爜鏁伴噺"
+ disabled
+></van-field>
+ <van-field
+ ref="cfNum"
+ v-model="formData.cfNum"
+ label="鎷嗗垎鏁伴噺"
+ clearable
+ placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�"
+ @input="handleNumberInput3"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+></van-field>
+</van-cell-group>
+ </div>
+
+ <van-button type="primary" @click="getChaiFen" >纭鎷嗗垎</van-button>
+ <%--<van-button type="primary" @click="ToErp" >瀹℃牳</van-button>--%>
+<%-- <van-button type="primary" @click="cleraCode" >娓呴櫎搴撲綅缂栫爜</van-button>--%>
+</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/BarCfBefore.js?<%=001 %>"></script>
+</asp:Content>
diff --git a/H5/BarCfBefore.aspx.cs b/H5/BarCfBefore.aspx.cs
new file mode 100644
index 0000000..f11cc1f
--- /dev/null
+++ b/H5/BarCfBefore.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_Scll : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Cgyt.aspx b/H5/Cgyt.aspx
new file mode 100644
index 0000000..0b9e80a
--- /dev/null
+++ b/H5/Cgyt.aspx
@@ -0,0 +1,164 @@
+锘�<%@ Page Title="楠岄��鎵爜" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Cgyt.aspx.cs" Inherits="H5_Scll" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <style>
+ .bg-info {
+ background-color:#fff;
+ }
+
+
+</style>
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-nav-bar
+ title="楠岄��鎵爜"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()"
+ @click-right="showButton = true"
+>
+ <template #right>
+ <van-icon name="ellipsis" />
+ </template>
+ </van-nav-bar>
+<%-- <div class="mySolid">--%>
+ <van-cell-group>
+ <van-field
+ ref="barcode"
+ v-model="formData.barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getScan"
+ <%--@change="getScan"--%>
+></van-field>
+ <van-field
+ v-model="formData.itemNo"
+ label="鐗╂枡缂栫爜"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.itemName"
+ label="鐗╂枡鍚嶇О"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.itemModel"
+ label="鐗╂枡瑙勬牸"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.sumQuantity"
+ label="鏉＄爜鏁伴噺"
+ placeholder="鏉＄爜鏁伴噺"
+ disabled
+></van-field>
+ <van-field
+ v-model="formData.itemNo"
+ label="鍒拌揣鍗曞彿"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
+ ref="ytdh"
+ v-model="ytdh"
+ label="楠岄��鍗曞彿"
+ clearable
+ :right-icon-size="19"
+ disabled
+></van-field>
+ <div class="button-container">
+ <van-button
+ type="info"
+ class="action-button submit-button"
+ @click.native="handleSubmit"
+ >纭閫�鏂�</van-button>
+ </div>
+</van-cell-group>
+<%-- </div>--%>
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <%--<van-col span="4">闇�姹傛暟</van-col>--%>
+<%-- <van-col span="5">鐗╂枡鍒嗗尯</van-col>--%>
+ <van-col span="8">宸叉壂鎬绘暟</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemDetail" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.item_model}}</div>
+ </van-col>
+<%-- <van-col span="3" class="blue-text"></van-col>--%>
+ <van-col span="8" class="blue-text">{{itm.quantity}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鏉＄爜" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鏉＄爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8">鏁伴噺</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in tableData" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="8">
+ <div>{{itm.quantity}}</div>
+ </van-col>
+ </van-row>
+ </van-tab>
+</van-tabs>
+
+ <!-- 寮瑰嚭鑿滃崟 -->
+ <van-popup
+ v-model="showButton"
+ position="bottom"
+ :style="{ width: '100%' }"
+ :close-on-click-overlay="!ttrre1 && !ttrre2"
+ lock-scroll
+ >
+ <div style="padding: 12px;">
+ <van-button
+ block
+ type="info"
+ @click="submit"
+ :loading="ttrre1"
+ loading-text="鍔犺浇涓�..."
+ >瀹℃牳鎺ㄩ��</van-button>
+ </div>
+ <div style="padding: 12px;">
+ <van-button
+ block
+ type="danger"
+ @click="deleteCgyt"
+ :loading="ttrre2"
+ loading-text="鍔犺浇涓�..."
+ >鍒犻櫎閫�鏂�</van-button>
+ </div>
+ </van-popup>
+
+<%-- <van-button type="primary" @click="getScan" >纭</van-button>--%>
+ <%--<van-button type="primary" @click="ToErp" >瀹℃牳</van-button>--%>
+<%-- <van-button type="primary" @click="cleraCode" >娓呴櫎搴撲綅缂栫爜</van-button>--%>
+</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/Cgyt.js?<%=00010001111 %>"></script>
+</asp:Content>
diff --git a/H5/Cgyt.aspx.cs b/H5/Cgyt.aspx.cs
new file mode 100644
index 0000000..f11cc1f
--- /dev/null
+++ b/H5/Cgyt.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_Scll : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Cpbd.aspx b/H5/Cpbd.aspx
index fa882d2..4b795d0 100644
--- a/H5/Cpbd.aspx
+++ b/H5/Cpbd.aspx
@@ -1,4 +1,5 @@
-锘�<%@ Page Title="浜у搧缁戝畾" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Cpbd.aspx.cs" Inherits="H5_Cpbd" %>
+锘�
+<%@ Page Title="浜у搧缁戝畾" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Cpbd.aspx.cs" Inherits="H5_Cpbd" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
.si-status-box,
@@ -69,7 +70,7 @@
v-model="LsBar"
label="鍚庣洊鏉＄爜"
placeholder="璇锋壂鍚庣洊鐮�"
-<%-- @keyup.enter.native="getModel" --%>
+ @keyup.enter.native="productBinding"
autofocus="true">
</van-field>
@@ -129,7 +130,7 @@
</van-row>
</van-tab>
- <van-tab title="宸茬粦鏉＄爜" class="mySolid font">
+<%-- <van-tab title="宸茬粦鏉＄爜" class="mySolid font">
<van-row>
<van-col span="5">浜哄憳</van-col>
<van-col span="5">浜х嚎</van-col>
@@ -144,7 +145,7 @@
<van-col span="4" >{{itm.fQty}}</van-col>
<van-col span="5" >{{itm.sQty}}</van-col>
</van-row>
- </van-tab>
+ </van-tab>--%>
</van-tabs>
</div>
</asp:Content>
@@ -154,5 +155,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbd.js?<%=1211121 %>"></script>
+ <script src="Js/Cpbd.js?<%=1211123 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/CpbdsjD.aspx b/H5/CpbdsjD.aspx
new file mode 100644
index 0000000..1b79dbd
--- /dev/null
+++ b/H5/CpbdsjD.aspx
@@ -0,0 +1,188 @@
+锘�<%@ Page Title="涓�閿�佹" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="CpbdsjD.aspx.cs" Inherits="H5_Cpdbsj" %>
+<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; /* 缁ф壙鐖剁骇鏂囧瓧棰滆壊 */
+ }
+
+
+ /* 灞呬腑鏍稿績鏍峰紡 */
+.centered-stepper-field {
+ .stepper-container {
+ display: flex;
+ justify-content: center; /* 姘村钩灞呬腑 */
+ width: 100%;
+ }
+
+ /* 璋冩暣姝ヨ繘鍣ㄦ寜閽棿璺� */
+ .van-stepper__minus {
+ margin-right: 12px;
+ }
+ .van-stepper__plus {
+ margin-left: 12px;
+ }
+}
+
+ /* 鏂板鏍峰紡 */
+ .button-container {
+ display: flex;
+ width: 100%;
+ gap: 12px; /* 鎸夐挳闂磋窛 */
+ padding: 0 16px; /* 宸﹀彸鐣欑櫧 */
+ box-sizing: border-box;
+ }
+
+ .action-button {
+ flex: 1; /* 绛夊垎鍓╀綑绌洪棿 */
+ min-width: 0; /* 闃叉鍐呭婧㈠嚭 */
+ }
+
+ .van-checkbox__icon--checked .van-icon
+ {
+ color: #ffffff !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="KbBar"
+ v-model="KbBar"
+ label="鍗℃澘鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getKbBarInfo"
+ autofocus="true">
+ </van-field>
+
+ <van-field
+ ref="DAA001"
+ v-model="DAA001"
+ label="鎸囦护宸ュ崟"
+ placeholder="鎸囦护宸ュ崟"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+ <van-field
+ ref="itemNo"
+ v-model="itemNo"
+ label="鐗╂枡缂栫爜"
+ placeholder="鐗╂枡缂栫爜"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+ <van-field
+ ref="itemName"
+ v-model="itemName"
+ label="鐗╂枡鍚嶇О"
+ placeholder="鐗╂枡鍚嶇О"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+ <van-field
+ ref="itemModel"
+ v-model="itemModel"
+ label="鐗╂枡瑙勬牸"
+ placeholder="鐗╂枡瑙勬牸"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+
+ <van-field
+ ref="lineName"
+ v-model="lineName"
+ label="绾夸綋鍚嶇О"
+ placeholder="绾夸綋鍚嶇О"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+
+ <van-field
+ ref="daA025"
+ v-model="KbBarInfo.daA025"
+ label="鐢熶骇绫诲瀷"
+ placeholder="鐢熶骇绫诲瀷"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+ <van-field
+ ref="quantity"
+ v-model="KbBarInfo.quantity"
+ label="鏁伴噺"
+ placeholder="鏁伴噺"
+ autofocus="true"
+ readonly
+ >
+ </van-field>
+
+
+
+
+
+ <div style="height: 10px"></div>
+ <!-- 淇敼鍚庣殑鎸夐挳瀹瑰櫒 -->
+ <div class="button-container">
+ <van-button
+ type="info"
+ class="action-button submit-button"
+ @click.native="handleSubmit"
+ >鎻愪氦</van-button>
+ </div>
+
+ </van-cell-group>
+ </div>
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+
+
+ </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/CpbdsjD.js?<%=1111 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/CpbdsjD.aspx.cs b/H5/CpbdsjD.aspx.cs
new file mode 100644
index 0000000..c84ddf3
--- /dev/null
+++ b/H5/CpbdsjD.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_Cpdbsj : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 66f9f12..ef17f70 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -51,6 +51,12 @@
flex: 1; /* 绛夊垎鍓╀綑绌洪棿 */
min-width: 0; /* 闃叉鍐呭婧㈠嚭 */
}
+
+ .van-checkbox__icon--checked .van-icon
+ {
+ color: #ffffff !important;
+ }
+
</style>
</asp:Content>
@@ -82,7 +88,7 @@
<div class="si-status__left">
<span class="si-status__label">鍙鏁�</span>
</div>
- <div class="si-status__right">{{KbBarInfo.oldqty||0}}</div>
+ <div class="si-status__right">{{KbBarInfo.quantity||0}}</div>
</div>
<div class="si-status-box si-status--error">
@@ -90,7 +96,7 @@
<span class="si-status__label">寰呰鏁�</span>
</div>
<div class="si-status__right">
- {{ ((+(KbBarInfo.oldqty || 0) - +(KbBarInfo.ySum || 0)) || 0) }}
+ {{ ((+(KbBarInfo.quantity || 0) - +(KbBarInfo.ySum || 0)) || 0) }}
</div>
</div>
</div>
@@ -134,38 +140,78 @@
autofocus="true">
</van-field>
+
<van-field
ref="LsBar"
v-model="LsBar"
label="浜у搧鏉＄爜"
+ class="custom-label-field"
placeholder="璇锋壂浜у搧鏉＄爜"
@keyup.enter.native="checkProductBarcode"
autofocus="true">
+ <template #extra>
+ <span style="margin-right:8px">AGV</span>
+ <van-checkbox
+ v-model="agvChecked"
+ shape="round"
+ icon-size="18px">
+ </van-checkbox>
+ </template>
</van-field>
-
-<%-- <van-field
- ref="LsBar"
- v-model="LsBar"
+
+
+ <van-field
+ ref="AgvDw"
+ v-model="AgvDw"
+ label="鐐逛綅"
+ placeholder="璇烽�夋嫨鐐逛綅"
+ autofocus="true"
+ @click.native="selectDW"
+ readonly>
+ </van-field>
+
+ <van-field
+ ref="xtName"
+ v-model="xtName"
label="绾垮埆"
placeholder="璇烽�夋嫨绾垮埆"
- autofocus="true">
- </van-field>--%>
+ autofocus="true"
+ @click.native="selectXt">
+ <template #button >
+ <van-button
+ style="background-color: #ffcc00;border-color: #ffcc00;color: white"
+ class="action-button reset-button"
+ @click.stop="handleAGVCall"
+ >鍛煎彨</van-button>
+ </template>
+ </van-field>
+ <div style="height: 10px"></div>
<!-- 淇敼鍚庣殑鎸夐挳瀹瑰櫒 -->
- <div class="button-container">
- <van-button
- type="warning"
- class="action-button reset-button"
-<%-- @click.native="handleClear"--%>
- >閲嶇疆</van-button>
- <van-button
- type="info"
- class="action-button submit-button"
- @click.native="handleSubmit"
- >閫佹</van-button>
- </div>
+ <div class="button-container">
+ <van-button
+ type="warning"
+ class="action-button reset-button"
+ @click.native="handleClear"
+ >閲嶇疆</van-button>
+ <van-button
+ type="primary"
+ class="action-button"
+ @click.native="handleAGVInspection"
+ >閫佹</van-button>
+ <!-- style="background-color: #27f83f;border-color: #27f83f;color: white" -->
+ <van-button
+ type="info"
+ class="action-button submit-button"
+ @click.native="handleSubmit"
+ >鎻愪氦</van-button>
+ </div>
</van-cell-group>
</div>
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+ <van-action-sheet v-model="showAgvDw" :actions="actionsAgvDw" @select="onSelectAgvDw" ></van-action-sheet>
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="绠辨槑缁�" class="mySolid font">
@@ -178,7 +224,7 @@
<van-row
v-for="(itm,index) in XbarInfo"
:key="index"
- :style="{ background: itm.is_hedui === '1' ? '#e8f5e9 !important' : 'transparent' }">
+ :style="{ background: itm.is_hedui === '1' ? '#75f41d !important' : 'transparent' }">
<van-col span="7" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
<van-col span="7" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
@@ -220,5 +266,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=1211111141 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=121114211526 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Dbck.aspx b/H5/Dbck.aspx
index 6b5b081..61370ec 100644
--- a/H5/Dbck.aspx
+++ b/H5/Dbck.aspx
@@ -8,6 +8,11 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<van-nav-bar
title="璋冩嫧鍑哄簱"
left-text="杩斿洖"
@@ -29,18 +34,16 @@
><template #button>
<van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
- <van-field
- ref="barcode"
- value=""
- label="鐗╂枡鏉＄爜"
- clearable
- placeholder="璇锋壂鐮�"
- @keyup.enter.native ="getBarcode"
- <%-- @change="getBarcode"--%>
- :right-icon-size="19"
- v-model="barcode"
- v-focus.noKeyboard
-></van-field>
+ <van-field
+ ref="barcode"
+ v-model="barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getScan">
+ </van-field>
<van-field
value=""
label="鐗╂枡缂栫爜"
@@ -51,52 +54,93 @@
v-focus.noKeyboard
disabled
></van-field>
- <van-field
- value=""
- v-model="num"
- label="鏁伴噺"
- placeholder="鏁伴噺"
- disabled
-></van-field>
- <van-field
+ <van-field
+ v-model="scanInfo.barcodeNum"
+ label="鏉＄爜鏁伴噺"
+ placeholder="鏉＄爜鏁伴噺"
+ disabled>
+ </van-field>
+<van-field
+ ref="splitNum"
+ v-model="scanInfo.splitNum"
center
clearable
- v-model="fum"
- label="鎷嗗垎鏁伴噺"
- placeholder="鎷嗗垎鏁伴噺"
- ><template #button>
- <van-button size="small" type="info" plain @click="tmcf" >鏉＄爜鎷嗗垎</van-button>
- </template></van-field>
+ label="鍙戞枡鏁伴噺"
+ placeholder="鍙戞枡鏁伴噺">
+ <van-button
+ slot="button"
+ type="info"
+ size="small"
+ plain
+ @click="getChaiFen">
+ 鏉＄爜鎷嗗垎
+ </van-button>
+</van-field>
</van-cell-group>
</div>
- <div class="van-tab-left">
- <van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
- <van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">寰呮壂</van-col>
- <van-col span="6">宸叉壂</van-col>
- </van-row>
- <van-row v-for="(itm,index) in ItemBlDetail" :key="index">
- <van-col span="12" class="text-left padding-left">
- <div>{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
- </van-col>
- <van-col span="6">{{itm.fQty}}</van-col>
- <!-- <van-col span="6">{{itm.sQty ?? 0}}</van-col> -->
- <van-col span="6">{{ itm.sQty != null ? itm.sQty : 0 }}</van-col>
- </van-row>
-</van-tab>
-<%-- <van-tab title="寰呭嚭鐗╂枡">
- <van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
- <van-col span="6">璁″垝鏁皗{value.qd007}}</van-col>
- <van-col span="6">瀹屾垚鏁皗{value.qd008}}</van-col>
- </van-row>
- </van-tab>
-</van-tabs>--%>
- </div>
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBlDetail" :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemYsDetail" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
+</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
</asp:Content>
@@ -105,5 +149,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Dbck.js?<%=1231 %>"></script>
+ <script src="Js/Dbck.js?<%=1231111111 %>"></script>
</asp:Content>
diff --git a/H5/Dbrk.aspx b/H5/Dbrk.aspx
index 9c82514..911eaea 100644
--- a/H5/Dbrk.aspx
+++ b/H5/Dbrk.aspx
@@ -16,19 +16,6 @@
></van-nav-bar>
<div>
<van-cell-group>
- <van-field
- ref="billNo"
- value=""
- label="璋冩嫧鐢宠"
- clearable
- placeholder="閫夋嫨/鎵嬪綍"
- @keyup.enter.native ="GetMesItemBlDetailByBillNo"
- :right-icon-size="19"
- v-model="billNo"
- v-focus.noKeyboard
- ><template #button>
- <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
- </template></van-field>
<van-field
ref="sectionCode"
value=""
@@ -62,6 +49,20 @@
v-model="itemNo"
v-focus.noKeyboard
></van-field>
+ <van-field
+ ref="billNo"
+ value=""
+ label="璋冩嫧鐢宠"
+ clearable
+ placeholder="鐢宠鍗曞彿"
+ @keyup.enter.native ="GetMesItemBlDetailByBillNo"
+ :right-icon-size="19"
+ v-model="billNo"
+ v-focus.noKeyboard
+ disabled
+ ><%--<template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template>--%></van-field>
<van-field
value=""
v-model="num"
@@ -73,7 +74,51 @@
</van-cell-group>
</div>
- <div class="van-tab-left">
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">鐢宠鏁伴噺</van-col>
+ <van-col span="3">鎵嚭鏁伴噺</van-col>
+ <van-col span="3">寰呭叆鏁伴噺</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="7" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.fQty}}</van-col>
+ <van-col span="3" class="blue-text">{{itm.sQty}}</van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">鐢宠鏁伴噺</van-col>
+ <van-col span="5">宸插叆鏁伴噺</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.rQty}}</van-col>
+ </van-row>
+ </van-tab>
+</van-tabs>
+
+<%-- <div class="van-tab-left">
<van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
<van-tab title="寰呭叆鐗╂枡" class="mySolid font">
<van-row>
@@ -97,8 +142,8 @@
<van-col span="6">瀹屾垚鏁皗{value.qd008}}</van-col>
</van-row>
</van-tab>--%>
-</van-tabs>
- </div>
+<%--</van-tabs>
+ </div>--%>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
</asp:Content>
@@ -107,5 +152,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Dbrk.js?<%=1141 %>"></script>
+ <script src="Js/Dbrk.js?<%=1141112 %>"></script>
</asp:Content>
diff --git a/H5/Default.aspx b/H5/Default.aspx
index 3e610ca..546dc18 100644
--- a/H5/Default.aspx
+++ b/H5/Default.aspx
@@ -22,12 +22,13 @@
<a class="font text-center" :href="item1.path+'&tabIdx='+index">
<img :src="item1.icoimg" alt="" class="img" style=" display:inline-block" />
</a>
- <div><span style="display:inline-block; font-size: 0.25rem;"> {{item1.pageView}}</span></div>
+ <div><span style="display:inline-block; font-size: 0.4rem;"> {{item1.pageView}}</span></div>
</van-grid-item>
</van-grid>
</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/Dhdsh.aspx b/H5/Dhdsh.aspx
index 3d1aede..e2e5c54 100644
--- a/H5/Dhdsh.aspx
+++ b/H5/Dhdsh.aspx
@@ -130,8 +130,9 @@
<van-col span="5" >閲囪喘璁㈠崟</van-col>
</van-row>
<van-row
- v-for="(itm,index) in BarList"
- :key="index">
+ v-for="(itm,index) in BarList"
+ :key="index"
+ :style="{ background: itm.include_qty == itm.ysl ? '#75f41d !important' : 'transparent' }">
<van-col span="7" class="text-left padding-left">{{itm.small_barcode}}</van-col>
<van-col span="6" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
@@ -166,7 +167,7 @@
@click="submit"
:loading="ttrre1"
loading-text="鍔犺浇涓�..."
- >鎻愪氦妫�楠�</van-button>
+ >瀹℃牳</van-button>
</div>
<div style="padding: 12px;">
<van-button
@@ -175,7 +176,7 @@
@click="Fsubmit"
:loading="ttrre2"
loading-text="鍔犺浇涓�..."
- >鎾ゅ洖妫�楠�</van-button>
+ >鍙嶅鏍�</van-button>
</div>
</van-popup>
@@ -187,5 +188,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Dhdsh.js?<%=1111111111 %>"></script>
+ <script src="Js/Dhdsh.js?<%=111111111 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Fgbd.aspx b/H5/Fgbd.aspx
new file mode 100644
index 0000000..259941a
--- /dev/null
+++ b/H5/Fgbd.aspx
@@ -0,0 +1,159 @@
+锘�
+<%@ Page Title="杩斿伐缁戝畾" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Fgbd.aspx.cs" Inherits="H5_Fgbd" %>
+<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="HgBar"
+ v-model="HgBar"
+ 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="HgBarInfo.lineName"
+ label="浜х嚎"
+ clearable
+ placeholder="浜х嚎鍚嶇О"
+ :right-icon-size="19"
+ readonly >
+ </van-field>
+
+ <van-field
+ ref="FgBar"
+ v-model="FgBar"
+ label="杩斿伐杩芥函鐮�"
+ placeholder="璇锋壂绠辨潯鐮�"
+ @keyup.enter.native="ScanFgbd"
+ 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">{{HgBarInfo.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">{{HgBarInfo.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="HgBarInfo.daa001" readonly style="background: #ffa53b"></van-field>
+ <van-field label="鏉＄爜鏁伴噺" colon="true" v-model="HgBarInfo.barQty" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="杩芥函鐮�" colon="true" v-model="HgBarInfo.zsBarcode" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="浜у搧缂栫爜" colon="true" v-model="HgBarInfo.item_no" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="浜у搧鍚嶇О" colon="true" v-model="HgBarInfo.item_name" readonly style="background: #ffa53b" ></van-field>
+ <van-field label="浜у搧瑙勬牸" colon="true" v-model="HgBarInfo.item_model" readonly style="background: #ffa53b" ></van-field>
+<%-- <van-field label="鍓嶄竴宸ュ簭" colon="true" v-model="HgBarInfo.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/Fgbd.js?<%=111 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/Fgbd.aspx.cs b/H5/Fgbd.aspx.cs
new file mode 100644
index 0000000..f222c66
--- /dev/null
+++ b/H5/Fgbd.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_Fgbd : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index 86cf8ec..bb89f8f 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -89,11 +89,15 @@
:right-icon-size="19"
v-model="selectKey"
><template #button>
- <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ <van-button size="small" type="info" @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
<van-action-sheet v-model="daashow" :actions="actions" @select="onSelect" ></van-action-sheet>
- <van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" ></van-field>
+ <van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" >
+ <template #button>
+ <van-button size="small" type="info" @click="scanOnH5DAA " >鎵弿</van-button>
+ </template>
+ </van-field>
<van-field label="妫�楠屾椂娈�" colon="true" v-model="formData.checkTimeSlot" 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>--%>
@@ -111,15 +115,23 @@
<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>
<div class="wrap-content">{{ remarks }}</div>
</template>
<template #button>
- <van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>
+ <%--<van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>--%>
+ <van-button size="small" type="info" @click="updateRemarks(formData.guid)" >杈撳叆</van-button>
</template>
</van-field>
+ <van-field label="妫�楠屽伐浣�" colon="true" v-model="jyGw" @keyup.enter.native="selIpqcItemsByGw" >
+ <template #button>
+ <van-button size="small" type="info" @click="scanOnH5GW" >鎵弿</van-button>
+<%-- <van-tag type="primary" style="font-size:15px" @click="scanOnH5">鎵弿</van-tag>--%>
+ </template>
+ </van-field>
<van-dialog v-model="showDialog" title="涓嶅悎鏍兼弿杩�" :show-cancel-button="false" @confirm="remarksConfirm">
<van-field
v-model="remarks"
@@ -158,19 +170,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
@@ -180,6 +197,10 @@
<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-if="item.fcheckResu === '/'">
+ <van-tag round plain type="default" color ="#c2bcbd" style="font-size:15px" @click="togglePopup(index)">/</van-tag>
</van-cell>
<van-cell center
center v-else >
@@ -209,7 +230,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="itm.fenterQty >=itm.checkQyt || itm.fcheckResu === '/'" 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>
@@ -220,8 +241,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>--%>
@@ -229,18 +250,39 @@
<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-if="jymxData.fcheckResu === '/'" type="default" color ="#c2bcbd">/</van-tag>
<van-tag round plain v-else type="warning">杩涜涓�</van-tag>
</template>
</van-field>
-
+
+ <van-field label="妫�楠岄」鐩弿杩�" colon v-model="checkItemDesc" readonly class="wrap-field">
+ <template #input>
+ <div class="wrap-content">{{ checkItemDesc }}</div>
+ </template>
+ <template #button>
+ <van-button size="small" type="info" @click="updateCheckItemDesc(jymxData.guid)" >杈撳叆</van-button>
+ </template>
+ </van-field>
+
+ <van-dialog v-model="showCheckItemDescDialog" title="妫�楠岄」鐩弿杩�" :show-cancel-button="false" @confirm="checkItemDescConfirm">
+ <van-field
+ v-model="checkItemDesc"
+ rows="5"
+ autosize
+ type="textarea"
+ maxlength="500"
+ placeholder="璇疯緭鍏ユ楠岄」鐩弿杩�"
+ show-word-limit
+ />
+ </van-dialog>
</template>
<template>
<!-- 杈撳叆妗� -->
- <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-input-box">
+ <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-input-box">
<div class="si-input__left">
<span class="si-input__label">妫�楠屽�艰緭鍏�</span>
</div>
- <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-status__right">
+ <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-status__right">
<van-field
:ref="'inputValue' + tabActive"
v-model="inputValue"
@@ -274,6 +316,16 @@
>
涓嶅悎鏍�
</van-button>
+ <van-button
+ type="default"
+ color ="#c2bcbd"
+ size="small"
+ class="status-btn"
+ @click="handleQualifiedCancel()"
+ >
+ /
+ </van-button>
+
</div>
</div>
</template>
@@ -351,5 +403,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?<%=1111111111255 %>"></script>
</asp:Content>
diff --git a/H5/IPQC_XJ/List.aspx b/H5/IPQC_XJ/List.aspx
index 9775353..3c5bae6 100644
--- a/H5/IPQC_XJ/List.aspx
+++ b/H5/IPQC_XJ/List.aspx
@@ -21,6 +21,11 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<van-nav-bar
title="宸℃妫�楠�"
left-text="杩斿洖"
@@ -79,7 +84,7 @@
<van-tag round plain v-else-if="item.fCheckResu === 'W:鏈煡'" type="warning">鏈煡</van-tag>
<van-tag round plain v-else-if="item.fCheckResu === ''" type="warning">鏈煡</van-tag>
<van-tag round plain v-else-if="item.fCheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">鏈煡</van-tag>
+ <van-tag round plain v-else type="warning">鏈煡</van-tag>
</template>
</van-field>
</van-cell-group>
@@ -133,5 +138,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/AgvCz.js b/H5/Js/AgvCz.js
new file mode 100644
index 0000000..74e5e17
--- /dev/null
+++ b/H5/Js/AgvCz.js
@@ -0,0 +1,320 @@
+锘�
+var vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ KbBar: "",//鍗℃澘鏉＄爜
+ LsBar: "",//鍚庣洊娴佹按鏉＄爜
+ XBar: "",//绠辨潯鐮�
+ UserName: Cookies.get('loginName'),//鐢ㄦ埛鍚嶇О
+ KbBarInfo: [],
+ KbBarMxInfo: [],
+ show: false,//鍒楄〃灞曠ず
+ actions: [{
+ name: "涓�妤�",
+ Postition: 1 // 鏂板
+ }, {
+ name: "鍥涙ゼ",
+ Postition: 4 // 鏂板
+ }],//鍒楄〃鐨勫��
+ show2: false,//鍒楄〃灞曠ず
+ actions2: [{
+ name: "鍚堟牸"
+ },{
+ name: "涓嶅悎鏍�"
+ }],//鍒楄〃鐨勫��
+ lcName: "",//妤煎眰鍚嶇О
+ lcNum: "",//妤煎眰缂栧彿
+ jyz: "",//妫�楠屽��
+
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ getKbBarInfo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/getKbBarInfo', {
+ Xt: that.GX,
+ Kbbarcode: that.KbBar
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ that.$refs.KbBar.focus();
+ that.KbBar = "";
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.KbBar.focus();
+ that.KbBar = "";
+ });
+ },
+
+
+
+ handleClear() {
+ this.KbBar = "";
+ this.XBar = "";
+ this.LsBar = "";
+ this.DAA001 = [];
+ this.XbarInfo = [];
+
+ },
+
+
+ handleSubmit() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ // 璁＄畻鍙鏁板拰宸茶鏁�
+ const oldqty = +(that.KbBarInfo.quantity || 0);
+ const ySum = +(that.KbBarInfo.ySum || 0);
+
+ if (oldqty !== ySum) {
+ that.$playSound('error');
+ that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/submitInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ // 娓呯┖鏁版嵁
+ //that.KbBar = "";
+ //that.XbarInfo = [];
+ //that.KbBarInfo = [];
+ //that.$refs.KbBar.focus();
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ that.$refs.KbBar.focus();
+ });
+ },
+
+ onSelect(action) {
+ this.lcNum = action.Postition; // 缁戝畾line_no鍒皒tNum瀛楁
+ //console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
+ this.lcName = action.name; // 缁戝畾name鍒皒tName瀛楁
+ this.show = false;
+ },
+
+ onSelect2(action) {
+ this.jyz = action.name; // 缁戝畾name鍒皒tName瀛楁
+ this.show2 = false;
+ },
+
+ //鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
+ selectLc() {
+ this.show = true;
+ //var that = this;
+ //that.actions = [];
+ //that.isLoading = true;
+ //that.AxiosHttp("post", 'Womdaa/GetAgvXt', {
+ // selectKey: that.selectKey,
+ //}, false)
+ // .then(function (res) {
+ // var json = res;
+ // if (json.status == 0) {
+
+ // if (json.data.tbBillList.length <= 0) {
+ // that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ // that.$playSound('error');
+ // } else {
+ // that.itemInfo = json.data.tbBillList;
+ // that.actions = json.data.tbBillList.map(item => {
+ // return {
+ // name: item.name,
+ // lineNo: item.line_no // 鏂板
+ // };
+ // });
+ // }
+ // }
+ // else {
+ // that.$toast.fail(json.message);
+ // that.$playSound('error');
+ // }
+ // that.isLoading = false;
+ // })
+ // .catch(function (error) {
+ // that.isLoading = false;
+ // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ // that.$playSound('error');
+ // console.log(error);
+ // });
+ },
+
+ selectJyz() {
+ this.show2 = true;
+ },
+
+ //AGV閫佹
+ handleAgvSj() {
+
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+ var that = this;
+
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("AGV閫佹澶辫触锛岃閲嶈瘯锛�");
+ that.$refs.KbBar.focus();
+ });
+ },
+
+ //AGV妫�楠�
+ handleAgvJy() {
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.jyz) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨妫�楠屽��");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAgvJy', {
+ jyz: that.jyz,
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("AGV妫�楠屽け璐ワ紝璇烽噸璇曪紒");
+ that.$refs.KbBar.focus();
+ });
+ },
+
+
+ handleAgvRk() {
+
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+ var that = this;
+
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAgvRk', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount,
+ Postition: that.lcNum
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("AGV鍏ョ珛搴撳け璐ワ紝璇烽噸璇曪紒");
+ that.$refs.KbBar.focus();
+ });
+ },
+
+
+ }
+})
\ No newline at end of file
diff --git a/H5/Js/BarCf.js b/H5/Js/BarCf.js
index 9f2065a..c19122d 100644
--- a/H5/Js/BarCf.js
+++ b/H5/Js/BarCf.js
@@ -115,6 +115,16 @@
that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ //if (that.formData.cfNum > that.formData.sumQuantity) {
+ // that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鏁伴噺锛�");
+ // return;
+ //}
+
+ if (parseFloat(that.formData.cfNum) > parseFloat(that.formData.sumQuantity)) {
+ that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鏁伴噺锛�");
+ return;
+ }
+
if (that.formData.barcode.length * 1 <= 0) {
that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
return;
@@ -157,6 +167,45 @@
.replace(/^\./g, '');
},
+ BarRePrint() {
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+
+ if (that.formData.barcode.length * 1 <= 0) {
+ that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesBarCF/BarRePrint', {
+ userName: that.userInfo.loginAccount,
+ barcode: that.formData.barcode
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ // 鎷嗗垎鍏ㄥ眬璋冪敤鏂规硶
+ that.sendPrintMessage(json.data.tbBillList);
+ that.$refs.barcode.focus();
+ that.formData.barcode = null;
+ that.$notify({ type: 'success', message: json.message });
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ });
+ },
+
}
})
\ No newline at end of file
diff --git a/H5/Js/BarCfBefore.js b/H5/Js/BarCfBefore.js
new file mode 100644
index 0000000..ced1062
--- /dev/null
+++ b/H5/Js/BarCfBefore.js
@@ -0,0 +1,168 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ formData: {
+ barcode: "",
+ itemNo: "",
+ sumQuantity:0
+ },
+ itemInsFormData: {},
+ tableData: [],
+ itemTableData: [],
+ barMessage: "",
+
+ Message: "",
+ messageCenter: {},
+ messageId: 0,
+
+ showClearIcon: false,
+ focus1: true,
+ focus2: false,
+ isActive: 0,
+ index: 0,
+ currentTab: 0,
+ contentScrollW: 0, // 瀵艰埅鍖哄搴�
+ scrollLeft: 0, // 妯悜婊氬姩鏉′綅缃�
+ fullHeight: "",
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ //getModel() {
+ // var that = this;
+ // that.isLoading = true;
+ // that.AxiosHttp("post", 'MesDepotSections/GetSectionName', {
+ // sectionCode: that.formData.sectionCode
+ // }, false)
+ // .then(function (res) {
+ // var json = res;
+ // if (json.status == 0) {
+ // that.formData.sectionName = json.data.tbBillList;
+ // }
+ // else {
+ // that.$toast.fail(json.message);
+ // that.formData.sectionName = "";
+ // }
+ // that.isLoading = false;
+ // })
+ // .catch(function (error) {
+ // that.isLoading = false;
+ // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ // console.log(error);
+ // that.$refs.daa001.focus();
+ // });
+ //},
+ getScan() {
+ var that = this;
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesBarCF/GetBarInfoBefore', {
+ barcode: that.formData.barcode,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ that.formData.sumQuantity = json.data.tbBillList.quantity;
+
+ that.formData.itemNo = json.data.tbMesItems.itemNo;
+ that.formData.itemName = json.data.tbMesItems.itemName;
+ that.formData.itemModel = json.data.tbMesItems.itemModel;
+
+ //that.itemInsFormData = json.data.tbBillList.itemIns;
+ //that.itemTableData = json.data.tbBillList.itemInDetails;
+ //that.tableData = json.data.tbBillList.invItemInCDetails;
+ //that.barMessage = json.data.tbBillList.message;
+ //that.$refs.barcode.focus();
+ //that.formData.barcode = null;
+ that.$refs.cfNum.focus();
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ that.formData.barcode = null;
+ }
+ //that.$notify({ type: 'success', message: json.message });
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.barcode.focus();
+ });
+ },
+ getChaiFen() {
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+
+ if (that.formData.cfNum * 1 <= 0) {
+ that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+
+ if (parseFloat(that.formData.cfNum) > parseFloat(that.formData.sumQuantity)) {
+ that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉＄爜鏁伴噺锛�");
+ return;
+ }
+
+ if (that.formData.barcode.length * 1 <= 0) {
+ that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesBarCF/BarCfBefore', {
+ userName: that.userInfo.loginAccount,
+ barcode: that.formData.barcode,
+ CfNum: that.formData.cfNum,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ // 鎷嗗垎鍏ㄥ眬璋冪敤鏂规硶
+ that.sendPrintMessage(json.data.tbBillList);
+ that.$refs.barcode.focus();
+ that.formData.barcode = null;
+ that.formData.cfNum = null;
+ that.$notify({ type: 'success', message: json.message });
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.cfNum.focus();
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ });
+ },
+ //cleraCode() {
+ // this.formData.sectionCode = null;
+ //},
+ handleNumberInput3(value) {
+ this.formData.cfNum = value.replace(/[^\d.]/g, '') // 1. 鍘婚櫎闈炴暟瀛楀拰灏忔暟鐐�
+ .replace(/(\..*)\./g, '$1') // 2. 绂佹澶氫釜灏忔暟鐐�
+ .replace(/^\./g, '');
+ },
+
+
+ }
+})
\ No newline at end of file
diff --git a/H5/Js/Cgyt.js b/H5/Js/Cgyt.js
new file mode 100644
index 0000000..97b7319
--- /dev/null
+++ b/H5/Js/Cgyt.js
@@ -0,0 +1,166 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ formData: {
+ sectionCode: "",
+ barcode: "",
+ itemNo: "",
+ sumQuantity:0
+ },
+ itemInsFormData: {},
+ tableData: [],
+ itemTableData: [],
+ barMessage: "",
+
+ Message: "",
+ messageCenter: {},
+ messageId: 0,
+
+ showClearIcon: false,
+ focus1: true,
+ focus2: false,
+ isActive: 0,
+ index: 0,
+ currentTab: 0,
+ contentScrollW: 0, // 瀵艰埅鍖哄搴�
+ scrollLeft: 0, // 妯悜婊氬姩鏉′綅缃�
+ fullHeight: "",
+ sectionCode:"",
+ depotData: [],
+ ItemDetail: [],
+ showButton: false,//鍙充笂瑙掕彍鍗曡Е鍙�
+ ttrre1: false,
+ ttrre2: false,
+ ytdh: "",
+
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ getScan() {
+ var that = this;
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesBarCF/GetBarInfoBefore', {
+ barcode: that.formData.barcode,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ that.formData.sumQuantity = json.data.tbBillList.quantity;
+
+ that.formData.itemNo = json.data.tbMesItems.itemNo;
+ that.formData.itemName = json.data.tbMesItems.itemName;
+ that.formData.itemModel = json.data.tbMesItems.itemModel;
+ that.ytdh = "";
+ that.ItemDetail = [];
+ that.tableData = [];
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ that.formData.barcode = null;
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.barcode.focus();
+ });
+ },
+
+
+ handleSubmit() {
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesCgthSq/ScanCgyt', {
+ barcode: that.formData.barcode,
+ userName: that.userInfo.loginAccount,
+ }, true, 0).then(function (res1) {
+ if (res1.status == 0) {
+ that.$notify({ type: 'success', message: res1.data.tbBillList.msg });
+ that.ytdh = res1.data.tbBillList.ytdh;
+ that.ItemDetail = res1.data.ytItem;
+ that.tableData = res1.data.ytBarInfo;
+ that.formData.barcode = "";
+ }
+ else {
+ that.$toast.fail(res1.message);
+ }
+ that.isLoading = false
+ }).catch(function (error) {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.isLoading = false
+ console.log(error);
+ });
+ },
+
+ deleteCgyt() {
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesCgthSq/deleteCgyt', {
+ ytdh: that.ytdh,
+ userName: that.userInfo.loginAccount,
+ }, true, 0).then(function (res1) {
+ if (res1.rtnData.outSum == 1) {
+ that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
+ that.init();
+ } else {
+ that.$toast.fail(res1.rtnData.outMsg);
+ }
+ that.isLoading = false
+ }).catch(function (error) {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.isLoading = false
+ console.log(error);
+ });
+ },
+
+ submit() {
+ if (this.ttrre) {
+ return;
+ }
+
+ var that = this;
+ that.ttrre = true;
+ that.AxiosHttp("post", 'FqcManager/EditModelSubmit', {
+ guid: that.formData.guid
+ }, true, 0).then(function (res1) {
+ if (res1.rtnData.outSum == 1) {
+ that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
+ that.init();
+ } else {
+ that.$toast.fail(res1.rtnData.outMsg);
+ }
+ that.ttrre = false
+ }).catch(function (error) {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.ttrre = false
+ console.log(error);
+ });
+ },
+ }
+})
\ No newline at end of file
diff --git a/H5/Js/Cpbd.js b/H5/Js/Cpbd.js
index ec4b01b..8bf9d59 100644
--- a/H5/Js/Cpbd.js
+++ b/H5/Js/Cpbd.js
@@ -28,7 +28,7 @@
var that = this;
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/getZsBarInfo', {
- Xt: that.GX,
+ GX: that.GX,
Zsbarcode: that.ZsBar
}, false)
.then(function (res) {
@@ -39,7 +39,14 @@
that.$refs.LsBar.focus();
}
else {
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
that.ZsBarInfo = [];
@@ -49,7 +56,14 @@
})
.catch(function (error) {
that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
that.ZsBarInfo = [];
@@ -60,10 +74,12 @@
var that = this;
if (that.ZsBar.length <= 0) {
that.$toast.fail("杩芥函鐮佷笉鑳戒负绌猴紒");
+ that.$playSound('error');
return;
}
if (that.LsBar.length <= 0) {
that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+ that.$playSound('error');
return;
}
@@ -78,12 +94,20 @@
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
}
else {
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
@@ -93,7 +117,14 @@
})
.catch(function (error) {
that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index e6e21c6..938f14f 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -1,4 +1,5 @@
-锘縱ar vm = new Vue({
+锘�
+var vm = new Vue({
el: '#app',
data: function () {
return {
@@ -27,6 +28,14 @@
//}
],
DAA001: [],
+ show: false,//鍒楄〃灞曠ず
+ actions: [],//鍒楄〃鐨勫��
+ xtName: "",//绾夸綋鍚嶇О
+ xtNum: "",//绾夸綋缂栧彿
+ AgvDw: "",//AGV鐐逛綅
+ agvChecked: false,//鏄惁鍕鹃�堿GV
+ showAgvDw: false,//鐐逛綅灞曠ず
+ actionsAgvDw: [],//鍒楄〃AGV鐐逛綅
}
},
mounted() {
@@ -37,6 +46,17 @@
};
},
methods: {
+ handleAgvPositions(positionStr) {
+ if (!positionStr) return [];
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ�楀彿锛屽鏋滀笉瀛樺湪鍒欒繑鍥炵┖鏁扮粍
+ if (!positionStr.includes(',')) return [];
+
+ // 灏嗗瓧绗︿覆鎸夐�楀彿鍒嗗壊骞惰浆鎹负閫夐」鏁扮粍
+ return positionStr.split(',').map(pos => ({
+ name: pos.trim() // 鍘婚櫎鍙兘鐨勭┖鏍�
+ }));
+ },
getKbBarInfo() {
var that = this;
that.isLoading = true;
@@ -46,17 +66,41 @@
}, false)
.then(function (res) {
var json = res;
+
if (json.status == 0) {
+ console.log(json.data.tbBillList.kbBarInfo[0].agvPostion);
that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
that.DAA001 = that.KbBarInfo.daA001;
that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
that.$refs.XBar.focus();
that.XbarInfo = [];
that.XBar = "";
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ�楀彿
+ //const agvPosition = json.data.tbBillList.kbBarInfo[0].agvPostion;
+ //that.AgvDw = agvPosition.includes(',') ? agvPosition.split(',')[0] : '';
+ const agvPostion = json.data && json.data.tbBillList && json.data.tbBillList.kbBarInfo &&
+ json.data.tbBillList.kbBarInfo[0] && json.data.tbBillList.kbBarInfo[0].agvPostion;
+
+ if (agvPostion != null) {
+ const agvPostionStr = String(agvPostion);
+ that.AgvDw = agvPostionStr.split(',')[0];
+ that.actionsAgvDw = that.handleAgvPositions(agvPostionStr);
+ } else {
+ that.AgvDw = null;
+ that.actionsAgvDw = null;
+ }
+
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
that.KbBar = "";
}
@@ -65,7 +109,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
that.KbBar = "";
});
@@ -91,17 +141,29 @@
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.XbarInfo.length >= that.Xvalue) {
that.$playSound('error');
- that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ //that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ that.$dialog.alert({
+ message: `宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
//寰呰鏁�
- var Dvalue = (that.KbBarInfo.oldqty || 0) - +(that.KbBarInfo.ySum || 0)
+ var Dvalue = (that.KbBarInfo.quantity || 0) - +(that.KbBarInfo.ySum || 0)
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.Xvalue > Dvalue) {
that.$playSound('error');
- that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ //that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ that.$dialog.alert({
+ message: `瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
@@ -110,7 +172,13 @@
const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
if (isExist) {
that.$playSound('error');
- that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ //that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ that.$dialog.alert({
+ message: "璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
@@ -126,19 +194,40 @@
var json = res;
if (json.status == 0) {
that.XbarInfo.push(json.data.tbBillList.xBarInfo[0]);
+ that.$playSound('success');
that.$refs.XBar.focus();
that.XBar = "";
+
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.XbarInfo.length >= that.Xvalue) {
+ that.$refs.LsBar.focus();
+ }
+
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ that.XBar = "";
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.XBar = "";
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
},
productBinding() {
@@ -177,7 +266,13 @@
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
@@ -188,7 +283,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
@@ -234,26 +335,49 @@
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
}
} else {
that.$playSound('error');
- that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ //that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ that.$dialog.alert({
+ message: "鏈壘鍒板尮閰嶇殑绠辨潯鐮�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.LsBar = ""; // 娓呯┖杈撳叆妗�
},
- GetWeightByXt() {
-
+ handleClear() {
+ this.KbBar = "";
+ this.XBar = "";
+ this.LsBar = "";
+ this.DAA001 = [];
+ this.XbarInfo = [];
+
},
// 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
@@ -279,7 +403,13 @@
that.getKbBarInfo();
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XbarInfo = [];
that.XBar = "";
that.LsBar = "";
@@ -290,7 +420,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
},
handleSubmit() {
@@ -307,12 +443,18 @@
}
// 璁＄畻鍙鏁板拰宸茶鏁�
- const oldqty = +(that.KbBarInfo.oldqty || 0);
+ const oldqty = +(that.KbBarInfo.quantity || 0);
const ySum = +(that.KbBarInfo.ySum || 0);
if (oldqty !== ySum) {
that.$playSound('error');
- that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ //that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ that.$dialog.alert({
+ message: `瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
return;
}
@@ -333,16 +475,241 @@
that.$refs.KbBar.focus();
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
});
},
+
+ onSelect(action) {
+ this.xtNum = action.lineNo; // 缁戝畾line_no鍒皒tNum瀛楁
+ console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
+ this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
+ if (action.agvPostion != null) {
+ const agvPostionStr = String(action.agvPostion);
+ this.AgvDw = agvPostionStr.split(',')[0];
+ this.actionsAgvDw = this.handleAgvPositions(agvPostionStr);
+ }
+ this.show = false;
+ },
+
+ onSelectAgvDw(action) {
+ this.AgvDw = action.name;
+ this.showAgvDw = false;
+ },
+
+ selectDW() {
+ this.showAgvDw = true;
+ },
+
+ //鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
+ selectXt() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetAgvXt', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.name,
+ lineNo: item.line_no, // 鏂板
+ agvPostion: item.agvPostion
+ };
+ });
+ }
+ }
+ else {
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+
+ //AGV閫佹
+ handleAGVInspection() {
+
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+
+ var that = this;
+ if (that.agvChecked === false)
+ {
+ that.$playSound('error');
+ that.$toast.fail("AGV閫佹璇峰厛鍕鹃�� AGV");
+ return;
+ }
+
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ if (!that.AgvDw) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨AGV鐐逛綅");
+ return;
+ }
+
+ // 璁＄畻鍙鏁板拰宸茶鏁�
+ const oldqty = +(that.KbBarInfo.quantity || 0);
+ const ySum = +(that.KbBarInfo.ySum || 0);
+
+ if (oldqty !== ySum) {
+ that.$playSound('error');
+ //that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ that.$dialog.alert({
+ message: `瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount,
+ AgvDw: that.AgvDw
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("AGV閫佹澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV閫佹澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ });
+ },
+
+ //AGV鍛煎彨
+ handleAGVCall() {
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.xtNum) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨绾夸綋");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVCall', {
+ XtNum: that.xtNum,
+ userAccount: that.userInfo.loginAccount,
+ AgvDw: that.AgvDw
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ });
+ }
+
+
}
})
\ No newline at end of file
diff --git a/H5/Js/CpbdsjD.js b/H5/Js/CpbdsjD.js
new file mode 100644
index 0000000..2fb6332
--- /dev/null
+++ b/H5/Js/CpbdsjD.js
@@ -0,0 +1,683 @@
+锘�
+var vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ KbBar: "",//鍗℃澘鏉＄爜
+ LsBar: "",//鍚庣洊娴佹按鏉＄爜
+ XBar: "",//绠辨潯鐮�
+ UserName: Cookies.get('loginName'),//鐢ㄦ埛鍚嶇О
+ KbBarInfo: [],
+ KbBarMxInfo: [],
+ GX: "G007:鏍稿閫佹",
+ Xvalue:4,
+ XbarInfo: [
+ //{
+ // iteM_BARCODE: "", // 鏉＄爜
+ // item_no: "", // 鐗╂枡缂栧彿
+ // item_name: "", // 鐗╂枡鍚嶇О
+ // item_model: "", // 瑙勬牸鍨嬪彿
+ // quantity: 0, // 鏁伴噺
+ // is_hedui: "0", // 鏄惁鏍稿(1:宸叉牳瀵� 0:鏈牳瀵�),
+ // weight: "" // 浜у搧閲嶉噺
+ //}
+ ],
+ DAA001: [],
+ show: false,//鍒楄〃灞曠ず
+ actions: [],//鍒楄〃鐨勫��
+ xtName: "",//绾夸綋鍚嶇О
+ xtNum: "",//绾夸綋缂栧彿
+ AgvDw: "",//AGV鐐逛綅
+ agvChecked: false,//鏄惁鍕鹃�堿GV
+ showAgvDw: false,//鐐逛綅灞曠ず
+ actionsAgvDw: [],//鍒楄〃AGV鐐逛綅
+ itemNo: "",
+ itemName: "",
+ itemModel: "",
+ lineName: ""
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ handleAgvPositions(positionStr) {
+ if (!positionStr) return [];
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ�楀彿锛屽鏋滀笉瀛樺湪鍒欒繑鍥炵┖鏁扮粍
+ if (!positionStr.includes(',')) return [];
+
+ // 灏嗗瓧绗︿覆鎸夐�楀彿鍒嗗壊骞惰浆鎹负閫夐」鏁扮粍
+ return positionStr.split(',').map(pos => ({
+ name: pos.trim() // 鍘婚櫎鍙兘鐨勭┖鏍�
+ }));
+ },
+ getKbBarInfo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/getKbBarInfo', {
+ Xt: that.GX,
+ Kbbarcode: that.KbBar
+ }, false)
+ .then(function (res) {
+ var json = res;
+
+ if (json.status == 0) {
+ console.log(json.data.tbBillList.kbBarInfo[0].agvPostion);
+ that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
+ that.DAA001 = that.KbBarInfo.daA001;
+ // 鏍规嵁鍚庣杩斿洖鐨勭粨鏋勮祴鍊肩墿鏂欎俊鎭�
+ that.itemNo = that.KbBarInfo.item_no || '';
+ that.itemName = that.KbBarInfo.item_name || '';
+ that.itemModel = that.KbBarInfo.item_model || '';
+ that.lineName = that.KbBarInfo.lineName || '';
+ // that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
+ //that.$refs.XBar.focus();
+
+
+ }
+ else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ that.KbBar = "";
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ that.KbBar = "";
+ });
+ },
+ getXBarInfo() {
+ var that = this;
+ if (that.KbBar.length <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鍗℃澘鏉＄爜涓嶈兘涓虹┖锛�");
+ that.$refs.KbBar.focus();
+ that.XBar = "";
+ return;
+ }
+
+ if (that.DAA001.length <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鎸囦护宸ュ崟涓嶈兘涓虹┖锛�");
+ that.$refs.KbBar.focus();
+ that.XBar = "";
+ return;
+ }
+
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.XbarInfo.length >= that.Xvalue) {
+ that.$playSound('error');
+ //that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ that.$dialog.alert({
+ message: `宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.XBar = "";
+ return;
+ }
+
+ //寰呰鏁�
+ var Dvalue = (that.KbBarInfo.quantity || 0) - +(that.KbBarInfo.ySum || 0)
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.Xvalue > Dvalue) {
+ that.$playSound('error');
+ //that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ that.$dialog.alert({
+ message: `瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.XBar = "";
+ return;
+ }
+
+ // 妫�鏌ユ潯鐮佹槸鍚﹀凡瀛樺湪
+ const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
+ if (isExist) {
+ that.$playSound('error');
+ //that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ that.$dialog.alert({
+ message: "璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.XBar = "";
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/getXBarInfo', {
+ KbBar: that.KbBar,
+ DAA001: that.DAA001,
+ userName: that.userInfo.loginAccount,
+ Xbarcode: that.XBar
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.XbarInfo.push(json.data.tbBillList.xBarInfo[0]);
+ that.$playSound('success');
+ that.$refs.XBar.focus();
+ that.XBar = "";
+
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.XbarInfo.length >= that.Xvalue) {
+ that.$refs.LsBar.focus();
+ }
+
+ }
+ else {
+ that.$playSound('error');
+ that.XBar = "";
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.XBar = "";
+ that.$playSound('error');
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ });
+ },
+ productBinding() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (that.ZsBar.length <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("杩芥函鐮佷笉鑳戒负绌猴紒");
+ return;
+ }
+ if (that.LsBar.length <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/ProductBinding', {
+ 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.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.ZsBar = null;
+ }
+ else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.ZsBar = null;
+ }
+
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.ZsBar = null;
+ });
+ },
+ checkProductBarcode() {
+
+ var that = this;
+ if (!that.LsBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇疯緭鍏ヤ骇鍝佹潯鐮�");
+ return;
+ }
+
+ // 鍦╔barInfo涓煡鎵惧尮閰嶇殑鏉＄爜
+ const matchedItem = that.XbarInfo.find(item =>
+ item.iteM_BARCODE === that.LsBar
+ );
+
+ if (matchedItem) {
+ if (matchedItem.is_hedui === "1") {
+ that.$toast("宸叉牳瀵�");
+ } else {
+
+ that.AxiosHttp("post", 'Womdaa/GetWeightByXt', {
+ LsBar: that.LsBar,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ var weigth = json.data.tbBillList.weight;
+ that.$set(matchedItem, 'is_hedui', "1");
+ that.$set(matchedItem, 'weight', weigth);
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
+ that.LsBar = "";
+ // 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
+ const allChecked = that.XbarInfo.every(item => item.is_hedui === "1");
+ if (allChecked && that.XbarInfo.length > 0 && that.XbarInfo.length === that.Xvalue) {
+ that.submitAllChecked();
+ }
+ }
+ else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ });
+ }
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ that.$dialog.alert({
+ message: "鏈壘鍒板尮閰嶇殑绠辨潯鐮�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+
+ that.LsBar = ""; // 娓呯┖杈撳叆妗�
+ },
+
+ handleClear() {
+ this.KbBar = "";
+ this.XBar = "";
+ this.LsBar = "";
+ this.DAA001 = [];
+ this.XbarInfo = [];
+
+ },
+
+ // 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
+ submitAllChecked() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ that.isLoading = true;
+
+ that.AxiosHttp("post", 'Womdaa/submitAllChecked', {
+ XbarInfo: that.XbarInfo,
+ KbBar: that.KbBar,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ that.getKbBarInfo();
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ // that.XbarInfo = [];
+ // that.XBar = "";
+ that.KbBar = "";
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ });
+ },
+ handleSubmit() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/submitInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ // 娓呯┖鏁版嵁
+ that.KbBar = "";
+ that.$refs.KbBar.focus();
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ });
+ },
+
+ onSelect(action) {
+ this.xtNum = action.lineNo; // 缁戝畾line_no鍒皒tNum瀛楁
+ console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
+ this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
+ this.show = false;
+ },
+
+ onSelectAgvDw(action) {
+ this.AgvDw = action.name;
+ this.showAgvDw = false;
+ },
+
+ selectDW() {
+ this.showAgvDw = true;
+ },
+
+ //鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
+ selectXt() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetAgvXt', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.name,
+ lineNo: item.line_no // 鏂板
+ };
+ });
+ }
+ }
+ else {
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+
+ //AGV閫佹
+ handleAGVInspection() {
+
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+
+ var that = this;
+ if (that.agvChecked === false)
+ {
+ that.$playSound('error');
+ that.$toast.fail("AGV閫佹璇峰厛鍕鹃�� AGV");
+ return;
+ }
+
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ if (!that.AgvDw) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨AGV鐐逛綅");
+ return;
+ }
+
+ // 璁＄畻鍙鏁板拰宸茶鏁�
+ const oldqty = +(that.KbBarInfo.quantity || 0);
+ const ySum = +(that.KbBarInfo.ySum || 0);
+
+ if (oldqty !== ySum) {
+ that.$playSound('error');
+ //that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ that.$dialog.alert({
+ message: `瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount,
+ AgvDw: that.AgvDw
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("AGV閫佹澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV閫佹澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ });
+ },
+
+ //AGV鍛煎彨
+ handleAGVCall() {
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.xtNum) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨绾夸綋");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVCall', {
+ XtNum: that.xtNum,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ });
+ }
+
+
+ }
+})
\ No newline at end of file
diff --git a/H5/Js/Dbck.js b/H5/Js/Dbck.js
index 4a5a8c4..6eac1c9 100644
--- a/H5/Js/Dbck.js
+++ b/H5/Js/Dbck.js
@@ -12,11 +12,19 @@
fum: "",
billNo: "",
barcode:"",
- ItemBlDetail:[],
+
+ ItemBlDetail: [], // 寰呮壂
+ ItemYsDetail: [], // 宸叉壂
+ ItemDetail: [],
+ ItemBarKw: [],
+ currentIndex: -1,
+
modeInfo: [],
active: 0,
show: false,
actions: [],
+ ItemDetail: [],
+ scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
}
},
mounted() {
@@ -27,6 +35,56 @@
};
},
methods: {
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ //this.active = 1; //鑷姩鍒囨崲鍒板簱浣嶅垪琛╰ab
+ },
+ GetBarKwByItem() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount,
+ type: 'DBCK',//璋冩嫧鍑哄簱
+ billNo: that.billNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
getInfo() {
this.show = true;
@@ -69,6 +127,8 @@
this.show = false;
this.billNo = item.name;
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
@@ -82,7 +142,10 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList;
+ //that.ItemDetail = json.data.tbBillList;
+ var tbBillList = json.data.tbBillList || {};
+ that.ItemBlDetail = tbBillList.blDetails || []; // 寰呮壂
+ that.ItemYsDetail = tbBillList.ysDetails || []; // 宸叉壂
that.$refs.barcode.focus();
that.barcode = "";
}
@@ -90,7 +153,7 @@
that.$toast.fail(json.message);
that.$refs.billNo.focus();
that.billNo = "";
- that.ItemBlDetail = null;
+ that.ItemDetail = null;
}
that.isLoading = false;
})
@@ -103,7 +166,7 @@
//console.log(error);
});
},
- getBarcode() {
+ getScan() {
//this.barcode = value;
@@ -137,15 +200,22 @@
var json = res;
if (json.status == 0) {
- that.itemNo = json.data.form.itemNo;
- //that.num = json.data.form.num;
- //that.fum = json.data.form.fum;
- that.ItemBlDetail = json.data.items
+ //that.itemNo = json.data.tbBillList.itemNo;
+ ////that.num = json.data.form.num;
+ ////that.fum = json.data.form.fum;
+ //that.ItemBlDetail = json.data.items
that.$notify({ type: 'success', message: '鎵爜鎴愬姛' });
-
+ that.$toast.success("鎵弿鎴愬姛");
that.$refs.barcode.focus();
that.barcode = "";
//that.GetMesItemBlDetailByBillNo();
+ that.GetMesItemBlDetailByBillNo();
+ }
+ else if (json.status == 2) {
+ that.itemNo = json.data.tbBillList.itemNo;
+ that.$refs.splitNum.focus();
+ that.scanInfo.splitNum = json.data.tbBillList.splitNum;
+ that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
}
else {
that.$toast.fail(json.message);
@@ -162,57 +232,71 @@
that.barcode = "";
});
},
- tmcf() {
+ getChaiFen() {
+ //this.isPrinterPopupVisible = true; // 鏄剧ず寮圭獥
+
+ if (this.isLoading) {
+ return;
+ }
+
var that = this;
-
- if (!that.userInfo.loginAccount) {
- this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+ if (that.billNo.length <= 0) {
+ that.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖锛�");
return;
}
+ if (that.scanInfo.splitNum * 1 <= 0) {
+ that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (that.barcode.length * 1 <= 0) {
+ that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+ //that.ip = "";
+ //that.prot = "";
+ //that.getPrintInfo();
- if (!that.barcode) {
- this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
- return;
- }
-
- if (!that.billNo) {
- this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
- return;
- }
-
- if (!that.fum) {
- this.$toast.fail("鎷嗗垎鏁颁笉鑳戒负绌�");
- return;
- }
+ //if (that.ip.length <= 0 || that.prot.length <= 0) {
+ // alert(that.ip);
+ // alert(that.prot);
+ // return;
+ //}
that.isLoading = true;
- that.AxiosHttp("post", 'TransferOut/SplitBarcode', {
+ that.AxiosHttp("post", 'TransferOut/ScanCodeCF', {
+ daa001: that.billNo,
userName: that.userInfo.loginAccount,
barcode: that.barcode,
- billNo: that.billNo,
- fum: that.fum
+ Num: that.scanInfo.splitNum,
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ that.scanInfo.splitNum = null;
+ that.scanInfo.barcodeNum = null;
+ that.scanInfo.barcode = null;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
- that.itemNo = json.data.form.itemNo;
- that.num = json.data.form.num;
- that.barcode = json.data.form.barcode;
- that.fum = json.data.form.fum;
- that.ItemBlDetail = json.data.items
- that.$notify({ type: 'success', message: '鎵爜鎴愬姛' });
+ that.sendPrintMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus();
+ that.barcode = "";
+ //that.GetMesItemBlDetailByBillNo();
+ that.GetMesItemBlDetailByBillNo();
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
+ that.$playSound('error');
});
- }
+ },
}
})
\ No newline at end of file
diff --git a/H5/Js/Dbrk.js b/H5/Js/Dbrk.js
index cb8a307..7cc93b8 100644
--- a/H5/Js/Dbrk.js
+++ b/H5/Js/Dbrk.js
@@ -17,6 +17,7 @@
active: 0,
show: false,
actions: [],
+ ItemDetail: [],
}
},
mounted() {
@@ -76,15 +77,16 @@
GetMesItemBlDetailByBillNo() {
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'TransferOut/GetTransferOutDetailListByBillNo', {
+ that.AxiosHttp("post", 'TransferOut/GetTransferInDetailListByBillNo', {
billNo: that.billNo
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList;
+ //that.ItemBlDetail = json.data.tbBillList;
+ that.ItemDetail = json.data.tbBillList;
that.$refs.sectionCode.focus();
- that.sectionCode = "";
+ //that.sectionCode = "";
}
else {
that.$toast.fail(json.message);
@@ -128,7 +130,7 @@
else {
that.$toast.fail(json.message);
that.$refs.sectionCode.focus();
- that.sectionCode = "";
+ //that.sectionCode = "";
}
})
@@ -137,7 +139,7 @@
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
//console.log(error);
that.$refs.sectionCode.focus();
- that.sectionCode = "";
+ //that.sectionCode = "";
});
},
getBarcode() {
@@ -165,11 +167,11 @@
return;
}
- if (!that.billNo) {
- this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
- that.isLoading = false;
- return;
- }
+ //if (!that.billNo) {
+ // this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
+ // that.isLoading = false;
+ // return;
+ //}
that.AxiosHttp("post", 'TransferOut/ScanReceiveBarcode', {
userName: that.userInfo.loginAccount,
@@ -188,7 +190,8 @@
that.$notify({ type: 'success', message: '鎵爜鎴愬姛' });
that.$refs.barcode.focus();
that.barcode = "";
- //that.GetMesItemBlDetailByBillNo();
+ that.billNo = json.data.form.billNo;
+ that.GetMesItemBlDetailByBillNo();
}
else {
that.$toast.fail(json.message);
diff --git a/H5/Js/Dhdsh.js b/H5/Js/Dhdsh.js
index aa9d5df..62dd4ab 100644
--- a/H5/Js/Dhdsh.js
+++ b/H5/Js/Dhdsh.js
@@ -47,7 +47,13 @@
if (json.status == 0) {
that.ItemList = json.data.tbBillList;
- that.dhdGuid = json.data.tbBillList[0].ddhid;
+ for (let i = 0; i < json.data.tbBillList.length; i++) {
+ if (json.data.tbBillList[i].ddhid) {
+ that.dhdGuid = json.data.tbBillList[i].ddhid;
+ foundValidDdhid = true;
+ break;
+ }
+ }
that.BarList = json.data.tbMesItems;
that.$refs.Bar.focus();
}
diff --git a/H5/Js/Fgbd.js b/H5/Js/Fgbd.js
new file mode 100644
index 0000000..f8d6d1d
--- /dev/null
+++ b/H5/Js/Fgbd.js
@@ -0,0 +1,129 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ HgBar: "",//杩芥函鏉＄爜
+ FgBar: "",//鍚庣洊娴佹按鏉＄爜
+ UserName: Cookies.get('loginName'),//鐢ㄦ埛鍚嶇О
+ HgBarInfo: [],
+ 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.HgBar
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.HgBarInfo = json.data.tbBillList.zsBarInfo[0];
+ that.Traceability = json.data.tbBillList.traceability;
+ that.$refs.FgBar.focus();
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.HgBar.focus();
+ that.HgBar = "";
+ that.HgBarInfo = [];
+ that.Traceability = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.HgBar.focus();
+ that.HgBar = "";
+ that.HgBarInfo = [];
+ that.Traceability = [];
+ });
+ },
+ ScanFgbd() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (that.HgBar.length <= 0) {
+ that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+ return;
+ }
+ if (that.FgBar.length <= 0) {
+ that.$toast.fail("绠辩爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/ScanFgbd', {
+ HgBar: that.HgBar,//娴佹按鐮�/鍚庣洊鐮�
+ FgBar: that.FgBar,//杩斿伐杩芥函鐮�
+ 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.HgBar.focus();
+ that.HgBar = null;
+ that.FgBar = null;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.HgBar.focus();
+ that.HgBar = null;
+ that.FgBar = null;
+ }
+
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.HgBar.focus();
+ that.HgBar = null;
+ that.FgBar = 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/Js/IPQC_XJ/Add.js b/H5/Js/IPQC_XJ/Add.js
index 5351162..6bc3747 100644
--- a/H5/Js/IPQC_XJ/Add.js
+++ b/H5/Js/IPQC_XJ/Add.js
@@ -1,4 +1,4 @@
-锘縱ar vm = new Vue({
+var vm = new Vue({
el: '#app',
data: function () {
return {
@@ -24,6 +24,7 @@
mocode: "",
boardStyle: ""
},
+ jyGw:"",//妫�楠屽伐浣�
isShowTable: false,
tableData: [],//杩斿洖鐨勬楠岄」鐩�
jymxData: [],//灞曠ず鐨勬楠岄」鐩�
@@ -40,6 +41,8 @@
okValue: '',//OK-鏁伴噺
ngValue: '',//NG-鏁伴噺
showDialog: false,//涓嶈壇琛ㄨ堪杈撳叆妗�
+ checkItemDesc: '',//妫�楠岄」鐩弿杩�
+ showCheckItemDescDialog: false,//妫�楠岄」鐩弿杩拌緭鍏ユ
selectKey: "",//鏌ヨ鍏抽敭瀛�
actions: [],//鍒楄〃鐨勫��
daashow: false,//宸ュ崟鍒楄〃灞曠ず
@@ -51,7 +54,24 @@
}
},
mounted() {
- var that = this;
+ let that = this;
+ //璇诲彇鎵爜beg 2025-7-25
+ window.msgFromUniapp = function (arg) {
+ //alert(arg.txtName);
+ //alert("鎵爜鐨勭粨鏋�:" + arg.msg);
+ //alert("宸ヤ綅鐮�:" + that.jyGw);
+ if (arg.txtName === "GW") {
+ that.jyGw = arg.msg;
+ that.selIpqcItemsByGw();
+ }
+ else if (arg.txtName === "DAA") {
+ that.formData.lotNo = arg.msg;
+ that.createByWomdaa();
+ }
+
+
+ }
+ //璇诲彇鎵爜end
this.userInfo = {
loginGuid: this.GetLoginInfor().loginGuid,
loginAccount: this.GetLoginInfor().loginAccount,
@@ -59,7 +79,16 @@
this.formData.id = this.Request("id"),
this.formData.releaseNo = this.Request("releaseNo");
this.formData.lotNo = this.Request("lotNo");
+
+ ////璇诲彇鎵爜beg 2025-7-25
+ //let that = this;
+ //window.msgFromUniapp = function (arg) {
+ // alert("鎵爜鐨勭粨鏋�:" + arg.msg);
+ //}
+ ////璇诲彇鎵爜end
+
this.init();
+
},
methods: {
// 杈撳叆杩囨护
@@ -90,6 +119,11 @@
input = "NG-1";
this.addJyzIpqc(input);
}
+ },
+ handleQualifiedCancel() {
+ var input = "";
+ input = "/";
+ this.addJyzIpqc(input);
},
togglePopup(index) {
// 鍒囨崲鎸囧畾绱㈠紩鐨� popup 鐘舵��
@@ -193,6 +227,7 @@
},
addJyzIpqc(input) {
+
var that = this;
var guid1 = that.formData.guid;//涓昏〃id
var mxguid = that.tableData[that.tabActive].guid;//妫�楠岄」鐩殑guid
@@ -203,8 +238,12 @@
inP1: input,//鎴栬��0k-19,鎴栬�卬g-19,鎴栧疄闄呮楠屽��
}, true, 1).then(function (res1) {
if (res1.rtnCode > 0) {
- that.$notify({
- type: 'success', message: res1.rtnMsg
+ //that.$notify({
+ // type: 'success', message: res1.rtnMsg
+ //});
+ that.$toast.success({
+ duration: 1000, // 鎸佺画灞曠ず toast
+ message: '鎿嶄綔鎴愬姛',
});
that.refreshJYItem();//鍒锋柊妫�楠岄」鐩�
//that.handleTabClick();//鍒锋柊妫�楠屾槑缁嗛潰鏉�
@@ -257,7 +296,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 +324,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) {
@@ -371,6 +410,30 @@
},
updateRemarks(guid) {
this.showDialog= true
+ },
+ updateCheckItemDesc(guid) {
+ this.showCheckItemDescDialog = true
+ },
+ checkItemDescConfirm() {
+ const that = this;
+ that.isLoading = true;
+ var guid = that.jymxData.guid;
+ that.AxiosHttp("post", 'Ipqc/updateCheckItemDesc', {
+ gid: guid,
+ CheckItemDesc: that.checkItemDesc
+ }, true, 0).then(res1 => {
+ if (res1.status == 0) {
+ that.$notify({ type: 'success', message: '杈撳叆鎴愬姛' });
+ that.showCheckItemDescDialog = false;
+ that.refreshJYItem();//鍒锋柊妫�楠岄」鐩�
+ } else {
+ that.$toast.fail(res1.rtnMsg);
+ }
+ that.isLoading = false;
+ }).catch(error => {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.isLoading = false;
+ });
},
deleteDetail13(guid12) {
const that = this;
@@ -534,5 +597,62 @@
that.init();//鍒锋柊妫�楠岄」鐩�
})
},
+ //妫�楠岄」鐩壂鎻忓伐浣嶅彲鍋氭楠�
+ selIpqcItemsByGw() {
+ //alert("寮�濮嬪伐浣�");
+ 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);
+ });
+ },
+
+ //鎵弿宸ヤ綅
+ scanOnH5GW() {
+ let sendData = {
+ Type: 'Scan',
+ txtName: 'GW',
+ Barcode: '',
+ Detail: '',
+ Ip: '',
+ Port: '',
+ }
+ uni.webView.postMessage({
+ data: JSON.stringify(sendData)
+ })
+ },
+
+ //鎵弿宸ュ崟
+ scanOnH5DAA() {
+ let sendData = {
+ Type: 'Scan',
+ txtName: 'DAA',
+ Barcode: '',
+ Detail: '',
+ Ip: '',
+ Port: '',
+ }
+ uni.webView.postMessage({
+ data: JSON.stringify(sendData)
+ })
+ },
}
})
\ 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/Kwbg.js b/H5/Js/Kwbg.js
new file mode 100644
index 0000000..c1884ba
--- /dev/null
+++ b/H5/Js/Kwbg.js
@@ -0,0 +1,191 @@
+锘縱ar vm = new Vue({
+ el: '#app', // 鎸囧畾Vue瀹炰緥鎸傝浇鍒癐D涓�'app'鐨凞OM鍏冪礌涓�
+ data: function () {
+ return {
+ isLoading: false, // 鍔犺浇鐘舵�佹爣蹇�
+ userInfo: { // 鐢ㄦ埛淇℃伅瀵硅薄
+ "loginGuid": '', // 鐢ㄦ埛鐧诲綍GUID
+ "loginAccount": '', // 鐢ㄦ埛鐧诲綍璐﹀彿
+ },
+ formData: { // 琛ㄥ崟鏁版嵁瀵硅薄
+ barcode: "", // 鐗╂枡鏉＄爜
+ itemNo: "", // 鐗╂枡缂栫爜
+ sumQuantity: 0, // 鏉＄爜鏁伴噺
+
+ DepotId: "",// 浠撳簱ID
+ DepotCode: "", // 浠撳簱缂栫爜
+ depotName: "", // 浠撳簱鍚嶇О
+ depotSectionsCode: "" //搴撲綅
+
+ // 娉ㄦ剰锛氳繖閲屽彧鏄剧ず浜嗛儴鍒嗗瓧娈碉紝瀹為檯浠ｇ爜涓彲鑳借繕鏈夋洿澶氬瓧娈�
+ },
+ itemInsFormData: {}, // 鐗╂枡瀹炰緥琛ㄥ崟鏁版嵁
+ tableData: [], // 琛ㄦ牸鏁版嵁
+ itemTableData: [], // 鐗╂枡琛ㄦ牸鏁版嵁
+ barMessage: "", // 鏉＄爜娑堟伅
+
+ Message: "", // 閫氱敤娑堟伅
+ messageCenter: {}, // 娑堟伅涓績
+ messageId: 0, // 娑堟伅ID
+
+ showClearIcon: false, // 鏄惁鏄剧ず娓呴櫎鍥炬爣
+ focus1: true, // 鐒︾偣鎺у埗1
+ focus2: false, // 鐒︾偣鎺у埗2
+ isActive: 0, // 娲诲姩鐘舵��
+ index: 0, // 绱㈠紩
+ currentTab: 0, // 褰撳墠鏍囩椤�
+ contentScrollW: 0, // 瀵艰埅鍖哄搴�
+ scrollLeft: 0, // 妯悜婊氬姩鏉′綅缃�
+ fullHeight: "", // 鍏ㄥ睆楂樺害
+ kwInfo: {},
+ }
+ },
+ mounted() { // Vue瀹炰緥鎸傝浇瀹屾垚鍚庢墽琛�
+ var that = this;
+ // 鍒濆鍖栫敤鎴蜂俊鎭�
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid, // 浠嶨etLoginInfor鏂规硶鑾峰彇鐧诲綍GUID
+ loginAccount: this.GetLoginInfor().loginAccount, // 浠嶨etLoginInfor鏂规硶鑾峰彇鐧诲綍璐﹀彿
+ };
+ },
+ methods: { // 鏂规硶瀹氫箟
+ // 宸叉敞閲婄殑getModel鏂规硶
+ //getModel() {
+ // var that = this;
+ // that.isLoading = true;
+ // that.AxiosHttp("post", 'MesDepotSections/GetSectionName', {
+ // sectionCode: that.formData.sectionCode
+ // }, false)
+ // .then(function (res) {
+ // var json = res;
+ // if (json.status == 0) {
+ // that.formData.sectionName = json.data.tbBillList;
+ // }
+ // else {
+ // that.$toast.fail(json.message);
+ // that.formData.sectionName = "";
+ // }
+ // that.isLoading = false;
+ // })
+ // .catch(function (error) {
+ // that.isLoading = false;
+ // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ // console.log(error);
+ // that.$refs.daa001.focus();
+ // });
+ //},
+
+ // 鑾峰彇鏉＄爜鎵弿淇℃伅鐨勬柟娉�
+ getScan() {
+ var that = this;
+
+ that.isLoading = true; // 璁剧疆鍔犺浇鐘舵�佷负true
+ // 鍙戦�丳OST璇锋眰鑾峰彇鏉＄爜淇℃伅
+ that.AxiosHttp("post", 'Kwbg/GetBarInfo', {
+ barcode: that.formData.barcode, // 浼犻�掓潯鐮佸弬鏁�
+ }, false)
+ .then(function (res) { // 璇锋眰鎴愬姛澶勭悊
+ var json = res;
+ if (json.status == 0) { // 濡傛灉杩斿洖鐘舵�佷负0琛ㄧず鎴愬姛
+ // 鏇存柊琛ㄥ崟鏁版嵁
+ console.log(json.data.tbBillList);
+ console.log(json.data.tbBillList[0]);
+ that.kwInfo = json.data.tbBillList[0];
+ // 宸叉敞閲婄殑浠ｇ爜锛氳缃叾浠栨暟鎹�
+ //that.itemInsFormData = json.data.tbBillList.itemIns;
+ //that.itemTableData = json.data.tbBillList.itemInDetails;
+ //that.tableData = json.data.tbBillList.invItemInCDetails;
+ //that.barMessage = json.data.tbBillList.message;
+ //that.$refs.barcode.focus();
+ //that.formData.barcode = null;
+
+ that.$refs.kwbg.focus(); // 灏嗙劍鐐圭Щ鍔ㄥ埌鎷嗗垎鏁伴噺杈撳叆妗�
+ }
+ else { // 濡傛灉杩斿洖鐘舵�佷笉涓�0琛ㄧず澶辫触
+ that.$toast.fail(json.message); // 鏄剧ず閿欒鎻愮ず
+ that.$refs.barcode.focus(); // 灏嗙劍鐐圭Щ鍥炴潯鐮佽緭鍏ユ
+ that.formData.barcode = null; // 娓呯┖鏉＄爜杈撳叆
+ }
+ //that.$notify({ type: 'success', message: json.message }); // 宸叉敞閲婄殑鎴愬姛閫氱煡
+ that.isLoading = false; // 璁剧疆鍔犺浇鐘舵�佷负false
+ })
+ .catch(function (error) { // 璇锋眰澶辫触澶勭悊
+ that.isLoading = false; // 璁剧疆鍔犺浇鐘舵�佷负false
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�"); // 鏄剧ず缃戠粶閿欒鎻愮ず
+ console.log(error); // 杈撳嚭閿欒鍒版帶鍒跺彴
+ that.$refs.barcode.focus(); // 灏嗙劍鐐圭Щ鍥炴潯鐮佽緭鍏ユ
+ });
+ },
+
+
+
+ // 鎵ц搴撲綅鍙樻洿鐨勬柟娉�
+ getBianGeng() {
+ if (this.isLoading) { // 濡傛灉姝ｅ湪鍔犺浇涓紝鐩存帴杩斿洖
+ return;
+ }
+
+ var that = this;
+
+ // 楠岃瘉搴撲綅鍙樻洿鏉′欢
+ if (!that.formData.kwbg || that.formData.kwbg.trim() === "") {
+ that.$toast.fail("鍙樻洿搴撲綅涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (that.formData.kwbg === that.formData.depotSectionsCode) {
+ that.$toast.fail("褰撳墠搴撲綅涓嶈兘绛変簬鍙樻洿搴撲綅锛�");
+ return;
+ }
+ if (!that.formData.barcode || that.formData.barcode.trim() === "") {
+ that.$toast.fail("鏉＄爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+
+ that.isLoading = true; // 璁剧疆鍔犺浇鐘舵�佷负true
+ // 鍙戦�丳OST璇锋眰鎵ц搴撲綅鍙樻洿鎿嶄綔
+ that.AxiosHttp("post", 'Kwbg/ChangeDepotSection', {
+ userName: that.userInfo.loginAccount, // 鐢ㄦ埛鍚�
+ barcode: that.formData.barcode, // 鏉＄爜
+ OldDepotSectionCode: that.kwInfo.depoT_SECTIONS_CODE, // 鍘熷簱浣嶇紪鐮�
+ NewDepotSectionCode: that.formData.kwbg // 鏂板簱浣嶇紪鐮�
+ }, false)
+ .then(function (res) { // 璇锋眰鎴愬姛澶勭悊
+ var json = res;
+ if (json.status == 0) { // 濡傛灉杩斿洖鐘舵�佷负0琛ㄧず鎴愬姛
+ // 宸叉敞閲婄殑浠ｇ爜锛氳缃ā寮忎俊鎭�
+ // that.modeInfo = json.data.tbBillList;
+
+ // 璋冪敤鎵撳嵃鏂规硶
+ //that.sendPrintMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus(); // 灏嗙劍鐐圭Щ鍥炴潯鐮佽緭鍏ユ
+ that.formData.barcode = null; // 娓呯┖鏉＄爜杈撳叆
+ that.formData.kwbg = null; // 娓呯┖鈥樺簱浣嶅彉鏇粹��
+ that.$notify({ type: 'success', message: json.message }); // 鏄剧ず鎴愬姛閫氱煡
+ }
+ else { // 濡傛灉杩斿洖鐘舵�佷笉涓�0琛ㄧず澶辫触
+ that.$toast.fail(json.message); // 鏄剧ず閿欒鎻愮ず
+ that.$refs.kwbg.focus(); // 灏嗙劍鐐圭Щ鍥炩�樺簱浣嶅彉鏇粹�欒緭鍏ユ
+ }
+ that.isLoading = false; // 璁剧疆鍔犺浇鐘舵�佷负false
+ })
+ .catch(function (error) { // 璇锋眰澶辫触澶勭悊
+ that.isLoading = false; // 璁剧疆鍔犺浇鐘舵�佷负false
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�"); // 鏄剧ず缃戠粶閿欒鎻愮ず
+ console.log(error); // 杈撳嚭閿欒鍒版帶鍒跺彴
+ });
+ },
+
+ // 宸叉敞閲婄殑娓呴櫎浠ｇ爜鏂规硶
+ //cleraCode() {
+ // this.formData.sectionCode = null;
+ //},
+
+ // 澶勭悊鏁板瓧杈撳叆鐨勬柟娉曪紝闄愬埗鍙兘杈撳叆鏁板瓧鍜屽皬鏁扮偣
+ //handleNumberInput3(value) {
+ // this.formData.kwbg = value.replace(/[^\d.]/g, '') // 1. 鍘婚櫎闈炴暟瀛楀拰灏忔暟鐐�
+ // .replace(/(\..*)\./g, '$1') // 2. 绂佹澶氫釜灏忔暟鐐�
+ // .replace(/^\./g, ''); // 3. 绂佹灏忔暟鐐瑰紑澶�
+ //},
+ }
+})
\ No newline at end of file
diff --git a/H5/Js/Kwcx.js b/H5/Js/Kwcx.js
new file mode 100644
index 0000000..0c992c3
--- /dev/null
+++ b/H5/Js/Kwcx.js
@@ -0,0 +1,172 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ modeInfo: { deptSectionCode: "", rkDate: "" }, // 鍏ュ簱鏃ユ湡榛樿绌�
+ scanInfo: { barcode: "", itemNo: "", itemName: "", itemModel: "", depotCode: "", depotName: "", sectionCode: "", sectionName: "", oldqty: "", quantity: "" },
+ barInfoList: [],
+ selectKW: "",
+ tbKWInfo: [],
+ tbItemInfo: [],
+ actions: [],
+ show: false,
+ zkChecked: false,
+ showDatePicker: false,
+ tempDate: new Date(), // 鏃ユ湡閫夋嫨鍣ㄩ粯璁や粖澶�
+ itemNo: { barCode: "", itemNo: "" }, // 鍏ュ簱鏃ユ湡榛樿绌�
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ watch: {
+ showDatePicker(val) {
+ if (val) {
+ // 寮圭獥鎵撳紑鏃讹紝閲嶇疆涓哄綋澶�
+ this.tempDate = new Date();
+ }
+ }
+ },
+ methods: {
+ formatDate(date) {
+ const d = new Date(date);
+ console.log(d);
+ return `${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}`;
+ },
+ onDateConfirm(date) {
+ this.modeInfo.rkDate = this.formatDate(date);
+ this.showDatePicker = false;
+ this.getBarInfoListModel();
+ },
+ getBarInfoListModel() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesKwcx/GetBarInfoList', {
+ deptSectionCode: that.modeInfo.deptSectionCode,
+ rkDate: that.modeInfo.rkDate,
+ zkChecked: that.zkChecked
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.barInfoList = json.data.tbBarInfoList;
+ } else {
+ that.barInfoList = [];
+ that.modeInfo.deptSectionCode = '';
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function () {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
+ getScan() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesKwcx/GetBarInfo', {
+ barcode: that.scanInfo.barcode
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ Object.assign(that.scanInfo, json.data.tbBarInfo);
+ } else {
+ that.scanInfo.barcode = '';
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function () {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
+ getKWInfo() {
+ var that = this;
+ that.show = true;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesKwcx/GetKWList', {
+ selectKW: that.selectKW
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0 && json.data.tbKWList.length > 0) {
+ that.actions = json.data.tbKWList.map(item => ({ name: item.code }));
+ } else {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function () {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
+ onSelect(item) {
+ var that = this;
+ that.show = false;
+ that.isLoading = true;
+ that.selectKW = item.name;
+ that.AxiosHttp("post", 'MesKwcx/GetKWInfo', {
+ code: item.name
+ }, false)
+ .then(function (res) {
+ var json = res;
+
+ if (json.status == 0) {
+ that.tbKWInfo = json.data.tbKWInfo;
+ } else {
+ that.tbKWInfo = [];
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function () {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
+ getItemInfoListModel() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesKwcx/GetItemInfoList', {
+ barCode: that.itemNo.barCode,
+ itemNo: that.itemNo.itemNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.tbItemInfo = json.data.tbItemInfo;
+ } else {
+ that.tbItemInfo = [];
+ that.itemNo.barCode = '';
+ that.itemNo.itemNo = '';
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function () {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$playSound('error');
+ });
+ },
+ }
+});
\ No newline at end of file
diff --git a/H5/Js/LLJ/Add.js b/H5/Js/LLJ/Add.js
index e725a23..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) {
@@ -351,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/My.js b/H5/Js/My.js
index 3e71506..d4fa6a0 100644
--- a/H5/Js/My.js
+++ b/H5/Js/My.js
@@ -44,7 +44,11 @@
img: "../Images/print.png",
path: '/H5/Config.aspx'
}
- ]
+ ],
+ actions: [],//鍒楄〃鐨勫��
+ orgName: "",//绾夸綋鍚嶇О
+ orgId: "",//绾夸綋缂栧彿
+ show: false,//鍒楄〃灞曠ず
}
},
mounted() {
@@ -71,24 +75,67 @@
// on cancel
});
},
+ //goMsg() {
+ // var that = this;
+ // window.location.href = "/H5/Message.aspx";
+ //},
goMsg() {
var that = this;
- window.location.href = "/H5/Message.aspx";
+ uni.navigateTo({
+ url: "/pages/index/test/PrintInit?type=1",
+
+ });
},
- goOrg() {
+ changeOrg() {
+ this.show = true;
var that = this;
- this.$dialog.confirm({
- title: '鍙嬫儏鎻愮ず',
- message: '纭畾鍒囨崲褰撳墠缁勭粐锛�',
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷'
- })
- .then(() => {
- window.location.href = "/UserLogin.aspx";
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Login/changeOrg', {
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.orgName,
+ orgId: item.orgId, // 鏂板
+ orgNo: item.orgNo // 鏂板
+ };
+ });
+ }
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
})
- .catch(() => {
- // on cancel
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
});
},
+
+ onSelect(action) {
+ //this.xtNum = action.lineNo; // 缁戝畾line_no鍒皒tNum瀛楁
+ //console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
+ //this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
+ //this.show = false;
+
+ Cookies.set('orgId', action.orgId);
+ Cookies.set('orgNo', action.orgNo);
+ Cookies.set('orgName', action.name);
+ this.show = false;
+ },
}
})
\ No newline at end of file
diff --git a/H5/Js/Nxhd.js b/H5/Js/Nxhd.js
new file mode 100644
index 0000000..b6bfc2a
--- /dev/null
+++ b/H5/Js/Nxhd.js
@@ -0,0 +1,160 @@
+锘縱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.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ that.$refs.ZsBar.focus();
+ that.ZsBar = "";
+ that.ZsBarInfo = [];
+ that.Traceability = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ 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("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+ that.$playSound('error');
+ return;
+ }
+ if (that.LsBar.length <= 0) {
+ that.$toast.fail("绠辩爜涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
+ 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.$playSound('success');
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.LsBar = null;
+ }
+ else {
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ that.$refs.ZsBar.focus();
+ that.ZsBar = null;
+ that.LsBar = null;
+ }
+
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ 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/Js/PurchaseReturn.js b/H5/Js/PurchaseReturn.js
index 4ceb63e..6c39c84 100644
--- a/H5/Js/PurchaseReturn.js
+++ b/H5/Js/PurchaseReturn.js
@@ -26,13 +26,21 @@
messageCenter: {},
messageId: 0,
- show: false,
-
scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
ip: "",
port: "",
oldBarInfo: [],
cfBarInfo: [],
+
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+ // 褰撳墠閫変腑琛岀殑绱㈠紩
+ currentIndex: -1,
+ // 瀛樺偍閫変腑琛屾暟鎹璞�
+ selItem: {},
+ ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
}
},
mounted() {
@@ -45,20 +53,78 @@
//that.show = false;
},
methods: {
- getItemOutNo() {
- var that = this;
+ /**
+ * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+ * @param {Object} item 褰撳墠琛屾暟鎹�
+ * @param {Number} index 褰撳墠琛岀储寮�
+ */
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,//椹煎嘲鍛藉悕娉曪紒锛侊紒
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ //鑾峰彇搴撲綅淇℃伅
+ GetBarKwByItem() {
+ //Womdaa
+ //WwGd
+ var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'MesCgthSq/GetMesCgthSq', {
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount,
+ type: 'CGCK',
+ billNo:that.scanFormData.itemOutNo
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+ getItemOutNo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesCgthSq/GetMesCgthSq', {}, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
that.itemOutNoList = json.data.tbBillList;
- that.itemOutNoStr = that.itemOutNoList.map(s => {
- return { name: s.billNo }
- });
- that.show = true;
+ if (!Array.isArray(that.itemOutNoList) || that.itemOutNoList.length === 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.show = false;
+ }
+ else {
+ that.itemOutNoStr = that.itemOutNoList.map(s => ({ name: s }));
+ that.show = true;
+ }
}
else {
that.$playSound('error');
@@ -100,38 +166,27 @@
},
onSelect(item) {
- // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
- // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
this.show = false;
-
- //let staf = this.stafList.filter(it => it.staffName === item.name);
-
this.scanFormData.itemOutNo = item.name;
-
- let itemOut = this.itemOutNoList.filter(it => it.billNo == item.name);
-
- this.invItemOutId = itemOut[0].id;
-
+ this.invItemOutId = item.name;
+ this.ItemBarKw = []; // 閫夋嫨鐢宠鍗曞彿鍚庢竻绌哄簱浣嶅垪琛�
this.getItem();
-
},
getItem() {
var that = this;
that.isLoading = true;
-
- let itemOut = this.itemOutNoList.filter(it => it.billNo == that.scanFormData.itemOutNo);
-
- //this.invItemOutId = itemOut[0].id;
-
that.AxiosHttp("post", 'MesCgthSq/GetSumItem', {
- //id: that.invItemOutId,
billNo: that.scanFormData.itemOutNo,
barcode: that.scanFormData.barcode,
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemDetail = json.data.tbBillList;
+ that.ItemDetail = {
+ items: json.data.tbBillList.items,
+ ysitems: json.data.tbBillList.ysitems,
+ allList: json.data.tbBillList.allList
+ };
that.$refs.barcode.focus();
}
else {
@@ -247,11 +302,12 @@
that.scanFormData.barcode = null;
that.$notify({ type: 'success', message: json.message });
that.$playSound('success');
-
- that.sendMessage(json.data.tbBillList);
+ that.getItem();
+ //that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
that.$refs.barcode.focus();
- that.getItem();
+
}
else {
that.$playSound('error');
diff --git a/H5/Js/Qtck.js b/H5/Js/Qtck.js
index adae1b8..efd7180 100644
--- a/H5/Js/Qtck.js
+++ b/H5/Js/Qtck.js
@@ -18,6 +18,11 @@
show: false,
actions: [],
ItemDetail: [],
+ splitNum: "",
+ zdy: "",
+ ItemTblDetail: [],
+ ItemBarKw: [],
+ currentIndex: -1,
}
},
mounted() {
@@ -28,6 +33,55 @@
};
},
methods: {
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ GetBarKwByItem() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount,
+ type: 'QTCK',
+ billNo: that.billNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
getInfo() {
this.show = true;
@@ -72,6 +126,8 @@
this.show = false;
this.billNo = item.name;
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
@@ -87,7 +143,14 @@
var json = res;
if (json.status == 0) {
that.ItemDetail = json.data.tbBillList;
+ that.zdy = json.data.tbBillList.allList[0].createNmae;
//that.ItemBlDetail = json.data.tbBillList;
+ that.$refs.barcode.focus();
+ that.barcode = "";
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
}
else {
that.$toast.fail(json.message);
@@ -140,18 +203,23 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
-
- that.itemNo = json.data.form.itemNo;
- that.num = json.data.form.num;
- that.fnm = json.data.form.fum;
- that.barcode = json.data.form.barcode;
- that.ItemBlDetail = json.data.item
- that.$notify({ type: 'success', message: json.data.message });
+ that.num = json.data.tbBillList.barcodeNum;
+ that.GetMesItemBlDetailByBillNo();
+ that.$refs.barcode.focus();
+ that.barcode = null;
that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ }
+ else if (json.status == 2) {
+ that.$refs.splitNum.focus();
+ that.splitNum = json.data.tbBillList.splitNum;
+ that.num = json.data.tbBillList.barcodeNum;
}
else {
- that.$toast.fail(json.message);
that.$playSound('error');
+ that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ that.barcode = null;
}
that.isLoading = false;
})
@@ -234,6 +302,82 @@
that.$playSound('error');
console.log(error);
});
- }
+ },
+
+ getChaiFen() {
+ //this.isPrinterPopupVisible = true; // 鏄剧ず寮圭獥
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.userInfo.loginAccount) {
+ this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+ that.$playSound('error');
+ that.isLoading = false;
+ return;
+ }
+
+ if (!that.barcode) {
+ this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
+ that.$playSound('error');
+ that.isLoading = false;
+ return;
+ }
+
+ if (!that.billNo) {
+ this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
+ that.$playSound('error');
+ that.isLoading = false;
+ return;
+ }
+ //that.ip = "";
+ //that.prot = "";
+ //that.getPrintInfo();
+
+ //if (that.ip.length <= 0 || that.prot.length <= 0) {
+ // alert(that.ip);
+ // alert(that.prot);
+ // return;
+ //}
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesItemQt/ScanCodeCF', {
+ userName: that.userInfo.loginAccount,
+ barcode: that.barcode,
+ billNo: that.billNo,
+ Num: that.splitNum,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ that.splitNum = null;
+ that.num = null;
+ that.barcode = null;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
+ that.GetMesItemBlDetailByBillNo();
+ //that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus();
+
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
+
}
})
\ No newline at end of file
diff --git a/H5/Js/Qtrk.js b/H5/Js/Qtrk.js
index 1f2a1c2..6e3cb49 100644
--- a/H5/Js/Qtrk.js
+++ b/H5/Js/Qtrk.js
@@ -18,6 +18,7 @@
show: false,
actions: [],
ItemDetail: [],
+ depotInfo:[],
}
},
mounted() {
@@ -62,11 +63,6 @@
console.log(error);
});
},
- onClick(index, title) {
- this.$toast(`${index} ${title}`);
- this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
-
- },
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
@@ -90,6 +86,9 @@
that.ItemDetail = json.data.tbBillList;
that.$refs.sectionCode.focus();
//that.sectionCode = null;
+ if (that.sectionCode) {
+ that.$refs.barcode.focus();
+ }
}
else {
that.$toast.fail(json.message);
@@ -139,6 +138,7 @@
if (json.status == 0) {
//that.$notify({ type: 'success', message: json.data.tbBillList });
//that.$playSound('success');
+ that.depotInfo = json.data;
that.$refs.barcode.focus();
}
else {
@@ -208,8 +208,8 @@
that.ItemBlDetail = json.data.items;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
that.$playSound('success');
- that.$refs.barcode.focus();
that.GetMesItemBlDetailByBillNo();
+ //that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index b12a9e1..cbafb1f 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -35,6 +35,30 @@
loginGuid: this.GetLoginInfor().loginGuid,
loginAccount: this.GetLoginInfor().loginAccount,
};
+
+ that.AxiosHttp("post", 'MesStaff/GetList', {
+ //name: that.userInfo.loginAccount,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.actions = json.data.tbBillList.map(item => {
+ return { name: item.staffName }
+ });
+
+ that.stafList = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ });
+
},
methods: {
getInfo() {
diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index 926b55b..0f63308 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -16,10 +16,20 @@
barcode: "",
ItemBlDetail:[],
modeInfo: [],
+ queryInfo: { dateTime: "", lineNo: "", lineName: "" },
active: 0,
show: false,
+ show1:false,
actions: [],
+ actions1: [],
ItemDetail: [],
+ minDate: new Date(new Date().getFullYear() - 1, 0, 1), // 杩囧幓涓�骞�
+ maxDate: new Date(new Date().getFullYear() + 1, 11, 31), // 鏈潵涓�骞�
+ showScDatePicker: false,
+ tempDate: new Date(),
+ showDatePicker: false,
+ ItemBarKw: [],
+ currentIndex: -1,
}
},
mounted() {
@@ -32,16 +42,72 @@
selectType = this.type == "bl" ? selectType = "鐢熶骇琛ユ枡" : selectType = "鐢熶骇瓒呴";
},
methods: {
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ GetBarKwByItem() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+ formatDate(date) {
+ const d = new Date(date);
+ console.log(d);
+ return `${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}`;
+ },
+ onDateConfirm(date) {
+ this.queryInfo.dateTime = this.formatDate(date);
+ this.showDatePicker = false;
+ },
getInfo() {
this.show = true;
var that = this;
that.isLoading = true;
-
-
that.AxiosHttp("post", 'MesItemBl/GetSCBLBillNo', {
type: selectType,
+ dateTime: that.queryInfo.dateTime,
+ lineNo: that.queryInfo.lineNo
}, false)
.then(function (res) {
var json = res;
@@ -75,10 +141,15 @@
//this.$toast(item.name);
},
+ onSelect1(actions1) {
+ this.queryInfo.lineNo = actions1.lineNo;
+ this.show1 = false;
+ this.queryInfo.lineName = actions1.name;
+ },
GetMesItemBlDetailByBillNo() {
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'MesItemBl/GetMesItemWWBlDetailByBillNo', {
+ that.AxiosHttp("post", 'MesItemBl/GetMesItemBlDetailByBillNo', {
billNo: that.billNo,
type: selectType
}, false)
@@ -87,7 +158,11 @@
if (json.status == 0) {
that.ItemDetail = json.data.tbBillList;
that.daa001 = json.data.tbBillList.daa001;
+ console.log(json.data.tbBillList.daa001);
+ console.log(json.data.tbBillList.items);
that.$refs.barcode.focus();
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
}
else {
that.$toast.fail(json.message);
@@ -106,6 +181,34 @@
that.billNo = "";
that.daa001 = "";
that.ItemBlDetail = [];
+ });
+ },
+ getLineInfo() {
+ var that = this;
+ that.show1 = true;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesItemBl/GetLineInfo', {
+ selectLine: that.selectLine
+ }, false)
+ .then(function (res) {
+ var json = res;
+ console.log(json);
+ if (json.status == 0 && json.data.tbLineInfo.length > 0) {
+ that.actions1 = json.data.tbLineInfo.map(item => ({
+ name: item.lineName,
+ lineNo: item.lineNo
+ }));
+ } else {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function () {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
});
},
getBarcode() {
@@ -239,12 +342,16 @@
var json = res;
if (json.status == 0) {
that.ItemBlDetail = json.data.pendingList;
- that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
- that.$refs.barcode.focus();
that.barcode = "";
that.num = "";
that.splitNum = "";
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
that.GetMesItemBlDetailByBillNo();
+ //that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
diff --git a/H5/Js/Scll.js b/H5/Js/Scll.js
index 94a8b49..381055d 100644
--- a/H5/Js/Scll.js
+++ b/H5/Js/Scll.js
@@ -24,6 +24,12 @@
// { printerId: 'Printer2', ipAddress: '192.168.1.2' },
// { printerId: 'Printer3', ipAddress: '192.168.1.3' }
//], // 鎵撳嵃鏈哄垪琛�
+ // 褰撳墠閫変腑琛岀殑绱㈠紩
+ currentIndex: -1,
+ // 瀛樺偍閫変腑琛屾暟鎹璞�
+ selItem: {} ,
+ ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
}
},
mounted() {
@@ -34,6 +40,62 @@
};
},
methods: {
+
+
+ /**
+ * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+ * @param {Object} item 褰撳墠琛屾暟鎹�
+ * @param {Number} index 褰撳墠琛岀储寮�
+ */
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.fMaterialId,
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ GetBarKwByItem() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+
+
getModel() {
var that = this;
that.isLoading = true;
@@ -45,14 +107,21 @@
var json = res;
if (json.status == 0) {
that.ItemDetail = json.data.tbBillList;
+ that.DaaInfo = json.data.tbBillList.daaInfo;
that.modeInfo.planNo = json.data.tbBillList.planNo;
+ that.modeInfo.startTime = json.data.tbBillList.startTime;
that.$refs.barcode.focus();
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.daa001.focus();
that.modeInfo.daa001 = "";
that.modeInfo.planNo = "";
+ that.modeInfo.startTime = "";
that.ItemDetail = [];
}
that.isLoading = false;
@@ -60,6 +129,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
that.$refs.daa001.focus();
that.modeInfo.daa001 = "";
@@ -164,7 +234,7 @@
that.$notify({ type: 'success', message: json.message });
that.$playSound('success');
- that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
that.$refs.barcode.focus();
that.getModel();
@@ -183,43 +253,43 @@
},
- sendMessage(tbBillList) {
- const cfDetails = tbBillList.cfBarInfo.map(item => {
- return "! 0 200 200 210 1\r\n" +
- "PAGE - WIDTH 700 \r\n" +
- "BOX 0 0 700 180 0 \r\n" +
- `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
- `T 55 3 120 10 ${item.iteM_NO}\r\n` +
- `T 16 0 310 10 ${item.item_name}\r\n` +
- "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
- `T 55 2 110 42 ${item.item_model}\r\n` +
- "T 16 0 10 78 鏁伴噺锛歕r\n" +
- `T 0 5 90 78 ${item.quantity}\r\n` +
- `T 16 5 180 78 ${item.barType}\r\n` +
- `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
- `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +
- "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
- `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
- "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
- `T 55 0 120 150 ${item.print_date}\r\n` +
- "B QR 580 12 M 2 U 4\r\n" +
- `MA,${item.iteM_BARCODE}\r\n` +
- "ENDQR\r\nFORM\r\nPRINT\r\n";
- });
- //alert(cfDetails);
- let sendData = {
- Type: 'Bar',
- Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,
- Detail: cfDetails,
- Ip: tbBillList.printInfo[0].ip,
- Port: tbBillList.printInfo[0].port,
- }
- console.log('sendMessage 寮�濮�1:')
- console.log('sendMessage 寮�濮�2:' + JSON.stringify(sendData))
- uni.webView.postMessage({
- data: JSON.stringify(sendData)
- })
- },
+ //sendMessage(tbBillList) {
+ // const cfDetails = tbBillList.cfBarInfo.map(item => {
+ // return "! 0 200 200 210 1\r\n" +
+ // "PAGE - WIDTH 700 \r\n" +
+ // "BOX 0 0 700 180 0 \r\n" +
+ // `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
+ // `T 55 3 120 10 ${item.iteM_NO}\r\n` +
+ // `T 16 0 310 10 ${item.item_name}\r\n` +
+ // "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
+ // `T 55 2 110 42 ${item.item_model}\r\n` +
+ // "T 16 0 10 78 鏁伴噺锛歕r\n" +
+ // `T 0 5 90 78 ${item.quantity}\r\n` +
+ // `T 16 5 180 78 ${item.barType}\r\n` +
+ // `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
+ // `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +
+ // "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
+ // `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
+ // "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
+ // `T 55 0 120 150 ${item.print_date}\r\n` +
+ // "B QR 580 12 M 2 U 4\r\n" +
+ // `MA,${item.iteM_BARCODE}\r\n` +
+ // "ENDQR\r\nFORM\r\nPRINT\r\n";
+ // });
+ // //alert(cfDetails);
+ // let sendData = {
+ // Type: 'Bar',
+ // Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,
+ // Detail: cfDetails,
+ // Ip: tbBillList.printInfo[0].ip,
+ // Port: tbBillList.printInfo[0].port,
+ // }
+ // console.log('sendMessage 寮�濮�1:')
+ // console.log('sendMessage 寮�濮�2:' + JSON.stringify(sendData))
+ // uni.webView.postMessage({
+ // data: JSON.stringify(sendData)
+ // })
+ //},
//getPrintInfo() {
// var that = this;
@@ -312,8 +382,8 @@
that.itemInfo = json.data.tbBillList;
that.actions = json.data.tbBillList.map(item => {
return {
- name: item.daaInfo // 鎷兼帴瀛楁
-
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname: item.startTime
};
});
}
diff --git a/H5/Js/Sctl.js b/H5/Js/Sctl.js
index b757f6a..002a44f 100644
--- a/H5/Js/Sctl.js
+++ b/H5/Js/Sctl.js
@@ -82,12 +82,12 @@
var json = res;
if (json.status == 0) {
that.ItemDetail = json.data.tbBillList;
- that.$refs.sectionCode.focus();
+ //that.$refs.sectionCode.focus();
}
else {
that.$toast.fail(json.message);
that.$refs.billNo.focus();
- that.ItemDetail = null;
+ that.ItemDetail = [];
that.billNo = null;
}
that.isLoading = false;
@@ -96,7 +96,7 @@
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
that.$refs.billNo.focus();
- that.ItemDetail = null;
+ that.ItemDetail = [];
that.billNo = null;
console.log(error);
});
@@ -180,15 +180,22 @@
that.itemNo = json.data.tbBillList.itemNo;
that.sms = json.data.tbBillList.num;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.getMesItemTblDetailByBillNo();
+ that.$refs.barcode.focus();
+ that.barcode = null;
}
else {
that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ that.barcode = null;
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.barcode.focus();
+ that.barcode = null;
console.log(error);
});
},
diff --git a/H5/Js/Strk.js b/H5/Js/Strk.js
index bc01d1b..05fa2c4 100644
--- a/H5/Js/Strk.js
+++ b/H5/Js/Strk.js
@@ -17,7 +17,12 @@
depot: {},
show: false,
actions: [],
- ItemTblDetail:[]
+ ItemBlDetail: [], // 寰呮壂
+ ItemYsDetail: [], // 宸叉壂
+ ItemTblDetail: [],
+ ItemDetail: [],
+ ItemBarKw: [],
+ currentIndex: -1,
}
},
mounted() {
@@ -43,6 +48,7 @@
if (json.status == 0) {
if (json.data.tbBillList.length <= 0) {
that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.show = false;
} else {
that.actions = json.data.tbBillList.map(item => {
return { name: item }
@@ -58,6 +64,7 @@
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
+ that.show = false;
});
},
//onClick(index, title) {
@@ -70,6 +77,8 @@
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
this.show = false;
this.billNo = item.name;
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.getMesItemDetailByBillNo();
//this.$toast(item.name);
},
@@ -82,7 +91,9 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemTblDetail = json.data.tbBillList;
+ var tbBillList = json.data.tbBillList || {};
+ that.ItemBlDetail = tbBillList.blDetails || []; // 寰呮壂
+ that.ItemYsDetail = tbBillList.ysDetails || []; // 宸叉壂
that.$refs.sectionCode.focus();
}
else {
@@ -165,6 +176,7 @@
that.itemNo = json.data.tbBillList.itemNo;
that.sms = json.data.tbBillList.num;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$toast.success("鎵弿鎴愬姛");
that.$refs.barcode.focus();
that.barcode = null;
that.getMesItemDetailByBillNo();
diff --git a/H5/Js/Sttl.js b/H5/Js/Sttl.js
index c8117c2..f2e0332 100644
--- a/H5/Js/Sttl.js
+++ b/H5/Js/Sttl.js
@@ -14,11 +14,16 @@
selectType: "",
daa001: "",
barcode: "",
- ItemBlDetail:[],
modeInfo: [],
active: 0,
show: false,
actions: [],
+ ItemBlDetail: [], // 寰呮壂
+ ItemYsDetail: [], // 宸叉壂
+ ItemTblDetail: [],
+ ItemDetail: [],
+ ItemBarKw: [],
+ currentIndex: -1,
}
},
mounted() {
@@ -29,6 +34,56 @@
};
},
methods: {
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ //this.active = 1; //鑷姩鍒囨崲鍒板簱浣嶅垪琛╰ab
+ },
+ GetBarKwByItem() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount,
+ type: 'STCK',//鍙楁墭閫�鏂�/鍙楁墭鍑哄簱
+ billNo: that.billNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
getInfo() {
this.show = true;
@@ -65,7 +120,7 @@
//onClick(index, title) {
// this.$toast(`${index} ${title}`);
// this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
-
+ //that.$playSound('success');
//},
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
@@ -73,6 +128,8 @@
this.show = false;
this.billNo = item.name;
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.GetMesItemDetailByBillNo();
//this.$toast(item.name);
@@ -87,9 +144,14 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList;
- //that.daa001 = json.data.tbBillList.item1;
+ //that.ItemBlDetail = json.data.tbBillList;
+ var tbBillList = json.data.tbBillList || {};
+ that.ItemBlDetail = tbBillList.blDetails || []; // 寰呮壂
+ that.ItemYsDetail = tbBillList.ysDetails || []; // 宸叉壂
that.$refs.barcode.focus();
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
}
else {
that.$toast.fail(json.message);
@@ -146,6 +208,7 @@
userName: that.userInfo.loginAccount,
barcode: that.barcode,
daa001: that.billNo,
+ billNo: that.billNo,
//type: selectType
}, false)
.then(function (res) {
@@ -157,17 +220,27 @@
that.num = null;
//that.ItemBlDetail = json.data.tbBillList.item2
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
that.GetMesItemDetailByBillNo();
that.$refs.barcode.focus();
that.barcode = "";
that.num = "";
that.splitNum = "";
+ that.GetBarKwByItem(); // 閫�鏂欏悗鍒锋柊搴撲綅
} else if (json.status == 2) {
+ //浣跨敤tbBillList
+ //that.$refs.splitNum.focus();
+ //that.splitNum = json.data.cfNum;
+ //that.num = json.data.num;
that.$refs.splitNum.focus();
- that.splitNum = json.data.cfNum;
- that.num = json.data.num;
+ that.splitNum = json.data.tbBillList.splitNum; // 鎷嗗垎鏁伴噺
+ that.num = json.data.tbBillList.barcodeNum; // 鏉＄爜鏁伴噺
+ that.daa001 = json.data.tbBillList.daa001; // 宸ュ崟鍙�
+ if (json.data.tbBillList.billNo) {
+ that.billNo = json.data.tbBillList.billNo;
+ } // 鍙戣揣閫氱煡鍗曞彿锛屽彧鍦ㄦ湁鍊兼椂璧嬪��
}
else {
that.$toast.fail(json.message);
@@ -212,11 +285,11 @@
return;
}
- if (!that.daa001) {
- this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
- that.isLoading = false;
- return;
- }
+ //if (!that.daa001) {
+ // this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+ // that.isLoading = false;
+ // return;
+ //}
if (!that.splitNum) {
this.$toast.fail("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
@@ -227,7 +300,8 @@
that.AxiosHttp("post", 'MesSttl/SplitBarcode', {
userName: that.userInfo.loginAccount,
barcode: that.barcode,
- daa001: that.billNo,
+ daa001: that.daa001,
+ billNo: that.billNo,
num: that.splitNum,
//type: selectType
}, false)
@@ -236,11 +310,14 @@
if (json.status == 0) {
that.ItemBlDetail = json.data.pendingList;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
+ that.sendPrintMessage(json.data.tbBillList);//鎵撳嵃
that.$refs.barcode.focus();
that.barcode = "";
that.num = "";
that.splitNum = "";
that.GetMesItemDetailByBillNo();
+ that.GetBarKwByItem();// 閫�鏂欏悗鍒锋柊搴撲綅
}
else {
that.$toast.fail(json.message);
diff --git a/H5/Js/UserLogin.js b/H5/Js/UserLogin.js
index 7ab253d..1eb6aaf 100644
--- a/H5/Js/UserLogin.js
+++ b/H5/Js/UserLogin.js
@@ -11,13 +11,14 @@
},
mounted() {
var that = this;
- if (typeof (Cookies.get('phone')) == "undefined") { }
- else {
- that.phone = Cookies.get('phone');
- that.passwd = Cookies.get('passwd');
+ if (typeof (Cookies.get('loginAccount')) == "undefined") {
}
- that.phone = "admin";
- that.passwd = "123456";
+ else {
+ that.phone = Cookies.get('loginAccount');
+ //that.passwd = Cookies.get('passwd');
+ }
+ //that.phone = "admin";
+ //that.passwd = "123456";
},
methods: {
onSubmit(name) {
@@ -37,9 +38,17 @@
var _userGuid = json.data.tbBillList.guid;
var _userAccount = json.data.tbBillList.account;
var _userName = json.data.tbBillList.userName;
+ var _orgId = json.data.tbBillList.orgId;
+ var _orgNo = json.data.tbBillList.orgNo;
+ var _orgName = json.data.tbBillList.orgName;
Cookies.set('loginGuid', _userGuid);
Cookies.set('loginAccount', _userAccount);
Cookies.set('loginName', _userName);
+ Cookies.set('orgId', _orgId);
+ Cookies.set('orgNo', _orgNo);
+ Cookies.set('orgName', _orgName);
+ console.log(json.data.tbBillList);
+ console.log(Cookies);
window.location.href = ("/H5/Default.aspx?userGuid=" + _userGuid + "&userAccount=" + _userAccount);
}
else {
diff --git a/H5/Js/Wwck.js b/H5/Js/Wwck.js
new file mode 100644
index 0000000..6dc51ef
--- /dev/null
+++ b/H5/Js/Wwck.js
@@ -0,0 +1,281 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ modeInfo: { daa001: "", planNo: "" },
+ scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
+ ItemDetail: [],
+ ip: "",
+ port: "",
+ oldBarInfo: [],
+ cfBarInfo: [],
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+ // 褰撳墠閫変腑琛岀殑绱㈠紩
+ currentIndex: -1,
+ // 瀛樺偍閫変腑琛屾暟鎹璞�
+ selItem: {},
+ ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
+ billno:"",
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ /**
+ * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+ * @param {Object} item 褰撳墠琛屾暟鎹�
+ * @param {Number} index 褰撳墠琛岀储寮�
+ */
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,//椹煎嘲鍛藉悕娉�
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ //鑾峰彇搴撲綅淇℃伅
+ GetBarKwByItem() {
+ //Womdaa
+ //WwGd
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+
+ getModel() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/GetItemsByWwckNo', {
+ daa001: that.billno,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemDetail = json.data.tbBillList;
+ that.DaaInfo = json.data.tbBillList.daaInfo;
+ that.modeInfo.planNo = json.data.tbBillList.planNo;
+ that.modeInfo.startTime = json.data.tbBillList.startTime;
+ that.modeInfo.daa001 = json.data.tbBillList.allList[0].daA001;
+ that.$refs.barcode.focus();
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.$refs.daa001.focus();
+ that.modeInfo.daa001 = "";
+ that.modeInfo.planNo = "";
+ that.modeInfo.startTime = "";
+ that.ItemDetail = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.daa001.focus();
+ that.modeInfo.daa001 = "";
+ });
+ },
+ //鎵爜
+ getScan() {
+ var that = this;
+ if (this.isLoading) {
+ return;
+ }
+ if (that.modeInfo.daa001.length <= 0) {
+ that.$toast.fail("濮斿宸ュ崟涓嶈兘涓虹┖锛�");
+ return;
+ }
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/WwckScanCode', {
+ daa001: that.modeInfo.daa001,
+ userName: that.userInfo.loginAccount,
+ barcode: that.scanInfo.barcode,
+ blNo: that.billno,
+ type: '濮斿棰嗘枡',
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.scanInfo = json.data.tbBillList;
+ that.$notify({ type: 'success', message: json.message });
+ that.getModel();
+ that.$refs.barcode.focus();
+ that.scanInfo.barcode = null;
+ }
+ else if (json.status == 2) {
+ that.$refs.splitNum.focus();
+ that.scanInfo.splitNum = json.data.tbBillList.splitNum;
+ that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ }
+ //that.$notify({ type: 'success', message: json.message });
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.barcode.focus();
+ });
+ },
+ //鎷嗗垎
+ getChaiFen() {
+ if (this.isLoading) {
+ return;
+ }
+ var that = this;
+ if (that.modeInfo.daa001.length <= 0) {
+ that.$toast.fail("濮斿宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ return;
+ }
+ if (that.scanInfo.splitNum * 1 <= 0) {
+ that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (that.scanInfo.barcode.length * 1 <= 0) {
+ that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/WwckScanCodeCF', {
+ daa001: that.modeInfo.daa001,
+ userName: that.userInfo.loginAccount,
+ barcode: that.scanInfo.barcode,
+ Num: that.scanInfo.splitNum,
+ blNo: that.billno,
+ type: '濮斿棰嗘枡',
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
+ that.sendPrintMessage(json.data.tbBillList);
+ that.getModel();
+ that.$refs.barcode.focus();
+ that.scanInfo.barcode = null;
+ that.scanInfo.barcodeNum = "";
+ that.scanInfo.splitNum = "";
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.splitNum.focus();
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.splitNum.focus();
+ });
+ },
+ //鑾峰彇宸ュ崟淇℃伅
+ getInfo() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/GetWWCKsq', {//WwGd/GetXcslDaa
+ type: '濮斿棰嗘枡',
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname: item.startTime
+ };
+ });
+ }
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+ console.log(item);
+
+ this.billno = item.name;
+ this.getModel();
+ //this.$toast(item.name);
+ },
+ }
+})
\ No newline at end of file
diff --git a/H5/Js/Wwll.js b/H5/Js/Wwll.js
index e359115..0e89c82 100644
--- a/H5/Js/Wwll.js
+++ b/H5/Js/Wwll.js
@@ -9,6 +9,20 @@
},
modeInfo: { daa001: "", planNo: "" },
scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
+ ItemDetail: [],
+ ip: "",
+ port: "",
+ oldBarInfo: [],
+ cfBarInfo: [],
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+ // 褰撳墠閫変腑琛岀殑绱㈠紩
+ currentIndex: -1,
+ // 瀛樺偍閫変腑琛屾暟鎹璞�
+ selItem: {},
+ ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
}
},
mounted() {
@@ -19,6 +33,61 @@
};
},
methods: {
+ /**
+ * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+ * @param {Object} item 褰撳墠琛屾暟鎹�
+ * @param {Number} index 褰撳墠琛岀储寮�
+ */
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,//椹煎嘲鍛藉悕娉�
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ //鑾峰彇搴撲綅淇℃伅
+ GetBarKwByItem() {
+ //Womdaa
+ //WwGd
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+
getModel() {
var that = this;
that.isLoading = true;
@@ -29,13 +98,20 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.modeInfo = json.data.tbBillList;
+ that.ItemDetail = json.data.tbBillList;
+ that.DaaInfo = json.data.tbBillList.daaInfo;
+ that.modeInfo.planNo = json.data.tbBillList.planNo;
+ that.modeInfo.startTime = json.data.tbBillList.startTime;
that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.daa001.focus();
that.modeInfo.daa001 = "";
+ that.modeInfo.planNo = "";
+ that.modeInfo.startTime = "";
+ that.ItemDetail = [];
}
that.isLoading = false;
})
@@ -47,6 +123,7 @@
that.modeInfo.daa001 = "";
});
},
+ //鎵爜
getScan() {
var that = this;
if (that.modeInfo.daa001.length <= 0) {
@@ -87,6 +164,7 @@
that.$refs.barcode.focus();
});
},
+ //鎷嗗垎
getChaiFen() {
var that = this;
if (that.modeInfo.daa001.length <= 0) {
@@ -132,5 +210,63 @@
that.$refs.splitNum.focus();
});
},
+ //鑾峰彇宸ュ崟淇℃伅
+ getInfo() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/GetXcslDaa', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname: item.startTime
+ };
+ });
+ }
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+ console.log(item);
+ // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
+ const regex = /\[([^\]]+)\]/;
+ const matchResult = item.name.match(regex);
+
+ if (matchResult && matchResult[1]) {
+ this.modeInfo.daa001 = matchResult[1]; // PPBOM00000088-1
+ console.log('鎻愬彇鐨凞AA001:', this.modeInfo.daa001);
+ } else {
+ this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+ this.modeInfo.daa001 = '';
+ }
+ this.getModel();
+ //this.$toast(item.name);
+ },
}
})
\ No newline at end of file
diff --git a/H5/Js/Xcsl.js b/H5/Js/Xcsl.js
index 0e183cf..55f5e50 100644
--- a/H5/Js/Xcsl.js
+++ b/H5/Js/Xcsl.js
@@ -23,6 +23,7 @@
selectKey: "",//鏌ヨ鍏抽敭瀛�
actions: [],//鍒楄〃鐨勫��
show: false,//鍒楄〃灞曠ず
+ DaaInfo: { },
}
},
@@ -34,11 +35,50 @@
};
},
methods: {
+ // 鏍规嵁鍥剧墖涓殑閫昏緫鍒ゆ柇琛岃儗鏅鑹�
+ getRowColorClass(itm) {
+ const xls = parseFloat(itm.DAB006) || 0; // 闇�棰嗘暟锛堟敮鎸佸皬鏁帮級
+ const bl = parseFloat(itm.BL_Num) || 0; // 澶囨枡鏁帮紙鏀寔灏忔暟锛�
+ const js = parseFloat(itm.JS_Num) || 0; // 鎺ユ敹鏁帮紙鏀寔灏忔暟锛�
+
+ // 1. 鏈鏂欐樉绀虹孩鑹�
+ if (bl === 0) {
+ return 'row-red';
+ }
+ // 2. 宸插叏閮ㄥ鏂欏凡鍏ㄩ儴鎺ユ敹鏄剧ず缁胯壊
+ if (xls === bl && bl === js && bl !== 0) {
+ return 'row-green';
+ }
+ // 3. 宸插叏閮ㄥ鏂欐帴鏀堕儴鍒嗘樉绀洪粍鑹�
+ // 4. 宸插叏閮ㄥ鏂欐湭鎺ユ敹鏄剧ず榛勮壊
+ if (xls === bl && bl > js && bl !== 0) {
+ return 'row-yellow';
+ }
+ // 5. 閮ㄥ垎澶囨枡鏈帴鏀舵樉绀鸿摑鑹�
+ if (xls > bl && bl > js && js === 0) {
+ return 'row-blue';
+ }
+ // 6. 閮ㄥ垎澶囨枡鎺ユ敹閮ㄥ垎鏄剧ず榛勮壊
+ if (xls > bl && bl > js && bl !== 0) {
+ return 'row-yellow';
+ }
+ // 7. 閮ㄥ垎澶囨枡宸插叏閮ㄦ帴鏀舵樉绀虹豢鑹�
+ if (bl === js && bl !== 0) {
+ return 'row-green';
+ }
+
+ //if (xls === js && bl !== 0) {
+ // return 'row-green';
+ //}
+
+ return '';
+ },
GetItemsXcsl() {
var that = this;
if (!that.DAA001 || that.DAA001.length <= 0) {
that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
that.$refs.DAA001.focus();
return;
}
@@ -50,8 +90,9 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.DAANum = json.data.tbBillList.gD_Num;
- that.DAA021 = json.data.tbBillList.workNo;
+ //that.DAANum = json.data.tbBillList.gD_Num;
+ //that.DAA021 = json.data.tbBillList.workNo;
+ that.DaaInfo = json.data.tbBillList.daaInfoList[0];
that.xcslItemList = json.data.tbBillList.xcslItemList;
that.xcslWjsBarList = json.data.tbBillList.xcslWjsBarList;
that.xcslYjsBarList = json.data.tbBillList.xcslYjsBarList;
@@ -59,6 +100,7 @@
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.DAA001.focus();
that.DAA001 = "";
}
@@ -67,6 +109,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
});
},
ScanXcsl() {
@@ -78,6 +121,7 @@
var that = this;
if (!that.Bar ||that.Bar.length <= 0) {
that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
that.$refs.Bar.focus();
return;
}
@@ -85,6 +129,7 @@
if (!that.DAA001 ||that.DAA001.length <= 0) {
that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
that.$refs.DAA001.focus();
return;
}
@@ -100,10 +145,12 @@
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
that.GetItemsXcsl();
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
that.$refs.Bar.focus();
@@ -112,6 +159,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
});
},
//鑾峰彇宸ュ崟淇℃伅
@@ -122,6 +170,7 @@
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/GetXcslDaa', {
selectKey: that.selectKey,
+ selDaaType: "1",
}, false)
.then(function (res) {
var json = res;
@@ -134,7 +183,8 @@
that.itemInfo = json.data.tbBillList;
that.actions = json.data.tbBillList.map(item => {
return {
- name: item.daaInfo // 鎷兼帴瀛楁
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname: item.startTime
};
});
@@ -167,6 +217,7 @@
console.log('鎻愬彇鐨凞AA001:', this.DAA001);
} else {
this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+ that.$playSound('error');
this.DAA001 = '';
}
this.GetItemsXcsl();
diff --git a/H5/Js/Xsck.js b/H5/Js/Xsck.js
index 9e004a6..746bf53 100644
--- a/H5/Js/Xsck.js
+++ b/H5/Js/Xsck.js
@@ -19,6 +19,11 @@
active: 0,
show: false,
actions: [],
+ ItemTblDetail: [],
+ ItemDetail: [],
+ ItemBarKw: [],
+ currentIndex: -1,
+ zdy: "",
}
},
mounted() {
@@ -29,8 +34,57 @@
};
},
methods: {
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ GetBarKwByItem() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount,
+ //type: 'XSCK',
+ //billNo: that.billNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+ //鑾峰彇鍙戣揣閫氱煡鍗曞彿
getInfo() {
-
this.show = true;
var that = this;
that.isLoading = true
@@ -47,11 +101,11 @@
that.actions = json.data.tbBillList.map(item => {
return { name: item }
});
-
}
}
else {
that.$toast.fail(json.message);
+ that.show = false;
}
that.isLoading = false;
})
@@ -67,16 +121,21 @@
// this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
//},
+ //鐐瑰嚮浜嬩欢
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
this.show = false;
this.billNo = item.name;
+
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.GetMesItemDetailByBillNo();
//this.$toast(item.name);
},
+ //鏍规嵁鍙戣揣閫氱煡鍗曞彿鑾峰彇鏄庣粏
GetMesItemDetailByBillNo() {
var that = this;
that.isLoading = true;
@@ -88,8 +147,12 @@
var json = res;
if (json.status == 0) {
that.ItemBlDetail = json.data.tbBillList;
+ that.zdy = json.data.tbBillList.allList[0].createNmae;
//that.daa001 = json.data.tbBillList.item1;
that.$refs.barcode.focus();
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
}
else {
that.$toast.fail(json.message);
@@ -104,12 +167,13 @@
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
//console.log(error);
- tthat.$refs.billNo.focus();
+ that.$refs.billNo.focus();
that.billNo = "";
that.daa001 = "";
that.ItemBlDetail = [];
});
},
+ //鎵爜
getBarcode() {
//this.barcode = value;
@@ -130,7 +194,7 @@
}
if (!that.billNo) {
- this.$toast.fail("鍙戣揣閫氱煡鍗曞彿涓嶈兘涓虹┖");
+ this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
that.isLoading = false;
return;
}
@@ -145,7 +209,8 @@
that.AxiosHttp("post", 'MesXsck/XSCKScanBarcode', {
userName: that.userInfo.loginAccount,
barcode: that.barcode,
- daa001: that.billNo,
+ daa001: that.daa001,
+ billNo: that.billNo,
//type: selectType
}, false)
.then(function (res) {
@@ -155,7 +220,6 @@
that.barcode = null;
that.sms = null;
that.num = null;
- //that.ItemBlDetail = json.data.tbBillList.item2
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
that.GetMesItemDetailByBillNo();
that.$refs.barcode.focus();
@@ -166,8 +230,12 @@
} else if (json.status == 2) {
that.$refs.splitNum.focus();
- that.splitNum = json.data.cfNum;
- that.num = json.data.num;
+ that.splitNum = json.data.tbBillList.splitNum; // 鎷嗗垎鏁伴噺
+ that.num = json.data.tbBillList.barcodeNum; // 鏉＄爜鏁伴噺
+ that.daa001 = json.data.tbBillList.daa001; // 宸ュ崟鍙�
+ if (json.data.tbBillList.billNo) {
+ that.billNo = json.data.tbBillList.billNo;
+ } // 鍙戣揣閫氱煡鍗曞彿锛屽彧鍦ㄦ湁鍊兼椂璧嬪��
}
else {
that.$toast.fail(json.message);
@@ -188,6 +256,7 @@
that.splitNum = "";
});
},
+ //鏉＄爜鎷嗗垎
tmcf() {
//this.show = true;
@@ -207,16 +276,16 @@
}
if (!that.billNo) {
- this.$toast.fail("琛ユ枡鍗曞彿涓嶈兘涓虹┖");
+ this.$toast.fail("鍙戣揣鍗曞彿涓嶈兘涓虹┖");
that.isLoading = false;
return;
}
- if (!that.daa001) {
- this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
- that.isLoading = false;
- return;
- }
+ //if (!that.daa001) {
+ // this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+ // that.isLoading = false;
+ // return;
+ //}
if (!that.splitNum) {
this.$toast.fail("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
@@ -227,7 +296,8 @@
that.AxiosHttp("post", 'MesXsck/SplitBarcode', {
userName: that.userInfo.loginAccount,
barcode: that.barcode,
- daa001: that.billNo,
+ daa001: that.daa001,
+ billNo: that.billNo,
num: that.splitNum,
//type: selectType
}, false)
@@ -236,6 +306,8 @@
if (json.status == 0) {
that.ItemBlDetail = json.data.pendingList;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
+ that.sendPrintMessage(json.data.tbBillList);
that.$refs.barcode.focus();
that.barcode = "";
that.num = "";
diff --git a/H5/Kwbg.aspx b/H5/Kwbg.aspx
new file mode 100644
index 0000000..9ea278e
--- /dev/null
+++ b/H5/Kwbg.aspx
@@ -0,0 +1,145 @@
+锘�<%@ Page Title="搴撲綅鍙樻洿" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Kwbg.aspx.cs" Inherits="H5_Scll" %>
+<%--
+ 椤甸潰鎸囦护锛�
+ - Title: 椤甸潰鏍囬涓�"搴撲綅鍙樻洿"
+ - Language: 浣跨敤C#浣滀负鏈嶅姟鍣ㄧ璇█
+ - MasterPageFile: 浣跨敤Mst.master浣滀负姣嶇増椤�
+ - AutoEventWireup: 璁剧疆涓簍rue锛屽厑璁歌嚜鍔ㄨ繛鎺ラ〉闈簨浠�
+ - CodeFile: 鍚庡彴浠ｇ爜鏂囦欢涓篕wbg.aspx.cs
+ - Inherits: 缁ф壙鑷狧5_Scll绫�
+--%>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <%-- 澶撮儴鍐呭鍖哄煙 --%>
+ <style>
+ .bg-info {
+ background-color:#fff; /* 璁剧疆鑳屾櫙棰滆壊涓虹櫧鑹� */
+ }
+</style>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <%-- 涓讳綋鍐呭鍖哄煙 --%>
+
+ <%-- Vant UI瀵艰埅鏍忕粍浠� --%>
+ <van-nav-bar
+ title="搴撲綅鍙樻洿" <%-- 瀵艰埅鏍忔爣棰� --%>
+ left-text="杩斿洖" <%-- 宸︿晶杩斿洖鎸夐挳鏂囨湰 --%>
+ left-arrow <%-- 鏄剧ず宸︿晶绠ご鍥炬爣 --%>
+ @click-left="GoBack()" <%-- 鐐瑰嚮宸︿晶鎸夐挳鏃惰皟鐢℅oBack鏂规硶 --%>
+></van-nav-bar>
+
+ <%-- 琛ㄥ崟鍖哄煙 --%>
+ <div class="mySolid">
+ <van-cell-group> <%-- Vant UI鍗曞厓鏍肩粍缁勪欢 --%>
+ <%-- 鐗╂枡鏉＄爜杈撳叆妗� --%>
+ <van-field
+ ref="barcode" <%-- Vue寮曠敤鏍囪瘑 --%>
+ v-model="formData.barcode" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.barcode --%>
+ label="鐗╂枡鏉＄爜" <%-- 瀛楁鏍囩 --%>
+ clearable <%-- 鍙竻绌哄唴瀹� --%>
+ placeholder="璇锋壂鐮�" <%-- 鍗犱綅绗︽枃鏈� --%>
+ :right-icon-size="19" <%-- 鍙充晶鍥炬爣澶у皬 --%>
+ v-focus.noKeyboard <%-- 鑷畾涔夋寚浠わ紝鑷姩鑱氱劍涓斾笉鏄剧ず閿洏 --%>
+ @keyup.enter.native="getScan" <%-- 鐩戝惉鍥炶溅閿簨浠讹紝瑙﹀彂getScan鏂规硶 --%>
+ <%-- @change="getScan" 宸叉敞閲婄殑鍙樻洿浜嬩欢 --%>
+ ></van-field>
+
+ <%-- 鐗╂枡缂栫爜鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.iteM_NO" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.itemNo --%>
+ label="鐗╂枡缂栫爜" <%-- 瀛楁鏍囩 --%>
+ placeholder="" <%-- 绌哄崰浣嶇 --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+ <%-- 鐗╂枡鍚嶇О鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.item_name" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.itemName --%>
+ label="鐗╂枡鍚嶇О" <%-- 瀛楁鏍囩 --%>
+ placeholder="" <%-- 绌哄崰浣嶇 --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+ <%-- 鐗╂枡瑙勬牸鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.item_model" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.itemModel --%>
+ label="鐗╂枡瑙勬牸" <%-- 瀛楁鏍囩 --%>
+ placeholder="" <%-- 绌哄崰浣嶇 --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+ <%-- 鏉＄爜鏁伴噺鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.quantity" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.sumQuantity --%>
+ label="鏉＄爜鏁伴噺" <%-- 瀛楁鏍囩 --%>
+ placeholder="鏉＄爜鏁伴噺" <%-- 鍗犱綅绗︽枃鏈� --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+
+ <%-- 浠撳簱ID鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.depot_id" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.DepotId --%>
+ label="浠撳簱ID" <%-- 瀛楁鏍囩 --%>
+ placeholder="" <%-- 绌哄崰浣嶇 --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+ <%-- 浠撳簱缂栫爜鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.depot_code" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.DepotCode --%>
+ label="浠撳簱缂栫爜" <%-- 瀛楁鏍囩 --%>
+ placeholder="" <%-- 绌哄崰浣嶇 --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+ <%-- 浠撳簱鍚嶇О鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.depot_name" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.depotName --%>
+ label="浠撳簱鍚嶇О" <%-- 瀛楁鏍囩 --%>
+ placeholder="" <%-- 绌哄崰浣嶇 --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+ <%-- 浠撳簱搴撲綅鏄剧ず瀛楁锛堝彧璇伙級 --%>
+ <van-field
+ v-model="kwInfo.depoT_SECTIONS_CODE" <%-- 鍙屽悜鏁版嵁缁戝畾鍒癴ormData.depotSectionsCode --%>
+ label="浠撳簱搴撲綅" <%-- 瀛楁鏍囩 --%>
+ placeholder="" <%-- 绌哄崰浣嶇 --%>
+ disabled <%-- 绂佺敤杈撳叆 --%>
+ ></van-field>
+
+ <van-field
+ ref="kwbg"
+ v-model="formData.kwbg"
+ label="搴撲綅鍙樻洿"
+ clearable
+ placeholder="璇疯緭鍏ュ彉鏇村簱浣�"
+<%-- @input="handleNumberInput3"--%>
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ ></van-field>
+
+ </van-cell-group>
+ </div>
+
+ <%-- 纭鍙樻洿鎸夐挳 --%>
+ <van-button type="primary" @click="getBianGeng">纭鍙樻洿</van-button>
+ <%-- 宸叉敞閲婄殑瀹℃牳鎸夐挳 --%>
+ <%--<van-button type="primary" @click="ToErp" >瀹℃牳</van-button>--%>
+ <%-- 宸叉敞閲婄殑娓呴櫎搴撲綅缂栫爜鎸夐挳 --%>
+ <%--<van-button type="primary" @click="cleraCode" >娓呴櫎搴撲綅缂栫爜</van-button>--%>
+</asp:Content>
+
+<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
+ <%-- 鍔犺浇鐘舵�佹樉绀哄尯鍩� --%>
+ <comloading v-if="isLoading"></comloading> <%-- 褰搃sLoading涓簍rue鏃舵樉绀哄姞杞界粍浠� --%>
+ <%-- 宸叉敞閲婄殑杩斿洖缁勪欢 --%>
+ <%--<comback ></comback>--%>
+</asp:Content>
+
+<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
+ <%-- JavaScript璧勬簮寮曞叆 --%>
+ <script src="Js/Kwbg.js?<%=121120 %>"></script> <%-- 寮曞叆BarBG.js鏂囦欢锛屽甫鐗堟湰鍙傛暟闃叉缂撳瓨 --%>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/Kwbg.aspx.cs b/H5/Kwbg.aspx.cs
new file mode 100644
index 0000000..f11cc1f
--- /dev/null
+++ b/H5/Kwbg.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_Scll : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Kwcx.aspx b/H5/Kwcx.aspx
new file mode 100644
index 0000000..7fc7ddf
--- /dev/null
+++ b/H5/Kwcx.aspx
@@ -0,0 +1,148 @@
+锘�<%@ Page Title="搴撲綅鏌ヨ" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Kwcx.aspx.cs" Inherits="H5_Kwcx" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+ /></van-notice-bar>
+ <div class="content-wrapper">
+ <van-nav-bar
+ title="搴撲綅鏌ヨ"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()">
+ </van-nav-bar>
+
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <!-- 搴撲綅鐗╂枡 -->
+ <van-tab title="搴撲綅鐗╂枡" class="mySolid font">
+ <van-cell-group>
+ <van-field
+ v-model="modeInfo.deptSectionCode"
+ label="搴撲綅"
+ clearable
+ placeholder="璇锋壂鐮�"
+ @keyup.enter.native="getBarInfoListModel">
+ <template #extra>
+ <span style="margin-right:8px">鍦ㄥ簱</span>
+ <van-checkbox
+ v-model="zkChecked"
+ shape="round"
+ icon-size="18px"
+ @change="getBarInfoListModel"></van-checkbox>
+ </template>
+ </van-field>
+ <van-field
+ v-model="modeInfo.rkDate"
+ label="鍏ュ簱鏃ユ湡"
+ clearable
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ readonly
+ @click="showDatePicker = true">
+ </van-field>
+ <van-popup v-model="showDatePicker" position="bottom">
+ <van-datetime-picker
+ type="date"
+ v-model="tempDate"
+ @confirm="onDateConfirm"
+ @cancel="showDatePicker = false" />
+ </van-popup>
+ </van-cell-group>
+ <van-row>
+ <van-col span="6" class="text-left padding-left">鐗╂枡缂栫爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡鍚嶇О</van-col>
+ <van-col span="7">鏉＄爜</van-col>
+ <van-col span="3">鏁伴噺</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in barInfoList" :key="index">
+ <van-col span="6" class="text-left padding-left">{{itm.itemNo}}</van-col>
+ <van-col span="8" class="text-left padding-left">{{itm.itemName}}</van-col>
+ <van-col span="7" class="blue-text">{{itm.itemBar}}</van-col>
+ <van-col span="3">{{itm.quantity}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <!-- 绌哄簱浣� -->
+ <van-tab title="绌哄簱浣�" class="mySolid font">
+ <van-cell-group>
+ <van-field
+ v-model="selectKW"
+ label="浠撳簱鏌ヨ"
+ clearable
+ placeholder="璇烽�夋嫨浠撳簱">
+ <template #button>
+ <van-button size="small" type="info" plain @click="getKWInfo">閫夋嫨</van-button>
+ </template>
+ </van-field>
+ </van-cell-group>
+ <van-row>
+ <van-col span="6" class="text-left padding-left">搴撲綅缂栫爜</van-col>
+ <van-col span="18" class="text-left padding-left">搴撲綅鍚嶇О</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in tbKWInfo" :key="index">
+ <van-col span="6" class="text-left padding-left">{{itm.code}}</van-col>
+ <van-col span="18" class="text-left padding-left">{{itm.name}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <!-- 鏉＄爜鏌ヨ -->
+ <van-tab title="鏉＄爜鏌ヨ" class="mySolid font">
+ <van-cell-group>
+ <van-field v-model="scanInfo.barcode" label="鏉＄爜" clearable placeholder="璇锋壂鐮�" @keyup.enter.native="getScan"></van-field>
+ <van-field v-model="scanInfo.barcode" label="鐗╂枡鏉＄爜" readonly></van-field>
+ <van-field v-model="scanInfo.itemNo" label="鐗╂枡缂栫爜" readonly></van-field>
+ <van-field v-model="scanInfo.itemName" label="鐗╂枡鍚嶇О" readonly></van-field>
+ <van-field v-model="scanInfo.itemModel" label="瑙勬牸" readonly></van-field>
+ <van-field v-model="scanInfo.depotCode" label="浠撳簱缂栧彿" readonly></van-field>
+ <van-field v-model="scanInfo.depotName" label="浠撳簱鍚嶇О" readonly></van-field>
+ <van-field v-model="scanInfo.sectionCode" label="鍌ㄤ綅缂栧彿" readonly></van-field>
+ <van-field v-model="scanInfo.sectionName" label="鍌ㄤ綅鍚嶇О" readonly></van-field>
+ <van-field v-model="scanInfo.oldqty" label="鍒濆鏁伴噺" readonly></van-field>
+ <van-field v-model="scanInfo.quantity" label="搴撳瓨鏁伴噺" readonly></van-field>
+ </van-cell-group>
+ </van-tab>
+
+ <!-- 缂栫爜鏌ヨ -->
+ <van-tab title="缂栫爜鏌ヨ" class="mySolid font">
+ <van-cell-group>
+ <van-field
+ v-model="itemNo.barCode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鎻忕墿鏂欐潯鐮�"
+ @keyup.enter.native="getItemInfoListModel">
+ </van-field>
+ <van-field
+ v-model="itemNo.itemNo"
+ label="鐗╂枡缂栫爜"
+ clearable
+ placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
+ @keyup.enter.native="getItemInfoListModel">
+ </van-field>
+ </van-cell-group>
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鐗╂枡缂栫爜</van-col>
+ <van-col span="8" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="6" class="text-left padding-left">鏁伴噺</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in tbItemInfo" :key="index">
+ <van-col span="10" class="text-left padding-left">{{itm.itemNo}}</van-col>
+ <van-col span="8" class="text-left padding-left">{{itm.sectionCode}}</van-col>
+ <van-col span="6" class="text-left padding-left">{{itm.quantity}}</van-col>
+ </van-row>
+ </van-tab>
+ </van-tabs>
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect"></van-action-sheet>
+ </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/Kwcx.js?<%=12366151 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/Kwcx.aspx.cs b/H5/Kwcx.aspx.cs
new file mode 100644
index 0000000..04890ac
--- /dev/null
+++ b/H5/Kwcx.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_Kwcx : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index cc9e1fe..affa9f2 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?<%=119997116 %>"></script>
</asp:Content>
diff --git a/H5/My.aspx b/H5/My.aspx
index 91a2481..9c9eff4 100644
--- a/H5/My.aspx
+++ b/H5/My.aspx
@@ -4,6 +4,7 @@
<style>
.van-field__control {
text-align:right !important;
+ color: #0283EF;
}
</style>
</asp:Content>
@@ -21,23 +22,44 @@
</dl>
</div>
<van-cell-group>
-<%-- <van-field
+ <%--<van-field
readonly
is-link
v-model="cardType"
label="鍒囨崲缁勭粐"
placeholder="绁堢Η鑲′唤"
@click="goOrg"
-></van-field>
- <van-field
+>
+
+ </van-field>--%>
+<%-- <van-field
readonly
is-link
v-model="cardType"
- label="娑堟伅涓績"
- placeholder="15鏉�"
+ label="鎵撳嵃閰嶇疆"
+ placeholder=""
@click="goMsg()"
></van-field>--%>
-
+<van-field
+ label="褰撳墠缁勭粐"
+ :value="Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅'"
+ readonly
+ input-align="center"
+ class="org-field bold-center"
+ :style="{
+ fontWeight: '700'
+ }"
+></van-field>
+
+ <van-field
+ readonly
+ is-link
+ v-model="cardType"
+ label="鍒囨崲缁勭粐"
+ placeholder=""
+ @click="changeOrg"
+ ></van-field>
+
<van-field
readonly
is-link
@@ -46,6 +68,9 @@
placeholder=""
@click="goOut"
></van-field>
+
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
</van-cell-group>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
@@ -53,6 +78,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?<%=123455 %>"></script>
</asp:Content>
diff --git a/H5/Nxhd.aspx b/H5/Nxhd.aspx
new file mode 100644
index 0000000..e76efb8
--- /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?<%=1112 %>"></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/PurchaseInventory.aspx b/H5/PurchaseInventory.aspx
index 65a426f..c305725 100644
--- a/H5/PurchaseInventory.aspx
+++ b/H5/PurchaseInventory.aspx
@@ -58,6 +58,12 @@
disabled
></van-field>
<van-field
+ v-model="formData.itemNo"
+ label="鍒拌揣鍗曞彿"
+ placeholder=""
+ disabled
+></van-field>
+ <van-field
v-model="formData.sumQuantity"
label="宸插叆鎬绘暟"
placeholder=""
@@ -87,7 +93,8 @@
<van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
<van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
<%--<van-col span="4">闇�姹傛暟</van-col>--%>
- <van-col span="8">宸插叆搴撴暟</van-col>
+ <van-col span="5">鐗╂枡鍒嗗尯</van-col>
+ <van-col span="3">宸插叆搴撴暟</van-col>
</van-row>
<van-row v-for="(itm,index) in ItemDetail" :key="index">
<van-col span="8" class="text-left padding-left">
@@ -97,7 +104,8 @@
<van-col span="8" class="text-left padding-left">
<div>{{itm.itemModel}}</div>
</van-col>
- <van-col span="8" class="blue-text">{{itm.fQty}}</van-col>
+ <van-col span="3" class="blue-text">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.fQty}}</van-col>
</van-row>
</van-tab>
diff --git a/H5/PurchaseReturn.aspx b/H5/PurchaseReturn.aspx
index 2ae3b4c..6864642 100644
--- a/H5/PurchaseReturn.aspx
+++ b/H5/PurchaseReturn.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<div class="content-wrapper">
<van-nav-bar
title="閲囪喘閫�鏂�"
@@ -41,7 +47,7 @@
<%--@change="SaveBarCodes"--%>
></van-field>
<van-field
- v-model="scanFormData.itemNo"
+ v-model="scanFormData.itemid"
label="鐗╂枡缂栫爜"
placeholder="鐗╂枡缂栫爜"
disabled
@@ -70,7 +76,7 @@
</van-field>
</van-cell-group>
</div>
- <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="寰呮壂鐗╂枡" class="mySolid font">
<van-row>
<van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
@@ -78,7 +84,12 @@
<van-col span="3">寰呮壂</van-col>
<van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
+ <!-- 澧炲姞琛岀偣鍑讳笌閫変腑楂樹寒 -->
+ <van-row
+ v-for="(itm,index) in ItemDetail.items"
+ :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
<van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
@@ -91,6 +102,25 @@
</van-row>
</van-tab>
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
+
<van-tab title="宸叉壂鐗╂枡" class="mySolid font">
<van-row>
<van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
@@ -100,7 +130,7 @@
</van-row>
<van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index">
<van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.itemNo}}</div>
+ <div class="blue-text">{{itm.itemid}}</div>
<div>{{itm.itemName}}</div>
</van-col>
<van-col span="8" class="text-left padding-left">
@@ -123,5 +153,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/PurchaseReturn.js?<%=12811111 %>"></script>
+ <script src="Js/PurchaseReturn.js?<%=1281111234 %>"></script>
</asp:Content>
diff --git a/H5/Qtck.aspx b/H5/Qtck.aspx
index 1a48f8a..22285e0 100644
--- a/H5/Qtck.aspx
+++ b/H5/Qtck.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="鍏朵粬鍑哄簱"
left-text="杩斿洖"
@@ -29,6 +35,7 @@
<van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
<van-field
+ ref="barcode"
value=""
label="鐗╂枡鏉＄爜"
clearable
@@ -41,12 +48,13 @@
></van-field>
<van-field
value=""
- label="鐗╂枡缂栫爜"
+ label="鍒跺崟浜�"
clearable
- placeholder="鐗╂枡缂栫爜"
+ placeholder="鍒跺崟浜�"
:right-icon-size="19"
- v-model="itemNo"
+ v-model="zdy"
v-focus.noKeyboard
+ disabled
></van-field>
<van-field
value=""
@@ -55,15 +63,22 @@
placeholder="鏉＄爜鏁伴噺"
disabled
></van-field>
-<van-field
- value=""
- v-model="fnm"
- label="鍙戞枡鏁伴噺"
- placeholder="鍙戞枡鏁伴噺"
- disabled
-><template #button>
- <van-button size="small" type="info" plain @click="tmcf" >鏉＄爜鎷嗗垎</van-button>
- </template></van-field>
+ <van-field
+ ref="splitNum"
+ v-model="splitNum"
+ center
+ clearable
+ label="鍙戞枡鏁伴噺"
+ placeholder="鍙戞枡鏁伴噺">
+ <van-button
+ slot="button"
+ type="info"
+ size="small"
+ plain
+ @click="getChaiFen">
+ 鏉＄爜鎷嗗垎
+ </van-button>
+</van-field>
</van-cell-group>
</div>
@@ -86,7 +101,9 @@
<van-col span="3">寰呮壂</van-col>
<van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
+ <van-row v-for="(itm,index) in ItemDetail.items" :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
<van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
@@ -96,6 +113,25 @@
</van-col>
<van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
<van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
</van-row>
</van-tab>
@@ -129,5 +165,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtck.js?<%=11300 %>"></script>
+ <script src="Js/Qtck.js?<%=111309 %>"></script>
</asp:Content>
diff --git a/H5/Qtrk.aspx b/H5/Qtrk.aspx
index 89d2c4f..9ad3c75 100644
--- a/H5/Qtrk.aspx
+++ b/H5/Qtrk.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="鍏朵粬鍏ュ簱"
left-text="杩斿洖"
@@ -38,6 +44,26 @@
<%--@change="getSectionCode"--%>
:right-icon-size="19"
placeholder="搴撲綅缂栫爜"
+></van-field>
+ <van-field
+ ref="depotsInfo"
+ v-model="depotInfo.depot_code"
+ value=""
+ label="浠撳簱缂栫爜"
+ clearable
+ placeholder="浠撳簱缂栫爜"
+ :right-icon-size="19"
+ disabled
+></van-field>
+ <van-field
+ ref="depotsInfo"
+ v-model="depotInfo.depot_name"
+ value=""
+ label="浠撳簱鍚嶇О"
+ clearable
+ placeholder="浠撳簱鍚嶇О"
+ :right-icon-size="19"
+ disabled
></van-field>
<van-field
ref="barcode"
@@ -132,5 +158,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtrk.js?<%=124000 %>"></script>
+ <script src="Js/Qtrk.js?<%=1240004 %>"></script>
</asp:Content>
diff --git a/H5/Scbg.aspx b/H5/Scbg.aspx
index 78ebfd8..b52bd29 100644
--- a/H5/Scbg.aspx
+++ b/H5/Scbg.aspx
@@ -131,5 +131,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scbg.js?<%=12327 %>"></script>
+ <script src="Js/Scbg.js?<%=12328 %>"></script>
</asp:Content>
diff --git a/H5/Scbl.aspx b/H5/Scbl.aspx
index 3f496b4..7587138 100644
--- a/H5/Scbl.aspx
+++ b/H5/Scbl.aspx
@@ -8,6 +8,11 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+ /></van-notice-bar>
<van-nav-bar
:title="type=='cl'?'鐢熶骇瓒呴':'鐢熶骇琛ユ枡'"
left-text="杩斿洖"
@@ -16,6 +21,32 @@
></van-nav-bar>
<div class="content-wrapper">
<van-cell-group>
+ <van-field
+ v-model="queryInfo.dateTime"
+ label="鍗曟嵁鏃ユ湡"
+ clearable
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ readonly
+ @click="showDatePicker = true">
+ </van-field>
+ <van-popup v-model="showDatePicker" position="bottom">
+ <van-datetime-picker
+ type="date"
+ v-model="tempDate"
+ :min-date="minDate"
+ :max-date="maxDate"
+ @confirm="onDateConfirm"
+ @cancel="showDatePicker = false" />
+ </van-popup>
+ <van-field
+ v-model="queryInfo.lineName"
+ label="鐢熶骇绾垮埆"
+ clearable
+ placeholder="璇烽�夋嫨鐢熶骇绾垮埆">
+ <template #button>
+ <van-button size="small" type="info" plain @click="getLineInfo">閫夋嫨</van-button>
+ </template>
+ </van-field>
<van-field
ref="billNo"
value=""
@@ -78,7 +109,9 @@
<van-col span="3">寰呮壂</van-col>
<van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
+ <van-row v-for="(itm,index) in ItemDetail.items" :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
<van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
@@ -90,6 +123,25 @@
<van-col span="5">{{itm.recoKw}}</van-col>
</van-row>
</van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
<van-tab title="宸叉壂鐗╂枡" class="mySolid font">
<van-row>
@@ -113,6 +165,7 @@
</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+ <van-action-sheet v-model="show1" :actions="actions1" @select="onSelect1"></van-action-sheet>
</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
@@ -120,5 +173,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scbl.js?<%=12318111 %>"></script>
+ <script src="Js/Scbl.js?<%=1231887111 %>"></script>
</asp:Content>
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index 8f21329..deec20f 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -4,10 +4,20 @@
.bg-info {
background-color: #fff;
}
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
+ }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<div class="content-wrapper">
<van-nav-bar
title="鐢熶骇澶囨枡"
@@ -15,6 +25,7 @@
left-arrow
@click-left="GoBack()">
</van-nav-bar>
+
<div class="mySolid">
<van-cell-group>
@@ -42,11 +53,29 @@
</van-field>
<van-field
- v-model="modeInfo.planNo"
+ v-model="DaaInfo.workNo"
label="浠诲姟鍗曞彿"
clearable
:right-icon-size="19"
placeholder="浠诲姟鍗曞彿"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
disabled>
</van-field>
@@ -92,39 +121,67 @@
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="寰呮壂鐗╂枡" class="mySolid font">
<van-row>
- <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="6" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="6" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="4">鍒嗗尯</van-col>
<van-col span="3">寰呮壂</van-col>
<van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
- <van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
+ <van-row
+ v-for="(itm,index) in ItemDetail.items"
+ :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="6" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="6" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="4">{{itm.wlfq}}</van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
</van-col>
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.itemModel}}</div>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
</van-col>
- <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
- <van-col span="5">{{itm.recoKw}}</van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
</van-row>
</van-tab>
<van-tab title="宸叉壂鐗╂枡" class="mySolid font">
<van-row>
- <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="6" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="6" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="4">鍒嗗尯</van-col>
<van-col span="3">闇�棰嗘暟</van-col>
<van-col span="5">宸查鏁�</van-col>
</van-row>
<van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index">
- <van-col span="8" class="text-left padding-left">
+ <van-col span="6" class="text-left padding-left">
<div class="blue-text">{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
</van-col>
- <van-col span="8" class="text-left padding-left">
+ <van-col span="6" class="text-left padding-left">
<div>{{itm.itemModel}}</div>
</van-col>
+ <van-col span="4">{{itm.wlfq}}</van-col>
<van-col span="3">{{itm.fQty}}</van-col>
<van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
</van-row>
@@ -138,5 +195,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=123336154 %>"></script>
+ <script src="Js/Scll.js?<%=1233361592 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Sctl.aspx b/H5/Sctl.aspx
index 9dec108..d06f5e8 100644
--- a/H5/Sctl.aspx
+++ b/H5/Sctl.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="鐢熶骇閫�鏂�"
left-text="杩斿洖"
@@ -131,6 +137,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Sctl.js?<%=162 %>"></script>
+ <script src="Js/Sctl.js?<%=16214 %>"></script>
</asp:Content>
diff --git a/H5/Strk.aspx b/H5/Strk.aspx
index fdae29f..d9f34e0 100644
--- a/H5/Strk.aspx
+++ b/H5/Strk.aspx
@@ -8,6 +8,11 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<van-nav-bar
title="鍙楁墭鍏ュ簱"
left-text="杩斿洖"
@@ -68,24 +73,46 @@
</van-cell-group>
</div>
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBlDetail" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
- <van-tab title="寰呴��鏄庣粏" class="mySolid font">
- <van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">寰呮壂</van-col>
- <van-col span="6">宸叉壂</van-col>
-</van-row>
- <van-row v-for="value in ItemTblDetail" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.itemNo}}</div>
- <div>{{value.itemName}}</div>
- </van-col>
- <van-col span="6">{{value.fQty}}</van-col>
- <van-col span="6">{{value.sQty ?? 0}}</van-col>
- </van-row>
-</van-tab>
- <van-tab title="宸查��鏄庣粏"></van-tab>
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemYsDetail" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -96,6 +123,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Strk.js?<%=17 %>"></script>
+ <script src="Js/Strk.js?<%=1764 %>"></script>
</asp:Content>
diff --git a/H5/Sttl.aspx b/H5/Sttl.aspx
index 0d1bcbe..630b6c1 100644
--- a/H5/Sttl.aspx
+++ b/H5/Sttl.aspx
@@ -8,6 +8,11 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
<van-nav-bar
title="鍙楁墭閫�鏂�"
left-text="杩斿洖"
@@ -62,30 +67,70 @@
</van-cell-group>
</div>
- <div class="van-tab-left">
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
-<%-- <van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
- <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
- <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
- </van-row>--%>
+
+ <van-tabs v-model="active" van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
<van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">闇�棰�</van-col>
- <van-col span="6">宸叉壂</van-col>
-</van-row>
-<van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.itemNo}}</div>
- <div>{{value.itemName}}</div>
- </van-col>
- <van-col span="6">{{value.fQty}}</van-col>
- <van-col span="6">{{value.sQty ?? 0}}</van-col>
-</van-row>
- </van-tab>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBlDetail" :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemYsDetail" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
- </div>
+
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -95,5 +140,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Sttl.js?<%=127 %>"></script>
+ <script src="Js/Sttl.js?<%=1307 %>"></script>
</asp:Content>
diff --git a/H5/Wwck.aspx b/H5/Wwck.aspx
new file mode 100644
index 0000000..4a8767b
--- /dev/null
+++ b/H5/Wwck.aspx
@@ -0,0 +1,188 @@
+锘�<%@ Page Title="濮斿鍑哄簱" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <style>
+ .bg-info {
+ background-color:#fff;
+ }
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
+ }
+</style>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
+ <van-nav-bar
+ title="濮斿棰嗘枡"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()"
+></van-nav-bar>
+
+ <div class="mySolid">
+ <van-cell-group>
+
+ <van-field
+ ref ="billno"
+ value=""
+ label="鐢宠鍗曞彿"
+ clearable
+ placeholder="璇烽�夋嫨鐢宠鍗曞彿"
+ :right-icon-size="19"
+ v-model="billno"
+ @keyup.enter.native ="getModel"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
+
+ <van-field
+ ref="daa001"
+ v-model="modeInfo.daa001"
+ label="濮斿宸ュ崟"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getModel"
+ autofocus="true"
+ ></van-field>
+ <van-field
+ v-model="modeInfo.planNo"
+ label="浠诲姟鍗曞彿"
+ clearable
+ :right-icon-size="19"
+ placeholder="浠诲姟鍗曞彿"
+ disabled
+></van-field>
+
+<%-- <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
+ disabled>
+ </van-field>--%>
+
+ <van-field
+ ref="barcode"
+ v-model="scanInfo.barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getScan"
+></van-field>
+ <van-field
+ v-model="scanInfo.barcodeNum"
+ label="鏉＄爜鏁伴噺"
+ placeholder="鏉＄爜鏁伴噺"
+ disabled
+></van-field>
+ <van-field
+ ref="splitNum"
+ v-model="scanInfo.splitNum"
+ center
+ clearable
+ label="鍙戞枡鏁伴噺"
+ placeholder="鍙戞枡鏁伴噺"
+ >
+ <van-button slot="button" type="info" size="small" plain @click="getChaiFen">鏉＄爜鎷嗗垎</van-button>
+ </van-field>
+</van-cell-group>
+ </div>
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
+ </van-row>
+ <!-- 澧炲姞琛岀偣鍑讳笌閫変腑楂樹寒 -->
+ <van-row
+ v-for="(itm,index) in ItemDetail.items"
+ :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index"><%--ItemBlDetail.ysitems--%>
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{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/Wwck.js?<%=105323 %>"></script>
+</asp:Content>
diff --git a/H5/Wwck.aspx.cs b/H5/Wwck.aspx.cs
new file mode 100644
index 0000000..f11cc1f
--- /dev/null
+++ b/H5/Wwck.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_Scll : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Wwll.aspx b/H5/Wwll.aspx
index 14a854a..ad6a420 100644
--- a/H5/Wwll.aspx
+++ b/H5/Wwll.aspx
@@ -4,18 +4,43 @@
.bg-info {
background-color:#fff;
}
-
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
+ }
</style>
</asp:Content>
+
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="濮斿棰嗘枡"
left-text="杩斿洖"
left-arrow
@click-left="GoBack()"
></van-nav-bar>
- <%--<div class="mySolid">--%>
+
+ <div class="mySolid">
<van-cell-group>
+
+ <van-field
+ ref ="selectKey"
+ value=""
+ label="宸ュ崟鏌ヨ"
+ clearable
+ placeholder="璇烽�夋嫨宸ュ崟鍙疯繘琛屾煡璇�"
+ :right-icon-size="19"
+ v-model="selectKey"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
+
<van-field
ref="daa001"
v-model="modeInfo.daa001"
@@ -35,6 +60,25 @@
placeholder="浠诲姟鍗曞彿"
disabled
></van-field>
+
+<%-- <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
+ disabled>
+ </van-field>--%>
+
<van-field
ref="barcode"
v-model="scanInfo.barcode"
@@ -59,49 +103,85 @@
label="鍙戞枡鏁伴噺"
placeholder="鍙戞枡鏁伴噺"
>
- <van-button slot="button" type="info" size="small" plain @click="getChaiFen">
- 鏉＄爜鎷嗗垎
- </van-button>
+ <van-button slot="button" type="info" size="small" plain @click="getChaiFen">鏉＄爜鎷嗗垎</van-button>
</van-field>
</van-cell-group>
- <%-- </div>--%>
- <van-tabs color="#000" title-active-color="#0283EF">
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
- <van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">寰呮壂</van-col>
- <van-col span="6">宸叉壂</van-col>
- </van-row>
- <van-row v-for="(itm,index) in modeInfo.daisao1" :key="index">
- <van-col span="12" class="text-left padding-left">
- <div>{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
- </van-col>
- <van-col span="6">{{itm.dab006}}</van-col>
- <van-col span="6">{{itm.dab007}}</van-col>
- </van-row>
- </van-tab>
- <van-tab title="鐗╂枡鎬绘竻鍗�" class="mySolid font">
- <van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">闇�棰嗘暟</van-col>
- <van-col span="6">宸查鏁�</van-col>
+ </div>
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
</van-row>
- <van-row v-for="(itm,index) in modeInfo.totals1" :key="index">
- <van-col span="12" class="text-left padding-left">
- <div>{{itm.itemNo}}</div>
+ <!-- 澧炲姞琛岀偣鍑讳笌閫変腑楂樹寒 -->
+ <van-row
+ v-for="(itm,index) in ItemDetail.items"
+ :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
- </van-col>
- <van-col span="6">{{itm.dab006}}</van-col>
- <van-col span="6">{{itm.dab007}}</van-col>
- </van-row>
- </van-tab>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index"><%--ItemBlDetail.ysitems--%>
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{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>
- <%--<comback ></comback>--%>
+
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwll.js?<%=12324 %>"></script>
+ <script src="Js/Wwll.js?<%=123263 %>"></script>
</asp:Content>
diff --git a/H5/Wwtl.aspx b/H5/Wwtl.aspx
index 5cc1bcf..50d1f10 100644
--- a/H5/Wwtl.aspx
+++ b/H5/Wwtl.aspx
@@ -67,24 +67,46 @@
</van-cell-group>
</div>
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
- <van-tab title="寰呴��鏄庣粏" class="mySolid font">
- <van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">寰呮壂</van-col>
- <van-col span="6">宸叉壂</van-col>
-</van-row>
- <van-row v-for="value in ItemTblDetail.items" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.itemNo}}</div>
- <div>{{value.itemName}}</div>
- </van-col>
- <van-col span="6">鐢宠鏁皗{value.tld005}}</van-col>
- <van-col span="6">宸查鏁皗{value.tld006}}</van-col>
- </van-row>
-</van-tab>
- <van-tab title="宸查��鏄庣粏"></van-tab>
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="8">寰呭叆搴撴暟</van-col>
+ <%--<van-col span="4">鏉＄爜寮犳暟</van-col>--%>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemTblDetail.items" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="8" class="blue-text">{{itm.dsQty}}</van-col>
+ <%--<van-col span="4">{{itm.recoKw}}</van-col>--%>
+ </van-row>
+ </van-tab>
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <%--<van-col span="4">闇�姹傛暟</van-col>--%>
+ <van-col span="8">宸插叆搴撴暟</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemTblDetail.ysitems" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+<%-- <van-col span="4">{{itm.fQty}}</van-col>--%>
+ <van-col span="8" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
diff --git a/H5/Xcsl.aspx b/H5/Xcsl.aspx
index a3a45e8..7ed6192 100644
--- a/H5/Xcsl.aspx
+++ b/H5/Xcsl.aspx
@@ -51,6 +51,37 @@
flex: 1; /* 绛夊垎鍓╀綑绌洪棿 */
min-width: 0; /* 闃叉鍐呭婧㈠嚭 */
}
+
+
+ /* 鏂板锛氬喕缁撴爣棰樿鏍峰紡 */
+ .sticky-header {
+ position: sticky;
+ top: 0;
+ background-color: #fafafa; /* 鑳屾櫙鑹诧紝鍙牴鎹渶瑕佽皟鏁� */
+ z-index: 10;
+ border-bottom: 1px solid #ebedf0;
+ font-weight: bold;
+ }
+
+ /* 纭繚琛ㄦ牸瀹瑰櫒鏈夊浐瀹氶珮搴﹀拰婊氬姩 */
+ .van-tab__pane {
+ max-height: 60vh; /* 鍙牴鎹渶瑕佽皟鏁撮珮搴� */
+ overflow-y: auto;
+ }
+
+ /* 琛岃儗鏅鑹叉牱寮� */
+ .row-red {
+ background-color: #f24343; /* 绾㈣壊鑳屾櫙 */
+ }
+ .row-green {
+ background-color: #5ff55f; /* 缁胯壊鑳屾櫙 */
+ }
+ .row-yellow {
+ background-color: #fbd12b; /* 榛勮壊鑳屾櫙 */
+ }
+ .row-blue {
+ background-color: #1eb8fa; /* 钃濊壊鑳屾櫙 */
+ }
</style>
</asp:Content>
@@ -87,14 +118,32 @@
>
</van-field>
<van-field
- ref="DAA021"
- v-model="DAA021"
+ v-model="DaaInfo.workNo"
label="浠诲姟鍗曞彿"
+ clearable
+ :right-icon-size="19"
placeholder="浠诲姟鍗曞彿"
- autofocus="true"
- readonly
- >
+ disabled>
</van-field>
+
+ <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
+ disabled>
+ </van-field>
+
<van-field
v-model="DAANum"
label="宸ュ崟鏁伴噺"
@@ -119,78 +168,86 @@
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="鏉愭枡鍒楄〃" class="mySolid font">
- <van-row>
- <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="8" class="text-left padding-left">瑙勬牸鍨嬪彿</van-col>
- <van-col span="4">澶囨枡鏁�</van-col>
- <van-col span="4">鎺ユ敹鏁�</van-col>
- </van-row>
- <van-row v-for="(itm,index) in xcslItemList" :key="index">
- <van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.item_no}}</div>
- <div>{{itm.item_name}}</div>
- </van-col>
- <van-col span="8" class="text-left padding-left">
- <div>{{itm.item_model}}</div>
- </van-col>
- <van-col span="4" class="blue-text">{{itm.bL_Num}}</van-col>
- <van-col span="4" class="blue-text">{{itm.jS_Num}}</van-col
- </van-row>
+ <div class="van-tab__pane">
+ <van-row class="sticky-header">
+ <van-col span="6" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="6" class="text-left padding-left">瑙勬牸鍨嬪彿</van-col>
+ <van-col span="4">闇�棰嗘暟</van-col>
+ <van-col span="4">澶囨枡鏁�</van-col>
+ <van-col span="4">鎺ユ敹鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in xcslItemList" :key="index" :class="getRowColorClass(itm)">
+ <van-col span="6" class="text-left padding-left">
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="6" class="text-left padding-left">
+ <div>{{itm.item_model}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.DAB006}}</van-col>
+ <van-col span="4" class="blue-text">{{itm.BL_Num}}</van-col>
+ <van-col span="4" class="blue-text">{{itm.JS_Num}}</van-col>
+ </van-row>
+ </div>
</van-tab>
<van-tab title="鏈帴鏀跺垪琛�" class="mySolid font">
- <van-row>
- <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
- <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
- <van-col span="3" >浜哄憳</van-col>
- <van-col span="5" >鏃堕棿</van-col>
- </van-row>
- <van-row
- v-for="(itm,index) in xcslWjsBarList"
- :key="index">
- <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
- <van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.item_no}}</div>
- <div>{{itm.item_name}}</div>
- </van-col>
- <van-col span="3" class="text-left padding-left">
- <div>{{itm.quantity}}</div>
- </van-col>
- <van-col span="3">
- <div>{{itm.useR_NAME}}</div>
- </van-col>
- <van-col span="5">
- <div>{{itm.create_date}}</div>
- </van-col>
- </van-row>
+ <div class="van-tab__pane">
+ <van-row class="sticky-header">
+ <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+ <van-col span="3" >浜哄憳</van-col>
+ <van-col span="5" >鏃堕棿</van-col>
+ </van-row>
+ <van-row
+ v-for="(itm,index) in xcslWjsBarList"
+ :key="index">
+ <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.QUANTITY}}</div>
+ </van-col>
+ <van-col span="3">
+ <div>{{itm.USER_NAME}}</div>
+ </van-col>
+ <van-col span="5">
+ <div>{{itm.create_date}}</div>
+ </van-col>
+ </van-row>
+ </div>
</van-tab>
<van-tab title="宸叉帴鏀跺垪琛�" class="mySolid font">
- <van-row>
- <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
- <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
- <van-col span="3" >鎺ユ敹浜�</van-col>
- <van-col span="5" >鎺ユ敹鏃堕棿</van-col>
- </van-row>
- <van-row
- v-for="(itm,index) in xcslYjsBarList"
- :key="index">
- <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
- <van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.item_no}}</div>
- <div>{{itm.item_name}}</div>
- </van-col>
- <van-col span="3" class="text-left padding-left">
- <div>{{itm.quantity}}</div>
- </van-col>
- <van-col span="3">
- <div>{{itm.useR_NAME}}</div>
- </van-col>
- <van-col span="5">
- <div>{{itm.xcsL_CREATE_DATE}}</div>
- </van-col>
- </van-row>
+ <div class="van-tab__pane">
+ <van-row class="sticky-header">
+ <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+ <van-col span="3" >鎺ユ敹浜�</van-col>
+ <van-col span="5" >鎺ユ敹鏃堕棿</van-col>
+ </van-row>
+ <van-row
+ v-for="(itm,index) in xcslYjsBarList"
+ :key="index">
+ <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
+ </van-col>
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.QUANTITY}}</div>
+ </van-col>
+ <van-col span="3">
+ <div>{{itm.USER_NAME}}</div>
+ </van-col>
+ <van-col span="5">
+ <div>{{itm.XCSL_CREATE_DATE}}</div>
+ </van-col>
+ </van-row>
+ </div>
</van-tab>
</van-tabs>
</div>
@@ -201,5 +258,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xcsl.js?<%=11111111 %>"></script>
+ <script src="Js/Xcsl.js?<%=11111116 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Xsck.aspx b/H5/Xsck.aspx
index de1e408..94a5444 100644
--- a/H5/Xsck.aspx
+++ b/H5/Xsck.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="閿�鍞嚭搴�"
left-text="杩斿洖"
@@ -41,6 +47,16 @@
v-model="barcode"
v-focus.noKeyboard
></van-field>
+ <van-field
+ value=""
+ label="鍒跺崟浜�"
+ clearable
+ placeholder="鍒跺崟浜�"
+ :right-icon-size="19"
+ v-model="zdy"
+ v-focus.noKeyboard
+ disabled
+></van-field>
<van-field
value=""
v-model="num"
@@ -62,30 +78,70 @@
</van-cell-group>
</div>
- <div class="van-tab-left">
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
-<%-- <van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
- <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
- <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
- </van-row>--%>
+
+<van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
<van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">闇�棰�</van-col>
- <van-col span="6">宸叉壂</van-col>
-</van-row>
-<van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.itemNo}}</div>
- <div>{{value.itemName}}</div>
- </van-col>
- <van-col span="6">{{value.fQty}}</van-col>
- <van-col span="6">{{value.sQty || 0}}</van-col>
-</van-row>
- </van-tab>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBlDetail.items" :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, index)">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="搴撲綅鍒楄〃" class="mySolid font">
+ <van-row>
+ <van-col span="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBlDetail.ysitems" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
- </div>
+
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -95,5 +151,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xsck.js?<%=1271111 %>"></script>
+ <script src="Js/Xsck.js?<%=12711115 %>"></script>
</asp:Content>
diff --git a/H5/Xsth.aspx b/H5/Xsth.aspx
index 1e755e8..e708b80 100644
--- a/H5/Xsth.aspx
+++ b/H5/Xsth.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="閿�鍞��璐�"
left-text="杩斿洖"
@@ -68,24 +74,47 @@
</van-cell-group>
</div>
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呴��鏄庣粏" class="mySolid font">
- <van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">寰呮壂</van-col>
- <van-col span="6">宸叉壂</van-col>
-</van-row>
- <van-row v-for="value in ItemTblDetail" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.itemNo}}</div>
- <div>{{value.itemName}}</div>
- </van-col>
- <van-col span="6">{{value.fQty}}</van-col>
- <van-col span="6">{{value.sQty || 0}}</van-col>
- </van-row>
-</van-tab>
- <van-tab title="宸查��鏄庣粏"></van-tab>
+<van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">寰呮壂</van-col>
+ <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemTblDetail.items" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+ <van-col span="5">{{itm.recoKw}}</van-col>
+ </van-row>
+ </van-tab>
+
+ <van-tab title="宸叉壂鐗╂枡" class="mySolid font">
+ <van-row>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+ <van-col span="3">闇�棰嗘暟</van-col>
+ <van-col span="5">宸查鏁�</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemTblDetail.ysitems" :key="index">
+ <van-col span="8" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -96,6 +125,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xsth.js?<%=161 %>"></script>
+ <script src="Js/Xsth.js?<%=162 %>"></script>
</asp:Content>
diff --git a/Images/Style.css b/Images/Style.css
index dc02823..db19f12 100644
--- a/Images/Style.css
+++ b/Images/Style.css
@@ -361,8 +361,8 @@
/* 褰撳睆骞曞搴﹀皬浜庢垨绛変簬600px鏃跺簲鐢ㄧ殑鏍峰紡 */
@media (max-width: 500px) {
.van-cell {
- font-size: .33rem; /* 鏇村皬鐨勫瓧浣撳ぇ灏� */
- line-height: .50rem;
+ font-size: .40rem; /* 鏇村皬鐨勫瓧浣撳ぇ灏� */
+ line-height: .55rem;
padding: .020rem .0800rem; /* 鏇村皬鐨勫唴杈硅窛 */
}
@@ -386,6 +386,15 @@
right: 0;
-webkit-transform: translate3d(0, -50%, 0);
transform: translate3d(0, -50%, 0);
+ }
+
+ .van-nav-bar__title {
+ max-width: 60%;
+ margin: 0 auto;
+ color: #323233;
+ font-weight: 500;
+ font-size: .5rem;
+ font-weight: bold; /* 瀛椾綋鍔犵矖 */
}
}
@@ -437,6 +446,15 @@
right: 0;
-webkit-transform: translate3d(0, -50%, 0);
transform: translate3d(0, -50%, 0);
+ }
+
+ .van-nav-bar__title {
+ max-width: 60%;
+ margin: 0 auto;
+ color: #323233;
+ font-weight: 500;
+ font-size: .35rem;
+ font-weight: bold; /* 瀛椾綋鍔犵矖 */
}
}
@@ -536,14 +554,7 @@
}
-.van-nav-bar__title {
- max-width: 60%;
- margin: 0 auto;
- color: #323233;
- font-weight: 500;
- font-size: .32rem;
- font-weight: bold; /* 瀛椾綋鍔犵矖 */
-}
+
/*琛ㄥご楂樺害 2025-03-13 姹犲崡楠忔柊澧�*/
.van-nav-bar__content {
@@ -586,7 +597,8 @@
/*鍏ㄥ眬鎸夐挳缂╁皬*/
.van-nav-bar__left, .van-nav-bar__right {
- font-size: .25rem;
+ font-size: .40rem;
+ padding: 0px .1rem;
}
/*璋冩暣鎼滅储妗嗗瓧浣撶殑楂樺害鍜屽ぇ灏�*/
@@ -836,4 +848,12 @@
.van-uploader__preview-delete-icon {
font-size: 1.8em;
}
-/*IQC妫�楠屾暣浣撴牱寮� 20250322 姹犲崡楠�*/
\ No newline at end of file
+/*IQC妫�楠屾暣浣撴牱寮� 20250322 姹犲崡楠�*/
+
+
+/*缁勭粐鎶ご鏍峰紡*/
+.org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
+}
\ No newline at end of file
diff --git a/Mst.master b/Mst.master
index 3e62dbd..ac8205e 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,10 +11,10 @@
<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?<%=123611117 %>"></script>
+ <script src="/scripts/config.js?<%=1236111102 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
- <link href="/Images/Style.css?<%=169950 %>" rel="stylesheet" />
+ <link href="/Images/Style.css?<%=1699524 %>" rel="stylesheet" />
<script src="/Scripts/uni.webview.1.5.2.js"></script>
<asp:ContentPlaceHolder ID="head" runat="server">
</asp:ContentPlaceHolder>
diff --git a/Scripts/config.js b/Scripts/config.js
index 97d05c2..ad979de 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,7 +1,7 @@
锘�/*var APIURL = "http://192.168.1.145:83/api/";*/
var APIURL = "http://localhost:5204/api/";
/*var APIURL_PC = "http://192.168.1.145:81/";*/
-var APIURL_PC = "http://192.168.1.145:8081/";//娴嬭瘯
+var APIURL_PC = "http://192.168.1.145:81/";//娴嬭瘯
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {
@@ -82,6 +82,8 @@
url = (APIURL_PC + url);
}
let headers = { 'Content-Type': 'application/json', }
+ var orgId = Cookies.get('orgId')
+ headers['OrgId'] = orgId;
if (isToken) {
var timestamp = (new Date()).getTime();
var token = Cookies.get('loginGuid')
@@ -178,14 +180,15 @@
`T 55 2 110 42 ${item.item_model}\r\n` +
"T 16 0 10 78 鏁伴噺锛歕r\n" +
`T 0 5 90 78 ${item.quantity}\r\n` +
- `T 16 5 180 78 ${item.barType}\r\n` +
- `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
+ `T 16 5 300 78 ${item.barType}\r\n` +
+ `BARCODE 128 1 25 35 300 120 ${item.iteM_BARCODE}\r\n` +
+ `T 10 10 300 153 ${item.iteM_BARCODE}\r\n` +
/* `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +*/
"T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
`T 55 0 120 125 ${item.creatE_DATE}\r\n` +
"T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
`T 55 0 120 150 ${item.print_date}\r\n` +
- "B QR 580 12 M 2 U 4\r\n" +
+ "B QR 580 2 M 2 U 4\r\n" +
`MA,${item.iteM_BARCODE}\r\n` +
"ENDQR\r\nFORM\r\nPRINT\r\n";
});
diff --git a/UserLogin.aspx b/UserLogin.aspx
index 1ce1f07..c86178a 100644
--- a/UserLogin.aspx
+++ b/UserLogin.aspx
@@ -47,12 +47,12 @@
</van-form>
</div>
</div>
- <div class=" margin-lg-top font-sm text-right font-remark" style="position:absolute;bottom:10px;right:10px;">鎶�鏈敮鎸侊細瀹佹尝骞挎繁绉戞妧</div>
+ <div class=" margin-lg-top font-sm text-right font-remark" style="position:absolute;bottom:10px;right:10px;">鐗堟潈鎵�鏈夛細瀹佹尝骞挎繁绉戞妧</div>
</template>
</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="/H5/Js/UserLogin.js?<%=1234 %>"></script>
+ <script src="/H5/Js/UserLogin.js?<%=1238 %>"></script>
</asp:Content>
--
Gitblit v1.9.3