1.采购验退 2.其他入库优化 3.入库前拆分优化

南骏 池

7 天以前 71ec8666c4063e6f7600415cfabc1b086f5dcc41

1.采购验退
2.其他入库优化
3.入库前拆分优化

 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>

 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>

 H5/Cgyt.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_Scll : System.Web.UI.Page
{
    protected void Page_Load(object sender, EventArgs e)
    {

    }
}

 H5/Js/Cgyt.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,133 @@
var 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);
            });
        },
    }
})

 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 {

 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>