提交 3c5c0fe4 编写于 作者: Skyeye云's avatar Skyeye云

合并商品初始化库存表和单据操作的库存表

上级 3df87298
...@@ -210,7 +210,7 @@ layui.config({ ...@@ -210,7 +210,7 @@ layui.config({
trId: "tr" + rowNum.toString(), //行的id trId: "tr" + rowNum.toString(), //行的id
materialId: "materialId" + rowNum.toString(), //商品id materialId: "materialId" + rowNum.toString(), //商品id
mUnitId: "mUnitId" + rowNum.toString(), //规格id mUnitId: "mUnitId" + rowNum.toString(), //规格id
currentTock: "currentTock" + rowNum.toString(), //库存id allStock: "allStock" + rowNum.toString(), //库存id
productionNum: "productionNum" + rowNum.toString(), //所需总数量id productionNum: "productionNum" + rowNum.toString(), //所需总数量id
machinNum: "machinNum" + rowNum.toString(), //待分配数量id machinNum: "machinNum" + rowNum.toString(), //待分配数量id
rkNum: "rkNum" + rowNum.toString(), //数量id rkNum: "rkNum" + rowNum.toString(), //数量id
...@@ -310,7 +310,7 @@ layui.config({ ...@@ -310,7 +310,7 @@ layui.config({
$("#mUnitId" + (rowNum - 1)).val(item.normsId); $("#mUnitId" + (rowNum - 1)).val(item.normsId);
//商品回显 //商品回显
$("#materialId" + (rowNum - 1)).val(item.product.materialName + "(" + item.product.materialModel + ")"); $("#materialId" + (rowNum - 1)).val(item.product.materialName + "(" + item.product.materialModel + ")");
$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显 $("#allStock" + (rowNum - 1)).html(item.allStock);//库存回显
//所需总数量 //所需总数量
$("#productionNum" + (rowNum - 1)).html(item.productionNum); $("#productionNum" + (rowNum - 1)).html(item.productionNum);
//待分配数量 //待分配数量
......
...@@ -93,7 +93,7 @@ layui.config({ ...@@ -93,7 +93,7 @@ layui.config({
$("#mUnitId" + (rowNum - 1)).val(item.normsId); $("#mUnitId" + (rowNum - 1)).val(item.normsId);
//商品回显 //商品回显
$("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")"); $("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")");
$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显 $("#allStock" + (rowNum - 1)).html(item.allStock);//库存回显
$.each(data.referToMation, function(j, bean){ $.each(data.referToMation, function(j, bean){
if(bean.normsId == item.normsId){ if(bean.normsId == item.normsId){
//所需总数量 //所需总数量
...@@ -278,7 +278,7 @@ layui.config({ ...@@ -278,7 +278,7 @@ layui.config({
trId: "tr" + rowNum.toString(), //行的id trId: "tr" + rowNum.toString(), //行的id
materialId: "materialId" + rowNum.toString(), //商品id materialId: "materialId" + rowNum.toString(), //商品id
mUnitId: "mUnitId" + rowNum.toString(), //规格id mUnitId: "mUnitId" + rowNum.toString(), //规格id
currentTock: "currentTock" + rowNum.toString(), //库存id allStock: "allStock" + rowNum.toString(), //库存id
productionNum: "productionNum" + rowNum.toString(), //所需总数量id productionNum: "productionNum" + rowNum.toString(), //所需总数量id
machinNum: "machinNum" + rowNum.toString(), //待分配数量id machinNum: "machinNum" + rowNum.toString(), //待分配数量id
rkNum: "rkNum" + rowNum.toString(), //数量id rkNum: "rkNum" + rowNum.toString(), //数量id
...@@ -378,7 +378,7 @@ layui.config({ ...@@ -378,7 +378,7 @@ layui.config({
$("#mUnitId" + (rowNum - 1)).val(item.normsId); $("#mUnitId" + (rowNum - 1)).val(item.normsId);
//商品回显 //商品回显
$("#materialId" + (rowNum - 1)).val(item.product.materialName + "(" + item.product.materialModel + ")"); $("#materialId" + (rowNum - 1)).val(item.product.materialName + "(" + item.product.materialModel + ")");
$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显 $("#allStock" + (rowNum - 1)).html(item.allStock);//库存回显
//所需总数量 //所需总数量
$("#productionNum" + (rowNum - 1)).html(item.productionNum); $("#productionNum" + (rowNum - 1)).html(item.productionNum);
//待分配数量 //待分配数量
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i> <i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
</td> </td>
<td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td> <td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
<td id="{{currentTock}}"></td> <td id="{{allStock}}"></td>
<td id="{{productionNum}}" style="text-align:center;">-</td> <td id="{{productionNum}}" style="text-align:center;">-</td>
<td id="{{machinNum}}" style="text-align:center;">-</td> <td id="{{machinNum}}" style="text-align:center;">-</td>
<td><input type="text" class="layui-input change-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td> <td><input type="text" class="layui-input change-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td>
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i> <i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
</td> </td>
<td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td> <td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
<td id="{{currentTock}}"></td> <td id="{{allStock}}"></td>
<td id="{{productionNum}}" style="text-align:center;">-</td> <td id="{{productionNum}}" style="text-align:center;">-</td>
<td id="{{machinNum}}" style="text-align:center;">-</td> <td id="{{machinNum}}" style="text-align:center;">-</td>
<td><input type="text" class="layui-input change-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td> <td><input type="text" class="layui-input change-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td>
......
...@@ -35,7 +35,7 @@ layui.config({ ...@@ -35,7 +35,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存(调出仓库)', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存(调出仓库)', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -64,7 +64,7 @@ layui.config({ ...@@ -64,7 +64,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -88,7 +88,7 @@ layui.config({ ...@@ -88,7 +88,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存(调出仓库)', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存(调出仓库)', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -34,7 +34,7 @@ layui.config({ ...@@ -34,7 +34,7 @@ layui.config({
{id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'}, {id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'},
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -62,7 +62,7 @@ layui.config({ ...@@ -62,7 +62,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -87,7 +87,7 @@ layui.config({ ...@@ -87,7 +87,7 @@ layui.config({
{id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'}, {id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'},
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
/** /**
* 根据规格加载库存 * 根据规格加载当前库存
* *
* @param rowNum 表格行坐标 * @param rowNum 表格行坐标
* @param depotId 仓库id * @param depotId 仓库id
...@@ -11,11 +11,11 @@ function loadTockByDepotAndMUnit(rowNum, depotId) { ...@@ -11,11 +11,11 @@ function loadTockByDepotAndMUnit(rowNum, depotId) {
if (!isNull(normsId)) { if (!isNull(normsId)) {
// 获取库存 // 获取库存
getStockAjaxByDepotAndNormsId(normsId, depotId, function (json) { getStockAjaxByDepotAndNormsId(normsId, depotId, function (json) {
$("#currentTock" + rowNum).html(json.bean[normsId]); $("#allStock" + rowNum).html(json.bean[normsId]);
}); });
} else { } else {
// 否则重置库存为空 // 否则重置库存为空
$("#currentTock" + rowNum).html(""); $("#allStock" + rowNum).html("");
} }
} }
...@@ -26,7 +26,7 @@ function loadTockByDepotAndMUnit(rowNum, depotId) { ...@@ -26,7 +26,7 @@ function loadTockByDepotAndMUnit(rowNum, depotId) {
*/ */
function loadMaterialDepotStockByDepotId(depotId) { function loadMaterialDepotStockByDepotId(depotId) {
var normsIds = new Array(); var normsIds = new Array();
var normsIdIndex = new Array(); var normsIdIndex = {};
$.each(initTableChooseUtil.getDataRowIndex('productList'), function (i, item) { $.each(initTableChooseUtil.getDataRowIndex('productList'), function (i, item) {
// 获取行坐标 // 获取行坐标
var thisRowKey = item; var thisRowKey = item;
...@@ -43,7 +43,7 @@ function loadMaterialDepotStockByDepotId(depotId) { ...@@ -43,7 +43,7 @@ function loadMaterialDepotStockByDepotId(depotId) {
getStockAjaxByDepotAndNormsId(normsIds.join(','), depotId, function (json) { getStockAjaxByDepotAndNormsId(normsIds.join(','), depotId, function (json) {
var stockMation = json.bean; var stockMation = json.bean;
$.each(normsIdIndex, function (rowIndex, normsId) { $.each(normsIdIndex, function (rowIndex, normsId) {
$("#currentTock" + normsIdIndex[rowIndex]).html(stockMation[normsId]); $("#allStock" + rowIndex).html(stockMation[normsId]);
}); });
}); });
} }
......
...@@ -33,10 +33,10 @@ layui.config({ ...@@ -33,10 +33,10 @@ layui.config({
var selTemplate = getFileContent('tpl/template/select-option.tpl'); var selTemplate = getFileContent('tpl/template/select-option.tpl');
//多个单位时的库存集合 //多个单位时的库存集合
//格式{trRow: 1, list: [{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",initialTock: "123"}]} //格式{trRow: 1, list: [{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",stock: "123"}]}
var normsStockList = new Array(); var normsStockList = new Array();
//单个单位时的库存集合 //单个单位时的库存集合
//格式[{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",initialTock: "123"}] //格式[{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",stock: "123"}]
var normsStockItem = new Array(); var normsStockItem = new Array();
//默认隐藏多单位选项内容 //默认隐藏多单位选项内容
...@@ -221,7 +221,7 @@ layui.config({ ...@@ -221,7 +221,7 @@ layui.config({
}); });
//单个单位新增库存 //单个单位新增库存
$("body").on("click", "#initialTock", function() { $("body").on("click", "#stock", function() {
normsStock = [].concat(normsStockItem); normsStock = [].concat(normsStockItem);
_openNewWindows({ _openNewWindows({
url: "../../tpl/materialnormstock/materialnormstock.html", url: "../../tpl/materialnormstock/materialnormstock.html",
...@@ -232,16 +232,16 @@ layui.config({ ...@@ -232,16 +232,16 @@ layui.config({
var str = ""; var str = "";
normsStockItem = [].concat(normsStock); normsStockItem = [].concat(normsStock);
$.each(normsStockItem, function(i, item) { $.each(normsStockItem, function(i, item) {
str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.initialTock + '</span></span>'; str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.stock + '</span></span>';
}); });
$("#initialTock").parent().html('<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="initialTock">新增库存</button>' + str); $("#stock").parent().html('<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="stock">新增库存</button>' + str);
}}); }});
}); });
//多单位 //多单位
$("body").on("click", ".initialTockMore", function() { $("body").on("click", ".stockMore", function() {
var _this = $(this); var _this = $(this);
//获取行号 //获取行号
var trRow = _this.attr("id").replace("initialTock", ""); var trRow = _this.attr("id").replace("stock", "");
//判断当前行是否有库存集合信息在列表中 //判断当前行是否有库存集合信息在列表中
var thisRowHasList = -1; var thisRowHasList = -1;
$.each(normsStockList, function(i, item) { $.each(normsStockList, function(i, item) {
...@@ -271,7 +271,7 @@ layui.config({ ...@@ -271,7 +271,7 @@ layui.config({
}); });
} }
$.each(normsStock, function(i, item) { $.each(normsStock, function(i, item) {
str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.initialTock + '</span></span>'; str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.stock + '</span></span>';
}); });
_this.parent().html(_this.prop("outerHTML") + str); _this.parent().html(_this.prop("outerHTML") + str);
}}); }});
...@@ -314,7 +314,7 @@ layui.config({ ...@@ -314,7 +314,7 @@ layui.config({
unitNameType: bean.baseUnit == 1 ? "基础单位" : "副单位", //单位类型 unitNameType: bean.baseUnit == 1 ? "基础单位" : "副单位", //单位类型
unitName: bean.name, //单位 unitName: bean.name, //单位
safetyTock: "safetyTock" + unitIndex.toString(), //安全存量 safetyTock: "safetyTock" + unitIndex.toString(), //安全存量
initialTock: "initialTock" + unitIndex.toString(), //初始化库存 stock: "stock" + unitIndex.toString(), //初始化库存
retailPrice: "retailPrice" + unitIndex.toString(), //零售价 retailPrice: "retailPrice" + unitIndex.toString(), //零售价
lowPrice: "lowPrice" + unitIndex.toString(), //最低售价 lowPrice: "lowPrice" + unitIndex.toString(), //最低售价
estimatePurchasePrice: "estimatePurchasePrice" + unitIndex.toString(), //预计采购价 estimatePurchasePrice: "estimatePurchasePrice" + unitIndex.toString(), //预计采购价
......
...@@ -19,27 +19,28 @@ layui.config({ ...@@ -19,27 +19,28 @@ layui.config({
showGrid({ showGrid({
id: "showForm", id: "showForm",
url: flowableBasePath + "material007", url: flowableBasePath + "material007",
params: {rowId: parent.rowId}, params: {id: parent.rowId},
pagination: false, pagination: false,
method: 'GET',
template: getFileContent('tpl/material/materialDetailsTemplate.tpl'), template: getFileContent('tpl/material/materialDetailsTemplate.tpl'),
ajaxSendAfter:function (json) { ajaxSendAfter:function (json) {
if(json.bean.unit == '1'){//非多单位 if (json.bean.unit == '1') {//非多单位
var item = json.bean.norms[0]; var item = json.bean.norms[0];
item.unitName = json.bean.unitName; item.unitName = json.bean.unitName;
$("#showForm").append(getDataUseHandlebars(simpleTemplate, item)); $("#showForm").append(getDataUseHandlebars(simpleTemplate, item));
var str = ""; var str = "";
$.each(json.bean.norms[0].normStock, function(i, item) { $.each(json.bean.norms[0].normStock, function (i, item) {
str += '<span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.initialTock + '</span></span><br>'; str += '<span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.stock + '</span></span><br>';
}); });
$("#initialTock").html(str); $("#initialTock").html(str);
} else {//多单位 } else {//多单位
var item = new Array(); var item = new Array();
item.unitGroupName = json.bean.unitGroupName; item.unitGroupName = json.bean.unitGroupName;
item.firstInUnit = json.bean.firstInUnit; item.firstInUnit = json.bean.firstInUnit;
item.firstOutUnit = json.bean.firstOutUnit; item.firstOutUnit = json.bean.firstOutUnit;
item.norms = json.bean.norms; item.norms = json.bean.norms;
$("#showForm").append(getDataUseHandlebars(manyTemplate, item)); $("#showForm").append(getDataUseHandlebars(manyTemplate, item));
} }
// 附件回显 // 附件回显
skyeyeEnclosure.showDetails({"enclosureUploadBtn": json.bean.enclosureInfo}); skyeyeEnclosure.showDetails({"enclosureUploadBtn": json.bean.enclosureInfo});
......
...@@ -34,10 +34,10 @@ layui.config({ ...@@ -34,10 +34,10 @@ layui.config({
var selTemplate = getFileContent('tpl/template/select-option.tpl'); var selTemplate = getFileContent('tpl/template/select-option.tpl');
//多个单位时的库存集合 //多个单位时的库存集合
//格式{trRow: 1, list: [{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",initialTock: "123"}]} //格式{trRow: 1, list: [{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",stock: "123"}]}
var normsStockList = new Array(); var normsStockList = new Array();
//单个单位时的库存集合 //单个单位时的库存集合
//格式[{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",initialTock: "123"}] //格式[{depotId: "ea843ebe9b5846f088525cc7a2975057",depotName: "广州第二仓库",stock: "123"}]
var normsStockItem = new Array(); var normsStockItem = new Array();
//商品分类类型树对象 //商品分类类型树对象
...@@ -46,8 +46,9 @@ layui.config({ ...@@ -46,8 +46,9 @@ layui.config({
showGrid({ showGrid({
id: "showForm", id: "showForm",
url: flowableBasePath + "material008", url: flowableBasePath + "material008",
params: {rowId: parent.rowId}, params: {id: parent.rowId},
pagination: false, pagination: false,
method: 'GET',
template: showBaseTemplate, template: showBaseTemplate,
ajaxSendLoadBefore: function(hdb) { ajaxSendLoadBefore: function(hdb) {
//商品来源 //商品来源
...@@ -122,9 +123,9 @@ layui.config({ ...@@ -122,9 +123,9 @@ layui.config({
normsStockItem = [].concat(j.bean.norms[0].normStock); normsStockItem = [].concat(j.bean.norms[0].normStock);
var str = ""; var str = "";
$.each(j.bean.norms[0].normStock, function (i, item) { $.each(j.bean.norms[0].normStock, function (i, item) {
str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.initialTock + '</span></span>'; str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.stock + '</span></span>';
}); });
$("#initialTock").parent().html('<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="initialTock">新增库存</button>' + str); $("#stock").parent().html('<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="stock">新增库存</button>' + str);
} else { } else {
// 多规格 // 多规格
$(".single-term").hide(); $(".single-term").hide();
...@@ -280,8 +281,8 @@ layui.config({ ...@@ -280,8 +281,8 @@ layui.config({
} }
}); });
//单个单位新增库存 // 单规格新增库存
$("body").on("click", "#initialTock", function() { $("body").on("click", "#stock", function() {
normsStock = [].concat(normsStockItem); normsStock = [].concat(normsStockItem);
_openNewWindows({ _openNewWindows({
url: "../../tpl/materialnormstock/materialnormstock.html", url: "../../tpl/materialnormstock/materialnormstock.html",
...@@ -292,16 +293,16 @@ layui.config({ ...@@ -292,16 +293,16 @@ layui.config({
var str = ""; var str = "";
normsStockItem = [].concat(normsStock); normsStockItem = [].concat(normsStock);
$.each(normsStockItem, function(i, item) { $.each(normsStockItem, function(i, item) {
str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.initialTock + '</span></span>'; str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.stock + '</span></span>';
}); });
$("#initialTock").parent().html('<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="initialTock">新增库存</button>' + str); $("#stock").parent().html('<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="stock">新增库存</button>' + str);
}}); }});
}); });
//多单位 //多单位
$("body").on("click", ".initialTockMore", function() { $("body").on("click", ".stockMore", function() {
var _this = $(this); var _this = $(this);
//获取行号 //获取行号
var trRow = _this.attr("id").replace("initialTock", ""); var trRow = _this.attr("id").replace("stock", "");
//判断当前行是否有库存集合信息在列表中 //判断当前行是否有库存集合信息在列表中
var thisRowHasList = -1; var thisRowHasList = -1;
$.each(normsStockList, function(i, item) { $.each(normsStockList, function(i, item) {
...@@ -331,7 +332,7 @@ layui.config({ ...@@ -331,7 +332,7 @@ layui.config({
}); });
} }
$.each(normsStock, function(i, item) { $.each(normsStock, function(i, item) {
str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.initialTock + '</span></span>'; str += '<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">' + item.depotName + '<span class="layui-badge layui-bg-gray">' + item.stock + '</span></span>';
}); });
_this.parent().html(_this.prop("outerHTML") + str); _this.parent().html(_this.prop("outerHTML") + str);
}}); }});
...@@ -397,7 +398,7 @@ layui.config({ ...@@ -397,7 +398,7 @@ layui.config({
unitNameType: bean.baseUnit == 1 ? "基础单位" : "副单位", //单位类型 unitNameType: bean.baseUnit == 1 ? "基础单位" : "副单位", //单位类型
unitName: bean.name, //单位 unitName: bean.name, //单位
safetyTock: "safetyTock" + unitIndex.toString(), //安全存量 safetyTock: "safetyTock" + unitIndex.toString(), //安全存量
initialTock: "initialTock" + unitIndex.toString(), //初始化库存 stock: "stock" + unitIndex.toString(), //初始化库存
retailPrice: "retailPrice" + unitIndex.toString(), //零售价 retailPrice: "retailPrice" + unitIndex.toString(), //零售价
lowPrice: "lowPrice" + unitIndex.toString(), //最低售价 lowPrice: "lowPrice" + unitIndex.toString(), //最低售价
estimatePurchasePrice: "estimatePurchasePrice" + unitIndex.toString(), //预计采购价 estimatePurchasePrice: "estimatePurchasePrice" + unitIndex.toString(), //预计采购价
......
...@@ -25,7 +25,7 @@ layui.config({ ...@@ -25,7 +25,7 @@ layui.config({
data: $.extend(true, [], normsStock), data: $.extend(true, [], normsStock),
cols: [[ cols: [[
{ field: 'depotName', title: '仓库', align: 'left', width: 200}, { field: 'depotName', title: '仓库', align: 'left', width: 200},
{ field: 'initialTock', title: '初始数量', align: 'left', width: 80}, { field: 'stock', title: '初始数量', align: 'left', width: 80},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'}
]], ]],
done: function(json) { done: function(json) {
...@@ -77,7 +77,7 @@ layui.config({ ...@@ -77,7 +77,7 @@ layui.config({
}); });
} }
//编辑 // 编辑
function edit(data) { function edit(data) {
chooseDepotId = data.depotId; chooseDepotId = data.depotId;
_openNewWindows({ _openNewWindows({
...@@ -94,7 +94,6 @@ layui.config({ ...@@ -94,7 +94,6 @@ layui.config({
form.render(); form.render();
form.on('submit(formAddBean)', function (data) { form.on('submit(formAddBean)', function (data) {
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
parent.normsStock = [].concat(normsStock); parent.normsStock = [].concat(normsStock);
parent.layer.close(index); parent.layer.close(index);
......
...@@ -38,9 +38,9 @@ layui.config({ ...@@ -38,9 +38,9 @@ layui.config({
normsStock.push({ normsStock.push({
depotId: $("#storeHouseId").val(), depotId: $("#storeHouseId").val(),
depotName: $("#storeHouseId").find("option:selected").text(), depotName: $("#storeHouseId").find("option:selected").text(),
initialTock: $("#initialTock").val() stock: $("#stock").val()
}); });
//赋值给列表 // 赋值给列表
parent.normsStock = [].concat(normsStock); parent.normsStock = [].concat(normsStock);
parent.layer.close(index); parent.layer.close(index);
parent.refreshCode = '0'; parent.refreshCode = '0';
......
...@@ -16,7 +16,7 @@ layui.config({ ...@@ -16,7 +16,7 @@ layui.config({
var depotId = parent.chooseDepotId; var depotId = parent.chooseDepotId;
$.each(normsStock, function(i, item) { $.each(normsStock, function(i, item) {
if(item.depotId === depotId){ if(item.depotId === depotId){
$("#initialTock").val(item.initialTock); $("#stock").val(item.stock);
$("#depotName").html(item.depotName); $("#depotName").html(item.depotName);
return false; return false;
} }
...@@ -28,7 +28,7 @@ layui.config({ ...@@ -28,7 +28,7 @@ layui.config({
if (winui.verifyForm(data.elem)) { if (winui.verifyForm(data.elem)) {
$.each(normsStock, function(i, item) { $.each(normsStock, function(i, item) {
if(item.depotId === depotId){ if(item.depotId === depotId){
item.initialTock = $("#initialTock").val(); item.stock = $("#stock").val();
return false; return false;
} }
}); });
......
...@@ -50,7 +50,7 @@ layui.config({ ...@@ -50,7 +50,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
...@@ -129,7 +129,7 @@ layui.config({ ...@@ -129,7 +129,7 @@ layui.config({
noError = true; noError = true;
return false; return false;
} }
if (parseInt(item.rkNum) > parseInt($("#currentTock" + thisRowKey).html())) { if (parseInt(item.rkNum) > parseInt($("#allStock" + thisRowKey).html())) {
$("#rkNum" + thisRowKey).addClass("layui-form-danger"); $("#rkNum" + thisRowKey).addClass("layui-form-danger");
$("#rkNum" + thisRowKey).focus(); $("#rkNum" + thisRowKey).focus();
winui.window.msg('超过库存数量.', {icon: 2, time: 2000}); winui.window.msg('超过库存数量.', {icon: 2, time: 2000});
......
...@@ -83,7 +83,7 @@ layui.config({ ...@@ -83,7 +83,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -117,7 +117,7 @@ layui.config({ ...@@ -117,7 +117,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
...@@ -201,7 +201,7 @@ layui.config({ ...@@ -201,7 +201,7 @@ layui.config({
noError = true; noError = true;
return false; return false;
} }
if (parseInt(item.rkNum) > parseInt($("#currentTock" + thisRowKey).html())) { if (parseInt(item.rkNum) > parseInt($("#allStock" + thisRowKey).html())) {
$("#rkNum" + thisRowKey).addClass("layui-form-danger"); $("#rkNum" + thisRowKey).addClass("layui-form-danger");
$("#rkNum" + thisRowKey).focus(); $("#rkNum" + thisRowKey).focus();
winui.window.msg('超过库存数量.', {icon: 2, time: 2000}); winui.window.msg('超过库存数量.', {icon: 2, time: 2000});
......
...@@ -50,7 +50,7 @@ layui.config({ ...@@ -50,7 +50,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -79,7 +79,7 @@ layui.config({ ...@@ -79,7 +79,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -113,7 +113,7 @@ layui.config({ ...@@ -113,7 +113,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -50,7 +50,7 @@ layui.config({ ...@@ -50,7 +50,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
...@@ -190,7 +190,7 @@ layui.config({ ...@@ -190,7 +190,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.normsId "value": item.normsId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.needNum, "rkNum": item.needNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
......
...@@ -85,7 +85,7 @@ layui.config({ ...@@ -85,7 +85,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -117,7 +117,7 @@ layui.config({ ...@@ -117,7 +117,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
...@@ -263,7 +263,7 @@ layui.config({ ...@@ -263,7 +263,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.normsId "value": item.normsId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.needNum, "rkNum": item.needNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
......
...@@ -59,7 +59,7 @@ layui.config({ ...@@ -59,7 +59,7 @@ layui.config({
// 初始化回显数据 // 初始化回显数据
function initDataShow(){ function initDataShow(){
AjaxPostUtil.request({url: flowableBasePath + "purchaseorder008", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function(json) { AjaxPostUtil.request({url: flowableBasePath + "purchaseorder008", params: {id: parent.rowId}, type: 'json', method: "GET", callback: function(json) {
if (isNull(json.bean)) { if (isNull(json.bean)) {
$("#showForm").html(""); $("#showForm").html("");
winui.window.msg('数据不存在~', {icon: 2, time: 2000}); winui.window.msg('数据不存在~', {icon: 2, time: 2000});
...@@ -99,7 +99,7 @@ layui.config({ ...@@ -99,7 +99,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": isNull(item.nowNumber) ? 0 : item.nowNumber, "rkNum": isNull(item.nowNumber) ? 0 : item.nowNumber,
"nowNum": isNull(item.nowNumber) ? 0 : item.nowNumber, // 订单剩余数量 "nowNum": isNull(item.nowNumber) ? 0 : item.nowNumber, // 订单剩余数量
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
...@@ -141,7 +141,7 @@ layui.config({ ...@@ -141,7 +141,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '当前库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'nowNum', title: '待入库数量', formType: 'detail', width: '80'}, {id: 'nowNum', title: '待入库数量', formType: 'detail', width: '80'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
......
...@@ -56,7 +56,7 @@ layui.config({ ...@@ -56,7 +56,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -88,7 +88,7 @@ layui.config({ ...@@ -88,7 +88,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -134,7 +134,7 @@ layui.config({ ...@@ -134,7 +134,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -59,7 +59,7 @@ layui.config({ ...@@ -59,7 +59,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -88,7 +88,7 @@ layui.config({ ...@@ -88,7 +88,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -134,7 +134,7 @@ layui.config({ ...@@ -134,7 +134,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -46,7 +46,7 @@ layui.config({ ...@@ -46,7 +46,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -84,7 +84,7 @@ layui.config({ ...@@ -84,7 +84,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -117,7 +117,7 @@ layui.config({ ...@@ -117,7 +117,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -46,7 +46,7 @@ layui.config({ ...@@ -46,7 +46,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -84,7 +84,7 @@ layui.config({ ...@@ -84,7 +84,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -117,7 +117,7 @@ layui.config({ ...@@ -117,7 +117,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -58,7 +58,7 @@ layui.config({ ...@@ -58,7 +58,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -90,7 +90,7 @@ layui.config({ ...@@ -90,7 +90,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -150,7 +150,7 @@ layui.config({ ...@@ -150,7 +150,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -104,7 +104,7 @@ layui.config({ ...@@ -104,7 +104,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": isNull(item.nowNumber) ? 0 : item.nowNumber, "rkNum": isNull(item.nowNumber) ? 0 : item.nowNumber,
"nowNum": isNull(item.nowNumber) ? 0 : item.nowNumber, "nowNum": isNull(item.nowNumber) ? 0 : item.nowNumber,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
...@@ -160,7 +160,7 @@ layui.config({ ...@@ -160,7 +160,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '当前库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'nowNum', title: '待出库数量', formType: 'detail', width: '80'}, {id: 'nowNum', title: '待出库数量', formType: 'detail', width: '80'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
......
...@@ -63,7 +63,7 @@ layui.config({ ...@@ -63,7 +63,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -94,7 +94,7 @@ layui.config({ ...@@ -94,7 +94,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -154,7 +154,7 @@ layui.config({ ...@@ -154,7 +154,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -65,7 +65,7 @@ layui.config({ ...@@ -65,7 +65,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -90,7 +90,7 @@ layui.config({ ...@@ -90,7 +90,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -151,7 +151,7 @@ layui.config({ ...@@ -151,7 +151,7 @@ layui.config({
cols: [ cols: [
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -34,7 +34,7 @@ layui.config({ ...@@ -34,7 +34,7 @@ layui.config({
{id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'}, {id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'},
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -63,7 +63,7 @@ layui.config({ ...@@ -63,7 +63,7 @@ layui.config({
"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}), "html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
"value": item.mUnitId "value": item.mUnitId
}, },
"currentTock": item.currentTock, "allStock": item.allStock,
"rkNum": item.operNum, "rkNum": item.operNum,
"unitPrice": item.unitPrice.toFixed(2), "unitPrice": item.unitPrice.toFixed(2),
"amountOfMoney": item.allPrice.toFixed(2), "amountOfMoney": item.allPrice.toFixed(2),
...@@ -88,7 +88,7 @@ layui.config({ ...@@ -88,7 +88,7 @@ layui.config({
{id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'}, {id: 'materialType', title: '商品类型', formType: 'select', width: '120', verify: 'required', modelHtml: '<option value="1">组合件</option><option value="2">普通子件</option>'},
{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'}, {id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'}, {id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
{id: 'currentTock', title: '库存', formType: 'detail', width: '80'}, {id: 'allStock', title: '库存', formType: 'detail', width: '80'},
{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'}, {id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'}, {id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'}, {id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
......
...@@ -44,14 +44,14 @@ layui.config({ ...@@ -44,14 +44,14 @@ layui.config({
where: getTableParams(), where: getTableParams(),
even: true, even: true,
page: true, page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
overflow: { overflow: {
type: 'tips', type: 'tips',
hoverTime: 300, // 悬停时间,单位ms, 悬停 hoverTime 后才会显示,默认为 0 hoverTime: 300, // 悬停时间,单位ms, 悬停 hoverTime 后才会显示,默认为 0
minWidth: 150, // 最小宽度 minWidth: 150, // 最小宽度
maxWidth: 500 // 最大宽度 maxWidth: 500 // 最大宽度
}, },
limit: 8, limits: getLimits(),
limit: getLimit(),
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'materialName', title: '商品名称', rowspan: '2', align: 'left', width: 150, templet: function (d) { { field: 'materialName', title: '商品名称', rowspan: '2', align: 'left', width: 150, templet: function (d) {
...@@ -73,7 +73,7 @@ layui.config({ ...@@ -73,7 +73,7 @@ layui.config({
}} }}
],[ ],[
{ field: 'unitName', title: '规格', align: 'center', width: 80 }, { field: 'unitName', title: '规格', align: 'center', width: 80 },
{ field: 'allTock', title: '总库存', align: 'center', width: 80 }, { field: 'allStock', title: '总库存', align: 'center', width: 80 },
{ field: 'initialTock', title: '初始库存', align: 'center', width: 80 }, { field: 'initialTock', title: '初始库存', align: 'center', width: 80 },
{ field: 'stockNum', title: '可盘点库存', align: 'center', width: 120, edit: 'text' } { field: 'stockNum', title: '可盘点库存', align: 'center', width: 120, edit: 'text' }
]], ]],
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<div class="layui-form-item layui-col-xs6 single-term"> <div class="layui-form-item layui-col-xs6 single-term">
<label class="layui-form-label">初始库存<i class="red">*</i></label> <label class="layui-form-label">初始库存<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="initialTock">库存信息</button> <button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="stock">库存信息</button>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6 single-term"> <div class="layui-form-item layui-col-xs6 single-term">
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<td>{{unitNameType}}</td> <td>{{unitNameType}}</td>
<td>{{unitName}}</td> <td>{{unitName}}</td>
<td><input type="text" class="layui-input" id="{{safetyTock}}" win-verify="number"/></td> <td><input type="text" class="layui-input" id="{{safetyTock}}" win-verify="number"/></td>
<td><button type="button" class="layui-btn layui-btn-primary layui-btn-xs initialTockMore" id="{{initialTock}}">库存信息</button></td> <td><button type="button" class="layui-btn layui-btn-primary layui-btn-xs stockMore" id="{{stock}}">库存信息</button></td>
<td><input type="text" class="layui-input" id="{{retailPrice}}" win-verify="money"/></td> <td><input type="text" class="layui-input" id="{{retailPrice}}" win-verify="money"/></td>
<td><input type="text" class="layui-input" id="{{lowPrice}}" win-verify="money"/></td> <td><input type="text" class="layui-input" id="{{lowPrice}}" win-verify="money"/></td>
<td><input type="text" class="layui-input" id="{{estimatePurchasePrice}}" win-verify="money"/></td> <td><input type="text" class="layui-input" id="{{estimatePurchasePrice}}" win-verify="money"/></td>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">当前存量</label> <label class="layui-form-label">当前存量</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
<a class="notice-title-click" rowid="{{id}}">{{allTock}}</a> <a class="notice-title-click" rowid="{{id}}">{{allStock}}</a>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <div class="layui-form-item layui-col-xs6">
...@@ -106,10 +106,10 @@ ...@@ -106,10 +106,10 @@
<td>{{safetyTock}}</td> <td>{{safetyTock}}</td>
<td> <td>
{{#each normStock}} {{#each normStock}}
<span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">{{depotName}}<span class="layui-badge layui-bg-gray">{{initialTock}}</span></span><br> <span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">{{depotName}}<span class="layui-badge layui-bg-gray">{{stock}}</span></span><br>
{{/each}} {{/each}}
</td> </td>
<td><a class="notice-title-click" rowid="{{id}}">{{allTock}}</a></td> <td><a class="notice-title-click" rowid="{{id}}">{{allStock}}</a></td>
<td>{{retailPrice}}</td> <td>{{retailPrice}}</td>
<td>{{lowPrice}}</td> <td>{{lowPrice}}</td>
<td>{{estimatePurchasePrice}}</td> <td>{{estimatePurchasePrice}}</td>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<td>{{unitNameType}}</td> <td>{{unitNameType}}</td>
<td>{{unitName}}</td> <td>{{unitName}}</td>
<td><input type="text" class="layui-input" id="{{safetyTock}}" win-verify="number"/></td> <td><input type="text" class="layui-input" id="{{safetyTock}}" win-verify="number"/></td>
<td><button type="button" class="layui-btn layui-btn-primary layui-btn-xs initialTockMore" id="{{initialTock}}">库存信息</button></td> <td><button type="button" class="layui-btn layui-btn-primary layui-btn-xs stockMore" id="{{stock}}">库存信息</button></td>
<td><input type="text" class="layui-input" id="{{retailPrice}}" win-verify="money"/></td> <td><input type="text" class="layui-input" id="{{retailPrice}}" win-verify="money"/></td>
<td><input type="text" class="layui-input" id="{{lowPrice}}" win-verify="money"/></td> <td><input type="text" class="layui-input" id="{{lowPrice}}" win-verify="money"/></td>
<td><input type="text" class="layui-input" id="{{estimatePurchasePrice}}" win-verify="money"/></td> <td><input type="text" class="layui-input" id="{{estimatePurchasePrice}}" win-verify="money"/></td>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<div class="layui-form-item layui-col-xs6 single-term"> <div class="layui-form-item layui-col-xs6 single-term">
<label class="layui-form-label">初始库存<i class="red">*</i></label> <label class="layui-form-label">初始库存<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="initialTock">库存信息</button> <button type="button" class="layui-btn layui-btn-primary layui-btn-xs" id="stock">库存信息</button>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6 single-term"> <div class="layui-form-item layui-col-xs6 single-term">
...@@ -193,9 +193,9 @@ ...@@ -193,9 +193,9 @@
<td>{{baseUnit}}</td> <td>{{baseUnit}}</td>
<td>{{unitName}}</td> <td>{{unitName}}</td>
<td><input type="text" class="layui-input" id="safetyTock{{addOne @index}}" win-verify="number" value="{{safetyTock}}"/></td> <td><input type="text" class="layui-input" id="safetyTock{{addOne @index}}" win-verify="number" value="{{safetyTock}}"/></td>
<td><button type="button" class="layui-btn layui-btn-primary layui-btn-xs initialTockMore" id="initialTock{{addOne @index}}">库存信息</button> <td><button type="button" class="layui-btn layui-btn-primary layui-btn-xs stockMore" id="stock{{addOne @index}}">库存信息</button>
{{#each normStock}} {{#each normStock}}
<br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">{{depotName}}<span class="layui-badge layui-bg-gray">{{initialTock}}</span></span> <br><span class="layui-badge layui-bg-blue" style="height: 25px !important; line-height: 25px !important; margin: 5px 0px;">{{depotName}}<span class="layui-badge layui-bg-gray">{{stock}}</span></span>
{{/each}} {{/each}}
</td> </td>
<td><input type="text" class="layui-input" id="retailPrice{{addOne @index}}" win-verify="money" value="{{retailPrice}}"/></td> <td><input type="text" class="layui-input" id="retailPrice{{addOne @index}}" win-verify="money" value="{{retailPrice}}"/></td>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">初始库存<i class="red">*</i></label> <label class="layui-form-label">初始库存<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="initialTock" name="initialTock" win-verify="required|number" placeholder="请输入初始库存" class="layui-input"/> <input type="text" id="stock" name="stock" win-verify="required|number" placeholder="请输入初始库存" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">初始库存<i class="red">*</i></label> <label class="layui-form-label">初始库存<i class="red">*</i></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="initialTock" name="initialTock" win-verify="required|number" placeholder="请输入初始库存" class="layui-input"/> <input type="text" id="stock" name="stock" win-verify="required|number" placeholder="请输入初始库存" class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -41,32 +41,7 @@ ...@@ -41,32 +41,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">列表项<i class="red">*</i></label> <label class="layui-form-label">列表项<i class="red">*</i></label>
<div class="layui-input-block" id="productList"> <div class="layui-input-block" id="productList">
<!-- todo 待验证删除 <div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="addRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>新增行</button>
<button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
</div>
</div>
<table class="layui-table">
<thead>
<tr>
<th style="width: 30px;"></th>
<th style="width: 150px;">商品(型号)</th>
<th style="width: 50px;">单位</th>
<th style="width: 80px;">库存</th>
<th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th>
<th style="width: 80px;">金额</th>
<th style="width: 80px;">税率(%)</th>
<th style="width: 80px;">税额</th>
<th style="width: 80px;">含税单价</th>
<th style="width: 80px;">合计价税</th>
<th style="min-width: 100px;">备注</th>
</tr>
</thead>
<tbody id="useTable" class="insurance-table">
</tbody>
</table>-->
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs4"> <div class="layui-form-item layui-col-xs4">
...@@ -148,27 +123,6 @@ ...@@ -148,27 +123,6 @@
</form> </form>
</div> </div>
<!-- todo 待验证删除 usetableTemplate
<script type="text/x-handlebars-template" id="usetableTemplate">
<tr trcusid="{{trId}}">
<td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
<td>
<input type="text" id="{{materialId}}" name="{{materialId}}" placeholder="请选择商品" class="layui-input" readonly="readonly"/>
<i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
</td>
<td><select id="{{unitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
<td id="{{currentTock}}"></td>
<td><input type="text" class="layui-input change-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td>
<td><input type="text" class="layui-input change-input unitPrice" id="{{unitPrice}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input amountOfMoney" id="{{amountOfMoney}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input taxRate" value="0.00" id="{{taxRate}}" win-verify="required|double"/></td>
<td><input type="text" class="layui-input change-input taxMoney" id="{{taxMoney}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input taxUnitPrice" id="{{taxUnitPrice}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input taxLastMoney" id="{{taxLastMoney}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input" id="{{remark}}"/></td>
</tr>
</script> -->
<script src="../../assets/lib/layui/layui.js"></script> <script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script> <script src="../../assets/lib/layui/custom.js"></script>
<script src="../../js/erpcommon/calculatePrice.js"></script> <script src="../../js/erpcommon/calculatePrice.js"></script>
......
...@@ -39,32 +39,7 @@ ...@@ -39,32 +39,7 @@
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">列表项<i class="red">*</i></label> <label class="layui-form-label">列表项<i class="red">*</i></label>
<div class="layui-input-block" id="productList"> <div class="layui-input-block" id="productList">
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
</div>
</div>
<table class="layui-table">
<thead>
<tr>
<th style="width: 30px;"></th>
<th style="width: 120px;">商品(型号)</th>
<th style="width: 70px;">单位</th>
<th style="width: 80px;">库存</th>
<th style="width: 80px;">待入库数量</th>
<th style="width: 80px;">数量</th>
<th style="width: 80px;">单价</th>
<th style="width: 80px;">金额</th>
<th style="width: 80px;">税率(%)</th>
<th style="width: 80px;">税额</th>
<th style="width: 80px;">含税单价</th>
<th style="width: 80px;">合计价税</th>
<th style="min-width: 100px;">备注</th>
</tr>
</thead>
<tbody id="useTable" class="insurance-table">
</tbody>
</table>
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs3"> <div class="layui-form-item layui-col-xs3">
...@@ -150,29 +125,7 @@ ...@@ -150,29 +125,7 @@
</div> </div>
</form> </form>
</div> </div>
<!-- usetableTemplate -->
<script type="text/x-handlebars-template" id="usetableTemplate">
<tr trcusid="{{trId}}">
<td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
<td>
<input type="text" id="{{materialId}}" name="{{materialId}}" placeholder="请选择商品" class="layui-input" readonly="readonly"/>
<i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
</td>
<td><select id="{{unitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
<td id="{{currentTock}}"></td>
<td id="{{nowNum}}">0</td>
<td><input type="text" class="layui-input change-input rkNum" value="0" id="{{rkNum}}" win-verify="required|number"/></td>
<td><input type="text" class="layui-input change-input unitPrice" id="{{unitPrice}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input amountOfMoney" id="{{amountOfMoney}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input taxRate" value="0.00" id="{{taxRate}}" win-verify="required|double"/></td>
<td><input type="text" class="layui-input change-input taxMoney" id="{{taxMoney}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input taxUnitPrice" id="{{taxUnitPrice}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input change-input taxLastMoney" id="{{taxLastMoney}}" win-verify="required|money"/></td>
<td><input type="text" class="layui-input" id="{{remark}}"/></td>
</tr>
</script>
<script src="../../assets/lib/layui/layui.js"></script> <script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script> <script src="../../assets/lib/layui/custom.js"></script>
<script src="../../js/erpcommon/calculatePrice.js"></script> <script src="../../js/erpcommon/calculatePrice.js"></script>
......
...@@ -23,7 +23,6 @@ layui.config({ ...@@ -23,7 +23,6 @@ layui.config({
var rowNum = 1; //表格的序号 var rowNum = 1; //表格的序号
var usetableTemplate = $("#usetableTemplate").html(); var usetableTemplate = $("#usetableTemplate").html();
var beanTemplate = $("#beanTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl'); var selOption = getFileContent('tpl/template/select-option.tpl');
// 已经选择的商品集合key:表格的行trId,value:商品信息 // 已经选择的商品集合key:表格的行trId,value:商品信息
var allChooseProduct = {}; var allChooseProduct = {};
...@@ -36,7 +35,7 @@ layui.config({ ...@@ -36,7 +35,7 @@ layui.config({
params: {id: parent.rowId}, params: {id: parent.rowId},
method: 'GET', method: 'GET',
pagination: false, pagination: false,
template: beanTemplate, template: $("#beanTemplate").html(),
ajaxSendAfter:function (json) { ajaxSendAfter:function (json) {
// 单据时间 // 单据时间
laydate.render({elem: '#operTime', type: 'datetime', value: json.bean.applyTime, trigger: 'click'}); laydate.render({elem: '#operTime', type: 'datetime', value: json.bean.applyTime, trigger: 'click'});
...@@ -87,7 +86,7 @@ layui.config({ ...@@ -87,7 +86,7 @@ layui.config({
$("#mUnitId" + (rowNum - 1)).val(item.normsId); $("#mUnitId" + (rowNum - 1)).val(item.normsId);
// 商品回显 // 商品回显
$("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")"); $("#materialId" + (rowNum - 1)).val(item.materialName + "(" + item.materialModel + ")");
$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显 $("#allStock" + (rowNum - 1)).html(item.allStock);//库存回显
$("#rkNum" + (rowNum - 1)).val(item.operNum);//数量回显 $("#rkNum" + (rowNum - 1)).val(item.operNum);//数量回显
$("#unitPrice" + (rowNum - 1)).html(item.unitPrice.toFixed(2));//单价回显 $("#unitPrice" + (rowNum - 1)).html(item.unitPrice.toFixed(2));//单价回显
$("#amountOfMoney" + (rowNum - 1)).html(item.allPrice.toFixed(2));//金额回显 $("#amountOfMoney" + (rowNum - 1)).html(item.allPrice.toFixed(2));//金额回显
...@@ -182,7 +181,7 @@ layui.config({ ...@@ -182,7 +181,7 @@ layui.config({
noError = true; noError = true;
return false; return false;
} }
if(parseInt(rkNum.val()) > parseInt($("#currentTock" + rowNum).html())){ if(parseInt(rkNum.val()) > parseInt($("#allStock" + rowNum).html())){
rkNum.addClass("layui-form-danger"); rkNum.addClass("layui-form-danger");
rkNum.focus(); rkNum.focus();
winui.window.msg('超过库存数量.', {icon: 2, time: 2000}); winui.window.msg('超过库存数量.', {icon: 2, time: 2000});
...@@ -269,7 +268,7 @@ layui.config({ ...@@ -269,7 +268,7 @@ layui.config({
trId: "tr" + rowNum.toString(), // 行的id trId: "tr" + rowNum.toString(), // 行的id
materialId: "materialId" + rowNum.toString(), //商品id materialId: "materialId" + rowNum.toString(), //商品id
mUnitId: "mUnitId" + rowNum.toString(), // 规格id mUnitId: "mUnitId" + rowNum.toString(), // 规格id
currentTock: "currentTock" + rowNum.toString(), // 库存id allStock: "allStock" + rowNum.toString(), // 库存id
rkNum: "rkNum" + rowNum.toString(), // 数量id rkNum: "rkNum" + rowNum.toString(), // 数量id
unitPrice: "unitPrice" + rowNum.toString(), // 单价id unitPrice: "unitPrice" + rowNum.toString(), // 单价id
amountOfMoney: "amountOfMoney" + rowNum.toString(), // 金额id amountOfMoney: "amountOfMoney" + rowNum.toString(), // 金额id
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i> <i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
</td> </td>
<td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td> <td><select id="{{mUnitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
<td id="{{currentTock}}"></td> <td id="{{allStock}}"></td>
<td><input type="text" class="layui-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td> <td><input type="text" class="layui-input rkNum" value="1" id="{{rkNum}}" win-verify="required|number"/></td>
<td id="{{unitPrice}}"></td> <td id="{{unitPrice}}"></td>
<td id="{{amountOfMoney}}"></td> <td id="{{amountOfMoney}}"></td>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册