From 60234752f298293de1f0a7224c7dc2cb226a0c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 19 Apr 2020 14:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=92=8C=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/pages/manage/account.html | 1 -
erp_web/pages/manage/systemConfig.html | 42 ++++++++++++--------------
2 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html
index 9ba0a23a..bc39b0e4 100644
--- a/erp_web/pages/manage/account.html
+++ b/erp_web/pages/manage/account.html
@@ -142,7 +142,6 @@
{
title: '操作', field: 'op', align: "center", width: 210, formatter: function (value, rec, index) {
var str = '';
- var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialno + 'AaBb' + rec.initialamount + 'AaBb' + rec.currentamount + 'AaBb' + rec.remark;
str += '
流水 ';
str += '
编辑 ';
str += '
删除 ';
diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html
index 68d97dcc..902c08d5 100644
--- a/erp_web/pages/manage/systemConfig.html
+++ b/erp_web/pages/manage/systemConfig.html
@@ -134,12 +134,10 @@
columns: [[
{field: 'id', width: 35, align: "center", checkbox:true},
{
- title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec) {
+ title: '操作', field: 'op', align: "center", width: 80,
+ formatter: function (value, rec, index) {
var str = '';
- var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
- + 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode
- + 'AaBb' + rec.depotFlag + 'AaBb' + rec.customerFlag;
- str += ' ';
+ str += ' ';
str += '';
return str;
}
@@ -340,7 +338,7 @@
if (checkCompanyName()) {
return;
}
- var companyName = $.trim($("#companyName").val());
+ var companyName = $.trim($("#companyName").textbox("getValue"));
if (!companyName) {
$.messager.alert('提示', '公司名称不能为空', 'warning');
$("#companyName").val("").focus();
@@ -373,31 +371,29 @@
});
//编辑系统配置信息
- function editSystemConfig(systemConfigTotalInfo) {
- var systemConfigInfo = systemConfigTotalInfo.split("AaBb");
+ function editSystemConfig(index) {
+ var res = $("#tableData").datagrid("getRows")[index];
var row = {
- companyName: systemConfigInfo[1],
- companyContacts: systemConfigInfo[2],
- companyAddress: systemConfigInfo[3],
- companyTel: systemConfigInfo[4],
- companyFax: systemConfigInfo[5],
- companyPostCode: systemConfigInfo[6]
+ companyName: res.companyName,
+ companyContacts: res.companyContacts,
+ companyAddress: res.companyAddress,
+ companyTel: res.companyTel,
+ companyFax: res.companyFax,
+ companyPostCode: res.companyPostCode
};
- oldCompanyName = systemConfigInfo[1];
+ oldCompanyName = res.companyName;
$('#systemConfigDlg').dialog('open').dialog('setTitle', ' 编辑系统配置信息');
$(".window-mask").css({width: webW, height: webH});
$('#systemConfigFM').form('load', row);
- systemConfigId = systemConfigInfo[0];
- //焦点在名称输入框==定焦在输入文字后面
- $("#companyName").val("").focus().val(systemConfigInfo[1]);
- $("#depotFlag").attr("checked", systemConfigInfo[7] == '1' ? true : false);
- $("#customerFlag").attr("checked", systemConfigInfo[8] == '1' ? true : false);
- url = '/systemConfig/update?id=' + systemConfigInfo[0];
+ systemConfigId = res.id;
+ $("#depotFlag").attr("checked", res.depotFlag == '1' ? true : false);
+ $("#customerFlag").attr("checked", res.customerFlag == '1' ? true : false);
+ url = '/systemConfig/update?id=' + res.id;
}
//检查系统配置 名称是否存在 ++ 重名无法提示问题需要跟进
function checkCompanyName() {
- var companyName = $.trim($("#companyName").val());
+ var companyName = $.trim($("#companyName").textbox("getValue"));
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
@@ -448,7 +444,7 @@
});
function showSystemConfigDetails(pageNo, pageSize) {
- var companyName = $.trim($("#searchCompanyName").val());
+ var companyName = $.trim($("#searchCompanyName").textbox("getValue"));
$.ajax({
type: "get",
url: "/systemConfig/list",