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

优化表结构

Browse Source
This commit is contained in:
季圣华
2020-07-22 00:57:23 +08:00
parent a4774016c8
commit ae7d26706a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/数据库更新记录-方便升级.txt
View File

@@ -956,7 +956,7 @@ alter table jsh_material change OtherField3 other_field3 varchar(50) DEFAULT NUL
alter table jsh_material change enableSerialNumber enable_serial_number varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是'; alter table jsh_material change enableSerialNumber enable_serial_number varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是';
alter table jsh_material change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; alter table jsh_material change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_depot_head rename to jsh_depot_head; alter table jsh_depothead rename to jsh_depot_head;
alter table jsh_depot_head change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'; alter table jsh_depot_head change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_depot_head change Type type varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)'; alter table jsh_depot_head change Type type varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)';
alter table jsh_depot_head change SubType sub_type varchar(50) DEFAULT NULL COMMENT '出入库分类'; alter table jsh_depot_head change SubType sub_type varchar(50) DEFAULT NULL COMMENT '出入库分类';
@@ -986,7 +986,7 @@ alter table jsh_depot_head change Status status varchar(1) DEFAULT NULL COMMENT
alter table jsh_depot_head change LinkNumber link_number varchar(50) DEFAULT NULL COMMENT '关联订单号'; alter table jsh_depot_head change LinkNumber link_number varchar(50) DEFAULT NULL COMMENT '关联订单号';
alter table jsh_depot_head change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; alter table jsh_depot_head change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_depot_item rename to jsh_depot_item; alter table jsh_depotitem rename to jsh_depot_item;
alter table jsh_depot_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'; alter table jsh_depot_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_depot_item change HeaderId header_id bigint(20) NOT NULL COMMENT '表头Id'; alter table jsh_depot_item change HeaderId header_id bigint(20) NOT NULL COMMENT '表头Id';
alter table jsh_depot_item change MaterialId material_id bigint(20) NOT NULL COMMENT '商品Id'; alter table jsh_depot_item change MaterialId material_id bigint(20) NOT NULL COMMENT '商品Id';

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

@@ -434,10 +434,10 @@
{ title: '操作',field: 'op',align:"center",width:opWidth, { title: '操作',field: 'op',align:"center",width:opWidth,
formatter:function(value,rec,index) { formatter:function(value,rec,index) {
var str = ''; var str = '';
var orgId = rec.organid? rec.organid:0; var orgId = rec.organId? rec.organId:0;
str += '<img title="查看" src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showDepotHead(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;'; str += '<img title="查看" src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showDepotHead(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepotHead(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;'; str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepotHead(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepotHead('+ rec.id +',' + orgId +',' + rec.totalprice+',' + rec.status + ');"/>'; str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepotHead('+ rec.id +',' + orgId +',' + rec.totalPrice+',' + rec.status + ');"/>';
if(isShowSkip) { if(isShowSkip) {
str += '&nbsp;&nbsp;&nbsp;<img title="' + opTitle + '" src="/js/easyui/themes/icons/redo.png" style="cursor: pointer;" onclick="skipDepotHead(\'' + index + '\');"/>'; str += '&nbsp;&nbsp;&nbsp;<img title="' + opTitle + '" src="/js/easyui/themes/icons/redo.png" style="cursor: pointer;" onclick="skipDepotHead(\'' + index + '\');"/>';
} }
@@ -1116,8 +1116,8 @@
url: "/supplier/updateAdvanceIn", url: "/supplier/updateAdvanceIn",
dataType: "json", dataType: "json",
data: { data: {
supplierId: row[i].organid, //会员id supplierId: row[i].organId, //会员id
advanceIn: row[i].totalprice //删除时同时返还用户的预付款 advanceIn: row[i].totalPrice //删除时同时返还用户的预付款
}, },
success: function (res) { success: function (res) {
if (res && res.code === 200) { if (res && res.code === 200) {
@@ -1253,12 +1253,12 @@
var res = sessionStorage.getItem("rowInfo"); var res = sessionStorage.getItem("rowInfo");
if(pageType == "skip" && res) { //从订单跳转过来 if(pageType == "skip" && res) { //从订单跳转过来
res = JSON.parse(res); res = JSON.parse(res);
$('#OrganId').combobox('setValue', res.organid); $('#OrganId').combobox('setValue', res.organId);
$("#LinkNumber").val(res.number); //关联订单号 $("#LinkNumber").val(res.number); //关联订单号
$("#DiscountLastMoney").val(res.totalprice); //优惠后金额 $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额
$("#ChangeAmount").val(res.totalprice).attr("data-changeamount", res.totalprice); $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice);
depotHeadID = res.id; depotHeadID = res.id;
initTableData_material("edit",res.totalprice); //商品列表 initTableData_material("edit",res.totalPrice); //商品列表
} else { } else {
initTableData_material("add"); //商品列表 initTableData_material("add"); //商品列表
} }