预约单开单

application/admin/controller/Preorder.php

@@ -54,7 +54,7 @@ class Preorder extends Backend
             //只能看自己的
             $where_op = [];
             if($this->auth->company_id){
-                $where_op['pre_order.company_id'] = $this->auth->company_id;
+                $where_op['preorder.company_id'] = $this->auth->company_id;
             }
 
             $list = $this->model
@@ -112,7 +112,8 @@ class Preorder extends Backend
         $map = ['id'=>$pre_order_id];
         $pre_order = Db::name('pre_order')->where($map)->find();
         if(!$this->request->post()){
-            $this->assign('pre_order',$pre_order);
+            $this->assign('id',$pre_order_id);
+            $this->assign('row',$pre_order);
             return $this->view->fetch();
         }
 

application/admin/view/order/add.html

@@ -66,12 +66,7 @@
             <input id="c-user_address" class="form-control" name="row[user_address]" type="text">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pre_order_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pre_order_id" data-rule="required" data-source="pre/order/index" class="form-control selectpage" name="row[pre_order_id]" type="text" value="">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Servicetype_id')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/order/edit.html

@@ -66,12 +66,7 @@
             <input id="c-user_address" class="form-control" name="row[user_address]" type="text" value="{$row.user_address|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pre_order_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pre_order_id" data-rule="required" data-source="pre/order/index" class="form-control selectpage" name="row[pre_order_id]" type="text" value="{$row.pre_order_id|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Servicetype_id')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/preorder/submitorder.html

@@ -0,0 +1,83 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <input type="hidden" name="id" value="{$id}" >
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mobile" data-rule="required" class="form-control"  type="text" value="{$row.mobile|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control"  type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Car_number')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-car_number" data-rule="required" class="form-control"  type="text" value="{$row.car_number|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-address" data-rule="required" class="form-control"  type="text" value="{$row.address|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Servicetype_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-servicetype_id" data-rule="required" data-source="servicetype/index" data-field="title" class="form-control selectpage" name="row[servicetype_id]" type="text" value="{$row.servicetype_id|htmlentities}">
+        </div>
+    </div>
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Server_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-server_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[server_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Server_info')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-server_info" class="form-control" name="row[server_info]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Server_images')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-server_images" class="form-control" size="50" name="row[server_images]" type="text">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-server_images" class="btn btn-danger faupload" data-input-id="c-server_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-server_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-server_images" class="btn btn-primary fachoose" data-input-id="c-server_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-server_images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-server_images"></ul>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_fee')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pay_fee" class="form-control" step="0.01" name="row[pay_fee]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Staff_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-staff_id" data-rule="required" data-source="staff/index" class="form-control selectpage" name="row[staff_id]" type="text" value="">
+        </div>
+    </div>
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

public/assets/js/backend/preorder.js

@@ -66,7 +66,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     icon:'fa fa-exclamation-circle',
                                     classname:'btn btn-xs btn-info btn-dialog',
                                     extend: 'data-area=["80%","80%"]',
-                                    url:'pre_order/cancel/id/{ids}?dialog=1',
+                                    url:'preorder/cancel/id/{ids}?dialog=1',
                                     target:'_self',
                                     hidden:function($row){
                                         if($row.pre_order_status == 1){
@@ -82,7 +82,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     icon:'fa fa-exclamation-circle',
                                     classname:'btn btn-xs btn-info btn-dialog',
                                     extend: 'data-area=["80%","80%"]',
-                                    url:'pre_order/submitorder/id/{ids}?dialog=1',
+                                    url:'preorder/submitorder/id/{ids}?dialog=1',
                                     target:'_self',
                                     hidden:function($row){
                                         if($row.pre_order_status == 1){