1.内箱核对
2.其他出库优化,新增子表仓库
3.登录菜单逻辑调整
4.巡检优化
5.核对送检线体选择
6.打印配置界面优化
已修改5个文件
已添加3个文件
329 ■■■■■ 文件已修改
H5/Cpdbsj.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Cpbdsj.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/My.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Nxhd.js 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/My.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Nxhd.aspx 159 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Nxhd.aspx.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Qtck.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Cpdbsj.aspx
@@ -144,8 +144,8 @@
                </van-field>
                
                <van-field
                    ref="LsBar"
                    v-model="LsBar"
                    ref="xt"
                    v-model="xt"
                    label="线别"
                    placeholder="请选择线别"
                    autofocus="true"
@@ -223,5 +223,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Cpbdsj.js?<%=1211111141 %>"></script>
    <script src="Js/Cpbdsj.js?<%=1211111142 %>"></script>
</asp:Content>
H5/Js/Cpbdsj.js
@@ -29,6 +29,7 @@
            DAA001: [],
            show: false,//列表展示
            actions: [],//列表的值
            xt:"",
        }
    },
    mounted() {
@@ -347,6 +348,19 @@
                });
        },
        onSelect(item) {
            // é»˜è®¤æƒ…况下点击选项时不会自动收起
            // å¯ä»¥é€šè¿‡ close-on-click-action å±žæ€§å¼€å¯è‡ªåŠ¨æ”¶èµ·
            this.show = false;
            console.log(item);
            // æ­£åˆ™åŒ¹é…ç¬¬ä¸€ä¸ªæ–¹æ‹¬å·å†…容
            const regex = /\[([^\]]+)\]/;
            const matchResult = item.name.match(regex);
            this.xt = item.name;
            //this.$toast(item.name);
        },
    }
})
H5/Js/My.js
@@ -81,6 +81,7 @@
                url: "/pages/index/test/PrintInit?type=1",
            });
        },
        goOrg() {
            var that = this;
            this.$dialog.confirm({
H5/Js/Nxhd.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,129 @@
var vm = new Vue({
    el: '#app',
    data: function () {
        return {
            isLoading: false,
            userInfo: {
                "loginGuid": '',
                "loginAccount": '',
            },
            ZsBar: "",//追溯条码
            LsBar: "",//后盖流水条码
            UserName: Cookies.get('loginName'),//用户名称
            ZsBarInfo: [],
            Traceability: [],
            GX: "G006:内箱核对",
        }
    },
    mounted() {
        var that = this;
        this.userInfo = {
            loginGuid: this.GetLoginInfor().loginGuid,
            loginAccount: this.GetLoginInfor().loginAccount,
        };
    },
    methods: {
        getHgBarInfo() {
            if (this.isLoading) {
                return;
            }
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/getHgBarInfo', {
                Xt: that.GX,
                Zsbarcode: that.ZsBar
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.ZsBarInfo = json.data.tbBillList.zsBarInfo[0];
                        that.Traceability = json.data.tbBillList.traceability;
                        that.$refs.LsBar.focus();
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.ZsBar.focus();
                        that.ZsBar = "";
                        that.ZsBarInfo = [];
                        that.Traceability = [];
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    that.$refs.ZsBar.focus();
                    that.ZsBar = "";
                    that.ZsBarInfo = [];
                    that.Traceability = [];
                });
        },
        ScanNxhd() {
            if (this.isLoading) {
                return;
            }
            var that = this;
            if (that.ZsBar.length <= 0) {
                that.$toast.fail("后盖码不能为空!");
                return;
            }
            if (that.LsBar.length <= 0) {
                that.$toast.fail("箱码不能为空!");
                return;
            }
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/ScanNxhd', {
                ZsBar: that.ZsBar,
                LsBar: that.LsBar,
                userName: that.userInfo.loginAccount,
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        // that.scanInfo = json.data.tbBillList;
                        that.$notify({ type: 'success', message: json.message });
                        that.$refs.ZsBar.focus();
                        that.ZsBar = null;
                        that.LsBar = null;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.ZsBar.focus();
                        that.ZsBar = null;
                        that.LsBar = null;
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    that.$refs.ZsBar.focus();
                    that.ZsBar = null;
                    that.LsBar = null;
                });
        },
        //打印机注释
        //selectPrinter(printer) {
        //    this.selectedPrinter = printer.printerId; // æ›´æ–°é€‰ä¸­çš„æ‰“印机编号
        //},
        //confirmSelection() {
        //    if (this.selectedPrinter) {
        //        alert(`您选择了打印机:${this.selectedPrinter}`);
        //        // åœ¨è¿™é‡Œå¤„理选择结果,例如调用接口或更新状态
        //        this.isPrinterPopupVisible = false; // å…³é—­å¼¹çª—
        //    } else {
        //        alert('请选择一个打印机!');
        //    }
        //},
        //onPrinterSelected(value) {
        //    console.log('当前选中的打印机编号:', value);
        //},
    }
})
H5/My.aspx
@@ -55,6 +55,6 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
     <script src="Js/comWebNav.js"></script>
    <script src="Js/My.js?<%=123451 %>"></script>
    <script src="Js/My.js?<%=123452 %>"></script>
</asp:Content>
H5/Nxhd.aspx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,159 @@

<%@ Page Title="内箱核对" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Nxhd.aspx.cs" Inherits="H5_Nxhd" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
  <style>
    .si-status-box,
    .si-status__left
    {
        background-color: transparent !important; /* é€æ˜ŽèƒŒæ™¯ */
        border: 1px solid #000 !important; /* é»‘色外框 */
        color: #000 !important; /* å…¨å±€æ–‡å­—颜色 */
        height: 0.5rem;
    }
    .si-status__left::after {
        content: none !important;
    }
    .si-status__label,
    .si-status__right {
        font-size: 0.33rem !important; /* ç»Ÿä¸€å­—体大小 */
        color: inherit !important; /* ç»§æ‰¿çˆ¶çº§æ–‡å­—颜色 */
    }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
    <div class="content-wrapper">
        <van-nav-bar
            title="内箱核对"
            left-text="返回"
            left-arrow
            @click-left="GoBack()">
        </van-nav-bar>
        <div class="mySolid">
            <van-cell-group>
                <van-field
                    ref="ZsBar"
                    v-model="ZsBar"
                    label="后盖条码"
                    clearable
                    placeholder="请扫后盖条码"
                    :right-icon-size="19"
                    v-focus.noKeyboard
                    @keyup.enter.native="getHgBarInfo"
                    autofocus="true">
                </van-field>
                <van-field
                    v-model="UserName"
                    label="作业人员"
                    clearable
                    :right-icon-size="19"
                    placeholder=""
                    readonly >
                </van-field>
                <van-field
                    ref="barcode"
                    v-model="ZsBarInfo.lineName"
                    label="产线"
                    clearable
                    placeholder="产线名称"
                    :right-icon-size="19"
                    readonly >
                </van-field>
                <van-field
                    ref="LsBar"
                    v-model="LsBar"
                    label="箱条码"
                    placeholder="请扫箱条码"
                   @keyup.enter.native="ScanNxhd"
                    autofocus="true">
                </van-field>
<%--                <div class="si-status-group">
                  <div class="si-status-box si-status--ok">
                    <div class="si-status__left">
                      <span class="si-status__label">总数</span>
                    </div>
                    <div  class="si-status__right">{{ZsBarInfo.sumQty}}</div>
                  </div>
                  <div class="si-status-box si-status--error">
                    <div class="si-status__left">
                      <span class="si-status__label">完成数</span>
                    </div>
                    <div class="si-status__right">{{ZsBarInfo.finQty}}</div>
                  </div>--%>
<%--                    <van-button
                        slot="button"
                        type="info"
                        size="small"
                        @click="productBinding">
                        æäº¤
                    </van-button>--%>
                </div>
            </van-cell-group>
        </div>
        <van-tabs color="#000" title-active-color="#0283EF">
            <van-tab title="产品信息" class="mySolid font">
                <van-cell-group >
                  <van-field label="指令单号" colon="true" v-model="ZsBarInfo.daa001" readonly style="background: #ffa53b"></van-field>
                  <van-field label="条码数量" colon="true" v-model="ZsBarInfo.barQty" readonly style="background: #ffa53b" ></van-field>
                  <van-field label="追溯码" colon="true" v-model="ZsBarInfo.zsBarcode" readonly style="background: #ffa53b" ></van-field>
                  <van-field label="产品编码" colon="true" v-model="ZsBarInfo.item_no" readonly style="background: #ffa53b" ></van-field>
                  <van-field label="产品名称" colon="true" v-model="ZsBarInfo.item_name" readonly style="background: #ffa53b" ></van-field>
                  <van-field label="产品规格" colon="true" v-model="ZsBarInfo.item_model" readonly style="background: #ffa53b" ></van-field>
                  <van-field label="前一工序" colon="true" v-model="ZsBarInfo.lastGx" readonly style="background: #ffa53b" ></van-field>
                  <van-field label="当前工序" colon="true" v-model="GX" readonly style="background: #ffa53b" ></van-field>
                </van-cell-group>
            </van-tab>
            <van-tab title="生产履历" class="mySolid font">
                <van-row>
                    <van-col span="6">人员</van-col>
                    <van-col span="6">产线</van-col>
                    <van-col span="6">工序</van-col>
                    <van-col span="6">结果</van-col>
                </van-row>
                <van-row v-for="(itm,index) in Traceability" :key="index">
                    <van-col span="6" >{{itm.useR_NAME}}</van-col>
                    <van-col span="6" >{{itm.line_no}}</van-col>
                    <van-col span="6" class="blue-text">{{itm.processNo}}</van-col>
                    <van-col span="6" >{{itm.checkResult}}</van-col>
                </van-row>
            </van-tab>
<%--            <van-tab title="已绑条码" class="mySolid font">
                <van-row>
                    <van-col span="5">人员</van-col>
                    <van-col span="5">产线</van-col>
                    <van-col span="5">工序</van-col>
                    <van-col span="4">良品</van-col>
                    <van-col span="5">不良品</van-col>
                </van-row>
                <van-row v-for="(itm,index) in Traceability" :key="index">
                    <van-col span="5" >{{itm.fQty}}</van-col>
                    <van-col span="5" >{{itm.fQty}}</van-col>
                    <van-col span="5" class="blue-text">{{itm.fQty}}</van-col>
                    <van-col span="4" >{{itm.fQty}}</van-col>
                    <van-col span="5" >{{itm.sQty}}</van-col>
                </van-row>
            </van-tab>--%>
        </van-tabs>
    </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading v-if="isLoading"></comloading>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Nxhd.js?<%=111 %>"></script>
</asp:Content>
H5/Nxhd.aspx.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
using 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)
    {
    }
}
H5/Qtck.aspx
@@ -62,9 +62,9 @@
  label="发料数量"
  placeholder="发料数量"
  disabled
><template #button>
><%--<template #button>
    <van-button size="small" type="info" plain @click="tmcf" >条码拆分</van-button>
  </template></van-field>
  </template>--%></van-field>
</van-cell-group>
    </div>