|
|
@@ -26,6 +26,7 @@
|
|
|
.btn-cancel{float: right;padding: 5px 12px;background-color: #fff;color: #58d1eb;border:1px solid #58d1eb;}
|
|
|
.my-pull-right{float: right;color: #999;}
|
|
|
.sp-status{margin-top: 5px;float: left;}
|
|
|
+ .sp-font{ font-size: 15px;}
|
|
|
</style>
|
|
|
<title>RST - 产品出库</title>
|
|
|
</head>
|
|
|
@@ -33,12 +34,12 @@
|
|
|
<div class="mui-content" style="background-color: #fff;">
|
|
|
<div style="padding: 10px 10px 0 10px;">
|
|
|
<div id="segmentedControl" class="mui-segmented-control">
|
|
|
- <a class="mui-control-item mui-active" href="#item1">出库</a>
|
|
|
- <a class="mui-control-item" href="#item2">已出库</a>
|
|
|
+ <a class="mui-control-item mui-active" href="#item1" id="chuku" >出库</a>
|
|
|
+ <a class="mui-control-item" href="#item2" id="yichuku">已出库</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <div id="item1" class="mui-control-content mui-active">
|
|
|
+ <div id="item1" class="mui-control-content mui-active chukuDiv">
|
|
|
<article class="cl pd-10">
|
|
|
<ul class="my_input_list" id="basic_input_list">
|
|
|
<li>销售公司
|
|
|
@@ -49,7 +50,7 @@
|
|
|
</li>
|
|
|
<li style="position: relative;">条 形 码 <span id="xy_number"></span>
|
|
|
<input type="text" class="input-text w-75" id="machineBarcode" placeholder="请输入产品条形码／扫描">
|
|
|
- <span class="iconfont icon-saoma chuku-saoma"></span>
|
|
|
+ <span class="iconfont icon-saoma chuku-saoma scan-code-machine"></span>
|
|
|
</li>
|
|
|
</ul>
|
|
|
</article>
|
|
|
@@ -58,32 +59,27 @@
|
|
|
<a class="btn btn-block btn-water radius size-L" href="javascript:void(0);" onclick="addMachineDelivery()">提交</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div style="padding-top: 100px;text-align: center;">
|
|
|
- 净水机：今日出库 <span class="cl-blue">0</span><br/>
|
|
|
- 上朵牙刷：今日出库 <span class="cl-blue">0</span>
|
|
|
+ <div style="padding-top: 100px;text-align: center;" id="deliveryNumber">
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div id="item2" class="mui-control-content">
|
|
|
+ <div id="item2" class="mui-control-content yichukuDiv">
|
|
|
<article class="cl pd-10">
|
|
|
<ul class="my_input_list">
|
|
|
<li style="position: relative;">条 形 码
|
|
|
- <input type="text" class="input-text w-75" id="machineBarcode" placeholder="请输入产品条形码／扫描进行搜索">
|
|
|
- <span class="iconfont icon-saoma chuku-saoma"></span>
|
|
|
+ <input type="text" class="input-text w-75" id="secahMachineBarcode" placeholder="请输入产品条形码／扫描进行搜索">
|
|
|
+ <span class="iconfont icon-saoma chuku-saoma secah-scan-code-machine"></span>
|
|
|
</li>
|
|
|
</ul>
|
|
|
<ul class="my-pull-list">
|
|
|
- <li>
|
|
|
- <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
|
|
|
- <div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
|
|
|
+
|
|
|
+ <#-- <li>
|
|
|
+ <div>232435u6yi1i2 爱贝源</div>
|
|
|
<div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
|
|
|
</li>
|
|
|
<li>
|
|
|
<div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
|
|
|
<div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
|
|
|
- </li>
|
|
|
+ </li>-->
|
|
|
</ul>
|
|
|
</article>
|
|
|
</div>
|
|
|
@@ -96,25 +92,137 @@
|
|
|
<script type="text/javascript" src="${path}/common/js/order/order_common.js"></script>
|
|
|
|
|
|
<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
|
|
|
-<#--<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>-->
|
|
|
+<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
|
|
|
<script>
|
|
|
- var check = true,alert_msg='';
|
|
|
- var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //手机号码
|
|
|
- var uname = /^[\u4e00-\u9fa5]{2,7}$/; //中文英文
|
|
|
- var code = /^[0-9]{4}$/; //数字
|
|
|
- var positive_float = /^[1-9]{1}\d*.[0-9]{1,3}$/; //正浮点数
|
|
|
- var positive_int = /^[0-9]{1}\d*$/; //正整数0-9
|
|
|
- var positive_int4 = /^[0-9]{4}$/; //交易尾号
|
|
|
- var ch_en_num=/^[A-Za-z0-9_\-\u4e00-\u9fa5]{1,}$/;//简体中文英文数字
|
|
|
- var en_num=/^[A-Za-z0-9]{9,12}$/;//英文数字9位-10位数
|
|
|
- var en_num1=/^[A-Za-z0-9\-]{1,}$/;//英文数字
|
|
|
- var card_id=/^(\d{17}[\d|x]|\d{15})$/; //身份证(国内)
|
|
|
var validate_flag=false;
|
|
|
|
|
|
+ document.getElementById('chuku').addEventListener('tap',function(){
|
|
|
+ $(".mui-control-item").removeClass("mui-active");
|
|
|
+ $(".mui-control-content").removeClass("mui-active");
|
|
|
+ $("#chuku").addClass("mui-active");
|
|
|
+ $(".chukuDiv").addClass("mui-active");
|
|
|
+ initializeMachines();
|
|
|
+ });
|
|
|
+ document.getElementById('yichuku').addEventListener('tap',function(){
|
|
|
+ $(".mui-control-item").removeClass("mui-active");
|
|
|
+ $(".mui-control-content").removeClass("mui-active");
|
|
|
+ $("#yichuku").addClass("mui-active");
|
|
|
+ $(".yichukuDiv").addClass("mui-active");
|
|
|
+ initializeDelivery("");
|
|
|
+ });
|
|
|
+
|
|
|
mui.ready(function() {
|
|
|
|
|
|
+ mui.ajax('${path}/admin/machine/list_delivery', {
|
|
|
+ data: {
|
|
|
+ },
|
|
|
+ type: 'post',
|
|
|
+ timeout: 15000,
|
|
|
+ success: function(dt) {
|
|
|
+ if(dt.isRedirect) {
|
|
|
+ location.href = dt.redirectURL;
|
|
|
+ }else{
|
|
|
+ if(dt.resultCode=="200") {
|
|
|
+ var result = dt.returnMsg.ptsSalesCompanyList;
|
|
|
+ var id = result[0].salesCompanyId;
|
|
|
+ var name = result[0].salesCompanyName;
|
|
|
+ $("#machineSalesCompanyId").val(name);
|
|
|
+ $("#machineSalesCompanyId").attr("name",id);
|
|
|
+ }else{
|
|
|
+ mui.alert(dt.resultMsg);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ error: function(xhr, type, errorThrown) {
|
|
|
+ mui.alert("加载失败！请检查网络或稍后重试！");
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ ///初始化时间
|
|
|
+ var YY = new Date().getFullYear(),
|
|
|
+ MM = new Date().getMonth()+1,
|
|
|
+ DD = new Date().getDate();
|
|
|
+ var machineSalesDate = YY + "-" + MM + "-" + DD;
|
|
|
+ $("#machineSalesDate").val(machineSalesDate);
|
|
|
+
|
|
|
+ //初始化机器台数
|
|
|
+ initializeMachines();
|
|
|
});
|
|
|
|
|
|
+ //初始化机器台数
|
|
|
+ function initializeMachines() {
|
|
|
+ var html = "";
|
|
|
+ mui.ajax('${path}/admin/machine/delivery_desc', {
|
|
|
+ data: {
|
|
|
+ },
|
|
|
+ type: 'post',
|
|
|
+ timeout: 15000,
|
|
|
+ success: function(dt) {
|
|
|
+ if(dt.isRedirect) {
|
|
|
+ location.href = dt.redirectURL;
|
|
|
+ }else{
|
|
|
+ if(dt.resultCode=="200") {
|
|
|
+ var result = dt.returnMsg.machineNumber;
|
|
|
+ var flag = 0;
|
|
|
+ for(var i=0;i<result.length;i++){
|
|
|
+ if(result[i].number != 0){
|
|
|
+ html += '<span>'+ result[i].name +': 今日出库<span class="cl-blue"> '+ result[i].number +'</span></span><br/>';
|
|
|
+ }
|
|
|
+ flag += result[i].number
|
|
|
+ }
|
|
|
+ if(flag != 0){
|
|
|
+ $("#deliveryNumber").html(html);
|
|
|
+ }else{
|
|
|
+ $("#deliveryNumber").html("今天暂时没有出库任何机器哦~");
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ mui.alert(dt.resultMsg);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ error: function(xhr, type, errorThrown) {
|
|
|
+ mui.alert("加载失败！请检查网络或稍后重试！");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ //初始化已出库
|
|
|
+ function initializeDelivery(machineBarcode) {
|
|
|
+ var html = "";
|
|
|
+ mui.ajax('${path}/admin/machine/to_list_delivery', {
|
|
|
+ data: {
|
|
|
+ machineBarcode : machineBarcode,
|
|
|
+ data : new Date().getTime()
|
|
|
+ },
|
|
|
+ type: 'post',
|
|
|
+ timeout: 15000,
|
|
|
+ success: function(dt) {
|
|
|
+ if(dt.isRedirect) {
|
|
|
+ location.href = dt.redirectURL;
|
|
|
+ }else{
|
|
|
+ if(dt.resultCode=="200") {
|
|
|
+ var result = dt.returnMsg.listPtsMachine;
|
|
|
+ for(var i=0;i<result.length;i++){
|
|
|
+ var machineBarcode = result[i].machineBarcode;
|
|
|
+ var machineSalesCompanyName = result[i].machineSalesCompanyName;
|
|
|
+ var machineSalesDate = result[i].machineSalesDate;
|
|
|
+ html += '<li>' +
|
|
|
+ '<div class="sp-font">'+ machineBarcode +' '+ machineSalesCompanyName +'</div>' +
|
|
|
+ '<div><span class="sp-status sp-font">已出库 '+ machineSalesDate +'</span><span class="btn-cancel sp-font" id="cancelTheLibrary" name="'+ machineBarcode +'">取消出库</span></div>' +
|
|
|
+ '</li>';
|
|
|
+ }
|
|
|
+ $(".my-pull-list").html(html);
|
|
|
+ }else{
|
|
|
+ mui.alert(dt.resultMsg);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ error: function(xhr, type, errorThrown) {
|
|
|
+ mui.alert("加载失败！请检查网络或稍后重试！");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
/*时间选择-- */
|
|
|
mui('body').on('tap', '#machineSalesDate', function() {
|
|
|
var th=this;
|
|
|
@@ -131,8 +239,43 @@
|
|
|
})
|
|
|
});
|
|
|
|
|
|
+ /*取消出库*/
|
|
|
+ mui('body').on('tap', '#cancelTheLibrary', function() {
|
|
|
+ var machineBarcode = $(this).attr("name");
|
|
|
+ var btnArray = ['否', '是'];
|
|
|
+ mui.confirm('是否取消该机器出库？', '取消出库', btnArray, function(e) {
|
|
|
+ if (e.index == 1) {
|
|
|
+ mui.ajax('${path}/admin/machine/cancel_warehouse', {
|
|
|
+ data: {
|
|
|
+ machineBarcode : machineBarcode,
|
|
|
+ data : new Date().getTime()
|
|
|
+ },
|
|
|
+ type: 'post',
|
|
|
+ timeout: 15000,
|
|
|
+ success: function(dt) {
|
|
|
+ if(dt.isRedirect) {
|
|
|
+ location.href = dt.redirectURL;
|
|
|
+ }else{
|
|
|
+ if(dt.resultCode=="200") {
|
|
|
+ mui.alert(dt.resultMsg);
|
|
|
+ initializeDelivery(""); //初始化出库列表
|
|
|
+ }else{
|
|
|
+ mui.alert(dt.resultMsg);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ error: function(xhr, type, errorThrown) {
|
|
|
+ mui.alert("加载失败！请检查网络或稍后重试！");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ });
|
|
|
+
|
|
|
/*出库扫码*/
|
|
|
- mui('body').on('tap', '.chuku-saoma', function() {
|
|
|
+ mui('body').on('tap', '.scan-code-machine', function() {
|
|
|
wx.scanQRCode({
|
|
|
needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
|
|
|
scanType: ["barCode"], // 可以指定扫二维码还是一维码，默认二者都有
|
|
|
@@ -144,6 +287,33 @@
|
|
|
var code = result;
|
|
|
var brCode = code.split(",");
|
|
|
$('#machineBarcode').val(brCode[1]);
|
|
|
+
|
|
|
+ var btnArray = ['否', '是'];
|
|
|
+ mui.confirm('条形码：'+brCode[1], '是否出库？', btnArray, function(e) {
|
|
|
+ if (e.index == 1) {
|
|
|
+ addMachineDelivery(); //调用提交
|
|
|
+ } else {
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ /*搜索的扫码*/
|
|
|
+ mui('body').on('tap', '.secah-scan-code-machine', function() {
|
|
|
+ wx.scanQRCode({
|
|
|
+ needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
|
|
|
+ scanType: ["barCode"], // 可以指定扫二维码还是一维码，默认二者都有
|
|
|
+ success: function (res) {
|
|
|
+ var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
|
|
|
+ if (result.indexOf("weixin.qq.com") > 0) {
|
|
|
+ mui.alert("请扫描条形码!");
|
|
|
+ } else {
|
|
|
+ var code = result;
|
|
|
+ var brCode = code.split(",");
|
|
|
+ $('#secahMachineBarcode').val(brCode[1]);
|
|
|
+ initializeDelivery(brCode[1]);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -204,7 +374,7 @@
|
|
|
|
|
|
/*提交*/
|
|
|
function addMachineDelivery(){
|
|
|
- mui("#basic_input_list .input-text").each(function() {
|
|
|
+ mui("#basic_input_list .input-text").each(function() {
|
|
|
switch(this.getAttribute("id")) {
|
|
|
case "machineSalesCompanyId":
|
|
|
if (this.value != "") {
|
