修改华云天成bug处理

addons/qingdongams/model/Contract.php

@@ -356,8 +356,11 @@ class Contract Extends Model {
             throw new Exception($Model->getError());
         }
         $staff = Staff::info();
-        $edit_reason=$params['edit_reason'] ?? '';
-        OperationLog::createLog(OperationLog::CONTRACT_TYPE, $params['id'], '修改合同地址,原因：' . $edit_reason);
+        $edit_reason = '';
+        if ($params['delivery_address']) {
+            $edit_reason = $params['delivery_address'] . $params['delivery_address_detail'];
+        }
+        OperationLog::createLog(OperationLog::CONTRACT_TYPE, $params['id'], '合同地址：' . $edit_reason);
         return true;
     }
     //修改合同乙方信息

addons/qingdongams/model/Workorder.php

@@ -494,6 +494,19 @@ class Workorder extends Model
             StaffSignIn::quickSignIn($params['customer_id'], $content, $paramsSign);
         }
 
+        // 发送通知-工单派单提醒
+        $noticeParams = [
+            'event' => 'dispatch_order',
+            'params' => array (
+                'receiver_admin_ids' => $staff->admin_id,
+                'receiver_admin_group_ids' => '',
+                'orderno' => $params['workorder_number'],
+                'title' => $params['title'],
+                'type' => $params['workorder_type'],
+                'order_id' => $lastId,
+            )];
+        \Think\Hook::listen('send_notice', $noticeParams);
+
         return $lastId;
     }
 
@@ -590,15 +603,16 @@ class Workorder extends Model
 
                 // 查找对应员工的admin账号id，发送对应消息
                 $staff = Staff::where(['id' => $owner_staff_id])->find();
+                // 发送通知-工单派单提醒
                 $noticeParams = [
-                    'event' => 'timeout_order',
-                    'params' => array(
-                        'receiver_admin_ids' => '',
-                        'receiver_admin_group_ids' => $staff->admin_id,
-                        'order_id' => $info['id'],
+                    'event' => 'dispatch_order',
+                    'params' => array (
+                        'receiver_admin_ids' => $staff->admin_id,
+                        'receiver_admin_group_ids' => '',
                         'orderno' => $info['workorder_number'],
                         'title' => $info['title'],
                         'type' => $info['workorder_type'],
+                        'order_id' => $info['id'],
                     )];
                 \Think\Hook::listen('send_notice', $noticeParams);
 

application/admin/controller/qingdongams/contract/Record.php

@@ -131,6 +131,11 @@ class Record extends Base
             Db::startTrans();
             try {
                 $result = $this->model::createRecord($params);
+
+                // 更新合同表时间
+                $contract = Contract::where(['id' => $params['relation_id']])->find();
+                $contract->updatetime = time();
+                $contract->save();
                 Db::commit();
             } catch (Exception $e) {
                 Db::rollback();

application/admin/controller/qingdongams/customer/Contract.php

@@ -294,8 +294,13 @@ class Contract extends Base {
                 try {
                     $params = Form::updateFormParams(Form::CONTRACT_TYPE, $params);
                     $res=true;
-      
-                   
+
+                    if ($params['start_time'] && $params['end_time']) {
+                        if (strtotime($params['start_time']) >= strtotime($params['end_time'])) {
+                            $this->error('生效时间不能大于等于结束时间');
+                        }
+                    }
+
                     if($params['product']){
                         $params['product']=json_decode($params['product'],true);
                     }
@@ -671,6 +676,11 @@ class Contract extends Base {
         // 修改绑定设备的设备状态
         \app\admin\model\qingdongams\customer\Equipmentdevice::updateStatus($ids);
 
+        // 更新合同表时间
+        $contract = \addons\qingdongams\model\Contract::where(['id' => $ids])->find();
+        $contract->updatetime = time();
+        $contract->save();
+
 		$result = $this->model->destroy($map);
 		if (!$result) {
 			$this->error('删除失败');
@@ -1599,6 +1609,11 @@ class Contract extends Base {
             Db::startTrans();
             try {
                 ContractModel::updateContractAddress($params);
+
+                // 更新合同表时间
+                $contract = \addons\qingdongams\model\Contract::where(['id' => $ids])->find();
+                $contract->updatetime = time();
+                $contract->save();
                 Db::commit();
             } catch (Exception $e) {
                 Db::rollback();
@@ -1628,6 +1643,11 @@ class Contract extends Base {
             try {
                 $params['invoice_file_ids'] = File::getId($params['invoice_file_ids']);
                 ContractModel::invoiceContract($params);
+
+                // 更新合同表时间
+                $contract = \addons\qingdongams\model\Contract::where(['id' => $ids])->find();
+                $contract->updatetime = time();
+                $contract->save();
                 Db::commit();
             } catch (Exception $e) {
                 Db::rollback();
@@ -1661,6 +1681,11 @@ class Contract extends Base {
                 $params['id'] = $ids;
                 $params['receipt_file_ids'] = File::getId($params['receipt_file_ids']);
                 ContractModel::receiptContract($params);
+
+                // 更新合同表时间
+                $contract = \addons\qingdongams\model\Contract::where(['id' => $ids])->find();
+                $contract->updatetime = time();
+                $contract->save();
                 Db::commit();
             } catch (Exception $e) {
                 Db::rollback();

application/admin/controller/qingdongams/customer/Equipmentdevice.php

@@ -46,15 +46,23 @@ class Equipmentdevice extends Backend
         }
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
         $map=[];
+        $idsArr = [];
             
         if($this->request->request('isselect')==1){
             $map['status']=0;
-            
-
+        }
+        if ($this->request->request('ids')) {
+            $ids = explode(',', $this->request->request('ids'));
+            foreach ($ids as $value) {
+                if ($value != "") {
+                    $idsArr[] = $value;
+                }
+            }
         }
         $list = $this->model
             ->where($where)
             ->where($map)
+            ->whereNotIn('id', $idsArr)
             ->order($sort, $order)
             ->paginate($limit);
         $result = ['total' => $list->total(), 'rows' => $list->items()];

application/admin/controller/qingdongams/parts/Parts.php

@@ -215,6 +215,7 @@ class Parts extends Base
                     $params['parts'][] = $parts;
                     $params['type'] = 1;
                     $params['parts'] = json_encode($params['parts']);
+                    $params['desc'] = $params['remarks'];
 
                     PartsStockReload::addRecord($params);
                     Db::commit();

application/admin/controller/qingdongams/workorder/Workorder.php

@@ -269,6 +269,18 @@ class Workorder extends Base
                 }
             }
 
+            if (isset($params['configgroup'])){
+                $configgroup = json_decode($params['configgroup'], true);
+                foreach ($configgroup as $v) {
+                    if ($v['i_start'] == $v['i_end']) {
+                        $this->error('开始时间和结束时间不能相同');
+                    }
+                    if ($v['i_end'] < $v['i_start']) {
+                        $this->error('结束时间不能小于开始时间');
+                    }
+                }
+            }
+
             // 表单验证
             if (($result = $this->validate($params, 'addons\qingdongams\validate\Workorder.create')) !== true) {
                 $this->error($result);

application/admin/view/qingdongams/customer/contract/detail.html

@@ -376,8 +376,6 @@
                 <table id="operation_product" class="table table-striped table-bordered table-hover table-nowrap"
                        width="100%">
                 </table>
-
-
             </div>
 			<div role="tabpanel" class="tab-pane fade panel-body form-horizontal" id="basic">
 
@@ -387,14 +385,14 @@
 
                     <div class="col-xs-6 col-sm-5">
                         <div class="form-group col-sm-10">
-                            <span class="text-muted">客户签约人:</span>
+                            <span class="text-muted">甲方签约人:</span>
                             <span class="text-black">{$row.contacts.name}</span>
                         </div>
                     </div>
 
                     <div class="col-xs-6 col-sm-5">
                         <div class="form-group col-sm-10">
-                            <span class="text-muted">公司签约人:</span>
+                            <span class="text-muted">乙方签约人:</span>
                             <span class="text-black">{$row.order_staff.name}</span>
                         </div>
                     </div>

application/admin/view/qingdongams/customer/equipmentdevice/select_add.html

@@ -36,7 +36,7 @@
 					<% if(row['name']){%>
 					<%=row['name']%>
 					<% }else{%>
-					【请点击选择】
+					【请点击选择11】
 					<% }%>
 				</a>
 

public/assets/css/backend.css

@@ -12,6 +12,7 @@
 @import url("../libs/bootstrap-select/dist/css/bootstrap-select.min.css");
 @import url("../libs/fastadmin-selectpage/selectpage.css");
 @import url("../libs/bootstrap-slider/slider.css");
+@import url("../libs/bootstrap-table/dist/extensions/pagejump/bootstrap-table-pagejump.css");
 .m-0 {
   margin-top: 0px !important;
   margin-right: 0px !important;

public/assets/js/backend/qingdongams/customer/contacts.js

@@ -381,6 +381,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 				// 初始化表格参数配置
 				Table.api.init({
 					extend : {
+						add_url    : 'qingdongams/customer/contacts/add',
 						detail_url : 'qingdongams/customer/contacts/detail',
 						customer_url  : 'qingdongams/customer/customer/detail',
 						table      : 'contacts',
@@ -399,6 +400,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 				// 初始化表格参数配置
 				Table.api.init({
 					extend : {
+						add_url    : 'qingdongams/customer/contacts/add',
 						detail_url : 'qingdongams/customer/contacts/detail',
 						customer_url  : 'qingdongams/customer/customer/detail',
 						table      : 'contacts',
@@ -419,6 +421,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 				// 初始化表格参数配置
 				Table.api.init({
 					extend : {
+						add_url    : 'qingdongams/customer/contacts/add',
 						detail_url : 'qingdongams/customer/contacts/detail',
 						customer_url  : 'qingdongams/customer/customer/detail',
 						table      : 'contacts',
@@ -440,6 +443,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 				// 初始化表格参数配置
 				Table.api.init({
 					extend : {
+						add_url    : 'qingdongams/customer/contacts/add',
 						detail_url : 'qingdongams/customer/contacts/detail',
 						customer_url  : 'qingdongams/customer/customer/detail',
 						table      : 'contacts',
@@ -461,6 +465,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 				// 初始化表格参数配置
 				Table.api.init({
 					extend : {
+						add_url    : 'qingdongams/customer/contacts/add',
 						detail_url : 'qingdongams/customer/contacts/detail',
 						customer_url  : 'qingdongams/customer/customer/detail',
 						table      : 'contacts',

public/assets/js/backend/qingdongams/workorder/workorder.js

@@ -59,7 +59,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 						{ field: 'owner_staff_id', title: '接单人员', operate: 'like', searchList: Config.ownerStaffList},
 						{
 							field: 'status', title: '工单状态', formatter: Table.api.formatter.status,
-							searchList: {1: '待处理', 2: '处理中', 3: '已完成', 9: "已撤销" }
+							searchList: {1: '待处理', 2: '处理中', 3: '已完成', 9: "终止工单" }
 						},
 						{ field: 'expected_end_time', title: '完成时间', operate: 'RANGE', addclass: 'datetimerange', formatter: Table.api.formatter.datetime },
 						// { field: 'workorder_number', title: '工单编号', operate: 'like' },

public/assets/js/fast.js

@@ -141,6 +141,7 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                     area: area,
                     content: url,
                     zIndex: Layer.zIndex,
+                    id: 1,
                     success: function (layero, index) {
                         var that = this;
                         //存储callback事件

public/assets/libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN.js

@@ -38,6 +38,9 @@
         },
         formatClearFilters: function () {
             return '清空过滤';
+        },
+        pageGo: function () {
+            return '跳转到';
         }
     };