diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index e9b75d2..4fb74e3 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -286,7 +286,7 @@ class Order extends Backend $params[$this->dataLimitField] = $this->auth->id; } sleep(2); - $result = false; + Db::startTrans(); try { //是否采用模型验证 @@ -296,9 +296,17 @@ class Order extends Backend $this->model->validateFailException()->validate($validate); } + $sources = $this->sources; - $sources = array_column($sources, 'title', 'id'); - $params['source_shop'] = $sources[$params['source']] ?? null; +// dd($sources); + + $sources = array_column($sources, null, 'id'); + + if (!in_array($sources[$params['source']]['pid'],[3,8])&& empty($params['customer'])){ + $this->error('请输入客户名称'); + } + $params['source_shop'] = $sources[$params['source']]['pid'] ?? null; + $itemIds = explode(',', $params['item_id'] ?? ''); $params['item_id'] = end($itemIds); diff --git a/application/admin/validate/Order.php b/application/admin/validate/Order.php index 4a02764..de7fe65 100644 --- a/application/admin/validate/Order.php +++ b/application/admin/validate/Order.php @@ -73,4 +73,5 @@ class Order extends Validate ], ]; + } diff --git a/application/admin/view/item/add.html b/application/admin/view/item/add.html index 3146a68..03a5062 100644 --- a/application/admin/view/item/add.html +++ b/application/admin/view/item/add.html @@ -1,9 +1,9 @@
- +
- {:build_select('row[pid]', $itemdata, null, ['class'=>'form-control', 'required'=>''])} + {:build_select('row[pid]', $itemdata, null, ['class'=>'form-control selectpicker','data-live-search'=>'true', 'required'=>''])}
diff --git a/application/admin/view/item/edit.html b/application/admin/view/item/edit.html index f6ef34c..43ba7be 100644 --- a/application/admin/view/item/edit.html +++ b/application/admin/view/item/edit.html @@ -1,9 +1,9 @@
- +
- {:build_select('row[pid]', $itemdata, $row.pid, ['class'=>'form-control', 'required'=>''])} + {:build_select('row[pid]', $itemdata, $row.pid, ['class'=>'form-control selectpicker','data-live-search'=>'true', 'required'=>''])}
diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index 944544d..a59e566 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -124,6 +124,13 @@ ${data.receive_type == 1 ? '已收定金' : '已收全款'} "10": "my_dispatch" } }, + { + field: 'create_time', + title: __('Create_time'), + operate: 'RANGE', + addclass: 'datetimerange', + autocomplete: false + }, { field: 'is_timeout', title: '是否超时', @@ -220,13 +227,6 @@ ${data.receive_type == 1 ? '已收定金' : '已收全款'} events: Table.api.events.image, formatter: Table.api.formatter.images }, - { - field: 'create_time', - title: __('Create_time'), - operate: 'RANGE', - addclass: 'datetimerange', - autocomplete: false - }, { field: 'update_time', title: __('Update_time'),