From 4be87a7080ad8523212fe8b5a29c4d18d363774f Mon Sep 17 00:00:00 2001
From: meimei <102865034@qq.com>
Date: Wed, 7 May 2025 18:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/firmcustomer/index.html        | 38 +++++-----
 .../admin/view/general/profile/index.html     | 72 +++++++++----------
 .../public/assets/js/backend/firmcustomer.js  | 23 ++++--
 3 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/admin/application/admin/view/firmcustomer/index.html b/admin/application/admin/view/firmcustomer/index.html
index d20e6d0..41fff8d 100755
--- a/admin/application/admin/view/firmcustomer/index.html
+++ b/admin/application/admin/view/firmcustomer/index.html
@@ -1,14 +1,14 @@
 <div class="panel panel-default panel-intro">
     
-    <div class="panel-heading">
-        {:build_heading(null,FALSE)}
-        <ul class="nav nav-tabs" data-field="status">
-            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
-            {foreach name="statusList" item="vo"}
-            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
-            {/foreach}
-        </ul>
-    </div>
+<!--    <div class="panel-heading">-->
+<!--        {:build_heading(null,FALSE)}-->
+<!--        <ul class="nav nav-tabs" data-field="status">-->
+<!--            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>-->
+<!--            {foreach name="statusList" item="vo"}-->
+<!--            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>-->
+<!--            {/foreach}-->
+<!--        </ul>-->
+<!--    </div>-->
 
 
     <div class="panel-body">
@@ -19,23 +19,23 @@
                         <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('firmcustomer/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('firmcustomer/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('firmcustomer/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('firmcustomer/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
 <!--                        <a href="firmtags/add" class="btn btn-success btn-dialog" title="{:__('添加标签')}" ><i class="fa fa-plus"></i> {:__('添加标签')}</a>-->
 
 
-                        <div class="dropdown btn-group {:$auth->check('firmcustomer/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <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 class="dropdown btn-group {:$auth->check('firmcustomer/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                {foreach name="statusList" item="vo"}-->
+<!--                                <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>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('firmcustomer/edit')}"
+                           data-operate-edit=""
                            data-operate-del="{:$auth->check('firmcustomer/del')}"
                            width="100%">
                     </table>
diff --git a/admin/application/admin/view/general/profile/index.html b/admin/application/admin/view/general/profile/index.html
index 39dca49..16ae9a4 100755
--- a/admin/application/admin/view/general/profile/index.html
+++ b/admin/application/admin/view/general/profile/index.html
@@ -38,8 +38,8 @@
     }
 </style>
 <div class="row animated fadeInRight">
-    <div class="col-md-4">
-        <div class="box box-primary">
+    <div class="col-md-4" style="width: 100%!important;">
+        <div class="box box-primary" >
             <div class="panel-heading">
                 {:__('Profile')}
             </div>
@@ -62,18 +62,18 @@
                             <label for="username" class="control-label">{:__('Username')}:</label>
                             <input type="text" class="form-control" id="username" name="row[username]" value="{$admin.username|htmlentities}" disabled/>
                         </div>
-                        <div class="form-group">
-                            <label for="mobile" class="control-label">{:__('Mobile')}:</label>
-                            <input type="text" class="form-control" id="mobile" name="row[mobile]" value="{$admin.mobile|htmlentities}" disabled/>
-                        </div>
-                        <div class="form-group">
-                            <label for="email" class="control-label">{:__('Email')}:</label>
-                            <input type="text" class="form-control" id="email" name="row[email]" value="{$admin.email|htmlentities}" data-rule="required;email"/>
-                        </div>
-                        <div class="form-group">
-                            <label for="nickname" class="control-label">{:__('Nickname')}:</label>
-                            <input type="text" class="form-control" id="nickname" name="row[nickname]" value="{$admin.nickname|htmlentities}" data-rule="required"/>
-                        </div>
+<!--                        <div class="form-group">-->
+<!--                            <label for="mobile" class="control-label">{:__('Mobile')}:</label>-->
+<!--                            <input type="text" class="form-control" id="mobile" name="row[mobile]" value="{$admin.mobile|htmlentities}" disabled/>-->
+<!--                        </div>-->
+<!--                        <div class="form-group">-->
+<!--                            <label for="email" class="control-label">{:__('Email')}:</label>-->
+<!--                            <input type="text" class="form-control" id="email" name="row[email]" value="{$admin.email|htmlentities}" data-rule="required;email"/>-->
+<!--                        </div>-->
+<!--                        <div class="form-group">-->
+<!--                            <label for="nickname" class="control-label">{:__('Nickname')}:</label>-->
+<!--                            <input type="text" class="form-control" id="nickname" name="row[nickname]" value="{$admin.nickname|htmlentities}" data-rule="required"/>-->
+<!--                        </div>-->
                         <div class="form-group">
                             <label for="password" class="control-label">{:__('Password')}:</label>
                             <input type="password" class="form-control" id="password" placeholder="{:__('Leave password blank if dont want to change')}" autocomplete="new-password" name="row[password]" value="" data-rule="password"/>
@@ -108,30 +108,30 @@
         </div>
 
     </div>
-    <div class="col-md-8">
-        <div class="panel panel-default panel-intro panel-nav">
-            <div class="panel-heading">
-                <ul class="nav nav-tabs">
-                    <li class="active"><a href="#one" data-toggle="tab"><i class="fa fa-list"></i> {:__('Admin log')}</a></li>
-                </ul>
-            </div>
-            <div class="panel-body">
-                <div id="myTabContent" class="tab-content">
-                    <div class="tab-pane fade active in" id="one">
-                        <div class="widget-body no-padding">
-                            <div id="toolbar" class="toolbar">
-                                {:build_toolbar('refresh')}
-                            </div>
-                            <table id="table" class="table table-striped table-bordered table-hover table-nowrap" width="100%">
+<!--    <div class="col-md-8">-->
+<!--        <div class="panel panel-default panel-intro panel-nav">-->
+<!--            <div class="panel-heading">-->
+<!--                <ul class="nav nav-tabs">-->
+<!--                    <li class="active"><a href="#one" data-toggle="tab"><i class="fa fa-list"></i> {:__('Admin log')}</a></li>-->
+<!--                </ul>-->
+<!--            </div>-->
+<!--            <div class="panel-body">-->
+<!--                <div id="myTabContent" class="tab-content">-->
+<!--                    <div class="tab-pane fade active in" id="one">-->
+<!--                        <div class="widget-body no-padding">-->
+<!--                            <div id="toolbar" class="toolbar">-->
+<!--                                {:build_toolbar('refresh')}-->
+<!--                            </div>-->
+<!--                            <table id="table" class="table table-striped table-bordered table-hover table-nowrap" width="100%">-->
 
-                            </table>
+<!--                            </table>-->
 
-                        </div>
-                    </div>
+<!--                        </div>-->
+<!--                    </div>-->
 
-                </div>
-            </div>
-        </div>
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
 
-    </div>
+<!--    </div>-->
 </div>
diff --git a/admin/public/assets/js/backend/firmcustomer.js b/admin/public/assets/js/backend/firmcustomer.js
index 6e18859..b864efa 100755
--- a/admin/public/assets/js/backend/firmcustomer.js
+++ b/admin/public/assets/js/backend/firmcustomer.js
@@ -24,24 +24,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                searchFormVisible: true,
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id'), operate: false},
                         {field: 'name', title: __('Customer_name'), operate: 'LIKE'},
-                        {field: 'age', title: __('Age')},
+                        {field: 'age', title: __('Age'), operate: false},
                         {field: 'phone', title: __('Phone'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'rel_wx', title: __('Rel_wx'), operate: 'LIKE'},
                         {field: 'rel_group', title: __('Rel_group'), operate: 'LIKE'},
                         {field: 'firmtags_ids', title: __('Firmtags_ids'), operate: 'LIKE'},
                         {field: 'headimage', title: __('Headimage'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'remark', title: __('Remark'), operate: 'LIKE'},
-                        {field: 'responsible_pm', title: __('Responsible_pm'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"yes":__('Status yes'),"no":__('Status no')}, formatter: Table.api.formatter.status},
+                        {field: 'remark', title: __('Remark'), operate: false},
+                        {field: 'responsible_pm', title: __('Responsible_pm'), operate: false},
+                        {field: 'status', title: __('Status'), searchList: {"yes":__('Status yes'),"no":__('Status no')}, formatter: Table.api.formatter.status, operate: false},
                         {field: 'firmstoreprojectstwo.name', title: __('Firmstoreprojectstwo.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'firmcustomerorigin.name', title: __('Firmcustomerorigin.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'admin_id', title: __('责任人'), operate: 'LIKE'},
-                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'admin_id', title: __('责任人'), operate: false},
+                        {field: 'create_time', title: __('Create_time'), operate:false, addclass:'datetimerange', autocomplete:false},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
 
                             buttons: [
@@ -90,6 +91,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return true;
                                     }
                                 },
+                                {
+                                    name: 'name',
+                                    icon: 'fa fa-pencil',
+                                    text: __('编辑客户'),
+                                    title: __('Edit'),
+                                    extend: 'data-toggle="tooltip" data-container="body"',
+                                    classname: 'btn btn-xs btn-warning btn-editone'
+                                },
                                 // {
                                 //     name: 'selectSendTime',
                                 //     text: __('查看发送时间'),