igds-app-v3.5.git

YYC

2023-05-11 f41b4b2fdca909f2fb0cec4242f5abd9882ee770

入库值仓，电子巡更

已修改9个文件

	igds-app/inout-handle-in.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/inout-in-handle-list.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/inout-in-handle.html	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/inout-out-handle.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-in-handle-list.js	309 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-out-handle-list.js	152 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/inout-out-handle.js	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/js/admin/warn-list.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-app/security-patrol.html	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 igds-app/inout-handle-in.html

@@ -533,6 +533,8 @@
                    });
                //携带车牌参数
                task.addData("plateNum", plateNum);
                //业务类型
                task.addData("bizType","01");
                //图片信息
                task.addFile(path, {
                    key: "uploadkey"

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

@@ -11,6 +11,8 @@
        <link rel="stylesheet" href="./css/admin/public.css" />
        <!-- 页面css -->
        <link rel="stylesheet" href="./css/admin/inout-in-handle-list.css">
        <!--App自定义的css-->
        <link rel="stylesheet" type="text/css" href="./css/mui.picker.min.css" />
    </head>
    <body class="g-bg" style="background-image: url(images/m-bg2.png);">
        <header id="header" class="mui-bar mui-bar-nav m-pagetit">
@@ -41,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>
@@ -124,7 +126,7 @@
                                        </div>
                                    </div>
                                </div>
                            </li> -->
                            </li> 
                        </ul>
                    </div>
                </div>
@@ -132,6 +134,7 @@
        </div>
    </body>
    <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-in-handle-list.js"></script>
    <script type="text/javascript" charset="utf-8">

 igds-app/inout-in-handle.html

@@ -11,6 +11,8 @@
        <link rel="stylesheet" href="./css/admin/public.css" />
        <!-- 页面css -->
        <link rel="stylesheet" href="./css/admin/inout-in-handle.css">
        <!--App自定义的css-->
        <link rel="stylesheet" type="text/css" href="./css/mui.picker.min.css" />
    </head>
    <body class="g-bg" style="background-image: url(images/m-bg2.png);">
        <header id="header" class="mui-bar mui-bar-nav m-pagetit">
@@ -24,16 +26,16 @@
                        <form action="">
                            <div class="m-box_zc1 p15">
                                <div class="item">
                                    <div class="tit">车牌号: <b>豫A123GM</b></div>
                                    <div class="tit">车牌号: <b id="plateNum">豫A123GM</b></div>
                                    <ul class="g-listb2">
                                        <li>
                                            <div class="con" style="background-image: url(images/icons/g-i24.png);">
                                                值仓仓库: <b>15号仓</b>
                                                值仓仓库: <b id="depotName">15号仓</b>
                                            </div>
                                        </li>
                                        <li>
                                            <div class="con" style="background-image: url(images/icons/g-i25.png);">
                                                保管员: <b>张三</b>
                                                保管员: <b id="storeKeeperName">张三</b>
                                            </div>
                                        </li>
                                    </ul>
@@ -41,10 +43,9 @@
                                <div class="item">
                                    <div class="tit"><b>添加照片</b></div>
                                    <div class="m-files">
                                        <div class="box">
                                        <div class="box" onclick="choosePic('1')">
                                            <div class="con">
                                                <label class="lab">
                                                    <input type="file" name="" id="" hidden/>
                                                <label class="lab" id="boxImg1">
                                                    <div class="icon">
                                                        <img src="images/icons/g-i23.png" alt="">
                                                    </div>
@@ -52,10 +53,9 @@
                                                </label>
                                            </div>
                                        </div>
                                        <div class="box">
                                        <div class="box" onclick="choosePic('2')">
                                            <div class="con">
                                                <label class="lab">
                                                    <input type="file" name="" id="" hidden/>
                                                <label class="lab" id="boxImg2">
                                                    <div class="icon">
                                                        <img src="images/icons/g-i23.png" alt="">
                                                    </div>
@@ -69,14 +69,7 @@
                            <div class="m-box_zc1">
                                <div class="mui-input-row">
                                    <label>值仓扣重:</label>
                                    <input type="text" class="mui-input-clear" placeholder="请输入重量">
                                    <span class="unit">KG</span>
                                </div>
                            </div>
                            <div class="m-box_zc1">
                                <div class="mui-input-row">
                                    <label>值仓扣重:</label>
                                    <input type="text" class="mui-input-clear" placeholder="请输入重量">
                                    <input id="number" type="text" class="mui-input-clear" placeholder="请输入重量">
                                    <span class="unit">KG</span>
                                </div>
                            </div>
@@ -91,20 +84,22 @@
            </div>
            <div class="m-bot_btn">
                <div class="box">
                    <button type="button" class="mui-btn  mui-btn-block bot-btn end">结束值仓</button>
                    <button type="button" class="mui-btn  mui-btn-block bot-btn 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.picker.min.js"></script>
    <script src="./js/jquery.js"></script>
    <script src="./js/admin/inout-in-handle.js"></script>
    <script type="text/javascript" charset="utf-8">
        //mui初始化
        mui.init();
        mui('.mui-scroll-wrapper').scroll({
            indicators: false, //是否显示滚动条
            deceleration: 0.0006, //阻尼系数,系数越小滑动越灵敏
            bounce: false, //是否启用回弹
            deceleration: 0.0005 //flick 减速系数，系数越大，滚动速度越慢，滚动距离越小，默认值0.0006
        });
        mui.plusReady(function() {
            //数据初始化
            init();
        })
    </script>
</html>

 igds-app/inout-out-handle.html

@@ -51,7 +51,6 @@
                                                        <img src="images/icons/g-i23.png" alt="">
                                                    </div>
                                                    <div class="t">拍照上传</div>
                                                    <!-- <img src="images/spad0.png"/> -->
                                                </label>
                                            </div>
                                            

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

@@ -13,13 +13,24 @@
        "intelCard": ""
    }
};

var data1 = {
    "interfaceId": "5208",
    "outId": "10208",
    "reqDateTime": new Date(),
    "tokenAuth": "",
    "data": {
        "type": "IN",
        "id": "",
        "intelCard": ""
    }
};
//初始化数据
function init() {
    var user = JSON.parse(localStorage.getItem('user'));
    var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
    url = user.url + "/api-phone/v35/gateway";
    data.tokenAuth = user.tokenAuth;
    data1.tokenAuth = user.tokenAuth;
    data.data.deptId = selectDeptId;
    
    //获取入库待值仓列表
@@ -30,7 +41,7 @@
function getInHandleList() {
    inHandleData = null;
    
    //赋值参数的日期
    //查询的车牌号
    data.data.plateNum = mui("#plateNum")[0].value;

    //请求
@@ -53,6 +64,56 @@
            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"
        }
    ]
}

//渲染页面
@@ -63,7 +124,8 @@
            $.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="" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
                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><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>';
@@ -77,14 +139,251 @@
                html += '</div></div></li>';
            })
        } else {
            html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">暂无入库待值仓信息</div></div></li>';
            html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">暂无入库待值仓信息</div></div></li>';
        }
    }else{
        html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">暂无入库待值仓信息</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);
}

//功能模块跳转
mui(".mui-scroll-wrapper").on("tap", ".mui-scroll ul li a", function() {
    var id = this.getAttribute("id");
    var depotName = this.getAttribute("depotName")
    var plateNum = this.getAttribute("plateNum")
    var storeKeeperName = this.getAttribute("storeKeeperName")
	
    var picker = new mui.PopPicker();
    picker.setData([{
        value: "photo",
        text: "现场值仓"
		
    }, {
        value: "snap",
        text: "远程值仓"
    }])
    picker.pickers[0].setSelectedValue('photo');
    picker.show(function(SelectedItem) {
        console.log(JSON.stringify(SelectedItem));
        //现场值仓
        if(SelectedItem.value == 'photo'){
            mui.openWindow({
                url: "inout-in-handle.html",
                id: "inout-in-handle",
                extras: {
                    data: {
                        serialNumber: id,
                        plateNum: plateNum,
                        depotName: depotName,
                        storeKeeperName: storeKeeperName
                    }
                }
            })
        }else{ //远程值仓
            mui.openWindow({
                url: "inout-in-handle.html",
                id: "inout-in-handle",
                extras: {
                    data: {
                        serialNumber: id,
                        plateNum: plateNum,
                        depotName: depotName,
                        storeKeeperName: storeKeeperName
                    }
                }
            })
        }
    })
});


/*---------------NFC读卡功能-------------------*/
var waiting;
var readyRead = false;
//读卡方法
function readCard() {
    readyRead = true;
    listenNFCStatus();
}

var NfcAdapter;
var NdefRecord;
var NdefMessage;
var count = 0;

//监听NFC状态
function listenNFCStatus() {
    try {
        var main = plus.android.runtimeMainActivity();
        var Intent = plus.android.importClass('android.content.Intent');
        var Activity = plus.android.importClass('android.app.Activity');
        var PendingIntent = plus.android.importClass('android.app.PendingIntent');
        var IntentFilter = plus.android.importClass('android.content.IntentFilter');
        NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
        var nfcAdapter = NfcAdapter.getDefaultAdapter(main);
        //判断设备是否支持NFC功能
        if (nfcAdapter == null) {
            mui.alert("设备不支持NFC功能！", '提示', ["确定"], function() {}, "div");
            return;
        }
        //判断设备是否开启NFC功能
        if (!nfcAdapter.isEnabled()) {
            mui.alert("请在系统设置中启用NFC功能！", '提示', ["确定"], function() {}, "div");
            return;
        }
        waiting = plus.nativeUI.showWaiting("请将NFC标签靠近！");

        //倒计时10秒，读取不到后提示是否重新读卡
        var interval = setInterval(function() { //定义定时器
            count++;
            if (count == 10 && readyRead) {
                readyRead = false;
                count = 0;
                waiting.close();
                clearInterval(interval); //清除定时器
                var btnArray = ["重试", "取消"];
                mui.confirm("已超时，是否重新读卡！", "提示", btnArray, function(e) {
                    if (e.index == 0) {
                        readCard();
                    }
                }, "div")
            }
        }, 1000);

        var intent = new Intent(main, main.getClass());
        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
        var pendingIntent = PendingIntent.getActivity(main, 0, intent, 0);
        var ndef = new IntentFilter("android.nfc.action.TECH_DISCOVERED");
        ndef.addDataType("*/*");
        var intentFiltersArray = [ndef];
        var techListsArray = [
            ["android.nfc.tech.IsoDep"],
            ["android.nfc.tech.NfcA"],
            ["android.nfc.tech.NfcB"],
            ["android.nfc.tech.NfcF"],
            ["android.nfc.tech.Ndef"],
            ["android.nfc.tech.NfcV"],
            ["android.nfc.tech.NdefFormatable"],
            ["android.nfc.tech.MifareClassic"],
            ["android.nfc.tech.MifareUltralight"]
        ];
        document.addEventListener("newintent",
            function() {
                setTimeout(readData, 1000);
            }, false);
        document.addEventListener("pause", function(e) {
            if (nfcAdapter) {
                nfcAdapter.disableForegroundDispatch(main);
            }
        }, false);
        document.addEventListener("resume", function(e) {
            if (nfcAdapter) {
                nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
            }
        }, false);
        nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
    } catch (e) {
        mui.toast("读卡失败，请重试！");
        waiting.close();
    }
}

//读取数据
function readData() {
    NdefRecord = plus.android.importClass("android.nfc.NdefRecord");
    NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
    var main = plus.android.runtimeMainActivity();
    var intent = main.getIntent();
    // if ("android.nfc.action.TAG_DISCOVERED" == intent.getAction()) {  //真机调试
    if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) { //打包
        if (readyRead) {
            readyRead = false;

            waiting.setTitle('请勿移开标签\n正在读取数据...');
            var Parcelable = plus.android.importClass("android.os.Parcelable");
            //读取id
            var byteId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
            //将id转为16进制字符串
            var id = ByteArrayToHexString(byteId);
            //关闭等待圆圈
            waiting.close();

            //读取id成功，赋值并发送请求查询
            data1.data.intelCard = id;
            getInoutDetail();
        }
    } else {
        waiting.close();
        mui.alert('读取失败，请重试！', '提示', ["确定"], function() {}, "div");
    }
}

//获取值仓单子详细信息
function getInoutDetail() {
    mui.ajax(url, {
        type: "POST",
        dataType: "json",
        crossDomain: true,
        contentType: "application/json;charset=utf-8",
        data: JSON.stringify(data1),
        success: function(result) {
            if (result.code == "0000") {
                //弹窗信息：单子车牌跟仓库，去值仓则进入值仓页面，传递单子id；
                var btnArray = ["去值仓", "取消"];
                var text = '值仓仓库:' + result.data.depotName + '<br/>车牌号：' + result.data.plateNum + '<br/>保管员：' + result.data.plateNum
                mui.confirm(text, "检测到待值仓信息如下", btnArray, function(e) {
                    if (e.index == 0) {
                        //先判断单子是否在值仓状态
                        if (result.data.progress == "HANDLE") {
                            //去值仓时判断单子类型是否是入库，不是给出提醒；
                            if (result.data.type == "IN") {
                                mui.openWindow({
                                    url: "inout-in-handle.html",
                                    id: "inout-in-handle",
                                    extras: {
                                        data: {
                                            serialNumber: result.data.id,
                                            plateNum: result.data.plateNum,
                                            depotName: result.data.depotName,
                                            storeKeeperName: result.data.storeKeeperName
                                        }
                                    }
                                })
                            } else {
                                mui.alert("该卡信息不是出库类型，请核对！", "提示", ["确定"], function() {}, "div")
                            }
                        } else {
                            mui.alert("当前卡不在值仓状态，请核查！", "提示", ["确定"], function() {}, "div")
                        }
                    }
                }, "div")
            } else {
                mui.toast(result.msg);
            }
        },
        error: function() {
            mui.alert('系统繁忙,请重试！', '提示', ["确定"], function() {}, "div");
        }
    })
}

//将字节数组转为16进制字符串
function ByteArrayToHexString(inarray) {
    var i, j, inn;
    hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
    out = "";
    for (j = 0; j < inarray.length; ++j) {
        inn = inarray[j] & 0xff;
        i = (inn >>> 4) & 0x0f;
        out += hex[i];
        i = inn & 0x0f;
        out += hex[i];
    }
    return out;
}


//滑动
mui('.mui-scroll-wrapper').scroll({
    indicators: false, //是否显示滚动条

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

@@ -29,13 +29,15 @@
    var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
    url = user.url + "/api-phone/v35/gateway";
    data.tokenAuth = user.tokenAuth;
    data1.tokenAuth = user.tokenAuth;
    data.data.deptId = selectDeptId;
    getOutHandleList();
    getInHandleList();
}

//查询出库记录
function getOutHandleList() {
function getInHandleList() {
    outHandleData = null;
    //查询的车牌号
    data.data.plateNum = mui("#plateNum")[0].value;
    //请求
    mui.ajax(url, {
@@ -59,55 +61,55 @@
            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"
    //     }
    // ]
    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();
}

@@ -121,8 +123,7 @@
                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>';
                        .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>';
@@ -193,49 +194,6 @@
            })
        }
    })
	
    // var btnArray = [{
    //     title:"现场值仓"
    // },{
    //     title:"远程值仓"
    // }];
    // plus.nativeUI.actionSheet({
    //     title:"请选择",
    //     cancel:"取消",
    //     buttons:btnArray
    // },function(e) {
    //     var index = e.index;
    //     switch (index) {
    //         case 1:
    //             mui.openWindow({
    //                 url: "inout-out-handle.html",
    //                 id: "inout-out-handle",
    //                 extras: {
    //                     data: {
    //                         serialNumber: id,
    //                         plateNum: plateNum,
    //                         depotName: depotName,
    //                         storeKeeperName: storeKeeperName
    //                     }
    //                 }
    //             })
    //             break;
    //         case 2:
    //             mui.openWindow({
    //                 url: "inout-out-handle.html",
    //                 id: "inout-out-handle",
    //                 extras: {
    //                     data: {
    //                         serialNumber: id,
    //                         plateNum: plateNum,
    //                         depotName: depotName,
    //                         storeKeeperName: storeKeeperName
    //                     }
    //                 }
    //             })
    //             break;
    //     }
    // });
});

/*---------------NFC读卡功能-------------------*/
@@ -350,7 +308,7 @@
            waiting.close();

            //读取id成功，赋值并发送请求查询
            data.data.intelCard = id;
            data1.data.intelCard = id;
            getInoutDetail();
        }
    } else {

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

@@ -43,11 +43,12 @@
    url = user.url + "/api-phone/v35/gateway";
    uploadUrl = user.url + "/api-phone/v35/upload-img";
    data.tokenAuth = user.tokenAuth;
    data1.tokenAuth = user.tokenAuth;
    //获取从上一个页面传递的数据
    var self = plus.webview.currentWebview();
    depotData = self.data;
    data.data.id = depotData.serialNumber;
    // data.data.intelCard = depotData.intelCard;
    data.data.intelCard = depotData.intelCard;
    $("#plateNum").html(depotData.plateNum);
    $("#depotName").html(depotData.depotName);
    $("#storeKeeperName").html(depotData.storeKeeperName);
@@ -179,27 +180,6 @@
        success: function(result) {
            if (result.code == '0000') {
                if (result.data.handleStart != null) {
                    var btnArray = [{
                        title: "拍照上传"
                    }, {
                        title: "从相册选择"
                    }];
                    plus.nativeUI.actionSheet({
                            title: "请选择",
                            cancel: "取消",
                            buttons: btnArray
                        },
                        function(e) {
                            var index = e.index;
                            switch (index) {
                                case 1:
                                    cameraImg(typeNum);
                                    break;
                                case 2:
                                    galleryImg(typeNum);
                                    break;
                            }
                        });
                    var picker = new mui.PopPicker();
                    picker.setData([{
                        value: "cameraImg",
@@ -243,9 +223,6 @@
    //         galleryImg(typeNum);
    //     }
    // })
	
        });

};

//使用相机拍照
@@ -308,6 +285,8 @@
        });
    //携带车牌参数
    task.addData("plateNum", depotData.plateNum);
    //业务类型
    task.addData("bizType","01");
    //图片信息
    task.addFile(path, {
        key: "uploadkey"

 igds-app/js/admin/warn-list.js

@@ -81,7 +81,7 @@
    //            "time": "2006-11-01 14:01:36",
    //            "info": "dolor",
    //            "depotId": "6",
    //            "depotName": "矿共和中过",
    //            "depotName": "",
    //         "remark":"00000"
    //        },
    //        {

 igds-app/security-patrol.html

@@ -28,7 +28,7 @@
            </div>
            <div class="mui-scroll-wrapper index-dzxg">
                <div class="mui-scroll">
                    <ul class="ul-cardb1">
                    <ul class="ul-cardb1" id="recordList">
                        <li>
                            <div class="item">
                                <div class="top">
@@ -144,14 +144,14 @@
            </div>
            <div class="m-bot_btn">
                <div class="box">
                    <button type="button" class="mui-btn  mui-btn-block bot-btn">拍照打卡</button>
                    <button type="button" class="mui-btn  mui-btn-block bot-btn" onclick="cameraImg()">拍照打卡</button>
                </div>
            </div>
            <!-- 预览图片 -->
            <div class="m-pop">
                <div class="pop-bg"></div>
                <div class="inner">
                    <div class="m-viewer">
                    <div class="m-viewer" id="viewerImg">
                        <img src="images/p-j1.jpg" alt="" class="img" />
                    </div>
                    <div class="close"><span class="mui-icon mui-icon-close"></span></div>
@@ -162,45 +162,14 @@
    <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/security-patrol.js"></script>
    <script type="text/javascript" charset="utf-8">
        //mui初始化
        mui.init();

        function chooseDate() {
            var dtpicker = new mui.DtPicker({
                type: "date", //设置日历初始视图模式 
                // beginDate: new Date(2015, 04, 25), //设置开始日期 
                // endDate: new Date(2016, 04, 25), //设置结束日期 

            })
            dtpicker.show(function(e) {
                document.getElementById("date").value = e.value
            })
        }

        mui('.mui-scroll-wrapper').scroll({
            indicators: false, //是否显示滚动条
            deceleration: 0.0006, //阻尼系数,系数越小滑动越灵敏
            bounce: false, //是否启用回弹
            deceleration: 0.0005 //flick 减速系数，系数越大，滚动速度越慢，滚动距离越小，默认值0.0006
        });
		
        mui(".mui-content").on("tap", ".g-date_box .prev", function() {
            var curDate = document.getElementById("date").value;
            document.getElementById("date").value = e.value
        });
        mui(".mui-content").on("tap", ".g-date_box .next", function() {
            var curDate = document.getElementById("date").value;
            document.getElementById("date").value = e.value
        });

        //查看照片
        mui(".mui-content").on("tap", ".ul-cardb1 li .r-btn", function() {
            $('.m-pop').css('display', 'flex');
        });
        //关闭照片
        $('.pop-bg,.m-pop .close').click(function(e) {
            e.stopPropagation();
            $('.m-pop').fadeOut();
        });
        mui.plusReady(function(){
            //数据初始化
            init();
        })
    </script>
</html>

			@@ -533,6 +533,8 @@
			});
			//携带车牌参数
			task.addData("plateNum", plateNum);
			//业务类型
			task.addData("bizType","01");
			//图片信息
			task.addFile(path, {
			key: "uploadkey"

			@@ -11,6 +11,8 @@
			<link rel="stylesheet" href="./css/admin/public.css" />
			<!-- 页面css -->
			<link rel="stylesheet" href="./css/admin/inout-in-handle-list.css">
			<!--App自定义的css-->
			<link rel="stylesheet" type="text/css" href="./css/mui.picker.min.css" />
			</head>
			<body class="g-bg" style="background-image: url(images/m-bg2.png);">
			<header id="header" class="mui-bar mui-bar-nav m-pagetit">
			@@ -41,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>
			@@ -124,7 +126,7 @@
			</div>
			</div>
			</div>
			</li> -->
			</li>
			</ul>
			</div>
			</div>
			@@ -132,6 +134,7 @@
			</div>
			</body>
			<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-in-handle-list.js"></script>
			<script type="text/javascript" charset="utf-8">

			@@ -51,7 +51,6 @@
			<img src="images/icons/g-i23.png" alt="">
			</div>
			<div class="t">拍照上传</div>
			<!-- <img src="images/spad0.png"/> -->
			</label>
			</div>

			@@ -13,13 +13,24 @@
			"intelCard": ""
			}
			};

			var data1 = {
			"interfaceId": "5208",
			"outId": "10208",
			"reqDateTime": new Date(),
			"tokenAuth": "",
			"data": {
			"type": "IN",
			"id": "",
			"intelCard": ""
			}
			};
			//初始化数据
			function init() {
			var user = JSON.parse(localStorage.getItem('user'));
			var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
			url = user.url + "/api-phone/v35/gateway";
			data.tokenAuth = user.tokenAuth;
			data1.tokenAuth = user.tokenAuth;
			data.data.deptId = selectDeptId;

			//获取入库待值仓列表
			@@ -30,7 +41,7 @@
			function getInHandleList() {
			inHandleData = null;

			//赋值参数的日期
			//查询的车牌号
			data.data.plateNum = mui("#plateNum")[0].value;

			//请求
			@@ -53,6 +64,56 @@
			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"
			}
			]
			}

			//渲染页面
			@@ -63,7 +124,8 @@
			$.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="" class="link">值仓<span class="mui-icon mui-icon-arrowright"></span></a>';
			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><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>';
			@@ -77,14 +139,251 @@
			html += '</div></div></li>';
			})
			} else {
			html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">暂无入库待值仓信息</div></div></li>';
			html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">暂无入库待值仓信息</div></div></li>';
			}
			}else{
			html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">暂无入库待值仓信息</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);
			}

			//功能模块跳转
			mui(".mui-scroll-wrapper").on("tap", ".mui-scroll ul li a", function() {
			var id = this.getAttribute("id");
			var depotName = this.getAttribute("depotName")
			var plateNum = this.getAttribute("plateNum")
			var storeKeeperName = this.getAttribute("storeKeeperName")

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

			}, {
			value: "snap",
			text: "远程值仓"
			}])
			picker.pickers[0].setSelectedValue('photo');
			picker.show(function(SelectedItem) {
			console.log(JSON.stringify(SelectedItem));
			//现场值仓
			if(SelectedItem.value == 'photo'){
			mui.openWindow({
			url: "inout-in-handle.html",
			id: "inout-in-handle",
			extras: {
			data: {
			serialNumber: id,
			plateNum: plateNum,
			depotName: depotName,
			storeKeeperName: storeKeeperName
			}
			}
			})
			}else{ //远程值仓
			mui.openWindow({
			url: "inout-in-handle.html",
			id: "inout-in-handle",
			extras: {
			data: {
			serialNumber: id,
			plateNum: plateNum,
			depotName: depotName,
			storeKeeperName: storeKeeperName
			}
			}
			})
			}
			})
			});


			/---------------NFC读卡功能-------------------/
			var waiting;
			var readyRead = false;
			//读卡方法
			function readCard() {
			readyRead = true;
			listenNFCStatus();
			}

			var NfcAdapter;
			var NdefRecord;
			var NdefMessage;
			var count = 0;

			//监听NFC状态
			function listenNFCStatus() {
			try {
			var main = plus.android.runtimeMainActivity();
			var Intent = plus.android.importClass('android.content.Intent');
			var Activity = plus.android.importClass('android.app.Activity');
			var PendingIntent = plus.android.importClass('android.app.PendingIntent');
			var IntentFilter = plus.android.importClass('android.content.IntentFilter');
			NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
			var nfcAdapter = NfcAdapter.getDefaultAdapter(main);
			//判断设备是否支持NFC功能
			if (nfcAdapter == null) {
			mui.alert("设备不支持NFC功能！", '提示', ["确定"], function() {}, "div");
			return;
			}
			//判断设备是否开启NFC功能
			if (!nfcAdapter.isEnabled()) {
			mui.alert("请在系统设置中启用NFC功能！", '提示', ["确定"], function() {}, "div");
			return;
			}
			waiting = plus.nativeUI.showWaiting("请将NFC标签靠近！");

			//倒计时10秒，读取不到后提示是否重新读卡
			var interval = setInterval(function() { //定义定时器
			count++;
			if (count == 10 && readyRead) {
			readyRead = false;
			count = 0;
			waiting.close();
			clearInterval(interval); //清除定时器
			var btnArray = ["重试", "取消"];
			mui.confirm("已超时，是否重新读卡！", "提示", btnArray, function(e) {
			if (e.index == 0) {
			readCard();
			}
			}, "div")
			}
			}, 1000);

			var intent = new Intent(main, main.getClass());
			intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
			var pendingIntent = PendingIntent.getActivity(main, 0, intent, 0);
			var ndef = new IntentFilter("android.nfc.action.TECH_DISCOVERED");
			ndef.addDataType("/");
			var intentFiltersArray = [ndef];
			var techListsArray = [
			["android.nfc.tech.IsoDep"],
			["android.nfc.tech.NfcA"],
			["android.nfc.tech.NfcB"],
			["android.nfc.tech.NfcF"],
			["android.nfc.tech.Ndef"],
			["android.nfc.tech.NfcV"],
			["android.nfc.tech.NdefFormatable"],
			["android.nfc.tech.MifareClassic"],
			["android.nfc.tech.MifareUltralight"]
			];
			document.addEventListener("newintent",
			function() {
			setTimeout(readData, 1000);
			}, false);
			document.addEventListener("pause", function(e) {
			if (nfcAdapter) {
			nfcAdapter.disableForegroundDispatch(main);
			}
			}, false);
			document.addEventListener("resume", function(e) {
			if (nfcAdapter) {
			nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
			}
			}, false);
			nfcAdapter.enableForegroundDispatch(main, pendingIntent, intentFiltersArray, techListsArray);
			} catch (e) {
			mui.toast("读卡失败，请重试！");
			waiting.close();
			}
			}

			//读取数据
			function readData() {
			NdefRecord = plus.android.importClass("android.nfc.NdefRecord");
			NdefMessage = plus.android.importClass("android.nfc.NdefMessage");
			var main = plus.android.runtimeMainActivity();
			var intent = main.getIntent();
			// if ("android.nfc.action.TAG_DISCOVERED" == intent.getAction()) { //真机调试
			if ("android.nfc.action.TECH_DISCOVERED" == intent.getAction()) { //打包
			if (readyRead) {
			readyRead = false;

			waiting.setTitle('请勿移开标签\n正在读取数据...');
			var Parcelable = plus.android.importClass("android.os.Parcelable");
			//读取id
			var byteId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
			//将id转为16进制字符串
			var id = ByteArrayToHexString(byteId);
			//关闭等待圆圈
			waiting.close();

			//读取id成功，赋值并发送请求查询
			data1.data.intelCard = id;
			getInoutDetail();
			}
			} else {
			waiting.close();
			mui.alert('读取失败，请重试！', '提示', ["确定"], function() {}, "div");
			}
			}

			//获取值仓单子详细信息
			function getInoutDetail() {
			mui.ajax(url, {
			type: "POST",
			dataType: "json",
			crossDomain: true,
			contentType: "application/json;charset=utf-8",
			data: JSON.stringify(data1),
			success: function(result) {
			if (result.code == "0000") {
			//弹窗信息：单子车牌跟仓库，去值仓则进入值仓页面，传递单子id；
			var btnArray = ["去值仓", "取消"];
			var text = '值仓仓库:' + result.data.depotName + '<br/>车牌号：' + result.data.plateNum + '<br/>保管员：' + result.data.plateNum
			mui.confirm(text, "检测到待值仓信息如下", btnArray, function(e) {
			if (e.index == 0) {
			//先判断单子是否在值仓状态
			if (result.data.progress == "HANDLE") {
			//去值仓时判断单子类型是否是入库，不是给出提醒；
			if (result.data.type == "IN") {
			mui.openWindow({
			url: "inout-in-handle.html",
			id: "inout-in-handle",
			extras: {
			data: {
			serialNumber: result.data.id,
			plateNum: result.data.plateNum,
			depotName: result.data.depotName,
			storeKeeperName: result.data.storeKeeperName
			}
			}
			})
			} else {
			mui.alert("该卡信息不是出库类型，请核对！", "提示", ["确定"], function() {}, "div")
			}
			} else {
			mui.alert("当前卡不在值仓状态，请核查！", "提示", ["确定"], function() {}, "div")
			}
			}
			}, "div")
			} else {
			mui.toast(result.msg);
			}
			},
			error: function() {
			mui.alert('系统繁忙,请重试！', '提示', ["确定"], function() {}, "div");
			}
			})
			}

			//将字节数组转为16进制字符串
			function ByteArrayToHexString(inarray) {
			var i, j, inn;
			hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
			out = "";
			for (j = 0; j < inarray.length; ++j) {
			inn = inarray[j] & 0xff;
			i = (inn >>> 4) & 0x0f;
			out += hex[i];
			i = inn & 0x0f;
			out += hex[i];
			}
			return out;
			}


			//滑动
			mui('.mui-scroll-wrapper').scroll({
			indicators: false, //是否显示滚动条

			@@ -29,13 +29,15 @@
			var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
			url = user.url + "/api-phone/v35/gateway";
			data.tokenAuth = user.tokenAuth;
			data1.tokenAuth = user.tokenAuth;
			data.data.deptId = selectDeptId;
			getOutHandleList();
			getInHandleList();
			}

			//查询出库记录
			function getOutHandleList() {
			function getInHandleList() {
			outHandleData = null;
			//查询的车牌号
			data.data.plateNum = mui("#plateNum")[0].value;
			//请求
			mui.ajax(url, {
			@@ -59,55 +61,55 @@
			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"
			// }
			// ]
			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();
			}

			@@ -121,8 +123,7 @@
			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>';
			.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>';
			@@ -193,49 +194,6 @@
			})
			}
			})

			// var btnArray = [{
			// title:"现场值仓"
			// },{
			// title:"远程值仓"
			// }];
			// plus.nativeUI.actionSheet({
			// title:"请选择",
			// cancel:"取消",
			// buttons:btnArray
			// },function(e) {
			// var index = e.index;
			// switch (index) {
			// case 1:
			// mui.openWindow({
			// url: "inout-out-handle.html",
			// id: "inout-out-handle",
			// extras: {
			// data: {
			// serialNumber: id,
			// plateNum: plateNum,
			// depotName: depotName,
			// storeKeeperName: storeKeeperName
			// }
			// }
			// })
			// break;
			// case 2:
			// mui.openWindow({
			// url: "inout-out-handle.html",
			// id: "inout-out-handle",
			// extras: {
			// data: {
			// serialNumber: id,
			// plateNum: plateNum,
			// depotName: depotName,
			// storeKeeperName: storeKeeperName
			// }
			// }
			// })
			// break;
			// }
			// });
			});

			/---------------NFC读卡功能-------------------/
			@@ -350,7 +308,7 @@
			waiting.close();

			//读取id成功，赋值并发送请求查询
			data.data.intelCard = id;
			data1.data.intelCard = id;
			getInoutDetail();
			}
			} else {

			@@ -43,11 +43,12 @@
			url = user.url + "/api-phone/v35/gateway";
			uploadUrl = user.url + "/api-phone/v35/upload-img";
			data.tokenAuth = user.tokenAuth;
			data1.tokenAuth = user.tokenAuth;
			//获取从上一个页面传递的数据
			var self = plus.webview.currentWebview();
			depotData = self.data;
			data.data.id = depotData.serialNumber;
			// data.data.intelCard = depotData.intelCard;
			data.data.intelCard = depotData.intelCard;
			$("#plateNum").html(depotData.plateNum);
			$("#depotName").html(depotData.depotName);
			$("#storeKeeperName").html(depotData.storeKeeperName);
			@@ -179,27 +180,6 @@
			success: function(result) {
			if (result.code == '0000') {
			if (result.data.handleStart != null) {
			var btnArray = [{
			title: "拍照上传"
			}, {
			title: "从相册选择"
			}];
			plus.nativeUI.actionSheet({
			title: "请选择",
			cancel: "取消",
			buttons: btnArray
			},
			function(e) {
			var index = e.index;
			switch (index) {
			case 1:
			cameraImg(typeNum);
			break;
			case 2:
			galleryImg(typeNum);
			break;
			}
			});
			var picker = new mui.PopPicker();
			picker.setData([{
			value: "cameraImg",
			@@ -243,9 +223,6 @@
			// galleryImg(typeNum);
			// }
			// })

			});

			};

			//使用相机拍照
			@@ -308,6 +285,8 @@
			});
			//携带车牌参数
			task.addData("plateNum", depotData.plateNum);
			//业务类型
			task.addData("bizType","01");
			//图片信息
			task.addFile(path, {
			key: "uploadkey"

			@@ -81,7 +81,7 @@
			// "time": "2006-11-01 14:01:36",
			// "info": "dolor",
			// "depotId": "6",
			// "depotName": "矿共和中过",
			// "depotName": "",
			// "remark":"00000"
			// },
			// {

			@@ -28,7 +28,7 @@
			</div>
			<div class="mui-scroll-wrapper index-dzxg">
			<div class="mui-scroll">
			<ul class="ul-cardb1">
			<ul class="ul-cardb1" id="recordList">
			<li>
			<div class="item">
			<div class="top">
			@@ -144,14 +144,14 @@
			</div>
			<div class="m-bot_btn">
			<div class="box">
			<button type="button" class="mui-btn mui-btn-block bot-btn">拍照打卡</button>
			<button type="button" class="mui-btn mui-btn-block bot-btn" onclick="cameraImg()">拍照打卡</button>
			</div>
			</div>
			<!-- 预览图片 -->
			<div class="m-pop">
			<div class="pop-bg"></div>
			<div class="inner">
			<div class="m-viewer">
			<div class="m-viewer" id="viewerImg">
			<img src="images/p-j1.jpg" alt="" class="img" />
			</div>
			<div class="close"><span class="mui-icon mui-icon-close"></span></div>
			@@ -162,45 +162,14 @@
			<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/security-patrol.js"></script>
			<script type="text/javascript" charset="utf-8">
			//mui初始化
			mui.init();

			function chooseDate() {
			var dtpicker = new mui.DtPicker({
			type: "date", //设置日历初始视图模式
			// beginDate: new Date(2015, 04, 25), //设置开始日期
			// endDate: new Date(2016, 04, 25), //设置结束日期

			})
			dtpicker.show(function(e) {
			document.getElementById("date").value = e.value
			})
			}

			mui('.mui-scroll-wrapper').scroll({
			indicators: false, //是否显示滚动条
			deceleration: 0.0006, //阻尼系数,系数越小滑动越灵敏
			bounce: false, //是否启用回弹
			deceleration: 0.0005 //flick 减速系数，系数越大，滚动速度越慢，滚动距离越小，默认值0.0006
			});

			mui(".mui-content").on("tap", ".g-date_box .prev", function() {
			var curDate = document.getElementById("date").value;
			document.getElementById("date").value = e.value
			});
			mui(".mui-content").on("tap", ".g-date_box .next", function() {
			var curDate = document.getElementById("date").value;
			document.getElementById("date").value = e.value
			});

			//查看照片
			mui(".mui-content").on("tap", ".ul-cardb1 li .r-btn", function() {
			$('.m-pop').css('display', 'flex');
			});
			//关闭照片
			$('.pop-bg,.m-pop .close').click(function(e) {
			e.stopPropagation();
			$('.m-pop').fadeOut();
			});
			mui.plusReady(function(){
			//数据初始化
			init();
			})
			</script>
			</html>