igds-app-v3.5.git

YYC

2023-06-15 1bd6821c8ccc6861c74505bab0e8c52fe38f69f7

出入库调整

已修改11个文件

	igds-app/inout-in-handle-list.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/inout-in-handle.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/inout-out-handle-list.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/inout-out-handle.html	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/basic-depot.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/es-real-electric.js	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-in-handle-list.js	88 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-in-handle.js	162 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-in-record.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-out-handle-list.js	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-out-handle.js	166 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 igds-app/inout-in-handle-list.html

@@ -43,7 +43,7 @@
                                    <div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">暂无入库待值仓信息</div>
                                </div>
                            </li> -->
                            <li>
                            <!-- <li>
                                <div class="con">
                                    <div class="top">
                                        <div class="info">车牌号: <b>豫A123GM</b></div>
@@ -126,7 +126,7 @@
                                        </div>
                                    </div>
                                </div>
                            </li> 
                            </li> -->
                        </ul>
                    </div>
                </div>

 igds-app/inout-in-handle.html

@@ -96,7 +96,16 @@
    <script src="./js/admin/inout-in-handle.js"></script>
    <script type="text/javascript" charset="utf-8">
        //mui初始化
        mui.init();
        mui.init({
            beforeback: function() {
                //获得父页面的webview
                var list = plus.webview.getWebviewById('inout-in-handle-list');
                //触发父页面的自定义事件(refresh1),从而进行刷新
                mui.fire(list, 'refresh2');
                //返回true,继续页面关闭逻辑
                return true;
            }
        });
        mui.plusReady(function() {
            //数据初始化
            init();

 igds-app/inout-out-handle-list.html

@@ -37,7 +37,7 @@
                <div class="mui-scroll">
                    <div class="wp">
                        <ul class="ul-rkzc" id="handleList">
                            <li>
                            <!-- <li>
                                <div class="con">
                                    <div class="top">
                                        <div class="info">车牌号: <b>豫A123GM</b></div>
@@ -149,7 +149,7 @@
                                        </div>
                                    </div>
                                </div>
                            </li>
                            </li>-->
                        </ul>
                    </div>
                </div>

 igds-app/inout-out-handle.html

@@ -1,11 +1,10 @@
<!DOCTYPE html>
<html>

    <head>
        <meta charset="utf-8">
        <meta name="viewport"
            content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
        <title>出库值仓</title>
        <title>入库值仓</title>
        <!-- MUI样式 -->
        <link rel="stylesheet" href="./css/mui.min.css" />
        <!-- 公共css -->
@@ -44,7 +43,7 @@
                                <div class="item">
                                    <div class="tit"><b>添加照片</b></div>
                                    <div class="m-files">
                                        <div class="box" onclick="choosePic('1')" >
                                        <div class="box" onclick="choosePic('1')">
                                            <div class="con">
                                                <label class="lab" id="boxImg1">
                                                    <div class="icon">
@@ -53,13 +52,12 @@
                                                    <div class="t">拍照上传</div>
                                                </label>
                                            </div>
											
                                        </div>
                                        <div class="box" onclick="choosePic('2')" >
                                        <div class="box" onclick="choosePic('2')">
                                            <div class="con">
                                                <label class="lab" id="boxImg2">
                                                    <div class="icon">
                                                        <img id="img2" src="images/icons/g-i23.png" alt="">
                                                        <img src="images/icons/g-i23.png" alt="">
                                                    </div>
                                                    <div class="t">拍照上传</div>
                                                </label>
@@ -84,26 +82,35 @@
                    </div>
                </div>
            </div>

            <div class="m-bot_btn">
                <div class="box">
                    <button type="button" class="mui-btn  mui-btn-block bot-btn end" onclick="toHandle('end')">结束值仓</button>
                    <button type="button" class="mui-btn  mui-btn-block bot-btn start" onclick="toHandle('start')">开始值仓</button>
                    <button type="button" class="mui-btn  mui-btn-block bot-btn end"
                        onclick="toHandle('end')">结束值仓</button>
                    <button type="button" class="mui-btn  mui-btn-block bot-btn start"
                        onclick="toHandle('start')">开始值仓</button>
                </div>
            </div>
        </div>
    </body>
    <script src="./js/mui.min.js"></script>
    <script src="js/mui.min.js"></script>
    <script src="./js/mui.picker.min.js"></script>
    <script src="./js/jquery.js"></script>
    <script src="js/admin/inout-out-handle.js"></script>
    <script src="./js/admin/inout-out-handle.js"></script>
    <script type="text/javascript" charset="utf-8">
        //mui初始化
        mui.init();
		
        mui.plusReady(function(){
        mui.init({
            beforeback: function() {
                //获得父页面的webview
                var list = plus.webview.getWebviewById('inout-out-handle-list');
                //触发父页面的自定义事件(refresh1),从而进行刷新
                mui.fire(list, 'refresh1');
                //返回true,继续页面关闭逻辑
                return true;
            }
        });
        mui.plusReady(function() {
            //数据初始化
            init();
        })
    </script>
</html>
</html>

 igds-app/js/admin/basic-depot.js

@@ -58,7 +58,7 @@
            html += '<div class="box"><div class="group state"><div class="desc">';
            html += (item.depotStatusName == null?"--":item.depotStatusName) + '</div><div class="ort">仓库状态</div></div></div>';
            html += '<div class="box"><div class="group weight"><div class="desc">';
            html += (item.storageReal == null?"--":item.storageReal) + '<span class="w"> KG</span></div><div class="ort">实际储量</div></div></div></div>';
            html += (item.storageReal == null?"--":item.storageReal) + '</div><div class="ort">实际储量(KG)</div></div></div></div>';
            html += '<div class="edit"><div class="sel"><div class="name">粮食品种</div>';
            html += '<div class="cont">' + (item.foodVarietyName == null?"--":item.foodVarietyName) + '</div></div>';
            html += '<div class="peo"><div class="name">保管员</div>';
@@ -73,7 +73,7 @@
        html += '<div class="box"><div class="group state"><div class="desc">';
        html += '--</div><div class="ort">仓库状态</div></div></div>';
        html += '<div class="box"><div class="group weight"><div class="desc">';
        html += '--<span class="w"> KG</span></div><div class="ort">实际储量</div></div></div></div>';
        html += '--</div><div class="ort">实际储量(KG)</div></div></div></div>';
        html += '<div class="edit"><div class="sel"><div class="name">粮食品种</div>';
        html += '<div class="cont">--</div></div>';
        html += '<div class="peo"><div class="name">保管员</div>';

 igds-app/js/admin/es-real-electric.js

@@ -137,19 +137,18 @@
                html += '<span class="bg" style="background-image: url(images/d3.png);"></span>'
            }
            html += '<span>' + item.depotName + '</span></div></div>';
            html += '<div class="inner"><div class="info">更新时间: <span style="font-size:15px">' + item
                .updateTime + '</span></div>';
            html += '<div class="txt"><div class="num">' + item.ua +
            html += '<div class="inner"><div class="info">更新时间: <span style="font-size:15px">' + (item.updateTime == null || item.updateTime == "" ? dateTime : item.updateTime) + '</span></div>';
            html += '<div class="txt"><div class="num">' + (item.ua == null || item.ua == "" ? "0" : item.ua)  +
                ' <span> V</span></div><div class="desc">A相电压</div></div>';
            html += '<div class="txt"><div class="num">' + item.ub +
            html += '<div class="txt"><div class="num">' + (item.ub == null || item.ub == "" ? "0" : item.ub) +
                ' <span> V</span></div><div class="desc">B相电压</div></div>';
            html += '<div class="txt"><div class="num">' + item.uc +
            html += '<div class="txt"><div class="num">' + (item.uc == null || item.uc == "" ? "0" : item.uc) +
                ' <span> V</span></div><div class="desc">B相电压</div></div>';
            html += '<div class="txt"><div class="num">' + item.ia +
            html += '<div class="txt"><div class="num">' + (item.ia == null || item.ib == "" ? "0" : item.ib) +
                ' <span> V</span></div><div class="desc">A相电流</div></div>';
            html += '<div class="txt"><div class="num">' + item.ib +
            html += '<div class="txt"><div class="num">' + (item.ib == null || item.ic == "" ? "0" : item.ic) +
                ' <span> V</span></div><div class="desc">B相电流</div></div>';
            html += '<div class="txt"><div class="num">' + item.ic +
            html += '<div class="txt"><div class="num">' + (item.ic == null || item.ic == "" ? "0" : item.ic) +
                ' <span> V</span></div><div class="desc">C相电流</div></div>';
            html += '</div></div></li>'
        })

 igds-app/js/admin/inout-in-handle-list.js

@@ -32,15 +32,18 @@
    data.tokenAuth = user.tokenAuth;
    data1.tokenAuth = user.tokenAuth;
    data.data.deptId = selectDeptId;
	

    //获取入库待值仓列表
    getInHandleList();
}
window.addEventListener('refresh2', function(e){//执行刷新
    getInHandleList();
});

//查询入库记录
function getInHandleList() {
    inHandleData = null;
	

    //查询的车牌号
    data.data.plateNum = mui("#plateNum")[0].value;

@@ -55,7 +58,6 @@
            if (result.code == "0000") {
                inHandleData = result.data;
                renderData();
                mui.toast(result.msg);
            } else {
                renderData();
                mui.toast(result.msg);
@@ -65,56 +67,6 @@
            mui.alert("系统繁忙,请重试！", "提示", ["确定"], function() {}, "div")
        }
    })

    // inHandleData = [{
    //         "id": "44",
    //         "plateNum": "97",
    //         "deHandle": "ut",
    //         "depotId": "16",
    //         "depotName": "青张列做总",
    //         "foodVariety": "magna pariatur laboris sunt dolor",
    //         "foodVarietyName": "提清除",
    //         "foodLevel": "fugiat",
    //         "foodLevelName": "应发热四民是始",
    //         "storeKeeperName": ""
    //     },
    //     {
    //         "id": "62",
    //         "plateNum": "71",
    //         "deHandle": "dolore ut non",
    //         "depotId": "79",
    //         "depotName": "增象定立样",
    //         "foodVariety": "Lorem est",
    //         "foodVarietyName": "市条群求被团两",
    //         "foodLevel": "ex labore",
    //         "foodLevelName": "持在写称情并",
    //         "storeKeeperName": "2"
    //     },
    //     {
    //         "id": "96",
    //         "plateNum": "61",
    //         "deHandle": "nulla magna ut proident cillum",
    //         "depotId": "42",
    //         "depotName": "条全他",
    //         "foodVariety": "aliquip",
    //         "foodVarietyName": "连开阶动际干",
    //         "foodLevel": "in id sunt",
    //         "foodLevelName": "没置定使文",
    //         "storeKeeperName": "3"
    //     },
    //     {
    //         "id": "61",
    //         "plateNum": "17",
    //         "deHandle": "commodo",
    //         "depotId": "80",
    //         "depotName": "展观快火全领",
    //         "foodVariety": "voluptate eu Lorem",
    //         "foodVarietyName": "他边派斯重离",
    //         "foodLevel": "dolor",
    //         "foodLevelName": "装第上",
    //         "storeKeeperName": "4"
    //     }
    // ]
}

//渲染页面
@@ -123,23 +75,28 @@
    if (inHandleData && inHandleData.length > 0) {
        $.each(inHandleData, function(index, item) {
            html += '<li><div class="con"><div class="top">';
            html += '<div class="info">车牌号: <b>' + (item.plateNum == null ? "" : item.plateNum) +'</b></div>';
            html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + item.depotName + '" storeKeeperName = "' + (item.storeKeeperName == "" || item
                    .storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
            html += '<div class="info">车牌号: <b>' + (item.plateNum == null ? "" : item.plateNum) + '</b></div>';
            html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + (item.depotName == null ? "" : item.depotName) + 
                    '" storeKeeperName = "' + (item.storeKeeperName == null ? '' : item.storeKeeperName) +
                '" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
            html += '</div><div class="box">';
            html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">';
            html +=
                '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">';
            html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>';
            html += '<div class="bot">目标仓库</div></div></div>';
            html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">';
            html +=
                '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">';
            html += '<div class="h3">' + (item.foodVarietyName == null ? "" : item.foodVarietyName) + '</div>';
            html += '<div class="bot">粮食品种</div></div></div>';
            html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">';
            html +=
                '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">';
            html += '<div class="h3">' + (item.foodLevelName == null ? "" : item.foodLevelName) + '</div>';
            html += '<div class="bot">粮食等级</div></div></div>';
            html += '</div></div></li>';
        })
    } else {
        html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">暂无入库待值仓信息</div></div></li>';
        html +=
            '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">暂无入库待值仓信息</div></div></li>';
    }
    $("#handleList").html(html);
}
@@ -150,12 +107,12 @@
    var depotName = this.getAttribute("depotName")
    var plateNum = this.getAttribute("plateNum")
    var storeKeeperName = this.getAttribute("storeKeeperName")
	
console.log(JSON.stringify(storeKeeperName))
    var picker = new mui.PopPicker();
    picker.setData([{
        value: "photo",
        text: "现场值仓"
		

    }, {
        value: "snap",
        text: "远程值仓"
@@ -164,7 +121,7 @@
    picker.show(function(SelectedItem) {
        console.log(JSON.stringify(SelectedItem));
        //现场值仓
        if(SelectedItem[0].value == 'photo'){
        if (SelectedItem[0].value == 'photo') {
            mui.openWindow({
                url: "inout-in-handle.html",
                id: "inout-in-handle",
@@ -177,7 +134,7 @@
                    }
                }
            })
        }else{ //远程值仓
        } else { //远程值仓
            mui.openWindow({
                url: "inout-in-handle.html",
                id: "inout-in-handle",
@@ -328,7 +285,8 @@
            if (result.code == "0000") {
                //弹窗信息：单子车牌跟仓库，去值仓则进入值仓页面，传递单子id；
                var btnArray = ["去值仓", "取消"];
                var text = '值仓仓库:' + result.data.depotName + '<br/>车牌号：' + result.data.plateNum + '<br/>保管员：' + result.data.plateNum
                var text = '值仓仓库:' + result.data.depotName + '<br/>车牌号：' + result.data.plateNum +
                    '<br/>保管员：' + result.data.plateNum
                mui.confirm(text, "检测到待值仓信息如下", btnArray, function(e) {
                    if (e.index == 0) {
                        //先判断单子是否在值仓状态

 igds-app/js/admin/inout-in-handle.js

@@ -30,7 +30,8 @@
        "fileName2": "",
        "deHandle": "",
        "lon": "",
        "lat": ""
        "lat": "",
        "handleUser": ""
    }
}

@@ -44,10 +45,13 @@
    uploadUrl = user.url + "/api-phone/v35/upload-img";
    data.tokenAuth = user.tokenAuth;
    data1.tokenAuth = user.tokenAuth;
    data1.data.handleUser = user.cname;
    //获取从上一个页面传递的数据
    var self = plus.webview.currentWebview();
    depotData = self.data;
    data.data.id = depotData.serialNumber;
    data1.data.id = depotData.serialNumber;
    console.log(JSON.stringify(depotData))
    // data.data.intelCard = depotData.intelCard;
    $("#plateNum").html(depotData.plateNum);
    $("#depotName").html(depotData.depotName);
@@ -70,27 +74,22 @@
                    //判断该值仓是否处于在值仓状态
                    if (result.data.progress == 'HANDLE') {
                        //判断单子是否已经开始进行值仓
                        if (result.data.handelStart == null) {
                            //发送请求，开始值仓
                            mui.ajax(url, {
                                type: "POST",
                                dataType: "json",
                                crossDomain: true,
                                contentType: "application/json;charset=utf-8",
                                data: JSON.stringify(data1),
                                success: function(result) {
                                    mui.toast("开始装粮，请上传图片！");
                                    //重新请求获取单子详情并渲染
                                    getDetail();
                                },
                                error: function() {
                                    mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {},
                                        "div");
                                }
                            })
                        } else {
                            mui.toast("已开始装粮！");
                        }

                        //发送请求，开始值仓
                        mui.ajax(url, {
                            type: "POST",
                            dataType: "json",
                            crossDomain: true,
                            contentType: "application/json;charset=utf-8",
                            data: JSON.stringify(data1),
                            success: function(result) {
                                mui.toast("开始装粮，请上传图片！");
                            },
                            error: function() {
                                mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {},
                                    "div");
                            }
                        })
                    } else {
                        //如果不在值仓状态，给出提示信息，不进行提交
                        mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
@@ -104,6 +103,7 @@
            }
        })
    } else { //结束值仓
        data1.data.type = tag;
        mui.ajax(url, {
            type: "POST",
            dataType: "json",
@@ -114,40 +114,37 @@
                if (result.code == '0000') {
                    //判断该值仓是否处于在值仓状态
                    if (result.data.progress == 'HANDLE') {
                        //判断单子是否已经开始进行值仓
                        if (result.data.handelStart) {
                            deHandle = $("#number")[0].value;
                            if (fileName1 == null || fileName2 == null) {
                                mui.toast("请先上传图片！");
                            } else {
                                if (deHandle) {
                                    data1.data.type = tag;
                                    data1.data.fileName1 = fileName1;
                                    data1.data.fileName2 = fileName2;
                                    data1.data.deHandle = deHandle;
                                    mui.ajax(url, {
                                        type: "POST",
                                        dataType: "json",
                                        crossDomain: true,
                                        contentType: "application/json;charset=utf-8",
                                        data: JSON.stringify(data1),
                                        success: function(result) {
                                            mui.toast("值仓完成！");
                                            //返回上一页
                                            mui.back();
                                        },
                                        error: function(result) {
                                            mui.alert(result.msg, '提示', ["确定"], function() {},
                                                "div");
                                        }
                                    })
                                } else {
                                    mui.toast("请先填写值仓扣重");
                                }
                            }
                        deHandle = $("#number")[0].value;
                        if (fileName1 == null || fileName2 == null) {
                            mui.toast("请先上传图片！");
                        } else {
                            mui.toast("请先点击开始装粮，并上传图片！");
                            if (deHandle) {
                                data1.data.type = tag;
                                data1.data.fileName1 = fileName1;
                                data1.data.fileName2 = fileName2;
                                data1.data.deHandle = deHandle;
                                mui.ajax(url, {
                                    type: "POST",
                                    dataType: "json",
                                    crossDomain: true,
                                    contentType: "application/json;charset=utf-8",
                                    data: JSON.stringify(data1),
                                    success: function(result) {
                                        // mui.toast("值仓完成！");
                                        mui.toast(result.msg)
                                        //返回上一页
                                        mui.back();
                                    },
                                    error: function(result) {
                                        mui.alert(result.msg, '提示', ["确定"], function() {},
                                            "div");
                                    }
                                })
                            } else {
                                mui.toast("请先填写值仓扣重");
                            }
                        }

                    } else {
                        //如果不在值仓状态，给出提示信息，不进行提交
                        mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
@@ -166,25 +163,6 @@
}
//拍照上传
function choosePic(typeNum) {
    var picker = new mui.PopPicker();
    picker.setData([{
        value: "cameraImg",
        text: "拍照上传"
    }, {
        value: "galleryImg",
        text: "从相册选择"
    }])
    picker.show(function(SelectedItem) {
        console.log(JSON.stringify(SelectedItem[0].value));
        console.log()
        if (SelectedItem[0].value == 'cameraImg') {
            console.log("拍照")
            cameraImg(typeNum);
        } else {
            console.log("相册")
            galleryImg(typeNum);
        }
    })
    // //获取定位信息
    // if (latitude == null || longitude == null) {
    //     return;
@@ -198,26 +176,22 @@
        data: JSON.stringify(data),
        success: function(result) {
            if (result.code == '0000') {
                if (result.data.handleStart != null) {
                    var picker = new mui.PopPicker();
                    picker.setData([{
                        value: "cameraImg",
                        text: "拍照上传"
                    }, {
                        value: "galleryImg",
                        text: "从相册选择"
                    }])
                    picker.show(function(SelectedItem) {
                        console.log(JSON.stringify(SelectedItem));
                        if (SelectedItem[0].value == 'cameraImg') {
                            cameraImg(typeNum);
                        } else {
                            galleryImg(typeNum);
                        }
                    })
                } else {
                    mui.toast("请先点击开始装粮！");
                }
                var picker = new mui.PopPicker();
                picker.setData([{
                    value: "cameraImg",
                    text: "拍照上传"
                }, {
                    value: "galleryImg",
                    text: "从相册选择"
                }])
                picker.show(function(SelectedItem) {
                    console.log(JSON.stringify(SelectedItem));
                    if (SelectedItem[0].value == 'cameraImg') {
                        cameraImg(typeNum);
                    } else {
                        galleryImg(typeNum);
                    }
                })
            } else {
                mui.alert(result.msg, '提示', ["确定"], function() {}, "div");
            }
@@ -226,7 +200,7 @@
            mui.alert('系统繁忙,请重试！', '提示', ["确定"], function() {}, "div");
        }
    })
	

};

//相机拍照

 igds-app/js/admin/inout-in-record.js

@@ -50,7 +50,6 @@
            } else {
                renderData();
                mui.toast(result.msg);
                console.log(JSON.stringify(result))
            }
        },
        error: function() {
@@ -93,7 +92,7 @@
    if (inRecordData) {
        sumHtml = inRecordData.sum;
        var inRecordList = inRecordData.listInout;
        console.log(JSON.stringify(inRecordList))
        // console.log(JSON.stringify(inRecordList))
        if (inRecordList && inRecordList.length > 0) {
            $.each(inRecordList, function(index, item) {
                html += '<div class="item">';

 igds-app/js/admin/inout-out-handle-list.js

@@ -33,7 +33,9 @@
    data.data.deptId = selectDeptId;
    getInHandleList();
}

window.addEventListener('refresh1', function(e){//执行刷新
    getInHandleList();
});
//查询出库记录
function getInHandleList() {
    outHandleData = null;
@@ -49,7 +51,7 @@
        success: function(result) {
            if (result.code == "0000") {
                outHandleData = result.data;
                console.log("if", JSON.stringify(result))
                // console.log("if", JSON.stringify(result))
                renderData();
            } else {
                renderData();
@@ -61,67 +63,17 @@
            mui.alert("系统繁忙,请重试！", "提示", ["确定"], function() {}, "div")
        }
    })
    // outHandleData = [{
    //         "id": "44",
    //         "plateNum": "97",
    //         "deHandle": "ut",
    //         "depotId": "16",
    //         "depotName": "青张列做总",
    //         "foodVariety": "magna pariatur laboris sunt dolor",
    //         "foodVarietyName": "提清除",
    //         "foodLevel": "fugiat",
    //         "foodLevelName": "应发热四民是始",
    //         "storeKeeperName": ""
    //     },
    //     {
    //         "id": "62",
    //         "plateNum": "71",
    //         "deHandle": "dolore ut non",
    //         "depotId": "79",
    //         "depotName": "增象定立样",
    //         "foodVariety": "Lorem est",
    //         "foodVarietyName": "市条群求被团两",
    //         "foodLevel": "ex labore",
    //         "foodLevelName": "持在写称情并",
    //         "storeKeeperName": "2"
    //     },
    //     {
    //         "id": "96",
    //         "plateNum": "61",
    //         "deHandle": "nulla magna ut proident cillum",
    //         "depotId": "42",
    //         "depotName": "条全他",
    //         "foodVariety": "aliquip",
    //         "foodVarietyName": "连开阶动际干",
    //         "foodLevel": "in id sunt",
    //         "foodLevelName": "没置定使文",
    //         "storeKeeperName": "3"
    //     },
    //     {
    //         "id": "61",
    //         "plateNum": "17",
    //         "deHandle": "commodo",
    //         "depotId": "80",
    //         "depotName": "展观快火全领",
    //         "foodVariety": "voluptate eu Lorem",
    //         "foodVarietyName": "他边派斯重离",
    //         "foodLevel": "dolor",
    //         "foodLevelName": "装第上",
    //         "storeKeeperName": "4"
    //     }
    // ]
    renderData();
}

//渲染页面
function renderData() {
    var html = '';
    if (outHandleData && outHandleData.length > 0) {
        $.each(outHandleData, function(index, item) {
            // console.log(JSON.stringify(item.depotName))
            html += '<li><div class="con"><div class="top">';
            html += '<div class="info">车牌号: <b>' + (item.plateNum == null ? "" : item.plateNum) + '</b></div>';
            html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + item.depotName + '" storeKeeperName = "' + 
            (item.storeKeeperName == "" || item.storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
            html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + (item.depotName == null ? "" : item.depotName) + '" storeKeeperName = "' + 
            (item.storeKeeperName == null || item.storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
            html += '</div><div class="box">';
            html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">';
            html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>';

 igds-app/js/admin/inout-out-handle.js

@@ -30,7 +30,8 @@
        "fileName2": "",
        "deHandle": "",
        "lon": "",
        "lat": ""
        "lat": "",
        "handleUser": ""
    }
}

@@ -44,14 +45,18 @@
    uploadUrl = user.url + "/api-phone/v35/upload-img";
    data.tokenAuth = user.tokenAuth;
    data1.tokenAuth = user.tokenAuth;
    data1.data.handleUser = user.cname;
    //获取从上一个页面传递的数据
    var self = plus.webview.currentWebview();
    depotData = self.data;
    data.data.id = depotData.serialNumber;
    data.data.intelCard = depotData.intelCard;
    data1.data.id = depotData.serialNumber;
    console.log(JSON.stringify(depotData))
    // data.data.intelCard = depotData.intelCard;
    $("#plateNum").html(depotData.plateNum);
    $("#depotName").html(depotData.depotName);
    $("#storeKeeperName").html(depotData.storeKeeperName);

}

function toHandle(tag) {
@@ -69,27 +74,22 @@
                    //判断该值仓是否处于在值仓状态
                    if (result.data.progress == 'HANDLE') {
                        //判断单子是否已经开始进行值仓
                        if (result.data.handelStart == null) {
                            //发送请求，开始值仓
                            mui.ajax(url, {
                                type: "POST",
                                dataType: "json",
                                crossDomain: true,
                                contentType: "application/json;charset=utf-8",
                                data: JSON.stringify(data1),
                                success: function(result) {
                                    mui.toast("开始装粮，请上传图片！");
                                    //重新请求获取单子详情并渲染
                                    getDetail();
                                },
                                error: function() {
                                    mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {},
                                        "div");
                                }
                            })
                        } else {
                            mui.toast("已开始装粮！");
                        }

                        //发送请求，开始值仓
                        mui.ajax(url, {
                            type: "POST",
                            dataType: "json",
                            crossDomain: true,
                            contentType: "application/json;charset=utf-8",
                            data: JSON.stringify(data1),
                            success: function(result) {
                                mui.toast("开始装粮，请上传图片！");
                            },
                            error: function() {
                                mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {},
                                    "div");
                            }
                        })
                    } else {
                        //如果不在值仓状态，给出提示信息，不进行提交
                        mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
@@ -103,6 +103,7 @@
            }
        })
    } else { //结束值仓
        data1.data.type = tag;
        mui.ajax(url, {
            type: "POST",
            dataType: "json",
@@ -113,40 +114,38 @@
                if (result.code == '0000') {
                    //判断该值仓是否处于在值仓状态
                    if (result.data.progress == 'HANDLE') {
                        //判断单子是否已经开始进行值仓
                        if (result.data.handelStart) {
                            deHandle = $("#number")[0].value;
                            if (fileName1 == null || fileName2 == null) {
                                mui.toast("请先上传图片！");
                            } else {
                                if (deHandle) {
                                    data1.data.type = tag;
                                    data1.data.fileName1 = fileName1;
                                    data1.data.fileName2 = fileName2;
                                    data1.data.deHandle = deHandle;
                                    mui.ajax(url, {
                                        type: "POST",
                                        dataType: "json",
                                        crossDomain: true,
                                        contentType: "application/json;charset=utf-8",
                                        data: JSON.stringify(data1),
                                        success: function(result) {
                                            mui.toast("值仓完成！");
                                            //返回上一页
                                            mui.back();
                                        },
                                        error: function(result) {
                                            mui.alert(result.msg, '提示', ["确定"], function() {},
                                                "div");
                                        }
                                    })
                                } else {
                                    mui.toast("请先填写值仓扣重");
                                }
                            }
                        deHandle = $("#number")[0].value;
                        if (fileName1 == null || fileName2 == null) {
                            mui.toast("请先上传图片！");
                        } else {
                            mui.toast("请先点击开始装粮，并上传图片！");
                            if (deHandle) {
                                data1.data.type = tag;
                                data1.data.fileName1 = fileName1;
                                data1.data.fileName2 = fileName2;
                                data1.data.deHandle = deHandle;
                                mui.ajax(url, {
                                    type: "POST",
                                    dataType: "json",
                                    crossDomain: true,
                                    contentType: "application/json;charset=utf-8",
                                    data: JSON.stringify(data1),
                                    success: function(result) {
                                        // mui.toast("值仓完成！");
                                        mui.toast(result.msg)
                                        //返回上一页
                                        mui.back();
										
                                    },
                                    error: function(result) {
                                        mui.alert(result.msg, '提示', ["确定"], function() {},
                                            "div");
                                    }
                                })
                            } else {
                                mui.toast("请先填写值仓扣重");
                            }
                        }

                    } else {
                        //如果不在值仓状态，给出提示信息，不进行提交
                        mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
@@ -178,26 +177,22 @@
        data: JSON.stringify(data),
        success: function(result) {
            if (result.code == '0000') {
                if (result.data.handleStart != null) {
                    var picker = new mui.PopPicker();
                    picker.setData([{
                        value: "cameraImg",
                        text: "拍照上传"
                    }, {
                        value: "galleryImg",
                        text: "从相册选择"
                    }])
                    picker.show(function(SelectedItem) {
                        console.log(JSON.stringify(SelectedItem));
                        if (SelectedItem[0].value == 'cameraImg') {
                            cameraImg(typeNum);
                        } else {
                            galleryImg(typeNum);
                        }
                    })
                } else {
                    mui.toast("请先点击开始装粮！");
                }
                var picker = new mui.PopPicker();
                picker.setData([{
                    value: "cameraImg",
                    text: "拍照上传"
                }, {
                    value: "galleryImg",
                    text: "从相册选择"
                }])
                picker.show(function(SelectedItem) {
                    console.log(JSON.stringify(SelectedItem));
                    if (SelectedItem[0].value == 'cameraImg') {
                        cameraImg(typeNum);
                    } else {
                        galleryImg(typeNum);
                    }
                })
            } else {
                mui.alert(result.msg, '提示', ["确定"], function() {}, "div");
            }
@@ -206,25 +201,10 @@
            mui.alert('系统繁忙,请重试！', '提示', ["确定"], function() {}, "div");
        }
    })
    // var picker = new mui.PopPicker();
    // picker.setData([{
    //     value: "cameraImg",
    //     text: "拍照上传"
    // }, {
    //     value: "galleryImg",
    //     text: "从相册选择"
    // }])
    // picker.show(function(SelectedItem) {
    //     console.log(JSON.stringify(SelectedItem));
    //     if (SelectedItem[0].value == 'cameraImg') {
    //         cameraImg(typeNum);
    //     } else {
    //         galleryImg(typeNum);
    //     }
    // })

};

//使用相机拍照
//相机拍照
function cameraImg(typeNum) {
    var cmr = plus.camera.getCamera();
    cmr.captureImage(function(p) {
@@ -284,8 +264,6 @@
        });
    //携带车牌参数
    task.addData("plateNum", depotData.plateNum);
    //业务类型
    task.addData("bizType","01");
    //图片信息
    task.addFile(path, {
        key: "uploadkey"

			@@ -43,7 +43,7 @@
			<div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">暂无入库待值仓信息</div>
			</div>
			</li> -->
			<li>
			<!-- <li>
			<div class="con">
			<div class="top">
			<div class="info">车牌号: <b>豫A123GM</b></div>
			@@ -126,7 +126,7 @@
			</div>
			</div>
			</div>
			</li>
			</li> -->
			</ul>
			</div>
			</div>

			@@ -96,7 +96,16 @@
			<script src="./js/admin/inout-in-handle.js"></script>
			<script type="text/javascript" charset="utf-8">
			//mui初始化
			mui.init();
			mui.init({
			beforeback: function() {
			//获得父页面的webview
			var list = plus.webview.getWebviewById('inout-in-handle-list');
			//触发父页面的自定义事件(refresh1),从而进行刷新
			mui.fire(list, 'refresh2');
			//返回true,继续页面关闭逻辑
			return true;
			}
			});
			mui.plusReady(function() {
			//数据初始化
			init();

			@@ -37,7 +37,7 @@
			<div class="mui-scroll">
			<div class="wp">
			<ul class="ul-rkzc" id="handleList">
			<li>
			<!-- <li>
			<div class="con">
			<div class="top">
			<div class="info">车牌号: <b>豫A123GM</b></div>
			@@ -149,7 +149,7 @@
			</div>
			</div>
			</div>
			</li>
			</li>-->
			</ul>
			</div>
			</div>

			@@ -1,11 +1,10 @@
			<!DOCTYPE html>
			<html>

			<head>
			<meta charset="utf-8">
			<meta name="viewport"
			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
			<title>出库值仓</title>
			<title>入库值仓</title>
			<!-- MUI样式 -->
			<link rel="stylesheet" href="./css/mui.min.css" />
			<!-- 公共css -->
			@@ -44,7 +43,7 @@
			<div class="item">
			<div class="tit"><b>添加照片</b></div>
			<div class="m-files">
			<div class="box" onclick="choosePic('1')" >
			<div class="box" onclick="choosePic('1')">
			<div class="con">
			<label class="lab" id="boxImg1">
			<div class="icon">
			@@ -53,13 +52,12 @@
			<div class="t">拍照上传</div>
			</label>
			</div>

			</div>
			<div class="box" onclick="choosePic('2')" >
			<div class="box" onclick="choosePic('2')">
			<div class="con">
			<label class="lab" id="boxImg2">
			<div class="icon">
			<img id="img2" src="images/icons/g-i23.png" alt="">
			<img src="images/icons/g-i23.png" alt="">
			</div>
			<div class="t">拍照上传</div>
			</label>
			@@ -84,26 +82,35 @@
			</div>
			</div>
			</div>

			<div class="m-bot_btn">
			<div class="box">
			<button type="button" class="mui-btn mui-btn-block bot-btn end" onclick="toHandle('end')">结束值仓</button>
			<button type="button" class="mui-btn mui-btn-block bot-btn start" onclick="toHandle('start')">开始值仓</button>
			<button type="button" class="mui-btn mui-btn-block bot-btn end"
			onclick="toHandle('end')">结束值仓</button>
			<button type="button" class="mui-btn mui-btn-block bot-btn start"
			onclick="toHandle('start')">开始值仓</button>
			</div>
			</div>
			</div>
			</body>
			<script src="./js/mui.min.js"></script>
			<script src="js/mui.min.js"></script>
			<script src="./js/mui.picker.min.js"></script>
			<script src="./js/jquery.js"></script>
			<script src="js/admin/inout-out-handle.js"></script>
			<script src="./js/admin/inout-out-handle.js"></script>
			<script type="text/javascript" charset="utf-8">
			//mui初始化
			mui.init();

			mui.plusReady(function(){
			mui.init({
			beforeback: function() {
			//获得父页面的webview
			var list = plus.webview.getWebviewById('inout-out-handle-list');
			//触发父页面的自定义事件(refresh1),从而进行刷新
			mui.fire(list, 'refresh1');
			//返回true,继续页面关闭逻辑
			return true;
			}
			});
			mui.plusReady(function() {
			//数据初始化
			init();
			})
			</script>
			</html>
			</html>

			@@ -58,7 +58,7 @@
			html += '<div class="box"><div class="group state"><div class="desc">';
			html += (item.depotStatusName == null?"--":item.depotStatusName) + '</div><div class="ort">仓库状态</div></div></div>';
			html += '<div class="box"><div class="group weight"><div class="desc">';
			html += (item.storageReal == null?"--":item.storageReal) + '<span class="w"> KG</span></div><div class="ort">实际储量</div></div></div></div>';
			html += (item.storageReal == null?"--":item.storageReal) + '</div><div class="ort">实际储量(KG)</div></div></div></div>';
			html += '<div class="edit"><div class="sel"><div class="name">粮食品种</div>';
			html += '<div class="cont">' + (item.foodVarietyName == null?"--":item.foodVarietyName) + '</div></div>';
			html += '<div class="peo"><div class="name">保管员</div>';
			@@ -73,7 +73,7 @@
			html += '<div class="box"><div class="group state"><div class="desc">';
			html += '--</div><div class="ort">仓库状态</div></div></div>';
			html += '<div class="box"><div class="group weight"><div class="desc">';
			html += '--<span class="w"> KG</span></div><div class="ort">实际储量</div></div></div></div>';
			html += '--</div><div class="ort">实际储量(KG)</div></div></div></div>';
			html += '<div class="edit"><div class="sel"><div class="name">粮食品种</div>';
			html += '<div class="cont">--</div></div>';
			html += '<div class="peo"><div class="name">保管员</div>';

			@@ -137,19 +137,18 @@
			html += '<span class="bg" style="background-image: url(images/d3.png);"></span>'
			}
			html += '<span>' + item.depotName + '</span></div></div>';
			html += '<div class="inner"><div class="info">更新时间: <span style="font-size:15px">' + item
			.updateTime + '</span></div>';
			html += '<div class="txt"><div class="num">' + item.ua +
			html += '<div class="inner"><div class="info">更新时间: <span style="font-size:15px">' + (item.updateTime == null \|\| item.updateTime == "" ? dateTime : item.updateTime) + '</span></div>';
			html += '<div class="txt"><div class="num">' + (item.ua == null \|\| item.ua == "" ? "0" : item.ua) +
			' <span> V</span></div><div class="desc">A相电压</div></div>';
			html += '<div class="txt"><div class="num">' + item.ub +
			html += '<div class="txt"><div class="num">' + (item.ub == null \|\| item.ub == "" ? "0" : item.ub) +
			' <span> V</span></div><div class="desc">B相电压</div></div>';
			html += '<div class="txt"><div class="num">' + item.uc +
			html += '<div class="txt"><div class="num">' + (item.uc == null \|\| item.uc == "" ? "0" : item.uc) +
			' <span> V</span></div><div class="desc">B相电压</div></div>';
			html += '<div class="txt"><div class="num">' + item.ia +
			html += '<div class="txt"><div class="num">' + (item.ia == null \|\| item.ib == "" ? "0" : item.ib) +
			' <span> V</span></div><div class="desc">A相电流</div></div>';
			html += '<div class="txt"><div class="num">' + item.ib +
			html += '<div class="txt"><div class="num">' + (item.ib == null \|\| item.ic == "" ? "0" : item.ic) +
			' <span> V</span></div><div class="desc">B相电流</div></div>';
			html += '<div class="txt"><div class="num">' + item.ic +
			html += '<div class="txt"><div class="num">' + (item.ic == null \|\| item.ic == "" ? "0" : item.ic) +
			' <span> V</span></div><div class="desc">C相电流</div></div>';
			html += '</div></div></li>'
			})

			@@ -32,15 +32,18 @@
			data.tokenAuth = user.tokenAuth;
			data1.tokenAuth = user.tokenAuth;
			data.data.deptId = selectDeptId;


			//获取入库待值仓列表
			getInHandleList();
			}
			window.addEventListener('refresh2', function(e){//执行刷新
			getInHandleList();
			});

			//查询入库记录
			function getInHandleList() {
			inHandleData = null;


			//查询的车牌号
			data.data.plateNum = mui("#plateNum")[0].value;

			@@ -55,7 +58,6 @@
			if (result.code == "0000") {
			inHandleData = result.data;
			renderData();
			mui.toast(result.msg);
			} else {
			renderData();
			mui.toast(result.msg);
			@@ -65,56 +67,6 @@
			mui.alert("系统繁忙,请重试！", "提示", ["确定"], function() {}, "div")
			}
			})

			// inHandleData = [{
			// "id": "44",
			// "plateNum": "97",
			// "deHandle": "ut",
			// "depotId": "16",
			// "depotName": "青张列做总",
			// "foodVariety": "magna pariatur laboris sunt dolor",
			// "foodVarietyName": "提清除",
			// "foodLevel": "fugiat",
			// "foodLevelName": "应发热四民是始",
			// "storeKeeperName": ""
			// },
			// {
			// "id": "62",
			// "plateNum": "71",
			// "deHandle": "dolore ut non",
			// "depotId": "79",
			// "depotName": "增象定立样",
			// "foodVariety": "Lorem est",
			// "foodVarietyName": "市条群求被团两",
			// "foodLevel": "ex labore",
			// "foodLevelName": "持在写称情并",
			// "storeKeeperName": "2"
			// },
			// {
			// "id": "96",
			// "plateNum": "61",
			// "deHandle": "nulla magna ut proident cillum",
			// "depotId": "42",
			// "depotName": "条全他",
			// "foodVariety": "aliquip",
			// "foodVarietyName": "连开阶动际干",
			// "foodLevel": "in id sunt",
			// "foodLevelName": "没置定使文",
			// "storeKeeperName": "3"
			// },
			// {
			// "id": "61",
			// "plateNum": "17",
			// "deHandle": "commodo",
			// "depotId": "80",
			// "depotName": "展观快火全领",
			// "foodVariety": "voluptate eu Lorem",
			// "foodVarietyName": "他边派斯重离",
			// "foodLevel": "dolor",
			// "foodLevelName": "装第上",
			// "storeKeeperName": "4"
			// }
			// ]
			}

			//渲染页面
			@@ -123,23 +75,28 @@
			if (inHandleData && inHandleData.length > 0) {
			$.each(inHandleData, function(index, item) {
			html += '<li><div class="con"><div class="top">';
			html += '<div class="info">车牌号: <b>' + (item.plateNum == null ? "" : item.plateNum) +'</b></div>';
			html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + item.depotName + '" storeKeeperName = "' + (item.storeKeeperName == "" \|\| item
			.storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
			html += '<div class="info">车牌号: <b>' + (item.plateNum == null ? "" : item.plateNum) + '</b></div>';
			html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + (item.depotName == null ? "" : item.depotName) +
			'" storeKeeperName = "' + (item.storeKeeperName == null ? '' : item.storeKeeperName) +
			'" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
			html += '</div><div class="box">';
			html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">';
			html +=
			'<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">';
			html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>';
			html += '<div class="bot">目标仓库</div></div></div>';
			html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">';
			html +=
			'<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">';
			html += '<div class="h3">' + (item.foodVarietyName == null ? "" : item.foodVarietyName) + '</div>';
			html += '<div class="bot">粮食品种</div></div></div>';
			html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">';
			html +=
			'<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">';
			html += '<div class="h3">' + (item.foodLevelName == null ? "" : item.foodLevelName) + '</div>';
			html += '<div class="bot">粮食等级</div></div></div>';
			html += '</div></div></li>';
			})
			} else {
			html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">暂无入库待值仓信息</div></div></li>';
			html +=
			'<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">暂无入库待值仓信息</div></div></li>';
			}
			$("#handleList").html(html);
			}
			@@ -150,12 +107,12 @@
			var depotName = this.getAttribute("depotName")
			var plateNum = this.getAttribute("plateNum")
			var storeKeeperName = this.getAttribute("storeKeeperName")

			console.log(JSON.stringify(storeKeeperName))
			var picker = new mui.PopPicker();
			picker.setData([{
			value: "photo",
			text: "现场值仓"


			}, {
			value: "snap",
			text: "远程值仓"
			@@ -164,7 +121,7 @@
			picker.show(function(SelectedItem) {
			console.log(JSON.stringify(SelectedItem));
			//现场值仓
			if(SelectedItem[0].value == 'photo'){
			if (SelectedItem[0].value == 'photo') {
			mui.openWindow({
			url: "inout-in-handle.html",
			id: "inout-in-handle",
			@@ -177,7 +134,7 @@
			}
			}
			})
			}else{ //远程值仓
			} else { //远程值仓
			mui.openWindow({
			url: "inout-in-handle.html",
			id: "inout-in-handle",
			@@ -328,7 +285,8 @@
			if (result.code == "0000") {
			//弹窗信息：单子车牌跟仓库，去值仓则进入值仓页面，传递单子id；
			var btnArray = ["去值仓", "取消"];
			var text = '值仓仓库:' + result.data.depotName + '<br/>车牌号：' + result.data.plateNum + '<br/>保管员：' + result.data.plateNum
			var text = '值仓仓库:' + result.data.depotName + '<br/>车牌号：' + result.data.plateNum +
			'<br/>保管员：' + result.data.plateNum
			mui.confirm(text, "检测到待值仓信息如下", btnArray, function(e) {
			if (e.index == 0) {
			//先判断单子是否在值仓状态

			@@ -30,7 +30,8 @@
			"fileName2": "",
			"deHandle": "",
			"lon": "",
			"lat": ""
			"lat": "",
			"handleUser": ""
			}
			}

			@@ -44,10 +45,13 @@
			uploadUrl = user.url + "/api-phone/v35/upload-img";
			data.tokenAuth = user.tokenAuth;
			data1.tokenAuth = user.tokenAuth;
			data1.data.handleUser = user.cname;
			//获取从上一个页面传递的数据
			var self = plus.webview.currentWebview();
			depotData = self.data;
			data.data.id = depotData.serialNumber;
			data1.data.id = depotData.serialNumber;
			console.log(JSON.stringify(depotData))
			// data.data.intelCard = depotData.intelCard;
			$("#plateNum").html(depotData.plateNum);
			$("#depotName").html(depotData.depotName);
			@@ -70,27 +74,22 @@
			//判断该值仓是否处于在值仓状态
			if (result.data.progress == 'HANDLE') {
			//判断单子是否已经开始进行值仓
			if (result.data.handelStart == null) {
			//发送请求，开始值仓
			mui.ajax(url, {
			type: "POST",
			dataType: "json",
			crossDomain: true,
			contentType: "application/json;charset=utf-8",
			data: JSON.stringify(data1),
			success: function(result) {
			mui.toast("开始装粮，请上传图片！");
			//重新请求获取单子详情并渲染
			getDetail();
			},
			error: function() {
			mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {},
			"div");
			}
			})
			} else {
			mui.toast("已开始装粮！");
			}

			//发送请求，开始值仓
			mui.ajax(url, {
			type: "POST",
			dataType: "json",
			crossDomain: true,
			contentType: "application/json;charset=utf-8",
			data: JSON.stringify(data1),
			success: function(result) {
			mui.toast("开始装粮，请上传图片！");
			},
			error: function() {
			mui.alert('开始装粮提交失败，请重新操作！', '提示', ["确定"], function() {},
			"div");
			}
			})
			} else {
			//如果不在值仓状态，给出提示信息，不进行提交
			mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
			@@ -104,6 +103,7 @@
			}
			})
			} else { //结束值仓
			data1.data.type = tag;
			mui.ajax(url, {
			type: "POST",
			dataType: "json",
			@@ -114,40 +114,37 @@
			if (result.code == '0000') {
			//判断该值仓是否处于在值仓状态
			if (result.data.progress == 'HANDLE') {
			//判断单子是否已经开始进行值仓
			if (result.data.handelStart) {
			deHandle = $("#number")[0].value;
			if (fileName1 == null \|\| fileName2 == null) {
			mui.toast("请先上传图片！");
			} else {
			if (deHandle) {
			data1.data.type = tag;
			data1.data.fileName1 = fileName1;
			data1.data.fileName2 = fileName2;
			data1.data.deHandle = deHandle;
			mui.ajax(url, {
			type: "POST",
			dataType: "json",
			crossDomain: true,
			contentType: "application/json;charset=utf-8",
			data: JSON.stringify(data1),
			success: function(result) {
			mui.toast("值仓完成！");
			//返回上一页
			mui.back();
			},
			error: function(result) {
			mui.alert(result.msg, '提示', ["确定"], function() {},
			"div");
			}
			})
			} else {
			mui.toast("请先填写值仓扣重");
			}
			}
			deHandle = $("#number")[0].value;
			if (fileName1 == null \|\| fileName2 == null) {
			mui.toast("请先上传图片！");
			} else {
			mui.toast("请先点击开始装粮，并上传图片！");
			if (deHandle) {
			data1.data.type = tag;
			data1.data.fileName1 = fileName1;
			data1.data.fileName2 = fileName2;
			data1.data.deHandle = deHandle;
			mui.ajax(url, {
			type: "POST",
			dataType: "json",
			crossDomain: true,
			contentType: "application/json;charset=utf-8",
			data: JSON.stringify(data1),
			success: function(result) {
			// mui.toast("值仓完成！");
			mui.toast(result.msg)
			//返回上一页
			mui.back();
			},
			error: function(result) {
			mui.alert(result.msg, '提示', ["确定"], function() {},
			"div");
			}
			})
			} else {
			mui.toast("请先填写值仓扣重");
			}
			}

			} else {
			//如果不在值仓状态，给出提示信息，不进行提交
			mui.alert("该单子不在值仓状态，不能进行值仓！", '提示', ["确定"], function() {}, "div");
			@@ -166,25 +163,6 @@
			}
			//拍照上传
			function choosePic(typeNum) {
			var picker = new mui.PopPicker();
			picker.setData([{
			value: "cameraImg",
			text: "拍照上传"
			}, {
			value: "galleryImg",
			text: "从相册选择"
			}])
			picker.show(function(SelectedItem) {
			console.log(JSON.stringify(SelectedItem[0].value));
			console.log()
			if (SelectedItem[0].value == 'cameraImg') {
			console.log("拍照")
			cameraImg(typeNum);
			} else {
			console.log("相册")
			galleryImg(typeNum);
			}
			})
			// //获取定位信息
			// if (latitude == null \|\| longitude == null) {
			// return;
			@@ -198,26 +176,22 @@
			data: JSON.stringify(data),
			success: function(result) {
			if (result.code == '0000') {
			if (result.data.handleStart != null) {
			var picker = new mui.PopPicker();
			picker.setData([{
			value: "cameraImg",
			text: "拍照上传"
			}, {
			value: "galleryImg",
			text: "从相册选择"
			}])
			picker.show(function(SelectedItem) {
			console.log(JSON.stringify(SelectedItem));
			if (SelectedItem[0].value == 'cameraImg') {
			cameraImg(typeNum);
			} else {
			galleryImg(typeNum);
			}
			})
			} else {
			mui.toast("请先点击开始装粮！");
			}
			var picker = new mui.PopPicker();
			picker.setData([{
			value: "cameraImg",
			text: "拍照上传"
			}, {
			value: "galleryImg",
			text: "从相册选择"
			}])
			picker.show(function(SelectedItem) {
			console.log(JSON.stringify(SelectedItem));
			if (SelectedItem[0].value == 'cameraImg') {
			cameraImg(typeNum);
			} else {
			galleryImg(typeNum);
			}
			})
			} else {
			mui.alert(result.msg, '提示', ["确定"], function() {}, "div");
			}
			@@ -226,7 +200,7 @@
			mui.alert('系统繁忙,请重试！', '提示', ["确定"], function() {}, "div");
			}
			})


			};

			//相机拍照

			@@ -50,7 +50,6 @@
			} else {
			renderData();
			mui.toast(result.msg);
			console.log(JSON.stringify(result))
			}
			},
			error: function() {
			@@ -93,7 +92,7 @@
			if (inRecordData) {
			sumHtml = inRecordData.sum;
			var inRecordList = inRecordData.listInout;
			console.log(JSON.stringify(inRecordList))
			// console.log(JSON.stringify(inRecordList))
			if (inRecordList && inRecordList.length > 0) {
			$.each(inRecordList, function(index, item) {
			html += '<div class="item">';

			@@ -33,7 +33,9 @@
			data.data.deptId = selectDeptId;
			getInHandleList();
			}

			window.addEventListener('refresh1', function(e){//执行刷新
			getInHandleList();
			});
			//查询出库记录
			function getInHandleList() {
			outHandleData = null;
			@@ -49,7 +51,7 @@
			success: function(result) {
			if (result.code == "0000") {
			outHandleData = result.data;
			console.log("if", JSON.stringify(result))
			// console.log("if", JSON.stringify(result))
			renderData();
			} else {
			renderData();
			@@ -61,67 +63,17 @@
			mui.alert("系统繁忙,请重试！", "提示", ["确定"], function() {}, "div")
			}
			})
			// outHandleData = [{
			// "id": "44",
			// "plateNum": "97",
			// "deHandle": "ut",
			// "depotId": "16",
			// "depotName": "青张列做总",
			// "foodVariety": "magna pariatur laboris sunt dolor",
			// "foodVarietyName": "提清除",
			// "foodLevel": "fugiat",
			// "foodLevelName": "应发热四民是始",
			// "storeKeeperName": ""
			// },
			// {
			// "id": "62",
			// "plateNum": "71",
			// "deHandle": "dolore ut non",
			// "depotId": "79",
			// "depotName": "增象定立样",
			// "foodVariety": "Lorem est",
			// "foodVarietyName": "市条群求被团两",
			// "foodLevel": "ex labore",
			// "foodLevelName": "持在写称情并",
			// "storeKeeperName": "2"
			// },
			// {
			// "id": "96",
			// "plateNum": "61",
			// "deHandle": "nulla magna ut proident cillum",
			// "depotId": "42",
			// "depotName": "条全他",
			// "foodVariety": "aliquip",
			// "foodVarietyName": "连开阶动际干",
			// "foodLevel": "in id sunt",
			// "foodLevelName": "没置定使文",
			// "storeKeeperName": "3"
			// },
			// {
			// "id": "61",
			// "plateNum": "17",
			// "deHandle": "commodo",
			// "depotId": "80",
			// "depotName": "展观快火全领",
			// "foodVariety": "voluptate eu Lorem",
			// "foodVarietyName": "他边派斯重离",
			// "foodLevel": "dolor",
			// "foodLevelName": "装第上",
			// "storeKeeperName": "4"
			// }
			// ]
			renderData();
			}

			//渲染页面
			function renderData() {
			var html = '';
			if (outHandleData && outHandleData.length > 0) {
			$.each(outHandleData, function(index, item) {
			// console.log(JSON.stringify(item.depotName))
			html += '<li><div class="con"><div class="top">';
			html += '<div class="info">车牌号: <b>' + (item.plateNum == null ? "" : item.plateNum) + '</b></div>';
			html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + item.depotName + '" storeKeeperName = "' +
			(item.storeKeeperName == "" \|\| item.storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
			html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + (item.depotName == null ? "" : item.depotName) + '" storeKeeperName = "' +
			(item.storeKeeperName == null \|\| item.storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
			html += '</div><div class="box">';
			html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">';
			html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>';