first commit

Application/Admin/Controller/QcodeController.class.php

@@ -664,7 +664,7 @@ class QcodeController extends AddonController{
             if($session_config['user_auth']['uid']==1 || $session_config['user_auth']['uid']==26) {
                 $companylist=M('qcode_gsmc')
                     ->where($wh)
-                    ->field('id,nickname')
+                    ->field('id,nickname,name')
                     ->select();
             }
 
@@ -764,10 +764,10 @@ class QcodeController extends AddonController{
             $map = array();
             $nickname = trim($_POST['nickname']);
             if ($nickname!=''){
-                $map['nickname']=$nickname;
+                $map['nickname|name']=$nickname;
             }
 
-            $print_code=M('qcode_gsmc')->where($map)->field('print_code')->find();
+            $print_code=M('qcode_gsmc')->where($map)->field('print_code,nickname,name')->find();
 
             $map2 = array();
             $map2['id'] = array('gt',27);

Application/Admin/View/Export/fahuo.html

@@ -104,6 +104,23 @@
 						<input id ="endDate"  name="endDate" class="easyui-datebox" style="width:150px" type="text" value="" data-options="editable:false"/>
 					</td>
 
+                    <td align="left">
+                        客户名称：
+                        <select id="customerSelect" name="customer_name" style="height:30px;width:290px" onchange="updateDeliveryInfo()">
+                            <!-- 设置默认选项 -->
+                            <option value="河南中烟工业有限责任公司黄金叶生产制造中心" selected>河南中烟工业有限责任公司黄金叶生产制造中心</option>
+                            <option value="河南中烟工业有限责任公司南阳卷烟厂">河南中烟工业有限责任公司南阳卷烟厂</option>
+                            <option value="河南中烟工业有限责任公司驻马店卷烟厂">河南中烟工业有限责任公司驻马店卷烟厂</option>
+                            <option value="河南中烟工业有限责任公司洛阳卷烟厂">河南中烟工业有限责任公司洛阳卷烟厂</option>
+                            <option value="河南中烟工业有限责任公司许昌卷烟厂">河南中烟工业有限责任公司许昌卷烟厂</option>
+                            <option value="河南中烟工业有限责任公司漯河卷烟厂">河南中烟工业有限责任公司漯河卷烟厂</option>
+                            <option value="河南中烟工业有限责任公司安阳卷烟厂">河南中烟工业有限责任公司安阳卷烟厂</option>
+                        </select>
+                    </td>
+                   
+                        <input type="text" id="deliveryAddressDisplay" name="delivery_address" style="height:30px;width:250px;display: none;" readonly />
+                    
+
 					<td colspan="2" align="left">
 						<a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-search'" onclick="searchBthFun()">查询</a>
 					</td>
@@ -145,15 +162,16 @@
 			<!--<tr>-->
 			<!--<td style="border: none"></td>-->
 			<!--</tr>-->
-			<tr class="info">
-				<td colspan="6">客户名称：河南中烟工业有限责任公司黄金叶生产制造中心</td>
-				<td colspan="4">送货单号：<span style="font-size: 16px;" id="shdh"></span></td>
-				<!--<td rowspan="2" style="border: none" width="8%"></td>-->
-			</tr>
-			<tr class="info">
-				<td colspan="6">送货地址：河南省郑州市经开区第三大街9号</td>
-				<td colspan="4">送货日期：<span style="font-size: 16px;"  id="shrq_date"></span></td>
-			</tr>
+           
+            <tr class="info">
+                <td colspan="6">客户名称：<span id="customerNameDisplay">河南中烟工业有限责任公司黄金叶生产制造中心</span></td>
+                <td colspan="4">送货单号：<span style="font-size: 16px;" id="shdh"></span></td>
+            </tr>
+            <tr class="info">
+                <td colspan="6">送货地址：<span id="deliveryAddressSpan">河南省郑州市经开区第三大街9号</span></td>
+                <td colspan="4">送货日期：<span style="font-size: 16px;" id="shrq_date"></span></td>
+            </tr>
+
 		</table>
 		<!--<div style=" width:1258px">-->
 		<!--<hr />-->
@@ -176,6 +194,35 @@
 	</div>
 </div>
 <script>
+    // 客户名称与对应的送货地址
+    var addressMap = {
+        "河南中烟工业有限责任公司黄金叶生产制造中心": "河南省郑州市经开区第三大街9号",
+        "河南中烟工业有限责任公司南阳卷烟厂": "河南省南阳市宛城区新华东路6号",
+        "河南中烟工业有限责任公司驻马店卷烟厂": "河南省驻马店市驿城区南海路1号",
+        "河南中烟工业有限责任公司洛阳卷烟厂": "河南省洛阳市洛龙区玉林路266号",
+        "河南中烟工业有限责任公司许昌卷烟厂": "河南省许昌市建安区魏武大道，明礼街",
+        "河南中烟工业有限责任公司漯河卷烟厂": "河南省漯河市召陵区漓江路与庐山路交叉口东北280米",
+        "河南中烟工业有限责任公司安阳卷烟厂": "河南省安阳市龙安区烟厂路与彩安路交叉口北100路西"
+    };
+
+    // 更新送货信息的函数
+    function updateDeliveryInfo() {
+        // 获取选择的客户名称
+        var customerName = document.getElementById("customerSelect").value;
+        
+        // 根据客户名称获取对应的送货地址
+        var deliveryAddress = addressMap[customerName];
+        
+        // 更新页面上的显示
+        document.getElementById("customerNameDisplay").innerText = customerName;
+        document.getElementById("deliveryAddressDisplay").value = deliveryAddress;
+        document.getElementById("deliveryAddressSpan").innerText = deliveryAddress;
+    }
+
+    // 页面加载时自动设置默认地址
+    window.onload = function() {
+        updateDeliveryInfo();
+    };
     var fahuoList,exportGrid;
 
     bt_is_load=true;//定义防重复弹出小标签全局变量
@@ -204,9 +251,9 @@
                 {field: 'ck', checkbox: true},
                 {field: 'shdh', title: '送货单号', sortable: true, width: 200},
                 {field: 'order_number', title: '订单号', sortable: true, width: 200},
-                {field: 'deliveryman', title: '司机',  width: 200},
+                {field: 'deliveryman', title: '司机',  width: 180},
                 {field: 'plate_number', title: '车牌号', align: 'center', sortable: true, width: 100},
-                {field: 'supplier_name', title: '供应商名称', align: 'center', sortable: true, width: 100},
+                {field: 'supplier_name', title: '供应商名称', align: 'center', sortable: true, width: 160},
                 {field: 'create_time', title: '送货日期', align: 'center', sortable: true, width: 150,
                     formatter: function(value,row,index){
                         return UnixToDate(value,true,8);

Application/Admin/View/Index/index.html

@@ -9,7 +9,7 @@
             <div class="user-infor">
                 <dt><i class="icon icon-user"></i></dt>
                 <dd>
-                    <h3>你好， <span>{$_user_auth.nickname}</span> 欢迎使用本系统！</h3>
+                    <h3>你好， <span>{$_user_auth.username}</span> 欢迎使用本系统！</h3>
                     <p>{:C('LOGO_DEFAULT')} <i class="icon icon-edit"></i></p>
                 </dd>
             </div>

Application/Admin/View/NewQcode/index.html

@@ -329,6 +329,7 @@
                     <td>
                         <select name="tray_num" id="tray_num" style="width:175px;height:35px;">
                             <option value="1">========选择========</option>
+                            <option value="5">========5层========</option>
                             <option value="24">========24箱========</option>
                             <option value="28">========28箱========</option>
                             <option value="32">========32箱========</option>
@@ -343,8 +344,11 @@
                             <option value="80">========80箱========</option>
                             <option value="96">========96箱========</option>
                             <option value="105">========105箱========</option>
+                            <option value="108">========108箱========</option>
+                            <option value="120">========120箱========</option>
                             <option value="144">========144箱========</option>
                             <option value="180">========180箱========</option>
+                            <option value="200">========200箱========</option>
                             <option value="240">========240箱========</option>
                         </select>
                     </td>
@@ -361,9 +365,14 @@
                             <option value="1000">=======1000张========</option>
                             <option value="2000">=======2000张========</option>
                             <option value="2500">=======2500张========</option>
+                            <option value="3000">=======3000张========</option>
+                            <option value="4000">=======4000张========</option>
                             <option value="5000">=======5000张========</option>
+                            <option value="5700">=======5700张========</option>
+                            <option value="5800">=======5800张========</option>
                             <option value="8000">=======8000张========</option>
                             <option value="10000">=======10000张========</option>
+                            <option value="24000">=======24000张========</option>
                         </select>
                     </td>
                 </tr>

Application/Admin/View/Public/layout.html

@@ -139,7 +139,7 @@
                                         <if condition="session('user_auth.uid') eq 1"><li><a href="{:U('Admin/Index/removeRuntime')}" style="border: 0;text-align: left" class="btn ajax-get no-refresh"><i class="fa fa-trash"></i> 清空缓存</a></li></if>
                                         <li class="dropdown">
                                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                                <i class="fa fa-user"></i> {$_user_auth.nickname} <b class="caret"></b>
+                                                <i class="fa fa-user"></i> {$_user_auth.username} <b class="caret"></b>
                                             </a>
                                             <ul class="dropdown-menu" role="menu">
                                                 <if condition="session('user_auth.uid') eq 1"><li><a href="{:U('Admin/Index/removeRuntime')}" style="border: 0;text-align: left;" class="btn text-left ajax-get no-refresh"><i class="fa fa-trash"></i> 清空缓存</a></li></if>
@@ -147,12 +147,12 @@
                                             </ul>
                                         </li>
                                     </ul>
-                                    <ul  class="nav navbar-nav navbar-right">
-                                        <li><a href="__PUBLIC__/libs/帮助手册.pdf" target="_blank">帮助手册</a></li>
-                                    </ul>
-                                    <ul  class="nav navbar-nav navbar-right">
-                                        <li><a href="https://dm.7in6.com/index.php" target="_blank">前往老系统</a></li>
-                                    </ul>
+                                    <!--<ul  class="nav navbar-nav navbar-right">-->
+                                    <!--    <li><a href="__PUBLIC__/libs/帮助手册.pdf" target="_blank">帮助手册</a></li>-->
+                                    <!--</ul>-->
+                                    <!--<ul  class="nav navbar-nav navbar-right">-->
+                                    <!--    <li><a href="https://dm.7in6.com/index.php" target="_blank">前往老系统</a></li>-->
+                                    <!--</ul>-->
                                 </div>
                             </div>
                         </div>

Application/Admin/View/Qcode/budadetail.html

@@ -553,15 +553,15 @@
             },
 
 			onLoadSuccess:function(data){
-				if(data.total){
-					if(data.rows[0].l_num == null || data.rows[0].l_num == 0){
-						$("#supTgGrid").datagrid("hideColumn", "l_num"); // 设置隐藏列
-						$("#supTgGrid").datagrid("showColumn", "l_weight"); // 设置显示列
-					}else{
-						$("#supTgGrid").datagrid("hideColumn", "l_weight"); // 设置隐藏列
-						$("#supTgGrid").datagrid("showColumn", "l_num"); // 设置显示列
-					}
-				}
+			    if(data.total){
+    				if(data.rows[0].l_num == null || data.rows[0].l_num == 0){
+    					$("#supTgGrid").datagrid("hideColumn", "l_num"); // 设置隐藏列
+    					$("#supTgGrid").datagrid("showColumn", "l_weight"); // 设置显示列
+    				}else{
+    					$("#supTgGrid").datagrid("hideColumn", "l_weight"); // 设置隐藏列
+    					$("#supTgGrid").datagrid("showColumn", "l_num"); // 设置显示列
+    				}
+			    }
 			},
 
 			onClickRow: function (rowIndex, rowData) {
@@ -1226,19 +1226,17 @@
                     "sign_type":1,
                 },
                 success: function (result) {
-                    if(result.code==0){
-						large = result.largrlabel;//大标签列表
-						small = result.smalllabel;//小标签列表
-						var newlabel_type1 = $('#newlabel_type1').val();
-
-						if (newlabel_type1 == 'v010') {
-							//打印盒包装纸(100*150)大件
-							small_v010_print(result,reFormData.printType1,idList.toString(),reptQty,1);
-						}
-					}else{
-						$.messager.alert('系统提示', result.msg, 'error');
-						return false;
-					}
+                    //console.log(result);
+                    large = result.largrlabel;//大标签列表
+                    small = result.smalllabel;//小标签列表
+                    var newlabel_type1 = $('#newlabel_type1').val();
+
+                    if (newlabel_type1 == 'v010') {
+                        //打印盒包装纸(100*150)大件
+                        small_v010_print(result,reFormData.printType1,idList.toString(),reptQty,1);
+                    }
+
+
                 },
                 error: function (XMLHttpRequest, textStatus, errorThrown) {
                     $.messager.alert('系统提示', '数据加载错误，请刷新重试！', 'error');

Application/Admin/View/Qcode/reprintdetail.html

@@ -463,6 +463,7 @@
                     alert('供应商不存在');
                     return false;
                 }else{
+                    supplier_name = data.print_code['nickname'];
                     var print_code = data.print_code['print_code'];
 
                 }
@@ -560,7 +561,11 @@
                     if (data.length > 0){
                         for (var i in data) {
                             // result += "<a value='" + data[i].nickname + "' data-id='"+data[i].print_code+"'>" + data[i].nickname + "</a>";
-                            result += "<a value='" + data[i].nickname + "'>" + data[i].nickname + "</a>";
+                            if (data[i].name == '' || data[i].name == null){
+                                result += "<a value='" + data[i].nickname + "'>" + data[i].nickname + "</a>";
+                            }else{
+                                result += "<a value='" + data[i].nickname + "'>" + data[i].name + "</a>";
+                            }
                         }
                     }
                     $('.option').html(result);

Application/Common/Conf/config.php

@@ -5,8 +5,8 @@
  */
 $_config = array(
     'PRODUCT_NAME'         => '', // 产品名称
-    'LOGO_DEFAULT'         => '<b><span style="color: #2699ed;font-size: 14px;">河南中烟批次追溯二维码打印</span></b>', // 产品Logo
-    'LOGO_INVERSE'         => '<b><span style="color: #fff;">河南中烟批次追溯二维码打印</span></b>', // 产品Logo深色背景
+    'LOGO_DEFAULT'         => '<b><span style="color: #2699ed;font-size: 14px;">批次追溯二维码打印</span></b>', // 产品Logo
+    'LOGO_INVERSE'         => '<b><span style="color: #fff;">批次追溯二维码打印</span></b>', // 产品Logo深色背景
     'CURRENT_VERSION'      => '1.0', // 当前版本号
     'DEVELOP_VERSION'      => '', // 开发版本号
     'BUILD_VERSION'        => '201703191221', // 编译标记

static/basejs/LodopFuncs.js

@@ -1,4 +1,4 @@
-//==本JS是加载Lodop插件或Web打印服务CLodop/Lodop7的综合示例，可直接使用，建议理解后融入自己程序==
+//==本JS是加载Lodop插件或Web打印服务CLodop/Lodop7的综合示例，可直接使用，建议理解后融入自己程序==
 
 //用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占:
 var MainJS ="CLodopfuncs.js",
@@ -48,48 +48,48 @@ function needCLodop() {
 //==检查加载成功与否，如没成功则用http(s)再试==
 //==低版本CLODOP6.561/Lodop7.043及前)用本方法==
 function checkOrTryHttp() {
-    if (window.getCLodop) {
-        LoadJsState = "complete";
-        return true;
-    }
-    if (LoadJsState == "loadingB" || LoadJsState == "complete") return;
-    LoadJsState = "loadingB";
-    var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
-    var JS1 = document.createElement("script")
-        ,JS2 = document.createElement("script")
-        ,JS3 = document.createElement("script");
-    JS1.src = URL_HTTP1;
-    JS2.src = URL_HTTP2;
-    JS3.src = URL_HTTP3;
-    JS1.onload = JS2.onload = JS3.onload = JS2.onerror = JS3.onerror=function(){LoadJsState = "complete";}
-    JS1.onerror = function(e) {
-        if (window.location.protocol !== 'https:')
-            head.insertBefore(JS2, head.firstChild); else
-            head.insertBefore(JS3, head.firstChild);
-    }
-    head.insertBefore(JS1,head.firstChild);
+  if (window.getCLodop) {
+     LoadJsState = "complete";
+     return true;
+  }
+  if (LoadJsState == "loadingB" || LoadJsState == "complete") return;
+  LoadJsState = "loadingB";
+  var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
+  var JS1 = document.createElement("script")
+     ,JS2 = document.createElement("script")
+     ,JS3 = document.createElement("script");
+  JS1.src = URL_HTTP1;
+  JS2.src = URL_HTTP2;
+  JS3.src = URL_HTTP3;
+  JS1.onload = JS2.onload = JS3.onload = JS2.onerror = JS3.onerror=function(){LoadJsState = "complete";}
+  JS1.onerror = function(e) {
+      if (window.location.protocol !== 'https:')
+          head.insertBefore(JS2, head.firstChild); else
+          head.insertBefore(JS3, head.firstChild);
+  }
+  head.insertBefore(JS1,head.firstChild);
 }
 
 //==加载Lodop对象的主过程:==
 (function loadCLodop(){
-    if (!needCLodop()) return;
-    CLodopIsLocal = !!((URL_WS1 + URL_WS2).match(/\/\/localho|\/\/127.0.0./i));
-    LoadJsState = "loadingA";
-    if (!window.WebSocket && window.MozWebSocket) window.WebSocket=window.MozWebSocket;
-    //ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
-    try {
-        var WSK1=new WebSocket(URL_WS1);
-        WSK1.onopen = function(e) { setTimeout("checkOrTryHttp()",200); }
-        WSK1.onmessage = function(e) {if (!window.getCLodop) eval(e.data);}
-        WSK1.onerror = function(e) {
-            var WSK2=new WebSocket(URL_WS2);
-            WSK2.onopen = function(e) {setTimeout("checkOrTryHttp()",200);}
-            WSK2.onmessage = function(e) {if (!window.getCLodop) eval(e.data);}
-            WSK2.onerror= function(e) {checkOrTryHttp();}
-        }
-    } catch(e){
-        checkOrTryHttp();
+  if (!needCLodop()) return;
+  CLodopIsLocal = !!((URL_WS1 + URL_WS2).match(/\/\/localho|\/\/127.0.0./i));
+  LoadJsState = "loadingA";
+  if (!window.WebSocket && window.MozWebSocket) window.WebSocket=window.MozWebSocket;
+  //ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
+  try {
+    var WSK1=new WebSocket(URL_WS1);
+    WSK1.onopen = function(e) { setTimeout("checkOrTryHttp()",200); }
+    WSK1.onmessage = function(e) {if (!window.getCLodop) eval(e.data);}
+    WSK1.onerror = function(e) {
+         var WSK2=new WebSocket(URL_WS2);
+         WSK2.onopen = function(e) {setTimeout("checkOrTryHttp()",200);}
+         WSK2.onmessage = function(e) {if (!window.getCLodop) eval(e.data);}
+         WSK2.onerror= function(e) {checkOrTryHttp();}
     }
+  } catch(e){
+    checkOrTryHttp();
+  }
 })();
 
 //==获取LODOP对象主过程,判断是否安装、需否升级:==