From 7505709e3d992844803b12b9a232d7b643730d5d Mon Sep 17 00:00:00 2001 From: hdm Date: Mon, 27 Jun 2022 01:27:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E4=B8=AA=E5=8A=9F=E8=83=BD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97UI=E6=95=88=E6=9E=9C=E9=A2=9C=E8=89=B2=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/article/view/index/index.html | 2 +- app/article/view/index/list.html | 2 +- app/finance/view/expense/checkedlist.html | 11 ++-- app/finance/view/expense/copy.html | 11 ++-- app/finance/view/expense/index.html | 11 ++-- app/finance/view/expense/list.html | 11 ++-- app/finance/view/expense/view.html | 12 ++-- app/finance/view/income/index.html | 6 +- app/finance/view/income/view.html | 24 +++---- app/finance/view/invoice/checkedlist.html | 17 +++-- app/finance/view/invoice/copy.html | 17 +++-- app/finance/view/invoice/index.html | 17 +++-- app/finance/view/invoice/list.html | 17 +++-- app/finance/view/invoice/view.html | 14 ++--- app/home/view/cate/car_cate.html | 4 +- app/home/view/cate/cost_cate.html | 4 +- app/home/view/cate/expense_cate.html | 4 +- app/home/view/cate/flow_type.html | 4 +- app/home/view/cate/seal_cate.html | 4 +- app/home/view/cate/subject.html | 4 +- app/home/view/cate/work_cate.html | 4 +- app/home/view/conf/index.html | 2 +- app/home/view/flow/index.html | 4 +- app/home/view/index/main.html | 6 +- app/home/view/keywords/index.html | 2 +- app/home/view/module/index.html | 4 +- app/home/view/role/index.html | 2 +- app/install/data/gouguoa.sql | 10 ++- app/note/view/index/index.html | 2 +- app/oa/controller/Plan.php | 4 +- app/project/view/index/index.html | 2 +- app/user/view/position/index.html | 2 +- public/static/assets/gougu/css/gougu.css | 62 +++++++++---------- public/static/assets/gougu/css/layout.css | 12 ++-- .../static/assets/gougu/module/oaSchedule.js | 2 +- 35 files changed, 158 insertions(+), 158 deletions(-) diff --git a/app/article/view/index/index.html b/app/article/view/index/index.html index 5ce04f2..03b5b1e 100644 --- a/app/article/view/index/index.html +++ b/app/article/view/index/index.html @@ -59,7 +59,7 @@ }, { field: 'title', title: '文章标题', - templet: '
{{d.title}}
' + templet: '
{{d.title}}
' },{ field: 'read', title: '阅读量', diff --git a/app/article/view/index/list.html b/app/article/view/index/list.html index 7bb5f7c..e35aaf9 100644 --- a/app/article/view/index/list.html +++ b/app/article/view/index/list.html @@ -70,7 +70,7 @@ }, { field: 'title', title: '文章标题', - templet: '
{{d.title}}
' + templet: '
{{d.title}}
' },{ field: 'read', title: '阅读量', diff --git a/app/finance/view/expense/checkedlist.html b/app/finance/view/expense/checkedlist.html index 1df03da..c0ec2b5 100644 --- a/app/finance/view/expense/checkedlist.html +++ b/app/finance/view/expense/checkedlist.html @@ -69,7 +69,6 @@ field: 'amount', title: '报销总金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 120, },{ field: 'check_status', @@ -77,18 +76,18 @@ align: 'center', width: 120, templet:function(d){ - var html='审批不通过'; + var html='审批不通过'; if(d.check_status==1){ - html='审批中'; + html='审批中'; } else if(d.check_status==2){ - html='审批通过'; + html='审批通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已打款'; + html='已打款'; } return html; } diff --git a/app/finance/view/expense/copy.html b/app/finance/view/expense/copy.html index f2353b4..8718cb2 100644 --- a/app/finance/view/expense/copy.html +++ b/app/finance/view/expense/copy.html @@ -57,7 +57,6 @@ field: 'amount', title: '报销总金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 120, },{ field: 'check_status', @@ -65,18 +64,18 @@ align: 'center', width: 120, templet:function(d){ - var html='审批不通过'; + var html='审批不通过'; if(d.check_status==1){ - html='审批中'; + html='审批中'; } else if(d.check_status==2){ - html='审批通过'; + html='审批通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已打款'; + html='已打款'; } return html; } diff --git a/app/finance/view/expense/index.html b/app/finance/view/expense/index.html index 59fffa3..deb01c8 100644 --- a/app/finance/view/expense/index.html +++ b/app/finance/view/expense/index.html @@ -72,7 +72,6 @@ field: 'amount', title: '报销总金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 120, },{ field: 'check_status', @@ -80,18 +79,18 @@ align: 'center', width: 120, templet:function(d){ - var html='审批不通过'; + var html='审批不通过'; if(d.check_status==1){ - html='审批中'; + html='审批中'; } else if(d.check_status==2){ - html='审批通过'; + html='审批通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已打款'; + html='已打款'; } return html; } diff --git a/app/finance/view/expense/list.html b/app/finance/view/expense/list.html index d6b2604..a28664f 100644 --- a/app/finance/view/expense/list.html +++ b/app/finance/view/expense/list.html @@ -52,7 +52,6 @@ field: 'amount', title: '报销总金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 120, },{ field: 'check_status', @@ -60,18 +59,18 @@ align: 'center', width: 120, templet:function(d){ - var html='审批不通过'; + var html='审批不通过'; if(d.check_status==1){ - html='审批中'; + html='审批中'; } else if(d.check_status==2){ - html='审批通过'; + html='审批通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已打款'; + html='已打款'; } return html; } diff --git a/app/finance/view/expense/view.html b/app/finance/view/expense/view.html index 89ee27f..bae8020 100644 --- a/app/finance/view/expense/view.html +++ b/app/finance/view/expense/view.html @@ -137,12 +137,12 @@ {/notempty} 审核状态 - {eq name="$detail.check_status" value="0"}待审批{/eq} - {eq name="$detail.check_status" value="1"}审批中{/eq} - {eq name="$detail.check_status" value="2"}已通过，待打款{/eq} - {eq name="$detail.check_status" value="3"}已拒绝{/eq} - {eq name="$detail.check_status" value="4"}已撤销{/eq} - {eq name="$detail.check_status" value="5"}已通过{/eq} + {eq name="$detail.check_status" value="0"}待审批{/eq} + {eq name="$detail.check_status" value="1"}审批中{/eq} + {eq name="$detail.check_status" value="2"}已通过，待打款{/eq} + {eq name="$detail.check_status" value="3"}已拒绝{/eq} + {eq name="$detail.check_status" value="4"}已撤销{/eq} + {eq name="$detail.check_status" value="5"}已通过，并打款{/eq} 查看审批记录 当前审核人 diff --git a/app/finance/view/income/index.html b/app/finance/view/income/index.html index bd821da..a1ba5e8 100644 --- a/app/finance/view/income/index.html +++ b/app/finance/view/income/index.html @@ -67,12 +67,12 @@ align: 'center', width: 90, templet:function(d){ - var html='未到账'; + var html='未到账'; if(d.is_cash==1){ - html='部分到账'; + html='部分到账'; } else if(d.is_cash==2){ - html='全部到账'; + html='全部到账'; } return html; } diff --git a/app/finance/view/income/view.html b/app/finance/view/income/view.html index 63553e3..4923e6c 100644 --- a/app/finance/view/income/view.html +++ b/app/finance/view/income/view.html @@ -99,19 +99,19 @@ 发票状态 {if condition="($detail.check_status == 0)"} - 待审 + 待审 {elseif condition="($detail.check_status == 1)"} - 审核中 + 审核中 {elseif condition="($detail.check_status == 2)"} - 审核通过,待开具 + 审核通过,待开具 {elseif condition="($detail.check_status == 3)"} - 审核不通过 【原因：{$detail.check_remark}】 + 审核不通过 【原因：{$detail.check_remark}】 {elseif condition="($detail.check_status == 4)"} - 撤销 【原因：{$detail.check_remark}】 + 撤销 【原因：{$detail.check_remark}】 {elseif condition="($detail.check_status == 5)"} - 已开具 + 已开具 {elseif condition="($detail.check_status == 10)"} - 已作废 + 已作废 {/if} 查看审批记录 @@ -135,17 +135,17 @@ 到账状态 {if condition="($detail.is_cash == 0)"} - 未到账 + 未到账 {elseif condition="($detail.is_cash == 1)"} - 部分到账 + 部分到账 {elseif condition="($detail.is_cash == 2)"} - 全部到账 + 全部到账 {/if} 未到账金额(元) - {$detail.not_income} + {$detail.not_income} 已到账金额(元) - {$detail.enter_amount} + {$detail.enter_amount} 到账记录 diff --git a/app/finance/view/invoice/checkedlist.html b/app/finance/view/invoice/checkedlist.html index cfb4c62..3e3d590 100644 --- a/app/finance/view/invoice/checkedlist.html +++ b/app/finance/view/invoice/checkedlist.html @@ -56,7 +56,7 @@ title: '发票列表', toolbar: '#toolbarDemo', url: "/finance/invoice/checkedlist", //数据接口 - cellMinWidth: 320, + cellMinWidth: 300, page: true, //开启分页 limit: 20, cols: [ @@ -84,7 +84,6 @@ field: 'amount', title: '开票金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 100, },{ field: 'invoice_type', @@ -107,24 +106,24 @@ align: 'center', width: 100, templet:function(d){ - var html='待审'; + var html='待审核'; if(d.check_status==1){ - html='审核中'; + html='审核中'; } else if(d.check_status==2){ - html='待开具'; + html='待开具'; } else if(d.check_status==3){ - html='审核不通过'; + html='审核不通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已开具'; + html='已开具'; } else if(d.check_status==10){ - html='已作废'; + html='已作废'; } return html; } diff --git a/app/finance/view/invoice/copy.html b/app/finance/view/invoice/copy.html index 4b01616..4de4e6f 100644 --- a/app/finance/view/invoice/copy.html +++ b/app/finance/view/invoice/copy.html @@ -44,7 +44,7 @@ toolbar: '#toolbarDemo', url: "/finance/invoice/copy", //数据接口 page: true, //开启分页 - cellMinWidth: 320, + cellMinWidth: 300, limit: 20, cols: [ [ @@ -70,7 +70,6 @@ field: 'amount', title: '开票金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 100, },{ field: 'invoice_type', @@ -93,24 +92,24 @@ align: 'center', width: 100, templet:function(d){ - var html='待审核'; + var html='待审核'; if(d.check_status==1){ - html='审核中'; + html='审核中'; } else if(d.check_status==2){ - html='待开具'; + html='待开具'; } else if(d.check_status==3){ - html='审核不通过'; + html='审核不通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已开具'; + html='已开具'; } else if(d.check_status==10){ - html='已作废'; + html='已作废'; } return html; } diff --git a/app/finance/view/invoice/index.html b/app/finance/view/invoice/index.html index fbddd13..a54e8ec 100644 --- a/app/finance/view/invoice/index.html +++ b/app/finance/view/invoice/index.html @@ -60,7 +60,7 @@ toolbar: '#toolbarDemo', url: "/finance/invoice/index", //数据接口 page: true, //开启分页 - cellMinWidth: 320, + cellMinWidth: 300, limit: 20, cols: [ [ @@ -86,7 +86,6 @@ field: 'amount', title: '开票金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 100, },{ field: 'invoice_type', @@ -109,24 +108,24 @@ align: 'center', width: 100, templet:function(d){ - var html='待审核'; + var html='待审核'; if(d.check_status==1){ - html='审核中'; + html='审核中'; } else if(d.check_status==2){ - html='待开具'; + html='待开具'; } else if(d.check_status==3){ - html='审核不通过'; + html='审核不通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已开具'; + html='已开具'; } else if(d.check_status==10){ - html='已作废'; + html='已作废'; } return html; } diff --git a/app/finance/view/invoice/list.html b/app/finance/view/invoice/list.html index 73b0e60..be6c6f2 100644 --- a/app/finance/view/invoice/list.html +++ b/app/finance/view/invoice/list.html @@ -37,7 +37,7 @@ title: '发票列表', toolbar: '#toolbarDemo', url: "/finance/invoice/list", //数据接口 - cellMinWidth: 320, + cellMinWidth: 300, page: true, //开启分页 limit: 20, cols: [ @@ -64,7 +64,6 @@ field: 'amount', title: '开票金额(元)', align: 'right', - style: 'color:#1E9FFF', width: 100, },{ field: 'invoice_type', @@ -87,24 +86,24 @@ align: 'center', width: 100, templet:function(d){ - var html='待审核'; + var html='待审核'; if(d.check_status==1){ - html='审核中'; + html='审核中'; } else if(d.check_status==2){ - html='待开具'; + html='待开具'; } else if(d.check_status==3){ - html='审核不通过'; + html='审核不通过'; } else if(d.check_status==4){ - html='撤销'; + html='撤销'; } else if(d.check_status==5){ - html='已开具'; + html='已开具'; } else if(d.check_status==10){ - html='已作废'; + html='已作废'; } return html; } diff --git a/app/finance/view/invoice/view.html b/app/finance/view/invoice/view.html index 0ffd172..0fe2984 100644 --- a/app/finance/view/invoice/view.html +++ b/app/finance/view/invoice/view.html @@ -143,19 +143,19 @@ 发票状态 {if condition="($detail.check_status == 0)"} - 待审 + 待审 {elseif condition="($detail.check_status == 1)"} - 审核中 + 审核中 {elseif condition="($detail.check_status == 2)"} - 审核通过,待开具 + 审核通过,待开具 {elseif condition="($detail.check_status == 3)"} - 审核不通过 【原因：{$detail.check_remark}】 + 审核不通过 【原因：{$detail.check_remark}】 {elseif condition="($detail.check_status == 4)"} - 撤销 【原因：{$detail.check_remark}】 + 撤销 【原因：{$detail.check_remark}】 {elseif condition="($detail.check_status == 5)"} - 已开具 + 已开具 {elseif condition="($detail.check_status == 10)"} - 已作废 + 已作废 {/if} 查看审批记录 diff --git a/app/home/view/cate/car_cate.html b/app/home/view/cate/car_cate.html index 34e07d2..fbe9860 100644 --- a/app/home/view/cate/car_cate.html +++ b/app/home/view/cate/car_cate.html @@ -31,8 +31,8 @@ ,{field:'title',title: '车辆名称'} ,{field:'name',title: '车牌号码'} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ - var html1='正常'; - var html2='禁用'; + var html1='正常'; + var html2='禁用'; if(d.status==1){ return html1; } diff --git a/app/home/view/cate/cost_cate.html b/app/home/view/cate/cost_cate.html index 602fd6c..cb5005d 100644 --- a/app/home/view/cate/cost_cate.html +++ b/app/home/view/cate/cost_cate.html @@ -30,8 +30,8 @@ {field:'id',width:80, title: 'ID号', align:'center'} ,{field:'title',title: '类别名称'} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ - var html1='正常'; - var html2='禁用'; + var html1='正常'; + var html2='禁用'; if(d.status==1){ return html1; } diff --git a/app/home/view/cate/expense_cate.html b/app/home/view/cate/expense_cate.html index b54853f..9958f82 100644 --- a/app/home/view/cate/expense_cate.html +++ b/app/home/view/cate/expense_cate.html @@ -30,8 +30,8 @@ {field:'id',width:80, title: 'ID号', align:'center'} ,{field:'title',title: '类别名称'} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ - var html1='正常'; - var html2='禁用'; + var html1='正常'; + var html2='禁用'; if(d.status==1){ return html1; } diff --git a/app/home/view/cate/flow_type.html b/app/home/view/cate/flow_type.html index cb118a7..2fa151d 100644 --- a/app/home/view/cate/flow_type.html +++ b/app/home/view/cate/flow_type.html @@ -54,8 +54,8 @@ return html; }} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ - var html1='正常'; - var html2='禁用'; + var html1='正常'; + var html2='禁用'; if(d.status==1){ return html1; } diff --git a/app/home/view/cate/seal_cate.html b/app/home/view/cate/seal_cate.html index 65ddf6b..efa7a0d 100644 --- a/app/home/view/cate/seal_cate.html +++ b/app/home/view/cate/seal_cate.html @@ -30,8 +30,8 @@ {field:'id',width:80, title: 'ID号', align:'center'} ,{field:'title',title: '类别名称'} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ - var html1='正常'; - var html2='禁用'; + var html1='正常'; + var html2='禁用'; if(d.status==1){ return html1; } diff --git a/app/home/view/cate/subject.html b/app/home/view/cate/subject.html index 272f6e2..61d4ba1 100644 --- a/app/home/view/cate/subject.html +++ b/app/home/view/cate/subject.html @@ -30,8 +30,8 @@ {field:'id',width:80, title: 'ID号', align:'center'} ,{field:'title',title: '发票主体名称'} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ - var html1='正常'; - var html2='禁用'; + var html1='正常'; + var html2='禁用'; if(d.status==1){ return html1; } diff --git a/app/home/view/cate/work_cate.html b/app/home/view/cate/work_cate.html index 95d4a70..73e7602 100644 --- a/app/home/view/cate/work_cate.html +++ b/app/home/view/cate/work_cate.html @@ -30,8 +30,8 @@ {field:'id',width:80, title: 'ID号', align:'center'} ,{field:'title',title: '类别名称'} ,{field:'status', title: '状态',width:80,align:'center',templet: function(d){ - var html1='正常'; - var html2='禁用'; + var html1='正常'; + var html2='禁用'; if(d.status==1){ return html1; } diff --git a/app/home/view/conf/index.html b/app/home/view/conf/index.html index 55c64d6..d23b22a 100644 --- a/app/home/view/conf/index.html +++ b/app/home/view/conf/index.html @@ -6,7 +6,7 @@