Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄成意
/
yunxin
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
83329291
authored
May 20, 2019
by
PRY5YKGJ82EZEPX\Administrator
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
更新联营物料上传
parent
e321e137
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
27 deletions
app/Model/UploadLogModel.php
public/pc/js/controller/PureComPrice.js
app/Model/UploadLogModel.php
View file @
83329291
...
...
@@ -43,7 +43,9 @@ class UploadLogModel extends Model
if
(
$v
[
'type'
]
==
UploadLogMap
::
type_import_sku
&&
array_key_exists
(
$v
[
'extend'
],
$foostoneLogStatus
)){
//如果是导入sku,查询状态
$v
[
'status'
]
=
@
UploadLogMap
::
$status
[
$foostoneLogStatus
[
$v
[
'extend'
]][
'status'
]];
$v
[
'log'
]
=
implode
(
','
,
@
$foostoneLogStatus
[
$v
[
'extend'
]][
'log'
]);
$v
[
'file_path'
]
=@
$foostoneLogStatus
[
$v
[
'extend'
]][
'file_name'
][
'down'
];
$downUrl
=
@
$foostoneLogStatus
[
$v
[
'extend'
]][
'file_name'
][
'down'
];
$uploadUrl
=
@
$foostoneLogStatus
[
$v
[
'extend'
]][
'file_name'
][
'upload'
];
$v
[
'file_path'
]
=
$downUrl
?
$downUrl
:
""
;
}
else
{
$v
[
'status'
]
=
@
UploadLogMap
::
$status
[
$v
[
'status'
]];
}
...
...
public/pc/js/controller/PureComPrice.js
View file @
83329291
...
...
@@ -9,32 +9,9 @@
app
.
tableList
()
})
},
// tableList:function () {
// layui.table.render({
// elem: '#list'
// ,url:'/api/PurePrice'
// ,method:'post'
// ,cellMinWidth: 100 //全局定义常规单元格的最小宽度
// ,request: {
// pageName: 'p' //页码的参数名称,默认:page
// ,limitName: 'limit' //每页数据量的参数名,默认:limit
// }
// ,where: {'goods_id':$("#goods_id").val()}
// ,loading:true
// ,first: true //不显示首页
// ,last: false //不显示尾页
// ,cols: [[
// {field:'add_time', title: '修改时间',align:'center'}
// ,{field:'cost', title: '价格',align:'center'}
// ]]
// ,id:'Abnormal'
// ,page:{
//
// }
// ,done: function(res, curr, count) {
// }
// });
// },
tableList
:
function
()
{
return
},
},
$
(
function
()
{
app
.
init
();
})
...
...
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