From 71ec8666c4063e6f7600415cfabc1b086f5dcc41 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 04 七月 2025 10:12:05 +0800
Subject: [PATCH] 1.采购验退 2.其他入库优化 3.入库前拆分优化
---
H5/Cgyt.aspx | 166 +++++++++++++++++++++++++++
H5/Js/Cgyt.js | 133 ++++++++++++++++++++++
H5/BarCfBefore.aspx | 2
H5/Js/Qtrk.js | 2
H5/Qtrk.aspx | 22 +++
H5/Cgyt.aspx.cs | 14 ++
6 files changed, 337 insertions(+), 2 deletions(-)
diff --git a/H5/BarCfBefore.aspx b/H5/BarCfBefore.aspx
index b062125..b394b21 100644
--- a/H5/BarCfBefore.aspx
+++ b/H5/BarCfBefore.aspx
@@ -73,5 +73,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/BarCfBefore.js?<%=0 %>"></script>
+ <script src="Js/BarCfBefore.js?<%=00 %>"></script>
</asp:Content>
diff --git a/H5/Cgyt.aspx b/H5/Cgyt.aspx
new file mode 100644
index 0000000..d96a569
--- /dev/null
+++ b/H5/Cgyt.aspx
@@ -0,0 +1,166 @@
+锘�<%@ 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="3">宸插叆搴撴暟</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.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.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.fQty}}</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="4">搴撲綅缂栫爜</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.barcode}}</div>
+ </van-col>
+ <van-col span="8" class="text-left padding-left">
+ <div>{{itm.itemNo}}</div>
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="4">
+ <div>{{itm.fQty}}</div>
+ </van-col>
+ <van-col span="4">{{itm.kw}}</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="submit"
+ :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?<%=0001000 %>"></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/Js/Cgyt.js b/H5/Js/Cgyt.js
new file mode 100644
index 0000000..be2d7e1
--- /dev/null
+++ b/H5/Js/Cgyt.js
@@ -0,0 +1,133 @@
+锘縱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;
+ }
+ 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.ttrre) {
+ return;
+ }
+
+ var that = this;
+ that.ttrre = true;
+ that.AxiosHttp("post", 'MesBarCF/EditModelSubmit', {
+ guid: that.formData.guid
+ }, true, 1).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);
+ });
+ },
+
+ submit() {
+ if (this.ttrre) {
+ return;
+ }
+
+ var that = this;
+ that.ttrre = true;
+ that.AxiosHttp("post", 'FqcManager/EditModelSubmit', {
+ guid: that.formData.guid
+ }, true, 1).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/Qtrk.js b/H5/Js/Qtrk.js
index 1f2a1c2..0b6c397 100644
--- a/H5/Js/Qtrk.js
+++ b/H5/Js/Qtrk.js
@@ -18,6 +18,7 @@
show: false,
actions: [],
ItemDetail: [],
+ depotInfo:[],
}
},
mounted() {
@@ -139,6 +140,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 {
diff --git a/H5/Qtrk.aspx b/H5/Qtrk.aspx
index 89d2c4f..0b3587c 100644
--- a/H5/Qtrk.aspx
+++ b/H5/Qtrk.aspx
@@ -40,6 +40,26 @@
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"
value=""
label="鐗╂枡鏉＄爜"
@@ -132,5 +152,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?<%=1240001 %>"></script>
</asp:Content>
--
Gitblit v1.9.3