purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化商品模块

Browse Source
This commit is contained in:
季圣华
2020-06-03 00:25:28 +08:00
parent 023c065e19
commit d344771c92
11 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erp_web/js/pages/materials/bill_detail.js
View File

@@ -423,7 +423,7 @@
columns:[[
{ title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn},
{ title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90},
{ title: '品名(型号)(扩展信息)(单位)',field: 'MaterialName',width:230},
{ title: '名称(型号)(扩展信息)(单位)',field: 'MaterialName',width:230},
{ title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
{ title: '单位',field: 'Unit',editor:'validatebox',width:60},
{ title: '数量',field: 'OperNumber',editor:'validatebox',width:60},
@@ -434,7 +434,7 @@
{ title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '备注',field: 'Remark',editor:'validatebox',width:120},
{ title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '名称-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '备注1',field: 'OtherField4',editor:'validatebox',hidden:true,width:60},

8
erp_web/js/pages/materials/in_out.js
View File

@@ -678,7 +678,7 @@
}
}
},
{ title: '条码_品名(规格)(型号)(扩展信息)(单位)',field: 'MaterialExtendId',width:270,
{ title: '条码_名称(规格)(型号)(扩展信息)(单位)',field: 'MaterialExtendId',width:270,
formatter:function(value,row,index){
return row.MaterialName;
},
@@ -696,7 +696,7 @@
panelHeight: 380,//下拉框的高度
columns:[[
{field:'mBarCode',title:'条码',width:120},
{field:'name',title:'品名',width:140},
{field:'name',title:'名称',width:140},
{field:'standard',title:'规格',width:80},
{field:'model',title:'型号',width:80},
{field:'unit',title:'单位',width:60},
@@ -833,7 +833,7 @@
});
function materialSelect(rec) {
var body,footer,input; //定义表格和文本框
var ratio = 1; //比例-品名专用
var ratio = 1; //比例-名称专用
var loadRatio = 1; //在单位输入框上面加载比例字段
if(rec) {
var meId = rec.Id;
@@ -955,7 +955,7 @@
columns:[[
{ title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn},
{ title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90},
{ title: '条码_品名(规格)(型号)(扩展信息)(单位)',field: 'MaterialName',width:270},
{ title: '条码_名称(规格)(型号)(扩展信息)(单位)',field: 'MaterialName',width:270},
{ title: '库存',field: 'Stock',width:50},
{ title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
{ title: '单位',field: 'Unit',editor:'validatebox',width:60},

22
erp_web/pages/materials/material.html
View File

@@ -35,7 +35,13 @@
</div>
</div>
<div class="form-group">
<label class="control-label">品名：</label>
<label class="control-label">条码：</label>
<div class="control-inline">
<input type="text" id="searchBarCode" name="searchBarCode" value="" maxlength="100" class="easyui-textbox width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">名称：</label>
<div class="control-inline">
<input type="text" id="searchName" name="searchName" value="" maxlength="100" class="easyui-textbox width-90"/>
</div>
@@ -72,7 +78,7 @@
<div title="基本信息" style="padding:20px;">
<table width="100%" style="min-width:1150px;">
<tr>
<td style="width:60px; height:30px;">品名</td>
<td style="width:60px; height:30px;">名称</td>
<td style="padding:5px;width:250px;">
<input name="Name" id="Name" class="easyui-textbox"
data-options="required:true,validType:'length[1,30]'"
@@ -464,12 +470,13 @@
return str;
}
},
{title: '品名', field: 'name', width: 120},
{title: '条码', field: 'mBarCode', width: 120},
{title: '名称', field: 'name', width: 120},
{title: '规格', field: 'standard', width: 80},
{title: '型号', field: 'model', width: 80},
{title: '类别', field: 'categoryName', width: 80},
{title: '扩展信息', field: 'materialOther', width: 150},
{title: '单位', field: 'unit', width: 100,
{title: '扩展信息', field: 'materialOther', width: 140},
{title: '单位', field: 'unit', width: 80,
formatter: function (value, rec) {
if(value) {
return value;
@@ -1192,7 +1199,7 @@
//保存信息
$("#saveMaterial").off("click").on("click", function () {
if (!$('#Name').val()) {
$.messager.alert('提示', '品名不能为空！', 'warning');
$.messager.alert('提示', '名称不能为空！', 'warning');
return;
}
if(!$("#Unit").val() && !$("#manyUnit").val()) {
@@ -1407,6 +1414,7 @@
});
function showMaterialDetails(pageNo, pageSize) {
var barCode = $.trim($("#searchBarCode").val());
var name = $.trim($("#searchName").val());
var standard = $.trim($("#searchStandard").val());
var model = $.trim($("#searchModel").val());
@@ -1416,6 +1424,7 @@
dataType: "json",
data: ({
search: JSON.stringify({
barCode: barCode,
name: name,
standard: standard,
model: model,
@@ -1443,6 +1452,7 @@
//重置按钮
$("#searchResetBtn").unbind().bind({
click: function () {
$("#searchBarCode").textbox("clear");
$("#searchParentName").textbox("clear");
$("#searchParentId").val("");
$("#searchName").textbox("clear");

4
erp_web/pages/materials/material_forselect.html
View File

@@ -24,7 +24,7 @@
collapsible="true" closable="false">
<table id="searchForSelectTable">
<tr>
<td>品名：</td>
<td>名称：</td>
<td>
<input name="searchForSelectName" id="searchForSelectName" style="width:80px;"/>
</td>
@@ -88,7 +88,7 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", hidden: true},
{title: '品名', field: 'name', width: 150},
{title: '名称', field: 'name', width: 150},
{title: '型号', field: 'model', width: 100},
{title: '类别', field: 'categoryName', width: 130},
{title: '单位', field: 'unit', width: 60}