From 9612d21e2e35666f9fe2e3ed5a6fdb53e6f42777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A8=84=E6=A2=A6=E5=AE=81?= <loumengning@100me.com>
Date: Wed, 17 Nov 2021 22:51:29 +0800
Subject: [PATCH] init

---
 .idea/workspace.xml                         | 269 ++++++++++++++--------------
 application/admin/controller/CfItem.php     |   4 +-
 application/admin/controller/CfRoomInfo.php |   2 +-
 application/admin/controller/CfRoomPlan.php |   8 +-
 application/admin/lang/zh-cn/cf_item.php    |   2 +-
 application/admin/lang/zh-cn/order_item.php |   2 +-
 application/admin/view/cf_item/edit.html    |   2 +-
 public/assets/js/backend/cf_hotel_info.js   |   2 +-
 public/assets/js/backend/cf_item.js         |  17 +-
 public/assets/js/backend/cf_room_info.js    |   5 +-
 public/assets/js/backend/cf_room_plan.js    |  14 +-
 11 files changed, 169 insertions(+), 158 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e52083d..03d3779 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="648f7d15-dc9f-4b1e-bba1-58d66fbf1157" name="Default Changelist" comment="">
+    <list default="true" id="648f7d15-dc9f-4b1e-bba1-58d66fbf1157" name="Default Changelist" comment="init">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/admin/view/order_main/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/order_main/add.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/static/css/app.56f3ccab0a4c003d09cb925186c6d511.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/static/fonts/element-icons.535877f.woff" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/static/fonts/element-icons.732389d.ttf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/static/js/app.38a975aa76887068fb55.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/static/js/manifest.2ae2e69a05c33dfc65f8.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/static/js/vendor.b77d5750c7830a38b1ff.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/controller/CfItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/CfItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/controller/CfRoomInfo.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/CfRoomInfo.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/controller/CfRoomPlan.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/CfRoomPlan.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/cf_item.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/cf_item.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/order_item.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/order_item.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/view/cf_item/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/cf_item/edit.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/assets/js/backend/cf_hotel_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/cf_hotel_info.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/assets/js/backend/cf_item.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/cf_item.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/assets/js/backend/cf_room_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/cf_room_info.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/assets/js/backend/cf_room_plan.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/cf_room_plan.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,7 +27,10 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="UPDATE_TYPE" value="MERGE" />
   </component>
-  <component name="PhpDebugGeneral" xdebug_debug_port="9006" listening_started="true" />
+  <component name="PhpDebugGeneral" xdebug_debug_port="9006" listening_started="true">
+    <xdebug_debug_ports port="9006" />
+    <xdebug_debug_ports port="9003" />
+  </component>
   <component name="PhpServers">
     <servers>
       <server host="cz.com" id="e1f06fd7-deb9-41a7-9d36-436111235361" name="Unnamed" />
@@ -83,21 +89,30 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/public" />
-    <property name="settings.editor.selected.configurable" value="reference.settings.php.debug.xdebug.proxy" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\code\lou\public" />
-    </key>
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RunManager">
     <configuration name="Unnamed" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" nameIsGenerated="true" server_name="Unnamed">
       <method v="2" />
     </configuration>
   </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -112,7 +127,11 @@
       <workItem from="1633843542476" duration="7474000" />
       <workItem from="1633967176055" duration="7788000" />
       <workItem from="1634461088170" duration="4763000" />
-      <workItem from="1634567190291" duration="34134000" />
+      <workItem from="1634567190291" duration="41479000" />
+      <workItem from="1635654134462" duration="35523000" />
+      <workItem from="1636808249831" duration="601000" />
+      <workItem from="1636878434062" duration="121000" />
+      <workItem from="1636878580264" duration="13648000" />
     </task>
     <task id="LOCAL-00001" summary="init">
       <created>1633847937612</created>
@@ -184,11 +203,102 @@
       <option name="project" value="LOCAL" />
       <updated>1635067483089</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="init">
+      <created>1635067920033</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1635067920033</updated>
+    </task>
+    <task id="LOCAL-00012" summary="init">
+      <created>1635083574492</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1635083574492</updated>
+    </task>
+    <task id="LOCAL-00013" summary="init">
+      <created>1635088810703</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1635088810703</updated>
+    </task>
+    <task id="LOCAL-00014" summary="init">
+      <created>1635655791788</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1635655791788</updated>
+    </task>
+    <task id="LOCAL-00015" summary="init">
+      <created>1635775792351</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1635775792351</updated>
+    </task>
+    <task id="LOCAL-00016" summary="init">
+      <created>1635780400746</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1635780400746</updated>
+    </task>
+    <task id="LOCAL-00017" summary="init">
+      <created>1635865804532</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1635865804532</updated>
+    </task>
+    <task id="LOCAL-00018" summary="init">
+      <created>1636265845920</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1636265845920</updated>
+    </task>
+    <task id="LOCAL-00019" summary="init">
+      <created>1636268317457</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1636268317457</updated>
+    </task>
+    <task id="LOCAL-00020" summary="init">
+      <created>1636268567040</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1636268567040</updated>
+    </task>
+    <task id="LOCAL-00021" summary="init">
+      <created>1636276001595</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1636276001595</updated>
+    </task>
+    <task id="LOCAL-00022" summary="init">
+      <created>1636276496007</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1636276496007</updated>
+    </task>
+    <task id="LOCAL-00023" summary="init">
+      <created>1636891272640</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1636891272640</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
@@ -203,129 +313,10 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
+    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="true" />
     <MESSAGE value="hotel" />
     <MESSAGE value="11111" />
     <MESSAGE value="init" />
     <option name="LAST_COMMIT_MESSAGE" value="init" />
   </component>
-  <component name="WindowStateProjectService">
-    <state x="222" y="0" key="#Servers" timestamp="1634445412897">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="222" y="0" key="#Servers/0.0.1280.680@0.0.1280.680" timestamp="1634445412897" />
-    <state x="96" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1634462037912">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="96" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1634462037912" />
-    <state x="365" y="143" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1634985372691">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="365" y="143" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1280.680@0.0.1280.680" timestamp="1634985372691" />
-    <state x="371" y="96" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1635064055100">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="371" y="96" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.1280.680@0.0.1280.680" timestamp="1635064055100" />
-    <state x="247" y="0" key="CommitChangelistDialog2" timestamp="1635067780648">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="247" y="0" key="CommitChangelistDialog2/0.0.1280.680@0.0.1280.680" timestamp="1635067780648" />
-    <state x="0" y="0" key="DiffContextDialog" timestamp="1635073555540">
-      <screen x="0" y="0" width="2560" height="1392" />
-    </state>
-    <state x="0" y="0" key="DiffContextDialog/0.0.2560.1392@0.0.2560.1392" timestamp="1635073555540" />
-    <state x="421" y="96" key="FileChooserDialogImpl" timestamp="1634453017169">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="421" y="96" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1634453017169" />
-    <state width="1238" height="149" key="GridCell.Tab.0.bottom" timestamp="1634462364022">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1634462364022" />
-    <state width="1238" height="149" key="GridCell.Tab.0.center" timestamp="1634462364020">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1634462364020" />
-    <state width="1238" height="149" key="GridCell.Tab.0.left" timestamp="1634462364019">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1634462364019" />
-    <state width="1238" height="149" key="GridCell.Tab.0.right" timestamp="1634462364021">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1634462364021" />
-    <state width="1238" height="149" key="GridCell.Tab.1.bottom" timestamp="1634462364026">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1634462364026" />
-    <state width="1238" height="149" key="GridCell.Tab.1.center" timestamp="1634462364024">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1634462364024" />
-    <state width="1238" height="149" key="GridCell.Tab.1.left" timestamp="1634462364023">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1634462364023" />
-    <state width="1238" height="149" key="GridCell.Tab.1.right" timestamp="1634462364025">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state width="1238" height="149" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1634462364025" />
-    <state x="350" y="56" key="MultipleFileMergeDialog" timestamp="1634829448022">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="350" y="56" key="MultipleFileMergeDialog/0.0.1280.680@0.0.1280.680" timestamp="1634829448022" />
-    <state x="500" y="51" key="RollbackChangesDialog" timestamp="1634222863596">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="500" y="51" key="RollbackChangesDialog/0.0.1280.680@0.0.1280.680" timestamp="1634222863596" />
-    <state x="142" y="0" key="SettingsEditor" timestamp="1634462282710">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="142" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1634462282710" />
-    <state x="371" y="90" width="591" height="524" key="StructurePopup" timestamp="1635064046155">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="371" y="90" width="591" height="524" key="StructurePopup/0.0.1280.680@0.0.1280.680" timestamp="1635064046155" />
-    <state x="466" y="151" key="Vcs.Push.Dialog.v2" timestamp="1635073559224">
-      <screen x="0" y="0" width="2560" height="1392" />
-    </state>
-    <state x="233" y="74" key="Vcs.Push.Dialog.v2/0.0.1280.680@0.0.1280.680" timestamp="1635067861265" />
-    <state x="466" y="151" key="Vcs.Push.Dialog.v2/0.0.2560.1392@0.0.2560.1392" timestamp="1635073559224" />
-    <state x="335" y="237" width="760" height="312" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1634222692562">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="335" y="237" width="760" height="312" maximized="true" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1280.680@0.0.1280.680" timestamp="1634222692562" />
-    <state x="872" y="528" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1635073538876">
-      <screen x="0" y="0" width="2560" height="1392" />
-    </state>
-    <state x="436" y="258" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1280.680@0.0.1280.680" timestamp="1634829543368" />
-    <state x="872" y="528" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1392@0.0.2560.1392" timestamp="1635073538876" />
-    <state x="319" y="72" width="779" height="600" key="find.popup" timestamp="1634984161512">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="319" y="72" width="779" height="600" key="find.popup/0.0.1280.680@0.0.1280.680" timestamp="1634984161512" />
-    <state x="305" y="4" width="672" height="678" key="search.everywhere.popup" timestamp="1635063310208">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="305" y="4" width="672" height="678" key="search.everywhere.popup/0.0.1280.680@0.0.1280.680" timestamp="1635063310208" />
-    <state x="439" y="306" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1633843159458">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="439" y="306" key="vcs.readOnlyHandler.ReadOnlyStatusDialog/0.0.1280.680@0.0.1280.680" timestamp="1633843159458" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/public/index.php</url>
-          <line>13</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/public/hotel.php</url>
-          <line>15</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
 </project>
\ No newline at end of file
diff --git a/application/admin/controller/CfItem.php b/application/admin/controller/CfItem.php
index 378b33a..03fdd51 100755
--- a/application/admin/controller/CfItem.php
+++ b/application/admin/controller/CfItem.php
@@ -57,7 +57,7 @@ class CfItem extends Backend
                 ->alias("a")
                 ->join('hbp_admin c','a.create_id = c.id','left')
                 ->join('hbp_admin d','a.purchase_user_id = d.id','left')
-                ->field("a.*,c.nickname,d.nickname as purchase_user_name")
+                ->field("a.*,d.nickname")
                 ->where($where);
             if ($group_id){
                 $list = $list
@@ -76,7 +76,7 @@ class CfItem extends Backend
             $config1 = json_decode($config1,true);
             $res = $list->items();
             foreach ($res as $key=>$val){
-                $res[$key]["item_type_name"]=$config[$val["item_type"]];
+                $res[$key]["item_type"]=$config[$val["item_type"]];
                 $res[$key]["item_unit"]=$config1[$val["item_unit"]];
             }
             $result = array("total" => $list->total(), "rows" =>  $list->items());
diff --git a/application/admin/controller/CfRoomInfo.php b/application/admin/controller/CfRoomInfo.php
index 81180c4..114bd94 100755
--- a/application/admin/controller/CfRoomInfo.php
+++ b/application/admin/controller/CfRoomInfo.php
@@ -57,7 +57,7 @@ class CfRoomInfo extends Backend
                 ->alias('a')
                 ->join('hbp_cf_hotel_info b','a.hotel_id = b.id','left')
                 ->join('hbp_admin c','a.create_id = c.id','left')
-                ->field("a.id,a.room_name,a.room_memo,b.hotel_name,a.create_time,a.update_time,c.nickname")
+                ->field("a.id,a.hotel_id,a.room_name,a.room_memo,b.hotel_name,a.create_time,a.update_time,c.nickname")
                 ->where($where);
             if ($group_id){
                 $list = $list
diff --git a/application/admin/controller/CfRoomPlan.php b/application/admin/controller/CfRoomPlan.php
index 4f76eed..e83011a 100755
--- a/application/admin/controller/CfRoomPlan.php
+++ b/application/admin/controller/CfRoomPlan.php
@@ -88,7 +88,7 @@ class CfRoomPlan extends Backend
                 ->join('hbp_admin d','a.purchase_user_id = d.id','left')
                 ->join('hbp_cf_room_info e','a.room_id = e.id','left')
                 ->join('hbp_cf_hotel_info f','a.hotel_id = f.id','left')
-                ->field("a.*,c.nickname,d.nickname as purchase_user_name,e.room_name,f.hotel_name")
+                ->field("a.*,c.nickname,d.nickname,e.room_name,f.hotel_name")
                 ->where($where);
             if ($group_id){
                 $list = $list
@@ -100,7 +100,11 @@ class CfRoomPlan extends Backend
                     ->order($sort, $order)
                     ->paginate($limit);
             }
-            $result = array("total" => $list->total(), "rows" => $list->items());
+            $result = $list->items();
+            foreach ($result as $k=>$item){
+                    $result[$k]["continuity_type"]=$this->continuity_type[$item["continuity_type"]];
+                }
+            $result = array("total" => $list->total(), "rows" => $result);
             return json($result);
         }
         return $this->view->fetch();
diff --git a/application/admin/lang/zh-cn/cf_item.php b/application/admin/lang/zh-cn/cf_item.php
index c366e08..9514e82 100755
--- a/application/admin/lang/zh-cn/cf_item.php
+++ b/application/admin/lang/zh-cn/cf_item.php
@@ -4,7 +4,7 @@ return [
     'Id'             => '附加项目ID',
     'Item_type'      => '附件项目类型',
     'Item_name'      => '附件项目名称',
-    'Item_unit'      => '计价单位 件、份、匝、张等',
+    'Item_unit'      => '计价单位',
     'Item_memo'      => '附件项目说明',
     'Item_log'       => '日志',
     'Country_id'     => '国家ID',
diff --git a/application/admin/lang/zh-cn/order_item.php b/application/admin/lang/zh-cn/order_item.php
index 75cf4ab..b0b7113 100755
--- a/application/admin/lang/zh-cn/order_item.php
+++ b/application/admin/lang/zh-cn/order_item.php
@@ -7,7 +7,7 @@ return [
     'Item_type'      => '附加项目类型',
     'Item_name'      => '附加项目名称',
     'Item_memo'      => '附加项目说明',
-    'Item_unit'      => '计价单位 件、份、匝、张等',
+    'Item_unit'      => '计价单位',
     'Use_date'       => '使用日期',
     'Prod_num'       => '产品数量',
     'Total_price'    => '总金额',
diff --git a/application/admin/view/cf_item/edit.html b/application/admin/view/cf_item/edit.html
index b3131dc..8ce882b 100755
--- a/application/admin/view/cf_item/edit.html
+++ b/application/admin/view/cf_item/edit.html
@@ -16,7 +16,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Item_unit')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-item_unit" data-rule="required" data-source="general/config/getList?key=site.item_unit" class="form-control selectpage" name="row[item_unit]" type="text" value="{$row.item_type|htmlentities}>
+            <input id="c-item_unit" data-rule="required" data-source="general/config/getList?key=site.item_unit" class="form-control selectpage" name="row[item_unit]" type="text" value="{$row.item_type|htmlentities}">
         </div>
     </div>
     <div class="form-group">
diff --git a/public/assets/js/backend/cf_hotel_info.js b/public/assets/js/backend/cf_hotel_info.js
index ca9e0d3..cd87e93 100755
--- a/public/assets/js/backend/cf_hotel_info.js
+++ b/public/assets/js/backend/cf_hotel_info.js
@@ -24,7 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 columns: [
                     [
-                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
                         {field: 'hotel_name', title: __('Hotel_name'), operate: 'LIKE'},
                         {field: 'hotel_phone', title: __('Hotel_phone'), operate: 'LIKE'},
                         {field: 'nickname', title: __('创建人')},
diff --git a/public/assets/js/backend/cf_item.js b/public/assets/js/backend/cf_item.js
index a13db1f..7f552dd 100755
--- a/public/assets/js/backend/cf_item.js
+++ b/public/assets/js/backend/cf_item.js
@@ -16,7 +16,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
 
             var table = $("#table");
-
+            table.on('post-common-search.bs.table', function (event, table) {
+                var form = $("form", table.$commonsearch);
+                $("input[name='nickname']", form).addClass("selectpage").data("source", "auth/admin/index").data("primaryKey", "nickname").data("field", "nickname").data("orderBy", "id desc");
+                Form.events.cxselect(form);
+                Form.events.selectpage(form);
+            });
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -25,15 +30,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {field: 'id', title: __('Id')},
-                        {field: 'item_type_name', title: __('Item_type')},
+                        {field: 'item_type', title: __('Item_type'),
+                            searchList: {"1":"一日游","2":"交通接驳","3":"租车","4":"门票"}},
                         {field: 'item_name', title: __('Item_name'), operate: 'LIKE'},
-                        {field: 'item_unit', title: __('计价单位'), operate: 'LIKE'},
-                        {field: 'item_memo', title: __('Item_memo'), operate: 'LIKE'},
+                        {field: 'item_unit', title: __('计价单位'),
+                            searchList: {"1":"件","2":"份","3":"匝","4":"张"}},
+                        {field: 'item_memo', title: __('Item_memo'), operate: 'LIKE',visible: false},
                         {field: 'province_name', title: __('Province_name'), operate: 'LIKE'},
                         {field: 'city_name', title: __('City_name'), operate: 'LIKE'},
                         {field: 'area_name', title: __('地区名'), operate: 'LIKE'},
                         {field: 'detail_address', title: __('Detail_address'), operate: 'LIKE'},
-                        {field: 'purchase_user_name', title: __('采购负责人'), operate: 'LIKE'},
+                        {field: 'nickname', title: __('采购负责人')},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
diff --git a/public/assets/js/backend/cf_room_info.js b/public/assets/js/backend/cf_room_info.js
index a27e989..b6e84e9 100755
--- a/public/assets/js/backend/cf_room_info.js
+++ b/public/assets/js/backend/cf_room_info.js
@@ -24,9 +24,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 columns: [
                     [
-                        {checkbox: true},
-                        {field: 'hotel_name', title: __('酒店名称')},
+                        {field: 'hotel_id', title: __('酒店ID')},
+                        {field: 'hotel_name', title: __('酒店名称'),operate: 'LIKE'},
                         {field: 'nickname', title: __('创建人')},
+                        {field: 'id', title: __('房型ID')},
                         {field: 'room_name', title: __('Room_name'), operate: 'LIKE'},
                         {field: 'room_memo', title: __('Room_memo'), operate: 'LIKE'},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
diff --git a/public/assets/js/backend/cf_room_plan.js b/public/assets/js/backend/cf_room_plan.js
index 3bb8d1c..a9dc7de 100755
--- a/public/assets/js/backend/cf_room_plan.js
+++ b/public/assets/js/backend/cf_room_plan.js
@@ -16,7 +16,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
 
             var table = $("#table");
-
+            table.on('post-common-search.bs.table', function (event, table) {
+                var form = $("form", table.$commonsearch);
+                $("input[name='d.nickname']", form).addClass("selectpage").data("source", "auth/admin/index").data("primaryKey", "nickname").data("field", "nickname").data("orderBy", "id desc");
+                Form.events.cxselect(form);
+                Form.events.selectpage(form);
+            });
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -25,15 +30,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {field: 'id', title: __('Id')},
+                        {field: 'hotel_id', title: __('酒店ID')},
                         {field: 'hotel_name', title: __('酒店')},
+                        {field: 'room_id', title: __('房型ID')},
                         {field: 'room_name', title: __('房型')},
                         {field: 'plan_name', title: __('Plan_name'), operate: 'LIKE'},
                         {field: 'breakfast_num', title: __('Breakfast_num')},
                         {field: 'book_end_day', title: __('Book_end_day')},
                         {field: 'book_end_hour', title: __('Book_end_hour')},
-                        {field: 'continuity_type', title: __('Continuity_type')},
+                        {field: 'continuity_type', title: __('Continuity_type'),
+                            searchList: {"0": __('无限制'), "1": __('连住几晚'),"2": __('连住几晚及以上'),"3": __('连住几晚及其倍数')}},
                         {field: 'coutinuity_day', title: __('Coutinuity_day')},
-                        {field: 'purchase_user_name', title: __('Charge_person'), operate: 'LIKE'},
+                        {field: 'd.nickname', title: __('采购负责人')},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}