lizhen_gitee 8 月之前
父节点
当前提交
2978eff6b7

+ 3 - 3
application/admin/lang/zh-cn/maintainbaojia.php

@@ -18,9 +18,9 @@ return [
     'Set status to 30'        => '设为用户待确认',
     'Status 40'               => '用户已确认',
     'Set status to 40'        => '设为用户已确认',
-    'Baojia_audit_staffid'    => '初步审核人ID',
-    'Baojia_audit_time'       => '初步审核时间',
-    'Baojia_audit_reason'     => '初步审核未通过原因',
+    'Baojia_audit_staffid'    => '审核管理员ID',
+    'Baojia_audit_time'       => '审核时间',
+    'Baojia_audit_reason'     => '审核未通过原因',
     'Updatetime'              => '更新时间',
     'Baojia_useraudit_time'   => '用户确认时间',
     'Baojia_useraudit_reason' => '用户审核未通过原因(废弃)',

+ 40 - 2
public/assets/js/backend/maintain.js

@@ -65,11 +65,49 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'eva_time', title: __('Eva_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'eva_score', title: __('Eva_score')},
 
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'), table: table,
+                            buttons:[
+                                {
+                                    name:'jindu',
+                                    text:'进度',
+                                    title:'进度',
+                                    icon:'fa fa-exclamation-circle',
+                                    classname:'btn btn-xs btn-info btn-dialog btn-jindu',
+                                    url:'maintainjindu/index/order_id/{ids}?dialog=1',
+                                    target:'_self',
+                                },
+                                {
+                                    name:'cailiao',
+                                    text:'材料',
+                                    title:'材料',
+                                    icon:'fa fa-exclamation-circle',
+                                    classname:'btn btn-xs btn-info btn-dialog btn-cailiao',
+                                    url:'maintaincailiao/index/order_id/{ids}?dialog=1',
+                                    target:'_self',
+                                },
+                                {
+                                    name:'baojia',
+                                    text:'报价',
+                                    title:'报价',
+                                    icon:'fa fa-exclamation-circle',
+                                    classname:'btn btn-xs btn-info btn-dialog btn-baojia',
+                                    url:'maintainbaojia/index/order_id/{ids}?dialog=1',
+                                    target:'_self',
+                                },
+                            ],
+                            events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
-                ]
+                ],
+                onLoadSuccess:function(){
+                    // 这里就是数据渲染结束后的回调函数
+                    $(".btn-jindu").data("area", ['80%','80%']);
+                    $(".btn-cailiao").data("area", ['80%','80%']);
+                    $(".btn-baojia").data("area", ['80%','80%']);
+                }
             });
 
+
+
             // 为表格绑定事件
             Table.api.bindevent(table);
         },

+ 8 - 8
public/assets/js/backend/maintainbaojia.js

@@ -22,13 +22,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
-                fixedColumns: true,
-                fixedRightNumber: 1,
+//                fixedColumns: true,
+//                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'order_id', title: __('Order_id')},
+                        {field: 'maintain.orderno', title: __('Maintain.orderno'), 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,7 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'baojia_staffid', title: __('Baojia_staffid')},
                         {field: 'admina.username', title: __('Admina.username'), operate: 'LIKE'},
                         {field: 'admina.nickname', title: __('Admina.nickname'), operate: 'LIKE'},
-                        {field: 'admina.mobile', title: __('Admina.mobile'), operate: 'LIKE'},
+//                        {field: 'admina.mobile', title: __('Admina.mobile'), operate: 'LIKE'},
 
                         {field: 'baojia_time', title: __('Baojia_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'baojia_filename', title: __('Baojia_filename'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
@@ -49,15 +51,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'baojia_audit_staffid', title: __('Baojia_audit_staffid')},
                         {field: 'adminb.username', title: __('Adminb.username'), operate: 'LIKE'},
                         {field: 'adminb.nickname', title: __('Adminb.nickname'), operate: 'LIKE'},
-                        {field: 'adminb.mobile', title: __('Adminb.mobile'), operate: 'LIKE'},
+//                        {field: 'adminb.mobile', title: __('Adminb.mobile'), operate: 'LIKE'},
 
                         {field: 'baojia_audit_time', title: __('Baojia_audit_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'baojia_audit_reason', title: __('Baojia_audit_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'updatetime', title: __('Updatetime'), 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: 'baojia_useraudit_time', title: __('Baojia_useraudit_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'baojia_useraudit_reason', title: __('Baojia_useraudit_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'maintain.orderno', title: __('Maintain.orderno'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'company.companyname', title: __('Company.companyname'), operate: 'LIKE'},
+//                        {field: 'baojia_useraudit_reason', title: __('Baojia_useraudit_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
 
 

+ 2 - 2
public/assets/js/backend/maintaincailiao.js

@@ -22,8 +22,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
-                fixedColumns: true,
-                fixedRightNumber: 1,
+//                fixedColumns: true,
+//                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},

+ 2 - 2
public/assets/js/backend/maintainjindu.js

@@ -22,8 +22,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
-                fixedColumns: true,
-                fixedRightNumber: 1,
+//                fixedColumns: true,
+//                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},