Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
470f7ba6
authored
Sep 11, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
审单添加销售类型
parent
450b32c7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
36 deletions
public/js/goods.js
resources/views/changeOrder/content.blade.php
resources/views/changeOrder/tempSave.blade.php
public/js/goods.js
View file @
470f7ba6
...
...
@@ -100,6 +100,8 @@
buyers_option
+=
'<option value="'
+
buyers
[
i
].
userId
+
'">'
+
buyers
[
i
].
name
+
'</option>'
;
}
var
sale_type
=
order_item
.
sale_type
==
1
?
'现卖'
:
'预售'
;
html
+=
'<tr data-sup="'
+
sup
+
'" data-brand_name="'
+
order_item
.
brand_name
+
'">\
<td>'
+
curr_no
+
'</td>\
<td>\
...
...
@@ -107,6 +109,7 @@
<input type="hidden" name="change_info['
+
curr_no
+
'][supplier_name]" value="'
+
order_item
.
supplier_name
+
'">\
<p>'
+
order_item
.
supplier_name
+
'</p>\
</td>\
<td>'
+
sale_type
+
'</td>\
<td>\
<input class="change_goods_name" type="hidden" name="change_info['
+
curr_no
+
'][goods_name]" value="'
+
order_item
.
goods_name
+
'">\
<p>'
+
order_item
.
goods_name
+
'</p>\
...
...
@@ -311,12 +314,15 @@
}
}
var
sale_type
=
order_item
.
sale_type
==
1
?
'现卖'
:
'预售'
;
html
+=
'<tr data-brand_name="'
+
add_brand_name
+
'">\
<td>'
+
curr_no
+
'</td>\
<td>\
<input type="hidden" name="change_info['
+
curr_no
+
'][supplier_name]" value="'
+
add_supplier_name
+
'">\
<p>'
+
add_supplier_name
+
'</p>\
</td>\
<td>'
+
sale_type
+
'</td>\
<td>\
<input class="change_goods_name" type="hidden" name="change_info['
+
curr_no
+
'][goods_name]" value="'
+
add_goods_name
+
'">\
<p>'
+
add_goods_name
+
'</p>\
...
...
resources/views/changeOrder/content.blade.php
View file @
470f7ba6
...
...
@@ -11,6 +11,7 @@
/* 提交审核弹框label */
.submit-check
label
{
display
:
inline-block
;
width
:
120px
;
text-align
:
right
;}
input
[
type
=
"text"
]
{
width
:
120px
;}
</style>
<div
class=
"tabs-box"
>
...
...
@@ -144,6 +145,7 @@
<thead>
<th
width=
"5%"
>
序号
</th>
<th
width=
"10%"
>
供应商
</th>
<th
width=
"5%"
>
销售类型
</th>
<th
width=
"10%"
>
型号
</th>
<th
width=
"10%"
>
品牌
</th>
@if ($order_info['order_goods_type'] == 1)
...
...
@@ -175,6 +177,7 @@
<input
type=
"hidden"
name=
"change_info[{{$v['rec_id']}}][supplier_name]"
value=
"{{$v['supplier_name']}}"
>
<p>
{{$v['supplier_name']}}
</p>
</td>
<td>
{{ $v['sale_type'] == 1 ? '现卖' : '预售' }}
</td>
<td>
<input
class=
"change_goods_id"
type=
"hidden"
name=
"change_info[{{$v['rec_id']}}][goods_id]"
value=
"{{$v['goods_id']}}"
>
<input
class=
"change_goods_name"
type=
"hidden"
name=
"change_info[{{$v['rec_id']}}][goods_name]"
value=
"{{$v['goods_name']}}"
>
...
...
resources/views/changeOrder/tempSave.blade.php
View file @
470f7ba6
...
...
@@ -3,10 +3,10 @@
#tempSaveForm
{
padding
:
15px
;
}
</style>
<div
id=
"temp-save-info"
>
<div
class=
"order-change-main"
>
<form
id=
"tempSaveForm"
class=
"form-horizontal
table-responsive
"
>
<div
class=
"order-change-main
row-fluid table-responsive
"
>
<form
id=
"tempSaveForm"
class=
"form-horizontal"
>
@if ($order_temp_info['temp_save_info']['customer_cn'])
<table
class=
"table table-bordered table-hover"
>
<table
class=
"table table-bordered table-hover
text-nowrap
"
>
<tr
class=
"caption"
>
<th
colspan=
"4"
style=
"text-align: center; background: #f9f9f9;"
>
终端客户信息
</th>
</tr>
...
...
@@ -25,41 +25,44 @@
</table>
@endif
<table
class=
"table table-bordered table-hover"
>
<thead>
<tr>
<th
width=
"20%"
>
型号
</th>
<th
width=
"20%"
>
标准品牌
</th>
<th>
调整数量
</th>
<th>
调整单价
</th>
<th>
采购员
</th>
<th>
批次
</th>
<th>
状态
</th>
</tr>
</thead>
<div
class=
"row-fluid table-responsive"
>
<table
class=
"table table-bordered table-hover text-nowrap"
>
<thead>
<tr>
<th
width=
"20%"
>
型号
</th>
<th
width=
"20%"
>
标准品牌
</th>
<th>
调整数量
</th>
<th>
调整单价
</th>
<th>
采购员
</th>
<th>
批次
</th>
<th>
状态
</th>
</tr>
</thead>
<tbody>
@if (isset($order_temp_info['temp_save_info']['change_info']))
@foreach ($order_temp_info['temp_save_info']['change_info'] as $k => $v)
<tr>
<td>
{{$v['goods_name']}}
</td>
<td>
{{ isset($v['standard_brand_name']) ? $v['standard_brand_name'] : '' }}
</td>
<td>
{{$v['goods_number']}}
</td>
<td>
{{$v['goods_price']}}
</td>
<td>
{{ isset($v['buyer_id']) ? App\Http\Controllers\getSalesName($v['buyer_id']) : '' }}
</td>
<td>
{{ isset($v['batch']) ? $v['batch'] : '' }}
</td>
<td>
<?=
$v
[
'status'
]
==
1
?
'正常'
:
'<i style="color: red;">已取消</i>'
?>
<tbody>
@if (isset($order_temp_info['temp_save_info']['change_info']))
@foreach ($order_temp_info['temp_save_info']['change_info'] as $k => $v)
<tr>
<td>
{{$v['goods_name']}}
</td>
<td>
{{ isset($v['standard_brand_name']) ? $v['standard_brand_name'] : '' }}
</td>
<td>
{{$v['goods_number']}}
</td>
<td>
{{$v['goods_price']}}
</td>
<td>
{{ isset($v['buyer_id']) ? App\Http\Controllers\getSalesName($v['buyer_id']) : '' }}
</td>
<td>
{{ isset($v['batch']) ? $v['batch'] : '' }}
</td>
<td>
<?=
$v
[
'status'
]
==
1
?
'正常'
:
'<i style="color: red;">已取消</i>'
?>
@if (isset($v['is_add']))
<i
style=
"color: green;"
>
(新增)
</i>
@endif
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
@if (isset($v['is_add']))
<i
style=
"color: green;"
>
(新增)
</i>
@endif
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<hr>
<table
class=
"table table-bordered table-hover"
>
<tr>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment