From c4db070541bc09f8960e2365aa4d945bd737a4e6 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, 27 Dec 2020 16:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E6=88=B7=E3=80=81?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=AD=89=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/pages/manage/account.html | 19 ++++++++++++------
erp_web/pages/manage/functions.html | 24 +++++++++++------------
erp_web/pages/manage/inOutItem.html | 14 ++++++-------
erp_web/pages/manage/person.html | 12 ++++++------
erp_web/pages/reports/account_report.html | 2 +-
5 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html
index e36a1607..669b88e4 100644
--- a/erp_web/pages/manage/account.html
+++ b/erp_web/pages/manage/account.html
@@ -123,6 +123,17 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", checkbox: true},
+ {
+ title: '操作', field: 'op', align: "center", width: 60,
+ formatter: function (value, rec, index) {
+ var str = '';
+ str += '
';
+ if(isShowOpFun()){
+ str += '
';
+ }
+ return str;
+ }
+ },
{title: '名称', field: 'name', width: 100},
{title: '编号', field: 'serialNo', width: 150, align: "center"},
{title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
@@ -140,14 +151,10 @@
},
{title: '备注', field: 'remark', width: 100},
{
- title: '操作', field: 'op', align: "center", width: 210,
+ title: '账户流水', field: 'show', align: "center", width: 100,
formatter: function (value, rec, index) {
var str = '';
- str += '
流水 ';
- str += ' 编辑 ';
- if(isShowOpFun()){
- str += ' 删除 ';
- }
+ str += ' 流水';
return str;
}
}
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html
index d3e1f847..389f1029 100644
--- a/erp_web/pages/manage/functions.html
+++ b/erp_web/pages/manage/functions.html
@@ -151,6 +151,17 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", checkbox: true},
+ {
+ title: '操作', field: 'op', align: "center", width: 80,
+ formatter: function (value, rec, index) {
+ var str = '';
+ str += ' ';
+ if(isShowOpFun()) {
+ str += '';
+ }
+ return str;
+ }
+ },
{title: '编号 ', field: 'number', width: 80},
{title: '名称', field: 'name', width: 100},
{title: '上级编号', field: 'parentNumber', width: 80},
@@ -161,18 +172,7 @@
return value ? "开" : "关";
}
},
- {title: '图标', field: 'icon', width: 110},
- {
- title: '操作', field: 'op', align: "center", width: 130,
- formatter: function (value, rec, index) {
- var str = '';
- str += ' 编辑 ';
- if(isShowOpFun()) {
- str += ' 删除 ';
- }
- return str;
- }
- }
+ {title: '图标', field: 'icon', width: 110}
]],
toolbar: [
{
diff --git a/erp_web/pages/manage/inOutItem.html b/erp_web/pages/manage/inOutItem.html
index 5fb5a90f..06c4a4d5 100644
--- a/erp_web/pages/manage/inOutItem.html
+++ b/erp_web/pages/manage/inOutItem.html
@@ -122,20 +122,20 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", checkbox: true},
- {title: '名称', field: 'name', width: 200},
- {title: '类型', field: 'type', width: 100, align: "center"},
- {title: '描述', field: 'remark', width: 200},
{
- title: '操作', field: 'op', align: "center", width: 130,
+ title: '操作', field: 'op', align: "center", width: 60,
formatter: function (value, rec, index) {
var str = '';
- str += ' 编辑 ';
+ str += ' ';
if(isShowOpFun()) {
- str += ' 删除 ';
+ str += '';
}
return str;
}
- }
+ },
+ {title: '名称', field: 'name', width: 200},
+ {title: '类型', field: 'type', width: 100},
+ {title: '描述', field: 'remark', width: 200}
]],
toolbar: [
{
diff --git a/erp_web/pages/manage/person.html b/erp_web/pages/manage/person.html
index 1259064f..3bf9ed2d 100644
--- a/erp_web/pages/manage/person.html
+++ b/erp_web/pages/manage/person.html
@@ -120,18 +120,18 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", checkbox: true},
- {title: '姓名', field: 'name', width: 180},
- {title: '类型', field: 'type', width: 180},
{
- title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec, index) {
+ title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec, index) {
var str = '';
- str += ' 编辑 ';
+ str += ' ';
if(isShowOpFun()) {
- str += ' 删除 ';
+ str += '';
}
return str;
}
- }
+ },
+ {title: '姓名', field: 'name', width: 180},
+ {title: '类型', field: 'type', width: 180}
]],
toolbar: [
{
diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html
index 9a38426a..27978fd5 100644
--- a/erp_web/pages/reports/account_report.html
+++ b/erp_web/pages/reports/account_report.html
@@ -93,7 +93,7 @@
{title: '本月发生额', field: 'thisMonthAmount', width: 100, align: "center"},
{title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
{
- title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
+ title: '账户流水', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialNo + 'AaBb' + rec.initialAmount + 'AaBb' + rec.currentAmount;
str += ' 流水 ';