南骏 池
2025-04-11 0bb1834b9755eaf7c67d25cd9012be2ca14a7efe
1.委外退料优化
2.核对送检
已添加1个文件
已修改2个文件
334 ■■■■ 文件已修改
H5/Cpdbsj.aspx 217 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Cpbdsj.js 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Wwtl.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Cpdbsj.aspx
@@ -1,4 +1,4 @@
<%@ Page Title="绑定送检" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Cpdbsj.aspx.cs" Inherits="H5_Cpdbsj" %>
<%@ Page Title="核对送检" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Cpdbsj.aspx.cs" Inherits="H5_Cpdbsj" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
  <style>
    .si-status-box,
@@ -19,13 +19,48 @@
        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; /* é˜²æ­¢å†…容溢出 */
    }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
    <div class="content-wrapper">
        <van-nav-bar
            title="绑定送检"
            title="核对送检"
            left-text="返回"
            left-arrow
            @click-left="GoBack()">
@@ -34,115 +69,131 @@
        <div class="mySolid">
            <van-cell-group>
                <van-field 
                    ref="ZsBar"
                    v-model="ZsBar"
                    label="追溯条码"
                    ref="KbBar"
                    v-model="KbBar"
                    label="卡板条码"
                    clearable 
                    placeholder="请扫码"
                    :right-icon-size="19"
                    v-focus.noKeyboard
                    @keyup.enter.native="getZsBarInfo"
                    @keyup.enter.native="getKbBarInfo"
                    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">{{KbBarInfo.oldqty}}</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">{{KbBarInfo.ySum}}</div>
                  </div>
                </div>
                
                <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 >
                  label="装箱数"
                  class="centered-stepper-field"
                  :model-value="Xvalue.toString()"
                >
                  <template #input>
                    <div class="stepper-container">
                      <van-stepper
                        v-model="Xvalue"
                        :min="1"
                        :max="99"
                        integer
                        button-size="26px"
                        :disable-input="true"
                      />
                    </div>
                  </template>
                </van-field>
                
                <van-field
                    ref="LsBar"
                    v-model="LsBar"
                    label="后盖条码"
                    placeholder="请扫后盖码"
                    @keyup.enter.native="getModel"
                    label="箱条码"
                    placeholder="请扫外箱码"
                    autofocus="true">
                </van-field>
                <van-field
                    ref="LsBar"
                    v-model="LsBar"
                    label="产品条码"
                    placeholder="请扫产品条码"
                    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="getChaiFen">
                        æäº¤
                    </van-button>
                <van-field
                    ref="LsBar"
                    v-model="LsBar"
                    label="线别"
                    placeholder="请选择线别"
                    autofocus="true">
                </van-field>
               <!-- ä¿®æ”¹åŽçš„æŒ‰é’®å®¹å™¨ -->
                <div class="button-container">
                  <van-button
                    type="warning"
                    class="action-button reset-button"
                  >重置</van-button>
                  <van-button
                    type="info"
                    class="action-button submit-button"
                  >送检</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-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-col span="7" class="text-left padding-left">条码</van-col>
                    <van-col span="7" 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-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 v-for="(itm,index) in KbBarMxInfo" :key="index">
                    <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>
                        <div>{{itm.item_name}}</div>
                    </van-col>
                    <van-col span="7" class="text-left padding-left">
                        <div>{{itm.item_model}}</div>
                    </van-col>
                    <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
                </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>
                    <van-col span="5">工序</van-col>
                    <van-col span="4">良品</van-col>
                    <van-col span="5">不良品</van-col>
                    <van-col span="7" class="text-left padding-left">条码</van-col>
                    <van-col span="7" 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-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 v-for="(itm,index) in KbBarMxInfo" :key="index">
                    <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>
                        <div>{{itm.item_name}}</div>
                    </van-col>
                    <van-col span="7" class="text-left padding-left">
                        <div>{{itm.item_model}}</div>
                    </van-col>
                    <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
                </van-row>
            </van-tab>
        </van-tabs>
@@ -154,5 +205,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Cpbd.js?<%=121112 %>"></script>
    <script src="Js/Cpbdsj.js?<%=11111 %>"></script>
</asp:Content>
H5/Js/Cpbdsj.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
var vm = new Vue({
    el: '#app',
    data: function () {
        return {
            isLoading: false,
            userInfo: {
                "loginGuid": '',
                "loginAccount": '',
            },
            KbBar: "",//卡板条码
            LsBar: "",//后盖流水条码
            UserName: Cookies.get('loginName'),//用户名称
            KbBarInfo: [],
            KbBarMxInfo: [],
            GX: "G007:核对送检",
            Xvalue:4,
            ItemDetail:[],
        }
    },
    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) {
                        that.$refs.LsBar.focus();
                        that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
                        that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.KbBar.focus();
                        that.KbBar = "";
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                });
        },
        productBinding() {
            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/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.$notify({ type: 'success', message: json.message });
                        that.$refs.ZsBar.focus();
                        that.ZsBar = null;
                        that.ZsBar = null;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.ZsBar.focus();
                        that.ZsBar = null;
                        that.ZsBar = null;
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    that.$refs.ZsBar.focus();
                    that.ZsBar = null;
                    that.ZsBar = 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/Wwtl.aspx
@@ -75,7 +75,7 @@
         <van-col span="6">待扫</van-col>
        <van-col span="6">已扫</van-col>
</van-row>
  <van-row v-for="value in ItemTblDetail" class="font">
  <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>