lizhen_gitee 7 hónapja
szülő
commit
6acf980070

+ 58 - 8
application/admin/controller/Maintain.php

@@ -3,7 +3,11 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
-
+use think\Db;
+use think\exception\DbException;
+use think\exception\PDOException;
+use think\exception\ValidateException;
+use Exception;
 /**
  * 维修单
  *
@@ -28,13 +32,6 @@ class Maintain extends Backend
 
 
     /**
-     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
-     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
-     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
-     */
-
-
-    /**
      * 查看
      */
     public function index()
@@ -71,4 +68,57 @@ class Maintain extends Backend
         return $this->view->fetch();
     }
 
+    /**
+     * 编辑
+     *
+     * @param $ids
+     * @return string
+     * @throws DbException
+     * @throws \think\Exception
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) {
+            $this->error(__('You have no permission'));
+        }
+        if (false === $this->request->isPost()) {
+
+            //
+            $row['filedata_array'] = json_decode($row['filedata'],true);
+            //
+
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        $result = false;
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            if ($this->modelValidate) {
+                $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                $row->validateFailException()->validate($validate);
+            }
+            $result = $row->allowField(true)->save($params);
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+        Db::rollback();
+        $this->error($e->getMessage());
+    }
+        if (false === $result) {
+            $this->error(__('No rows were updated'));
+        }
+        $this->success();
+    }
+
 }

+ 7 - 7
application/admin/lang/zh-cn/maintain.php

@@ -8,10 +8,10 @@ return [
     'User_id'             => '用户ID',
     'Createtime'          => '创建时间',
     'Updatetime'          => '更新时间',
-    'Info'                => '详情',
+    'Info'                => '上报详情',
     'Filedata'            => '上传附件',
-    'Mobile'              => '联系方式',
-    'Address'             => '联系地址',
+    'Mobile'              => '上报联系方式',
+    'Address'             => '上报联系地址',
     'Status'              => '状态',
     'Status 0'            => '待报价',
     'Set status to 0'     => '设为待报价',
@@ -53,10 +53,10 @@ return [
     'Eva_info'            => '评价详情',
     'Eva_time'            => '评价时间',
     'Eva_score'           => '评价得分',
-    'Company.companyname' => '公司名',
+    'Company.companyname' => '维保公司名',
     'User.nickname'       => '商户名',
-    'User.mobile'         => '手机号',
+    'User.mobile'         => '商户手机号',
     'Usercompany.projectname' => '项目名称',
-    'Worker.truename'     => '姓名',
-    'Worker.mobile'       => '手机号'
+    'Worker.truename'     => '师傅姓名',
+    'Worker.mobile'       => '师傅手机号'
 ];

+ 30 - 18
application/admin/view/maintain/edit.html

@@ -3,27 +3,27 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Orderno')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-orderno" class="form-control" name="row[orderno]" type="text" value="{$row.orderno|htmlentities}">
+            <input id="c-orderno" disabled class="form-control" name="row[orderno]" type="text" value="{$row.orderno|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Uc_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-uc_id" data-rule="required" data-source="user/company/index" class="form-control selectpage" name="row[uc_id]" type="text" value="{$row.uc_id|htmlentities}">
+            <input id="c-uc_id" data-rule="required" data-source="usercompany/index" data-field="projectname" class="form-control selectpage" name="row[uc_id]" type="text" value="{$row.uc_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-company_id" data-rule="required" data-source="company/index" class="form-control selectpage" name="row[company_id]" type="text" value="{$row.company_id|htmlentities}">
+            <input id="c-company_id" data-rule="required" data-source="company/index" data-field="companyname" class="form-control selectpage" name="row[company_id]" type="text" value="{$row.company_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Info')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -33,7 +33,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Filedata')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-filedata" class="form-control " rows="5" name="row[filedata]" cols="50">{$row.filedata|htmlentities}</textarea>
+            <?php
+            if(!empty($row['filedata_array'])){
+                foreach($row['filedata_array'] as $key => $val){
+                    if(isset($val['type']) && $val['type'] == 'video'){
+                        echo '<video width="100" height="100" controls><source src="'. localpath_to_netpath($val['url']) .'" type="video/ogg"></video>';
+                    }
+                    if(isset($val['type']) && $val['type'] == 'img'){
+                        echo '<img width="100" height="100" src="'. localpath_to_netpath($val['url']) .'" >';
+                    }
+                    echo '<br>';
+                }
+            }
+            ?>
         </div>
     </div>
     <div class="form-group">
@@ -48,7 +60,7 @@
             <input id="c-address" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             
@@ -59,8 +71,8 @@
             </div>
 
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Canceltime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-canceltime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[canceltime]" type="text" value="{:$row.canceltime?datetime($row.canceltime):''}">
@@ -77,14 +89,14 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-baojia_confirmtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[baojia_confirmtime]" type="text" value="{:$row.baojia_confirmtime?datetime($row.baojia_confirmtime):''}">
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Worker_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-worker_id" data-rule="required" data-source="worker/index" class="form-control selectpage" name="row[worker_id]" type="text" value="{$row.worker_id|htmlentities}">
+            <input id="c-worker_id" data-rule="required" data-source="worker/index" data-field="truename" class="form-control selectpage" name="row[worker_id]" type="text" value="{$row.worker_id|htmlentities}">
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cailiao_time')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-cailiao_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[cailiao_time]" type="text" value="{:$row.cailiao_time?datetime($row.cailiao_time):''}">
@@ -95,7 +107,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-lingqu_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[lingqu_time]" type="text" value="{:$row.lingqu_time?datetime($row.lingqu_time):''}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Lingqu_images')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -110,7 +122,7 @@
             <ul class="row list-inline faupload-preview" id="p-lingqu_images"></ul>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Shangmen_time')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-shangmen_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[shangmen_time]" type="text" value="{:$row.shangmen_time?datetime($row.shangmen_time):''}">
@@ -133,7 +145,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-wancheng_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[wancheng_time]" type="text" value="{:$row.wancheng_time?datetime($row.wancheng_time):''}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Eva_info')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 2 - 2
application/admin/view/maintain/index.html

@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintain/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('maintain/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('maintain/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('maintain/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 5 - 3
public/assets/js/backend/maintain.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'maintain/index' + location.search,
                     add_url: 'maintain/add',
                     edit_url: 'maintain/edit',
-                    del_url: 'maintain/del',
+//                    del_url: 'maintain/del',
                     multi_url: 'maintain/multi',
                     import_url: 'maintain/import',
                     table: 'maintain',
@@ -29,8 +29,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'orderno', title: __('Orderno'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'uc_id', title: __('Uc_id')},
-                        {field: 'usercompany.projectname', title: __('Usercompany.projectname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
                         {field: 'company_id', title: __('Company_id')},
                         {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
@@ -39,6 +37,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
 
+                        //                        {field: 'uc_id', title: __('Uc_id')},
+                        {field: 'usercompany.projectname', title: __('Usercompany.projectname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+
+
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
 //                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'info', title: __('Info'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},