11
啊鑫
昨天 5046056a0860ee978af022154aab430d4347ca52
11
已修改13个文件
582 ■■■■ 文件已修改
H5/Cpdbsj.aspx 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Dbrk.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Cpbdsj.js 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Dbrk.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/PurchaseReturn.js 109 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Qtck.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Wwll.js 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Xsck.js 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/PurchaseReturn.aspx 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Qtck.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Wwll.aspx 154 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Xsck.aspx 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Scripts/config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Cpdbsj.aspx
@@ -159,6 +159,17 @@
                    </template>
                </van-field>
                <van-field
                    ref="AgvDw"
                    v-model="AgvDw"
                    label="点位"
                    placeholder="请选择点位"
                    autofocus="true"
                    @click.native="selectDW"
                    readonly>
                </van-field>
                <van-field
                    ref="xtName"
                    v-model="xtName"
@@ -199,6 +210,8 @@
        </div>
        <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
        <van-action-sheet v-model="showAgvDw" :actions="actionsAgvDw" @select="onSelectAgvDw" ></van-action-sheet>
        <van-tabs color="#000" title-active-color="#0283EF">
            <van-tab title="箱明细" class="mySolid font">
@@ -253,5 +266,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Cpbdsj.js?<%=12111111421514 %>"></script>
    <script src="Js/Cpbdsj.js?<%=1212111421525 %>"></script>
</asp:Content>
H5/Dbrk.aspx
@@ -152,5 +152,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Dbrk.js?<%=1141111 %>"></script>
 <script src="Js/Dbrk.js?<%=1141112 %>"></script>
</asp:Content>
H5/Js/Cpbdsj.js
@@ -32,7 +32,10 @@
            actions: [],//列表的值
            xtName: "",//线体名称
            xtNum: "",//线体编号
            AgvDw: "",//AGV点位
            agvChecked: false,//是否勾选AGV
            showAgvDw: false,//点位展示
            actionsAgvDw: [],//列表AGV点位
        }
    },
    mounted() {
@@ -43,6 +46,17 @@
        };
    },
    methods: {
        handleAgvPositions(positionStr) {
            if (!positionStr) return [];
            // 检查是否存在逗号,如果不存在则返回空数组
            if (!positionStr.includes(',')) return [];
            // 将字符串按逗号分割并转换为选项数组
            return positionStr.split(',').map(pos => ({
                name: pos.trim() // 去除可能的空格
            }));
        },
        getKbBarInfo() {
            var that = this;
            that.isLoading = true;
@@ -52,13 +66,31 @@
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        console.log(json.data.tbBillList.kbBarInfo[0].agvPostion);
                        that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
                        that.DAA001 = that.KbBarInfo.daA001;
                        that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
                        that.$refs.XBar.focus();
                        that.XbarInfo = [];
                        that.XBar = "";
                        // 检查是否存在逗号
                        //const agvPosition = json.data.tbBillList.kbBarInfo[0].agvPostion;
                        //that.AgvDw = agvPosition.includes(',') ? agvPosition.split(',')[0] : '';
                        const agvPostion = json.data && json.data.tbBillList && json.data.tbBillList.kbBarInfo &&
                            json.data.tbBillList.kbBarInfo[0] && json.data.tbBillList.kbBarInfo[0].agvPostion;
                        if (agvPostion != null) {
                            const agvPostionStr = String(agvPostion);
                            that.AgvDw = agvPostionStr.split(',')[0];
                            that.actionsAgvDw = that.handleAgvPositions(agvPostionStr);
                        } else {
                            that.AgvDw = null;
                            that.actionsAgvDw = null;
                        }
                    }
                    else {
                        that.$playSound('error');
@@ -371,6 +403,16 @@
            this.xtName = action.name;  // 绑定name到xtName字段
            this.show = false;
        },
        onSelectAgvDw(action) {
            this.AgvDw = action.name;
            this.showAgvDw = false;
        },
        selectDW() {
            this.showAgvDw = true;
        },
        //获取可呼叫AGV的线体
        selectXt() {
            this.show = true;
@@ -435,6 +477,12 @@
                that.$toast.fail("请先扫描卡板条码");
                return;
            }
            if (!that.AgvDw) {
                that.$playSound('error');
                that.$toast.fail("请先选择AGV点位");
                return;
            }
    
            // 计算可装数和已装数
            const oldqty = +(that.KbBarInfo.quantity || 0);
@@ -449,7 +497,8 @@
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
                KbBar: that.KbBar,
                userAccount: that.userInfo.loginAccount
                userAccount: that.userInfo.loginAccount,
                AgvDw: that.AgvDw
            }, false)
                .then(function (res) {
                    var json = res;
H5/Js/Dbrk.js
@@ -86,7 +86,7 @@
                        //that.ItemBlDetail = json.data.tbBillList;
                        that.ItemDetail = json.data.tbBillList;
                        that.$refs.sectionCode.focus();
                        that.sectionCode = "";
                        //that.sectionCode = "";
                    }
                    else {
                        that.$toast.fail(json.message);
@@ -130,7 +130,7 @@
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.sectionCode.focus();
                        that.sectionCode = "";
                        //that.sectionCode = "";
                    }
                })
@@ -139,7 +139,7 @@
                    that.$toast.fail("网络错误,请重试!");
                    //console.log(error);
                    that.$refs.sectionCode.focus();
                    that.sectionCode = "";
                    //that.sectionCode = "";
                });
        },
        getBarcode() {
H5/Js/PurchaseReturn.js
@@ -26,13 +26,21 @@
            messageCenter: {},
            messageId: 0,
            show: false,
            scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
            ip: "",
            port: "",
            oldBarInfo: [],
            cfBarInfo: [],
            selectKey: "",//查询关键字
            actions: [],//列表的值
            show: false,//列表展示
            // 当前选中行的索引
            currentIndex: -1,
            // 存储选中行数据对象
            selItem: {},
            ItemBarKw: [],//当天行相关条码库位信息
            DaaInfo: {},
        }
    },
    mounted() {
@@ -45,20 +53,78 @@
        //that.show = false;
    },
    methods: {
        getItemOutNo() {
            var that = this;
        /**
        * 处理行点击事件(单选逻辑)
        * @param {Object} item 当前行数据
        * @param {Number} index 当前行索引
        */
        handleRowClick(item, index) {
            if (this.isLoading) {
                return;
            }
            // 重置所有行的选中状态
            this.currentIndex = -1;
            // 设置当前选中行
            this.currentIndex = index;
            this.selItem = {
                itemid: item.itemId,//驼峰命名法!!!
                index: index
            };
            console.log('当前选中项:', this.selItem); // 调试用
            this.GetBarKwByItem();
        },
        //获取库位信息
        GetBarKwByItem() {
            //Womdaa
            //WwGd
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesCgthSq/GetMesCgthSq', {
            that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
                itemId: that.selItem.itemid,
                userName: that.userInfo.loginAccount,
                type: 'CGCK',
                billNo:that.scanFormData.itemOutNo
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.ItemBarKw = json.data.tbBillList;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.ItemBarKw = [];
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    that.$playSound('error');
                    console.log(error);
                    that.ItemBarKw = [];
                });
        },
        getItemOutNo() {
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesCgthSq/GetMesCgthSq', {}, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.itemOutNoList = json.data.tbBillList;
                        that.itemOutNoStr = that.itemOutNoList.map(s => {
                            return { name: s.billNo }
                        });
                        that.show = true;
                        if (!Array.isArray(that.itemOutNoList) || that.itemOutNoList.length === 0) {
                            that.$toast.fail("没有可用的数据");
                            that.show = false;
                        }
                        else {
                            that.itemOutNoStr = that.itemOutNoList.map(s => ({ name: s }));
                            that.show = true;
                        }
                    }
                    else {
                        that.$playSound('error');
@@ -100,38 +166,27 @@
        },
        onSelect(item) {
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起
            this.show = false;
            //let staf = this.stafList.filter(it => it.staffName === item.name);
            this.scanFormData.itemOutNo = item.name;
            let itemOut = this.itemOutNoList.filter(it => it.billNo == item.name);
            this.invItemOutId = itemOut[0].id;
            this.invItemOutId = item.name;
            this.ItemBarKw = []; // 选择申请单号后清空库位列表
            this.getItem();
        },
        getItem() {
            var that = this;
            that.isLoading = true;
            let itemOut = this.itemOutNoList.filter(it => it.billNo == that.scanFormData.itemOutNo);
            //this.invItemOutId = itemOut[0].id;
            that.AxiosHttp("post", 'MesCgthSq/GetSumItem', {
                //id: that.invItemOutId,
                billNo: that.scanFormData.itemOutNo,
                barcode: that.scanFormData.barcode,
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.ItemDetail = json.data.tbBillList;
                        that.ItemDetail = {
                            items: json.data.tbBillList.items,
                            ysitems: json.data.tbBillList.ysitems,
                            allList: json.data.tbBillList.allList
                        };
                        that.$refs.barcode.focus();
                    }
                    else {
H5/Js/Qtck.js
@@ -56,9 +56,11 @@
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
            that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
                itemId: that.selItem.itemid,
                userName: that.userInfo.loginAccount
                userName: that.userInfo.loginAccount,
                type: 'QTCK',
                billNo: that.billNo
            }, false)
                .then(function (res) {
                    var json = res;
@@ -124,6 +126,8 @@
            this.show = false;
            this.billNo = item.name;
            // 清空库位列表
            this.ItemBarKw = [];
            this.GetMesItemBlDetailByBillNo();
            //this.$toast(item.name);
H5/Js/Wwll.js
@@ -9,6 +9,20 @@
            },
            modeInfo: { daa001: "", planNo: "" },
            scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
            ItemDetail: [],
            ip: "",
            port: "",
            oldBarInfo: [],
            cfBarInfo: [],
            selectKey: "",//查询关键字
            actions: [],//列表的值
            show: false,//列表展示
            // 当前选中行的索引
            currentIndex: -1,
            // 存储选中行数据对象
            selItem: {},
            ItemBarKw: [],//当天行相关条码库位信息
            DaaInfo: {},
        }
    },
    mounted() {
@@ -19,6 +33,61 @@
        };
    },
    methods: {
        /**
        * 处理行点击事件(单选逻辑)
        * @param {Object} item 当前行数据
        * @param {Number} index 当前行索引
        */
        handleRowClick(item, index) {
            if (this.isLoading) {
                return;
            }
            // 重置所有行的选中状态
            this.currentIndex = -1;
            // 设置当前选中行
            this.currentIndex = index;
            this.selItem = {
                itemid: item.itemId,//驼峰命名法
                index: index
            };
            console.log('当前选中项:', this.selItem); // 调试用
            this.GetBarKwByItem();
        },
        //获取库位信息
        GetBarKwByItem() {
            //Womdaa
            //WwGd
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
                itemId: that.selItem.itemid,
                userName: that.userInfo.loginAccount
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.ItemBarKw = json.data.tbBillList;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.ItemBarKw = [];
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    that.$playSound('error');
                    console.log(error);
                    that.ItemBarKw = [];
                });
        },
        getModel() {
            var that = this;
            that.isLoading = true;
@@ -29,13 +98,20 @@
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.modeInfo = json.data.tbBillList;
                        that.ItemDetail = json.data.tbBillList;
                        that.DaaInfo = json.data.tbBillList.daaInfo;
                        that.modeInfo.planNo = json.data.tbBillList.planNo;
                        that.modeInfo.startTime = json.data.tbBillList.startTime;
                        that.$refs.barcode.focus();
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.$refs.daa001.focus();
                        that.modeInfo.daa001 = "";
                        that.modeInfo.planNo = "";
                        that.modeInfo.startTime = "";
                        that.ItemDetail = [];
                    }
                    that.isLoading = false;
                })
@@ -47,6 +123,7 @@
                    that.modeInfo.daa001 = "";
                });
        },
        //扫码
        getScan() {
            var that = this;
            if (that.modeInfo.daa001.length <= 0) {
@@ -87,6 +164,7 @@
                    that.$refs.barcode.focus();
                });
        },
        //拆分
        getChaiFen() {
            var that = this;
            if (that.modeInfo.daa001.length <= 0) {
@@ -132,5 +210,63 @@
                    that.$refs.splitNum.focus();
                });
        },
        //获取工单信息
        getInfo() {
            this.show = true;
            var that = this;
            that.actions = [];
            that.isLoading = true;
            that.AxiosHttp("post", 'WwGd/GetXcslDaa', {
                selectKey: that.selectKey,
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        if (json.data.tbBillList.length <= 0) {
                            that.$toast.fail("没有可用的数据");
                            that.$playSound('error');
                        } else {
                            that.itemInfo = json.data.tbBillList;
                            that.actions = json.data.tbBillList.map(item => {
                                return {
                                    name: item.daaInfo,  // 拼接字段
                                    subname: item.startTime
                                };
                            });
                        }
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    that.$playSound('error');
                    console.log(error);
                });
        },
        onSelect(item) {
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起
            this.show = false;
            console.log(item);
            // 正则匹配第一个方括号内容
            const regex = /\[([^\]]+)\]/;
            const matchResult = item.name.match(regex);
            if (matchResult && matchResult[1]) {
                this.modeInfo.daa001 = matchResult[1]; // PPBOM00000088-1
                console.log('提取的DAA001:', this.modeInfo.daa001);
            } else {
                this.$toast.fail('工单号格式异常');
                this.modeInfo.daa001 = '';
            }
            this.getModel();
            //this.$toast(item.name);
        },
    }
})
H5/Js/Xsck.js
@@ -23,6 +23,7 @@
            ItemDetail: [],
            ItemBarKw: [],
            currentIndex: -1, 
            zdy: "",
        }
    },
    mounted() {
@@ -56,9 +57,11 @@
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
            that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
                itemId: that.selItem.itemid,
                userName: that.userInfo.loginAccount
                userName: that.userInfo.loginAccount,
                //type: 'XSCK',
                //billNo: that.billNo
            }, false)
                .then(function (res) {
                    var json = res;
@@ -125,6 +128,9 @@
            this.show = false;
            this.billNo = item.name;
            // 清空库位列表
            this.ItemBarKw = [];
            this.GetMesItemDetailByBillNo();
            //this.$toast(item.name);
@@ -141,6 +147,7 @@
                    var json = res;
                    if (json.status == 0) {
                        that.ItemBlDetail = json.data.tbBillList;
                        that.zdy = json.data.tbBillList.allList[0].createNmae;
                        //that.daa001 = json.data.tbBillList.item1;
                        that.$refs.barcode.focus();
                    }
@@ -157,7 +164,7 @@
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    //console.log(error);
                    tthat.$refs.billNo.focus();
                    that.$refs.billNo.focus();
                    that.billNo = "";
                    that.daa001 = "";
                    that.ItemBlDetail = [];
@@ -184,7 +191,7 @@
            }
            if (!that.billNo) {
                this.$toast.fail("发货通知单号不能为空");
                this.$toast.fail("申请单号不能为空");
                that.isLoading = false;
                return;
            }
@@ -199,7 +206,8 @@
            that.AxiosHttp("post", 'MesXsck/XSCKScanBarcode', {
                userName: that.userInfo.loginAccount,
                barcode: that.barcode,
                daa001: that.billNo,
                daa001: that.daa001,
                billNo: that.billNo,
                //type: selectType
            }, false)
                .then(function (res) {
@@ -219,8 +227,12 @@
                    } else if (json.status == 2) {
                        that.$refs.splitNum.focus();
                        that.splitNum = json.data.cfNum;
                        that.num = json.data.num;
                        that.splitNum = json.data.tbBillList.splitNum; // 拆分数量
                        that.num = json.data.tbBillList.barcodeNum;    // 条码数量
                        that.daa001 = json.data.tbBillList.daa001;     // 工单号
                        if (json.data.tbBillList.billNo) {
                            that.billNo = json.data.tbBillList.billNo;
                        }     // 发货通知单号,只在有值时赋值
                    }
                    else {
                        that.$toast.fail(json.message);
@@ -261,16 +273,16 @@
            }
            if (!that.billNo) {
                this.$toast.fail("补料单号不能为空");
                this.$toast.fail("发货单号不能为空");
                that.isLoading = false;
                return;
            }
            if (!that.daa001) {
                this.$toast.fail("工单号不能为空");
                that.isLoading = false;
                return;
            }
            //if (!that.daa001) {
            //    this.$toast.fail("工单号不能为空");
            //    that.isLoading = false;
            //    return;
            //}
            if (!that.splitNum) {
                this.$toast.fail("发货数量不能为空");
@@ -281,7 +293,8 @@
            that.AxiosHttp("post", 'MesXsck/SplitBarcode', {
                userName: that.userInfo.loginAccount,
                barcode: that.barcode,
                daa001: that.billNo,
                daa001: that.daa001,
                billNo: that.billNo,
                num: that.splitNum,
                //type: selectType
            }, false)
H5/PurchaseReturn.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
            <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
        <div class="content-wrapper">
    <van-nav-bar
  title="采购退料"
@@ -41,7 +47,7 @@
  <%--@change="SaveBarCodes"--%>
></van-field>
   <van-field
  v-model="scanFormData.itemNo"
  v-model="scanFormData.itemid"
  label="物料编码"
  placeholder="物料编码"
  disabled
@@ -70,7 +76,7 @@
</van-field>
</van-cell-group>
    </div>
  <van-tabs color="#000" title-active-color="#0283EF">
    <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>
@@ -78,7 +84,12 @@
            <van-col span="3">待扫</van-col>
            <van-col span="5">推荐库位</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
        <!-- 增加行点击与选中高亮 -->
            <van-row
            v-for="(itm,index) in ItemDetail.items"
            :key="index"
            :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
            @click.native="handleRowClick(itm, index)">
            <van-col span="8" class="text-left padding-left">
                <div class="blue-text">{{itm.itemNo}}</div>
                <div>{{itm.itemName}}</div>
@@ -91,6 +102,25 @@
        </van-row>
    </van-tab>
                          <van-tab title="库位列表" class="mySolid font">
                <van-row>
                    <van-col span="10" class="text-left padding-left">条码编号</van-col>
                    <van-col span="5" class="text-left padding-left">库位</van-col>
                    <van-col span="4">数量</van-col>
                    <van-col span="5">仓库</van-col>
                </van-row>
                <van-row v-for="(itm,index) in ItemBarKw" :key="index">
                    <van-col span="10" class="text-left padding-left">
                        <div class="blue-text">{{itm.iteM_BARCODE}}</div>
                    </van-col>
                    <van-col span="5" class="text-left padding-left">
                        <div>{{itm.depoT_SECTIONS_CODE}}</div>
                    </van-col>
                    <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
                    <van-col span="5" >{{itm.depot_name}}</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>
@@ -100,7 +130,7 @@
        </van-row>
        <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index">
            <van-col span="8" class="text-left padding-left">
                <div class="blue-text">{{itm.itemNo}}</div>
                <div class="blue-text">{{itm.itemid}}</div>
                <div>{{itm.itemName}}</div>
            </van-col>
            <van-col span="8" class="text-left padding-left">
@@ -123,5 +153,5 @@
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/PurchaseReturn.js?<%=1281111111 %>"></script>
    <script src="Js/PurchaseReturn.js?<%=1281111233 %>"></script>
</asp:Content>
H5/Qtck.aspx
@@ -165,5 +165,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Qtck.js?<%=111306 %>"></script>
 <script src="Js/Qtck.js?<%=111307 %>"></script>
</asp:Content>
H5/Wwll.aspx
@@ -4,18 +4,43 @@
    .bg-info {
        background-color:#fff;
    }
          .org-info {
        height: 0.5rem;
        line-height: 0.5rem;
        padding: 0 0.16rem;
    }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
            <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
    <van-nav-bar
  title="委外领料"
  left-text="返回"
  left-arrow
  @click-left="GoBack()"
></van-nav-bar>
    <%--<div class="mySolid">--%>
    <div class="mySolid">
        <van-cell-group>
                <van-field
                    ref ="selectKey"
                value=""
                label="工单查询"
                clearable
                    placeholder="请选择工单号进行查询"
                :right-icon-size="19"
                    v-model="selectKey"
                ><template #button>
                <van-button size="small" type="info" plain @click="getInfo" >选择</van-button>
                </template></van-field>
  <van-field 
    ref="daa001"
    v-model="modeInfo.daa001"
@@ -35,6 +60,25 @@
   placeholder="任务单号"
   disabled
></van-field>
<%--                <van-field
                    v-model="DaaInfo.startTime"
                    label="开工时间"
                    clearable
                    :right-icon-size="19"
                    placeholder="开工时间"
                    disabled>
                </van-field>
                <van-field
                    v-model="DaaInfo.lineName"
                    label="线体名称"
                    clearable
                    :right-icon-size="19"
                    placeholder="线体名称"
                    disabled>
                </van-field>--%>
 <van-field
   ref="barcode"
   v-model="scanInfo.barcode"
@@ -59,49 +103,85 @@
    label="发料数量"
    placeholder="发料数量" 
  >
    <van-button slot="button" type="info" size="small"  plain @click="getChaiFen">
      条码拆分
    </van-button>
    <van-button slot="button" type="info" size="small"  plain @click="getChaiFen">条码拆分</van-button>
  </van-field>
</van-cell-group>
   <%-- </div>--%>
  <van-tabs color="#000" title-active-color="#0283EF">
  <van-tab title="待发物料" class="mySolid font">
      <van-row>
            <van-col span="12" class="text-left padding-left">物料</van-col>
             <van-col span="6">待扫</van-col>
            <van-col span="6">已扫</van-col>
    </van-row>
    <van-row  v-for="(itm,index) in modeInfo.daisao1" :key="index">
          <van-col span="12"  class="text-left padding-left">
               <div>{{itm.itemNo}}</div>
               <div>{{itm.itemName}}</div>
          </van-col>
          <van-col span="6">{{itm.dab006}}</van-col>
         <van-col span="6">{{itm.dab007}}</van-col>
    </van-row>
  </van-tab>
   <van-tab title="物料总清单" class="mySolid font">
         <van-row>
            <van-col span="12" class="text-left padding-left">物料</van-col>
             <van-col span="6">需领数</van-col>
            <van-col span="6">已领数</van-col>
    </div>
    <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
    <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="3">待扫</van-col>
            <van-col span="5">推荐库位</van-col>
        </van-row>
        <van-row  v-for="(itm,index) in modeInfo.totals1" :key="index">
           <van-col span="12" class="text-left padding-left">
                <div>{{itm.itemNo}}</div>
        <!-- 增加行点击与选中高亮 -->
            <van-row
            v-for="(itm,index) in ItemDetail.items"
            :key="index"
            :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
            @click.native="handleRowClick(itm, 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="6">{{itm.dab006}}</van-col>
           <van-col span="6">{{itm.dab007}}</van-col>
       </van-row>
   </van-tab>
            </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.dsQty}}</van-col>
            <van-col span="5">{{itm.recoKw}}</van-col>
        </van-row>
    </van-tab>
                    <van-tab title="库位列表" class="mySolid font">
                <van-row>
                    <van-col span="10" class="text-left padding-left">条码编号</van-col>
                    <van-col span="5" class="text-left padding-left">库位</van-col>
                    <van-col span="4">数量</van-col>
                    <van-col span="5">仓库</van-col>
                </van-row>
                <van-row v-for="(itm,index) in ItemBarKw" :key="index">
                    <van-col span="10" class="text-left padding-left">
                        <div class="blue-text">{{itm.iteM_BARCODE}}</div>
                    </van-col>
                    <van-col span="5" class="text-left padding-left">
                        <div>{{itm.depoT_SECTIONS_CODE}}</div>
                    </van-col>
                    <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
                    <van-col span="5" >{{itm.depot_name}}</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="3">需领数</van-col>
            <van-col span="5">已领数</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index"><%--ItemBlDetail.ysitems--%>
            <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">{{itm.fQty}}</van-col>
            <van-col span="5" class="blue-text">{{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>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Wwll.js?<%=12324 %>"></script>
    <script src="Js/Wwll.js?<%=123263 %>"></script>
</asp:Content>
H5/Xsck.aspx
@@ -47,6 +47,16 @@
     v-model="barcode"
  v-focus.noKeyboard
></van-field>
     <van-field
  value=""
  label="制单人"
   clearable
 placeholder="制单人"
  :right-icon-size="19"
     v-model="zdy"
  v-focus.noKeyboard
     disabled
></van-field>
   <van-field
  value=""
       v-model="num"
@@ -141,5 +151,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Xsck.js?<%=12711113 %>"></script>
 <script src="Js/Xsck.js?<%=12711114 %>"></script>
</asp:Content>
Scripts/config.js
@@ -1,5 +1,5 @@
var APIURL = "http://192.168.0.51:8183/api/";//PDA后端发布测试地址(内网)
var APIURL_PC = "http://192.168.0.51:8181/"; //PC后端的测试地址(外网)
var APIURL = "http://192.168.0.51:8083/api/";//PDA后端发布测试地址(内网)
var APIURL_PC = "http://192.168.0.51:8081/"; //PC后端的测试地址(外网)
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;