From 3ae95385125aea0dce4b3d2b21fce9a717f8b290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 12 Jul 2022 10:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=81=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=B5=B7=E5=A4=96=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwlog/models/wwwlogs_model.php           |  2 +-
 echarts/views/echarts/inchina_customers.php   |  6 +++-
 echarts/views/echarts/mobile_deal.php         | 35 +++++++++++++++++--
 echarts/views/echarts/potential_customers.php |  6 +++-
 echarts/views/echarts/regular_customers.php   |  6 +++-
 5 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/application/third_party/wwwlog/models/wwwlogs_model.php b/application/third_party/wwwlog/models/wwwlogs_model.php
index aecc5535..54e5f6d0 100644
--- a/application/third_party/wwwlog/models/wwwlogs_model.php
+++ b/application/third_party/wwwlog/models/wwwlogs_model.php
@@ -55,7 +55,7 @@ class wwwlogs_model extends CI_Model {
         $sql .= "    
                 COLI_SN,COLI_ID, COLI_WebCode,COLI_Name, COLI_OrderDetailText, COLI_OrderStartDate,COLI_SenderIP,COLI_WebCode,COLI_ApplyDate from ConfirmLineInfo
                 where 1=1 
-                and COLI_WebCode in ('cht','ah','ct','yz','sht','gl','gm')
+                and COLI_WebCode in ('cht','ah','gh','ct','yz','sht','gl','gm','jp','ru','it','vac','vc')
                 and not exists (select top 1 1 from InfoManager.dbo.wwwlogs where wl_COLI_SN=COLI_SN )
                 and COLI_SenderIP is not null
                 and DeleteFlag=0
diff --git a/echarts/views/echarts/inchina_customers.php b/echarts/views/echarts/inchina_customers.php
index c3104c6b..0822b48b 100644
--- a/echarts/views/echarts/inchina_customers.php
+++ b/echarts/views/echarts/inchina_customers.php
@@ -17,7 +17,11 @@
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
-                        <input type="checkbox" id="website_GHKHYY" name="website" value="GHKHYY"> GH客户运营中心
+                        <input type="checkbox" id="website_GHKYZG" name="website" value="GHKYZG"> 客运中心中国
+                    </label>
+                </li>
+                <li><label class="checkbox-inline">
+                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW"> 客运中心海外
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
diff --git a/echarts/views/echarts/mobile_deal.php b/echarts/views/echarts/mobile_deal.php
index 5997deec..62a70716 100644
--- a/echarts/views/echarts/mobile_deal.php
+++ b/echarts/views/echarts/mobile_deal.php
@@ -85,7 +85,7 @@
     <div class="row">
         <div class="col-sm-4 col-md-4">
             <label class="checkbox-inline">
-                <input type="checkbox" checked disabled value="1">预定日期
+                <input type="checkbox" name="mobile_deal_ApplydateCheck" id="mobile_deal_ApplydateCheck" value="1">预定日期
             </label>
         </div>
         <div class="col-sm-8 col-md-8">
@@ -100,6 +100,29 @@
             <button class="btn btn-default" type="button" onclick="updateMobileDeal();">统计</button>
         </div>
     </div>
+
+    <div class="row">
+        <div class="col-sm-4 col-md-4">
+            <label class="checkbox-inline">
+                <input type="checkbox" name="OrderStartdateCheck" id="mobile_deal_OrderStartdateCheck" checked
+                       value="1">出发日期
+            </label>
+        </div>
+        <div class="col-sm-8 col-md-8">
+            <input name="mobile_deal_OrderStartdateStart" id="mobile_deal_OrderStartdateStart" type="text"
+                   placeholder="开始日期"
+                   class="form-control ShowMeTheDatePicker_cn" value="<?php echo date('Y-m-01', time()); ?>">
+        </div>
+        <div class="col-sm-8 col-md-8">
+            <input name="mobile_deal_OrderStartdateEnd" id="mobile_deal_OrderStartdateEnd" type="text"
+                   placeholder="截至日期"
+                   class="form-control ShowMeTheDatePicker_cn" value="<?php echo date('Y-m-t', time()); ?>">
+        </div>
+        <div class="col-sm-4 col-md-4">
+
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-sm-24 col-md-24">
             <div class="table-responsive">
@@ -123,12 +146,16 @@
 </div>
 <script type="text/javascript">
     function updateMobileDeal() {
+        let ApplydateCheck = $('#mobile_deal_ApplydateCheck').prop("checked") ? $('#mobile_deal_ApplydateCheck').val() : 0;
         let ApplydateStart = $('#mobile_deal_ApplydateStart').val();
         let ApplydateEnd = $('#mobile_deal_ApplydateEnd').val();
+        let OrderStartdateCheck = $('#mobile_deal_OrderStartdateCheck').prop("checked") ? $('#mobile_deal_OrderStartdateCheck').val() : 0;
+        let OrderStartdateStart = $('#mobile_deal_OrderStartdateStart').val();
+        let OrderStartdateEnd = $('#mobile_deal_OrderStartdateEnd').val();
         let DEI_SNList = $('#module_mobile_meal input[name="DEI_SNList"]:checked').map(function (index, element) {
             return $(element).val();
         }).get().join(',');//将数组元素连接起来转化为字符串
-        if (ApplydateStart == '' || ApplydateEnd == '' || DEI_SNList == '') {
+        if (ApplydateStart == '' || ApplydateEnd == '' || OrderStartdateStart == '' || OrderStartdateEnd == '' || DEI_SNList == '') {
             $.modaldialog.error("请检查必填项");
             return false;
         }
@@ -138,7 +165,9 @@
             dataType: "json",
             url: "<?php echo site_url('welcome/show_me_the_data')?>",
             data: {
-                "url": '/service-tourdesign/CountYDOrder?ApplydateStart=' + ApplydateStart + '&ApplydateEnd=' + ApplydateEnd + '%2023:59&DEI_SNList=' + DEI_SNList,
+                "url": '/service-tourdesign/CountYDOrder?ApplydateCheck=' + ApplydateCheck + '&ApplydateStart=' + ApplydateStart + '&ApplydateEnd=' + ApplydateEnd + '%2023:59'
+                    + '&OrderStartdateCheck=' + OrderStartdateCheck + '&OrderStartdateStart=' + OrderStartdateStart + '&OrderStartdateEnd=' + OrderStartdateEnd + '%2023:59'
+                    + '&DEI_SNList=' + DEI_SNList,
             },
             success: function (data, textStatus) {
                 document.getElementById('mobile_deal').innerHTML = '';
diff --git a/echarts/views/echarts/potential_customers.php b/echarts/views/echarts/potential_customers.php
index e58ac124..e9ec0c05 100644
--- a/echarts/views/echarts/potential_customers.php
+++ b/echarts/views/echarts/potential_customers.php
@@ -17,7 +17,11 @@
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
-                        <input type="checkbox" id="website_GHKHYY" name="website" value="GHKHYY" checked> GH客户运营中心
+                        <input type="checkbox" id="website_GHKYZG" name="website" value="GHKYZG" > 客运中心中国
+                    </label>
+                </li>
+                <li><label class="checkbox-inline">
+                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW" > 客运中心海外
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
diff --git a/echarts/views/echarts/regular_customers.php b/echarts/views/echarts/regular_customers.php
index 3f93134a..3674e5d9 100644
--- a/echarts/views/echarts/regular_customers.php
+++ b/echarts/views/echarts/regular_customers.php
@@ -17,7 +17,11 @@
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
-                        <input type="checkbox" id="website_GHKHYY" name="website" value="GHKHYY"> GH客户运营中心
+                        <input type="checkbox" id="website_GHKYZG" name="website" value="GHKYZG" > 客运中心中国
+                    </label>
+                </li>
+                <li><label class="checkbox-inline">
+                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW" > 客运中心海外
                     </label>
                 </li>
                 <li><label class="checkbox-inline">