|
|
|
@ -197,12 +197,12 @@ |
|
|
|
|
|
|
|
let cols = [ |
|
|
|
{type: "checkbox", width: 50}, |
|
|
|
{title: '存货编码', width: 150, templet: '#materialCode'}, |
|
|
|
{field: "code", title: '存货编码', width: 150, templet: '#materialCode'}, |
|
|
|
{field: 'mname', width: 200, title: '物料名称'}, |
|
|
|
{field: 'brand', width: 200, title: '品牌'}, |
|
|
|
{field: 'version', width: 200, title: '规格型号'}, |
|
|
|
{field: 'typeName', width: 200, title: '物料类型'}, |
|
|
|
{title: '计量单位', width: 200, templet: '#changeUnit', align: "center"}, |
|
|
|
{field: "unit", title: '计量单位', width: 200, templet: '#changeUnit', align: "center"}, |
|
|
|
{field: 'quantity', width: 200, title: '数量'}, |
|
|
|
{field: 'depositoryName', width: 200, title: '仓库名称'}, |
|
|
|
{field: 'depositoryCode', width: 200, title: '仓库编码'}, |
|
|
|
@ -640,7 +640,13 @@ |
|
|
|
, yes: function (index, layero) { |
|
|
|
if (flagForImport) { |
|
|
|
flagForImport = false; |
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0,shadeClose:true}); |
|
|
|
let loading2 = layer.open({ |
|
|
|
type: 3, |
|
|
|
shade: [0.25, '#000'], |
|
|
|
icon: 2, |
|
|
|
speed: 0, |
|
|
|
shadeClose: true |
|
|
|
}); |
|
|
|
$.ajax({ |
|
|
|
url: "/excel/realImportInventory", |
|
|
|
type: "post", |
|
|
|
|