diff --git a/src/main/resources/templates/pages/depository/table-in.html b/src/main/resources/templates/pages/depository/table-in.html
index d6425c02..914f05c7 100644
--- a/src/main/resources/templates/pages/depository/table-in.html
+++ b/src/main/resources/templates/pages/depository/table-in.html
@@ -168,7 +168,7 @@
cols: [
[
{type: "checkbox", width: 50},
- {title: '存货编码', width: 150, templet: '#applicationInCode'},
+ {field: 'aircode',title: '存货编码', width: 150, templet: '#applicationInCode'},
{field: 'mname', width: 150, title: '物料名称'},
{field: 'mversion', width: 150, title: '规格型号'},
{field: 'airUnit', width: 100, title: '计量单位'},
diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html
index 099ccad2..30bcc443 100644
--- a/src/main/resources/templates/pages/depository/table-out.html
+++ b/src/main/resources/templates/pages/depository/table-out.html
@@ -90,7 +90,7 @@
@@ -133,7 +133,7 @@
area: ['70%', '70%'],
move: '.layui-layer-title',
fixed: false,
- content: '/selectDepository?type='+selectDepositoryType,
+ content: '/selectDepository?type=' + selectDepositoryType,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
@@ -172,7 +172,7 @@
let cols = [
{type: "checkbox", width: 50},
- {title: '申请编码', width: 150, templet: '#applicationOutCode'},
+ {field: "code", title: '申请编码', width: 150, templet: '#applicationOutCode'},
{field: 'mname', width: 150, title: '物料名称'},
{field: 'mcode', width: 150, title: '存货编码'},
{field: 'quantity', width: 150, title: '数量', sort: true},
@@ -275,10 +275,10 @@
skin: 'line',
done: function (res, curr, count) {
let display = $("#delete").css("display");
- if(display !== "none"){
+ if (display !== "none") {
if (flagForReload) {
flagForReload = false;
- let col = {field: 'price', title: '金额', minWidth: 150, sort: true};
+ let col = {field: 'price', title: '金额', minWidth: 150, sort: true};
cols.splice(6, 0, col);
table.reload('currentTableId', {cols: [cols]});
}
@@ -430,7 +430,7 @@
console.log(obj)
});
- showDetail = function(obj){
+ showDetail = function (obj) {
var index = layer.open({
title: '出库信息详情',
type: 2,
diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html
index 23711663..5148c096 100644
--- a/src/main/resources/templates/pages/depository/table-stock.html
+++ b/src/main/resources/templates/pages/depository/table-stock.html
@@ -183,7 +183,7 @@
area: ['70%', '70%'],
move: '.layui-layer-title',
fixed: false,
- content: '/selectDepository?type='+selectDepositoryType,
+ content: '/selectDepository?type=' + selectDepositoryType,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
@@ -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: '仓库编码'},
@@ -638,9 +638,15 @@
, moveType: 1 //拖拽模式,0或者1
, content: re
, yes: function (index, layero) {
- if(flagForImport){
+ 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",
@@ -668,7 +674,7 @@
}, 'data');
})
},
- error : function(){
+ error: function () {
flagForImport = true;
}
diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html
index 73916f51..9dc9db78 100644
--- a/src/main/resources/templates/pages/material/material-out.html
+++ b/src/main/resources/templates/pages/material/material-out.html
@@ -169,7 +169,7 @@
let cols = [
{type: "checkbox", width: 50},
- {title: '存货编码', width: 150, templet: '#materialCode'},
+ {field: 'mcode',title: '存货编码', width: 150, templet: '#materialCode'},
{field: 'mname', width: 120, title: '物料名称', sort: false},
{field: 'typeName', width: 150, title: '物料种类'},
{field: 'version', width: 200, title: '规格型号', sort: false},
diff --git a/src/main/resources/templates/pages/split/split-out.html b/src/main/resources/templates/pages/split/split-out.html
index c2ed706d..00415659 100644
--- a/src/main/resources/templates/pages/split/split-out.html
+++ b/src/main/resources/templates/pages/split/split-out.html
@@ -132,7 +132,7 @@
cols: [
[
{type: "checkbox", width: 50},
- {title: '存货编码', width: 150, templet: '#splitCode'},
+ {field: 'mcode',title: '存货编码', width: 150, templet: '#splitCode'},
{field: 'mname', width: 120, title: '物料名称', sort: false},
{field: 'typeName', width: 150, title: '物料种类'},
{field: 'version', width: 200, title: '规格型号', sort: false},
diff --git a/src/main/resources/templates/pages/warehouse/depository-out.html b/src/main/resources/templates/pages/warehouse/depository-out.html
index 9f0855e3..722c3db4 100644
--- a/src/main/resources/templates/pages/warehouse/depository-out.html
+++ b/src/main/resources/templates/pages/warehouse/depository-out.html
@@ -134,8 +134,7 @@
cols: [
[
{type: "checkbox", width: 50},
- // {field: 'code', width: 150, title: '仓库编码'},
- {title: '仓库编码', width: 150, templet: '#depositoryCode'},
+ {field: 'dcode',title:"仓库编码", width: 150, templet: '#depositoryCode'},
{field: 'dname', width: 120, title: '仓库名称'},
{field: 'cname', width: 200, title: '所处公司'},
{field: 'adminorgName', width: 150, title: '所属部门'},
diff --git a/src/main/resources/templates/pages/warehouse/warehouseByParentId.html b/src/main/resources/templates/pages/warehouse/warehouseByParentId.html
index 555ace2d..b15ae705 100644
--- a/src/main/resources/templates/pages/warehouse/warehouseByParentId.html
+++ b/src/main/resources/templates/pages/warehouse/warehouseByParentId.html
@@ -138,8 +138,7 @@
cols: [
[
{type: "checkbox", width: 50},
- // {field: 'code', width: 100, title: '库位号', sort: true},
- {title: '库位编码', width: 100, templet: '#placeCode'},
+ {field:'code',title: '库位编码', width: 100, templet: '#placeCode'},
{title: '物料名称', minWidth: 350, templet: '#viewMname', align: "center"},
{field: 'depositoryName', width: 200, title: '仓库名称'},
{field: 'depositoryCode', width: 200, title: '仓库编码'},