hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

发布2.3测试版

Browse Source
This commit is contained in:
hawind
2021-05-02 05:55:42 +08:00
parent 8732c85312
commit ef8224d20e
83 changed files with 635 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Stock/views/delivery/create.blade.php
+3 -3
View File
@@ -436,7 +436,7 @@ var grid = null;
// 选择客户事件
gdoo.event.set('stock_delivery.customer_id', {
onSelect(row) {
if (row.id) {
if (row) {
$('#stock_delivery_order_type_id').val(row.type_id);
$('#stock_delivery_order_type_id_select').val(row.type_id);
@@ -455,7 +455,7 @@ var grid = null;
query(query) {
},
onSelect(row) {
if (row.id) {
if (row) {
$('#stock_delivery_freight_short_car').val(row.short_car_sn);
return true;
}
@@ -467,7 +467,7 @@ var grid = null;
query(query) {
},
onSelect(row) {
if (row.id) {
if (row) {
$('#stock_delivery_freight_logistics_phone').val(row.business_phone);
return true;
}
app/Gdoo/Stock/views/delivery/getBatchSelect.blade.php
+4 -27
View File
@@ -11,20 +11,14 @@
var search = JSON.parse('{{json_encode($search)}}');
var params = search.query;
var option = gdoo.formKey(params);
var event = gdoo.event.get(option.key);
event.trigger('query', params);
var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
var grid = new agGridOptions();
var multiple = false;
var option = gdoo.dialogInit(params, grid);
grid.remoteDataUrl = '{{url()}}';
grid.remoteParams = params;
grid.suppressRowClickSelection = true;
grid.rowSelection = multiple ? 'multiple' : 'single';
grid.rowSelection = 'single';
grid.columnDefs = [
{suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
{suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: false, suppressSizeToFit: true, sortable: false, width: 40},
{suppressMenu: true, cellClass:'text-center', sortable: false, field: 'sn', type:'sn', suppressSizeToFit: true, headerName: '', width: 40},
{suppressMenu: true, cellClass:'text-center', sortable: false, field: 'warehouse_code', headerName: '仓库编码', width: 60},
{suppressMenu: true, cellClass:'text-left', sortable: false, field: 'warehouse_name', headerName: '仓库名称', width: 100},
@@ -39,27 +33,10 @@
{suppressMenu: true, cellClass:'text-right', sortable: false, field: 'ky_num', type:'number', headerName: '可用数量', width: 80},
];
grid.onRowClicked = function(row) {
var selected = row.node.isSelected();
if (selected === false) {
row.node.setSelected(true, true);
}
};
grid.onRowDoubleClicked = function (row) {
var ret = gdoo.writeSelected(event, params, option, grid);
if (ret == true) {
$('#gdoo-dialog-' + params.dialog_index).dialog('close');
}
};
gdoo.dialogs[option.id] = grid;
var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
new agGrid.Grid(gridDiv, grid);
grid.remoteData({page: 1});
grid.remoteAfterSuccess = function() {
gdoo.initSelected(params, option, grid);
}
var data = search.forms;
var search = $("#dialog-{{$search['query']['id']}}-search-form").searchForm({
app/Gdoo/Stock/views/delivery/print/87.blade.php
+2 -56
View File
@@ -1,5 +1,4 @@
<div id="div1">
<div style="line-height:40px;font-size:14pt;" align=center><strong><font>{{$setting['print_title']}}{{$form['template']['name']}}</font></strong></div>
<table width="100%">
<tbody>
<tr>
@@ -102,62 +101,9 @@
<table width="100%">
<tr>
<td width="25%">制单：{{$master['created_by']}}</td>
<td width="25%">财务：李彩</td>
<td width="25%">财务：</td>
<td width="25%">发货：</td>
<td width="25%">仓管：</td>
</tr>
</table>
</div>
<div id="div4">
<div align="center">第<font tdata="PageNO">##</font>页，<font tdata="PageCount">##</font></span>页</div>
</div>
<script language="javascript" src="{{$asset_url}}/vendor/LodopFuncs.js"></script>
<script language="javascript" type="text/javascript">
var LODOP;
function print280() {
LODOP = getLodop();
LODOP.PRINT_INIT("{{$form['template']['name']}}");
LODOP.SET_PRINT_PAGESIZE(0, 2100, 2700, "CreateCustomPage");
var strStyle = "<style> table,td,th {border-width:1px;border-style:solid;border-collapse:collapse}</style>";
LODOP.ADD_PRINT_TABLE(125, "4%", "92%", 400, strStyle + document.getElementById("div2").innerHTML);
LODOP.SET_PRINT_STYLEA(0,"Vorient", 3);
LODOP.ADD_PRINT_HTM(10, "4%", "92%", 120, document.getElementById("div1").innerHTML);
LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
LODOP.ADD_PRINT_HTM(10, 0, "92%", 54, document.getElementById("div3").innerHTML);
LODOP.SET_PRINT_STYLEA(0,"LinkedItem", -2);
LODOP.ADD_PRINT_HTM('96%', "4%","92%", 22, document.getElementById("div4").innerHTML);
LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
LODOP.PREVIEW();
};
function print140() {
LODOP = getLodop();
LODOP.PRINT_INIT("{{$form['template']['name']}}");
LODOP.SET_PRINT_PAGESIZE(0, 2100, 1400, "CreateCustomPage");
var strStyle = "<style> table,td,th {border-width:1px;border-style:solid;border-collapse:collapse}</style>";
LODOP.ADD_PRINT_TABLE(125, "4%", "92%", 410, strStyle + document.getElementById("div2").innerHTML);
LODOP.SET_PRINT_STYLEA(0,"Vorient", 3);
LODOP.ADD_PRINT_HTM(10, "4%", "92%", 120, document.getElementById("div1").innerHTML);
LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
LODOP.ADD_PRINT_HTM(10, 0, "92%", 54, document.getElementById("div3").innerHTML);
LODOP.SET_PRINT_STYLEA(0,"LinkedItem", -2);
LODOP.ADD_PRINT_HTM('93%', "4%","92%", 22, document.getElementById("div4").innerHTML);
LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
LODOP.PREVIEW();
};
</script>
</div>