hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #194: (feature/hant -> develop)

Browse Source 
Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/194?initial=true
This commit is contained in:
todayswind 2025-06-27 18:07:17 +08:00 committed by Coding
commit 136804c074
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/admin/controller/Order.php
View File

@ -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);

1
application/admin/validate/Order.php
View File

@ -73,4 +73,5 @@ class Order extends Validate
],
];
}

4
application/admin/view/item/add.html
View File

@ -1,9 +1,9 @@
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
<label class="control-label col-xs-12 col-sm-2">服务类型归属:</label>
<div class="col-xs-12 col-sm-8">
{: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'=>''])}
</div>
</div>

4
application/admin/view/item/edit.html
View File

@ -1,9 +1,9 @@
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
<label class="control-label col-xs-12 col-sm-2">服务类型归属:</label>
<div class="col-xs-12 col-sm-8">
{: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'=>''])}
</div>
</div>
<div class="form-group">

14
public/assets/js/backend/order.js
View File

@ -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'),