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

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

Browse Source 
Merge Request: 订单录入bug

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/121?initial=true
This commit is contained in:
todayswind 2025-06-07 19:22:26 +08:00 committed by Coding
commit f94ff3d3c3
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,6 +204,7 @@ class Order extends Backend
public function add()
{
if (false === $this->request->isPost()) {
return $this->view->fetch();
}

2
application/admin/view/order/add.html
View File

@ -54,7 +54,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Item_title')}:</label>
<div class="col-xs-12 col-sm-8">
<input type="text" id="item_id" class="zd-input__inner">
<input type="text" data-rule="required" id="item_id" class="zd-input__inner">
<input type="text" id="item_id_value" style="display: none" name="row[item_id]" class="zd-input__inner">
</div>

2
application/admin/view/order/edit.html
View File

@ -54,7 +54,7 @@
<div class="form-group col-xs-12">
<label class="control-label col-xs-12 col-sm-3">{:__('Item_title')}:</label>
<div class="col-xs-12 col-sm-8">
<input type="text" id="item_id" value="{$row.item_title}" data-value="{$row.item_title}" class="zd-input__inner">
<input type="text" data-rule="required" id="item_id" value="{$row.item_title}" data-value="{$row.item_title}" class="zd-input__inner">
<input type="text" id="item_id_value" value="{$row.item_id}" style="display: none" name="row[item_id]" class="zd-input__inner">
</div>
</div>

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

@ -3,6 +3,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
function clearInfo() {
$('[name^="row["]').val('');
$("#c-city").citypicker('reset');
$("#item_id").val('');
$("#item_id_value").val('');
$(".selectpicker").val('').selectpicker('refresh');
}

5
public/assets/js/cascader.js
View File

@ -278,14 +278,14 @@
datas.push({
label: `${prov.label} / ${city.label} / ${area.label}`,
labels: [prov.label, city.label, area.label],
value: [prov.value, city.value, area.value],
value: [area.value],
})
})
} else {
datas.push({
label: `${prov.label} / ${city.label}`,
labels: [prov.label, city.label],
value: [prov.value, city.value],
value: [ city.value],
})
}
})
@ -318,6 +318,7 @@
}).sort(function(a, b) {
return b.num - a.num
}).slice(0, 10)
console.log(data);
this.reload(data, true)
}
//关键词筛选数据（暂不用）