发布从测试版本2.3.4
This commit is contained in:
@@ -15,7 +15,7 @@ class Controller extends BaseController
|
||||
/**
|
||||
* @var 程序版本
|
||||
*/
|
||||
public $version = '2.3.3';
|
||||
public $version = '2.3.4';
|
||||
|
||||
/**
|
||||
* @var 配置参数
|
||||
|
||||
+19
-2
@@ -1472,12 +1472,16 @@ class Form
|
||||
$tabContent .= '</tbody></table>';
|
||||
}
|
||||
|
||||
// 保存时数据不能为空
|
||||
$saveDataNotEmpty = in_array('required', (array)$permission_option['v']);
|
||||
|
||||
$_options = [
|
||||
'columns' => $columns,
|
||||
'data' => $rows,
|
||||
'links' => $links,
|
||||
'table' => $model['table'],
|
||||
'title' => $model['name'],
|
||||
'saveDataNotEmpty' => $saveDataNotEmpty,
|
||||
];
|
||||
|
||||
$js = 'gdoo.forms["'.$model['table'].'"] = gridForms("' . $table . '","' . $model['table'] . '", ' . json_encode($_options, JSON_UNESCAPED_UNICODE) . ');';
|
||||
@@ -1718,7 +1722,20 @@ class Form
|
||||
$field = $fields[$key];
|
||||
$_rules = (array)$row['v'];
|
||||
if ($_rules) {
|
||||
$t = $model['type'] == 1 ? $table . '.rows.*.' . $key : $table . '.' . $key;
|
||||
|
||||
$field_name = $fields[$key]['name'];
|
||||
|
||||
if ($model['type'] == 1) {
|
||||
if ($key == '@option') {
|
||||
$t = $table . '.rows';
|
||||
$field_name = $model->name;
|
||||
} else {
|
||||
$t = $table . '.rows.*.' . $key;
|
||||
}
|
||||
} else {
|
||||
$t = $table . '.' . $key;
|
||||
}
|
||||
|
||||
$data_type = $field['data_type'];
|
||||
$data_field = $field['data_field'];
|
||||
$data_link = $field['data_link'];
|
||||
@@ -1740,7 +1757,7 @@ class Form
|
||||
}
|
||||
}
|
||||
$rules[$t] = join('|', $_rules);
|
||||
$attributes[$t] = $fields[$key]['name'];
|
||||
$attributes[$t] = $field_name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,12 +80,10 @@
|
||||
<td>
|
||||
{{$submodel->table}}@option
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
<select multiple data-placeholder="选择验证规则" class="form-control input-sm input-inline input-select2" name="data[{{$submodel->table}}][{{$field->field}}][v][]">
|
||||
<select multiple data-placeholder="选择验证规则" class="form-control input-sm input-inline input-select2" name="data[{{$submodel->table}}][@option][v][]">
|
||||
<option value=""></option>
|
||||
<option @if(in_array('required', (array)$permission['data'][$submodel->table]['@option']['v'])) selected @endif value="required">必填</option>
|
||||
</select>
|
||||
|
||||
@@ -125,6 +125,8 @@ var form_action = '{{$action}}';
|
||||
query.customer_id = customer_id;
|
||||
},
|
||||
onSelect(row, selected) {
|
||||
row.is_gift_name = '否';
|
||||
row.is_gift = 0;
|
||||
if (row.product_code == '99001') {
|
||||
row.type_id_name = '费用';
|
||||
row.type_id = 5;
|
||||
@@ -270,6 +272,8 @@ var form_action = '{{$action}}';
|
||||
var rows = $ref_promotion_data.api.getSelectedRows();
|
||||
for (let i = 0; i < rows.length; i++) {
|
||||
var row = rows[i];
|
||||
row.is_gift_name = '是';
|
||||
row.is_gift = 1;
|
||||
row.quantity = row.wsy_num;
|
||||
row.delivery_quantity = row.quantity;
|
||||
row.total_weight = row.quantity * row.weight;
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
<th style="white-space:nowrap"></th>
|
||||
|
||||
@if(count($categorys))
|
||||
@if($categorys)
|
||||
@foreach($categorys as $k => $v)
|
||||
@if($v['parent_id'] == 226)
|
||||
<th nowrap="nowrap">{{$v['name']}}</th>
|
||||
@@ -39,7 +39,7 @@
|
||||
-->
|
||||
</tr>
|
||||
|
||||
@if(count($now_year_single['money']))
|
||||
@if($now_year_single['money'])
|
||||
@foreach($now_year_single['money'] as $key => $value)
|
||||
|
||||
<tr>
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
<td align="center" style="vertical-align:middle;color:#999;">销售金额(元)</td>
|
||||
|
||||
@if(count($categorys))
|
||||
@if($categorys)
|
||||
@foreach($categorys as $k => $v)
|
||||
@if($v['parent_id'] == 226)
|
||||
<td align="right">
|
||||
@@ -96,7 +96,7 @@
|
||||
|
||||
<td align="center" style="vertical-align:middle;color:#999;">去年同期增长率</td>
|
||||
|
||||
@if(count($categorys))
|
||||
@if($categorys)
|
||||
@foreach($categorys as $category_id => $category)
|
||||
@if($category['parent_id'] == 226)
|
||||
<td align="right" title="去年同期增长率" nowrap="nowrap">
|
||||
@@ -133,7 +133,7 @@
|
||||
|
||||
<tr>
|
||||
<td align="center" style="vertical-align:middle;color:#999;">占区域该品类百分比</td>
|
||||
@if(count($categorys))
|
||||
@if($categorys)
|
||||
@foreach($categorys as $k => $v)
|
||||
@if($v['parent_id'] == 226)
|
||||
<td align="right" title="占区域该品类百分比">
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
</select>
|
||||
|
||||
年份
|
||||
<input type="text" id="year" name="year" onclick="datePicker({dateFmt:'yyyy'});" value="{{$select['select']['year']}}" class="form-control input-sm">
|
||||
<input type="text" id="year" name="year" autocomplete="off" onclick="datePicker({dateFmt:'yyyy'});" value="{{$select['query']['year']}}" class="form-control input-sm">
|
||||
|
||||
<button type="submit" class="btn btn-default btn-sm">筛选</button>
|
||||
</form>
|
||||
|
||||
@@ -117,13 +117,6 @@ class RoleController extends DefaultController
|
||||
|
||||
$rules = json_decode($assets[$asset]['rules'], true);
|
||||
|
||||
// 清除旧权限
|
||||
foreach ((array)$rules as $key => $rule) {
|
||||
if (empty($controllers[$key])) {
|
||||
unset($rules[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($controllers as $key => $actions) {
|
||||
unset($rules[$key][$id]);
|
||||
if ($actions['action']) {
|
||||
|
||||
@@ -110,6 +110,7 @@
|
||||
{{'';$selected = $assets[$menuKey][$groupKey.'.'.$childKey]}}
|
||||
<label title="{{$childKey}}" class="checkbox-inline">
|
||||
<input type="checkbox" class="action-check" name="assets[{{$menuKey}}][{{$groupKey}}.{{$childKey}}][action]" value="1" @if(isset($selected)) checked @endif>
|
||||
<input type="hidden" name="assets[{{$menuKey}}][{{$groupKey}}.{{$childKey}}][access]" value="1">
|
||||
{{$childValue['name']}}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user