From d608ecbbbe77fd691fcd8883d83695e42225a0d7 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 15 十月 2025 11:04:38 +0800
Subject: [PATCH] pda周转箱调拨
---
Scripts/config.js | 2
H5/Js/UserLogin.js | 1
UserLogin.aspx | 41 ++++
H5/Zzxdb.aspx.cs | 14 +
H5/Js/Zzxdb.js | 261 +++++++++++++++++++++++++++++
Mst.master | 2
H5/Zzxdb.aspx | 213 +++++++++++++++++++++++
7 files changed, 532 insertions(+), 2 deletions(-)
diff --git a/H5/Js/UserLogin.js b/H5/Js/UserLogin.js
index 1eb6aaf..c847c4c 100644
--- a/H5/Js/UserLogin.js
+++ b/H5/Js/UserLogin.js
@@ -5,6 +5,7 @@
isLoading: false,
phone: '',
passwd: '',
+ rememberPwd: false,
show: false,
show2: false,
}
diff --git a/H5/Js/Zzxdb.js b/H5/Js/Zzxdb.js
new file mode 100644
index 0000000..1441f6f
--- /dev/null
+++ b/H5/Js/Zzxdb.js
@@ -0,0 +1,261 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ load: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ "loginOrgid":'',
+ },
+ billNo: "",
+ dckw: "", // 璋冨嚭搴撲綅
+ drkw: "", // 璋冨叆搴撲綅
+ remark: "", // 澶囨敞
+ barcode: "",
+ ItemBlDetail: [],
+ modeInfo: [],
+ active: 0,
+ show: false,
+ actions: [],
+ ItemDetail: {
+ items: [] // 纭繚鏈夎繖涓粨鏋�
+ },
+ scanInfo: {
+ barcodeNum: "",
+ splitNum: "",
+ barcode: "",
+ },
+ dbNum: "", // 璋冩嫧鏁伴噺
+ kcNum: "", // 鍗虫椂搴撳瓨
+ printItemInfo: [],
+ itemId:"",
+ itemNo: "", // 鐗╂枡缂栫爜
+ item_name: "", // 鐗╂枡鍚嶇О
+ item_model: "" // 鐗╂枡瑙勬牸
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ getInfo() {
+ this.show = true;
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Zzxdb/GetItemNoList', {
+ //name: that.userInfo.loginAccount,
+ itemNo: that.itemNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length == 0) {
+ that.$toast.fail("娌℃湁鎵惧埌鍙互閫夋嫨鐨勭墿鏂欑紪鍙�");
+ }
+
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.item_no,
+ itemId : item.item_id
+ }
+ });
+ }
+ else {
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ });
+ },
+ onClick(index, title) {
+ this.$toast(`${index} ${title}`);
+ //this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
+
+ },
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+
+ //this.itemNo = item.name;
+ this.itemId = item.itemId;
+ console.log("鐗╂枡id", this.itemId)
+ this.itemNo = item.name.split('/')[0];
+ this.GetMesItemByItemNo();
+ //this.$toast(item.name);
+
+ },
+ GetMesItemBlDetailByBillNo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Zzxdb/GetKwByBillNo', {
+ billNo: that.billNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ if (json.data.tbBillList.xcslItemList[0].rnum == 2) {
+ that.drkw = 'Z2';
+ that.dckw = 'A14-3-33';
+ that.billNo = json.data.tbBillList.xcslItemList[0].billno;
+ }
+ else {
+ that.drkw = 'A14-3-33';
+ that.dckw = 'Z2';
+ that.billNo = json.data.tbBillList.xcslItemList[0].billno;
+ }
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.billNo = "";
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.billNo.focus();
+ that.billNo = "";
+ that.ItemBlDetail = null;
+ //console.log(error);
+ });
+ },
+ GetMesItemByItemNo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Zzxdb/GetMesItemByItemNo', {
+ itemNo: that.itemNo,
+ userName: that.userInfo.loginAccount,
+ dckw: that.dckw,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.itemNo = json.data.tbBillList.xcslItemList[0].item_no;
+ that.item_model = json.data.tbBillList.xcslItemList[0].item_model;
+ that.item_name = json.data.tbBillList.xcslItemList[0].item_name;
+ that.kcNum = json.data.tbBillList.xcslItemList[0].kcnum;
+ that.ItemDetail.items = json.data.tbBillList.itemDetail
+
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.itemNo = "";
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.billNo.focus();
+ that.billNo = "";
+ that.ItemBlDetail = null;
+ //console.log(error);
+ });
+ },
+ saveDbsq() {
+ var that = this;
+ that.isLoading = true;
+
+ if (that.dbNum <= 0) {
+ that.$toast.fail("璋冩嫧鏁伴噺涓嶈兘涓�0");
+ that.isLoading = false; // 娣诲姞杩欒
+ return; // 娣诲姞杩斿洖
+ }
+ if (that.dbNum > that.kcNum) {
+ that.$toast.fail("璋冩嫧鏁伴噺涓嶈兘澶т簬鍗虫椂搴撳瓨");
+ that.isLoading = false; // 娣诲姞杩欒
+ return; // 娣诲姞杩斿洖
+ }
+
+ that.AxiosHttp("post", 'Zzxdb/saveDbsq', {
+ id: that.itemId,
+ dbNum: that.dbNum,
+ userName: that.userInfo.loginAccount,
+ remark: that.remark,
+ drkw: that.drkw,
+ dckw: that.dckw,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.GetMesItemByItemNo();
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.itemNo = "";
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.billNo.focus();
+ that.billNo = "";
+ that.ItemBlDetail = null;
+ //console.log(error);
+ });
+ },
+ deleteDbsqMx(mxid) {
+ var that = this;
+ that.isLoading = true;
+
+ that.AxiosHttp("post", 'Zzxdb/deleteDbsqMx', {
+ id: mxid,
+ userName: that.userInfo.loginAccount,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.GetMesItemByItemNo();
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.itemNo = "";
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //console.log(error);
+ });
+ },
+ submitDbBillNo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Zzxdb/submit', {
+ id: that.ItemDetail.items[0].pid,
+ userName: that.userInfo.loginAccount,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.GetMesItemByItemNo();
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.itemNo = "";
+ }
+ 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/Zzxdb.aspx b/H5/Zzxdb.aspx
new file mode 100644
index 0000000..dced747
--- /dev/null
+++ b/H5/Zzxdb.aspx
@@ -0,0 +1,213 @@
+锘�<%@ Page Title="鍛ㄨ浆绠辫皟鎷�" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <style>
+ .bg-info {
+ background-color: #fff;
+ }
+ .container {
+ padding: 10px;
+ }
+ .header {
+ background-color: #f5f5f5;
+ padding: 8px 0;
+ font-weight: bold;
+ border-bottom: 1px solid #ebedf0;
+ }
+ .data-rows {
+ max-height: 400px;
+ overflow-y: auto;
+ }
+ .data-row {
+ padding: 8px 0;
+ border-bottom: 1px solid #ebedf0;
+ }
+ .text-left {
+ text-align: left;
+ }
+ .padding-left {
+ padding-left: 8px;
+ }
+ .blue-text {
+ color: #1989fa;
+ }
+ .empty-state {
+ text-align: center;
+ padding: 20px;
+ color: #969799;
+ }
+ .mySolid.font {
+ font-size: 14px;
+ }
+ .van-button {
+ margin: 5px;
+ }
+ .van-cell-group {
+ margin-bottom: 10px;
+ }
+ </style>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-nav-bar
+ title="鍛ㄨ浆绠辫皟鎷�"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()"
+ ></van-nav-bar>
+
+ <div>
+ <van-cell-group>
+ <van-field
+ ref="billNo"
+ v-model="billNo"
+ label="鍗曟嵁缂栧彿"
+ clearable
+ placeholder="杈撳叆鎴栨壂鎻忎簩缁寸爜"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="GetMesItemBlDetailByBillNo()"
+ ></van-field>
+
+ <van-field
+ ref="dckw"
+ v-model="dckw"
+ label="璋冨嚭搴撲綅"
+ clearable
+ placeholder="杈撳叆鎴栨壂鎻忎簩缁寸爜"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ ></van-field>
+
+ <van-field
+ ref="drkw"
+ v-model="drkw"
+ label="璋冨叆搴撲綅"
+ clearable
+ placeholder="杈撳叆鎴栨壂鎻忎簩缁寸爜"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ ></van-field>
+
+ <van-field
+ v-model="itemNo"
+ label="鐗╂枡缂栫爜"
+ clearable
+ placeholder="鐗╂枡缂栫爜"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="GetMesItemByItemNo()"
+ >
+ <template #button>
+ <van-button size="small" type="info" plain @click="getInfo">閫夋嫨</van-button>
+ </template>
+ </van-field>
+
+ <van-field
+ ref="dbNum"
+ v-model="dbNum"
+ center
+ clearable
+ label="璋冩嫧鏁伴噺"
+ placeholder="杈撳叆璋冩嫧鏁伴噺"
+ v-focus.noKeyboard
+ ></van-field>
+
+ <van-field
+ v-model="item_name"
+ label="鐗╂枡鍚嶇О"
+ placeholder=""
+ clearable
+ :right-icon-size="19"
+ disabled
+ ></van-field>
+
+ <van-field
+ v-model="item_model"
+ label="鐗╂枡瑙勬牸"
+ clearable
+ placeholder=""
+ :right-icon-size="19"
+ disabled
+ ></van-field>
+
+ <van-field
+ v-model="remark"
+ label="澶囨敞"
+ clearable
+ placeholder="杈撳叆澶囨敞"
+ :right-icon-size="19"
+ ></van-field>
+
+ <van-field
+ v-model="kcNum"
+ label="鍗虫椂搴撳瓨"
+ clearable
+ placeholder="鍗虫椂搴撳瓨"
+ :right-icon-size="19"
+ disabled
+ ></van-field>
+ </van-cell-group>
+ </div>
+
+ <div style="padding: 10px;">
+ <van-button type="primary" @click="saveDbsq" :loading="load" loading-text="鍙戦�佷腑">淇濆瓨</van-button>
+ <van-button type="primary" @click="submitDbBillNo" :loading="load" loading-text="鍙戦�佷腑">纭璋冩嫧</van-button>
+ </div>
+
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呯‘璁よ皟鎷ㄥ崟" class="mySolid font">
+ <div class="container">
+ <!-- 琛ㄥご -->
+ <van-row class="header">
+ <van-col span="3" class="text-left padding-left">璋冨嚭搴撲綅</van-col>
+ <van-col span="3" class="text-left padding-left">璋冨叆搴撲綅</van-col>
+ <van-col span="5" class="text-left padding-left">鐗╂枡缂栫爜</van-col>
+ <van-col span="3">璋冩嫧鏁伴噺</van-col>
+ <van-col span="4" 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-row>
+
+ <!-- 鏁版嵁琛� -->
+ <div class="data-rows">
+ <van-row v-for="(itm,index) in ItemDetail.items" :key="index" class="data-row">
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.dckw}}</div>
+ </van-col>
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.drkw}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div class="blue-text">{{itm.itemNo}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.FQty}}</van-col>
+ <van-col span="4" class="text-left padding-left">
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="3">{{itm.itemModel}}</van-col>
+ <van-col center span="3">
+ <van-tag type="danger" @click="deleteDbsqMx(itm.id)" style="font-size:15px" >鍒犻櫎</van-tag>
+ </van-col>
+ </van-row>
+
+ <!-- 绌虹姸鎬佹彁绀� -->
+ <div v-if="!ItemDetail.items || ItemDetail.items.length === 0" class="empty-state">
+ 鏆傛棤鏁版嵁
+ </div>
+ </div>
+ </div>
+ </van-tab>
+ </van-tabs>
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect"></van-action-sheet>
+
+</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/Zzxdb.js?<%=11117 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/Zzxdb.aspx.cs b/H5/Zzxdb.aspx.cs
new file mode 100644
index 0000000..0bbf74c
--- /dev/null
+++ b/H5/Zzxdb.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_Scbl : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/Mst.master b/Mst.master
index a82a064..54d09a6 100644
--- a/Mst.master
+++ b/Mst.master
@@ -11,7 +11,7 @@
<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?<%=123611130 %>"></script>
+ <script src="/scripts/config.js?<%=123611131 %>"></script>
<!-- <script src="/scripts/config.js?<%=DateTime.Now.Ticks %>"></script>-->
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
diff --git a/Scripts/config.js b/Scripts/config.js
index 8a354bc..c711a0e 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -86,6 +86,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')
diff --git a/UserLogin.aspx b/UserLogin.aspx
index 1fa9d6d..e68021d 100644
--- a/UserLogin.aspx
+++ b/UserLogin.aspx
@@ -4,6 +4,35 @@
.bg-info {
background-color:#fff;
}
+ .remember-pwd {
+ display: flex;
+ align-items: center;
+ padding: 8px 16px;
+ margin: 10px 0;
+ }
+ .remember-label {
+ font-size: 14px;
+ color: #323233;
+ display: flex;
+ align-items: center;
+ }
+ .custom-checkbox {
+ transform: scale(0.9); /* 缂╁皬澶嶉�夋 */
+ margin-right: 6px; /* 璋冩暣涓庢枃瀛楃殑闂磋窛 */
+ }
+ .forgot-pwd {
+ font-size: 14px;
+ color: #1989fa;
+ text-decoration: none;
+ }
+ /* 濡傛灉闇�瑕佹洿绮剧‘鐨勬帶鍒讹紝鍙互瑕嗙洊Vant鏍峰紡 */
+ .van-checkbox__icon .van-icon {
+ font-size: 18px; /* 璋冩暣鍥炬爣澶у皬 */
+ }
+ .van-checkbox__label {
+ margin-left: 5px; /* 璋冩暣鏍囩宸﹁竟璺� */
+ font-size: 14px;
+ }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" runat="Server">
@@ -37,6 +66,16 @@
placeholder="璇疯緭鍏ュ瘑鐮�"
:rules="[{ required: true, message: '璇疯緭鍏ュ瘑鐮�' }]"
></van-field>
+ <!-- 璁颁綇瀵嗙爜澶嶉�夋 - 璋冩暣浣嶇疆鍒拌〃鍗曢」澶栭潰 -->
+ <div class="remember-pwd">
+ <van-checkbox
+ v-model="rememberPwd"
+ shape="square"
+ icon-size="16px"
+ class="remember-label">
+ 璁颁綇瀵嗙爜
+ </van-checkbox>
+ </div>
</van-cell-group>
<div class="margin padding margin-lg-bottom">
<van-button round block type="info" native-type="submit" :loading="isLoading">
@@ -54,5 +93,5 @@
<comloading v-if="isLoading"></comloading>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="Server">
- <script src="/H5/Js/UserLogin.js?<%=1236 %>"></script>
+ <script src="/H5/Js/UserLogin.js?<%=1237 %>"></script>
</asp:Content>
--
Gitblit v1.9.3