From 469712af22140dfffbb67d9d7ceff2a2b5f1b803 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 16:27:22 +0800
Subject: [PATCH] #优化
---
src/main/webapp/static/js/cstmr/cstmr.js | 2
src/main/webapp/views/order/order_more.html | 32 +++++-----
src/main/webapp/static/js/order/order.js | 19 ++++++
src/main/webapp/views/home/dashboard.html | 60 ++++++++++++--------
src/main/webapp/views/order/order.html | 9 +-
5 files changed, 76 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 1ee16b3..bc5a4d4 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -153,7 +153,7 @@
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true}
,{field: 'rela', align: 'left',title: '瀹㈡埛鍏崇郴', hide: true}
,{field: 'contacts', align: 'left',title: '瀹㈡埛鑱旂郴浜�', hide: true}
- ,{field: 'director$', align: 'left',title: '璐熻矗浜�', hide: true}
+ ,{field: 'director$', align: 'left',title: '璐熻矗浜�', hide: false}
,{field: 'province', align: 'left',title: '鐪�', hide: true}
,{field: 'city', align: 'left',title: '甯�', hide: true}
,{field: 'district', align: 'left',title: '鍘�', hide: true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6ca4607..f215400 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -145,7 +145,8 @@
,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore', templet:function(d){return emptyShow(d.cstmrId$)}}
,{field: 'pcd$', align: 'left',title: '鎵�灞炲尯鍩�', templet:function(d){return emptyShow(d.pcd$)}}
,{field: 'addr', align: 'left',title: '椤圭洰鍦板潃', templet:function(d){return emptyShow(d.addr)}}
- ,{field: 'money', align: 'right',title: '椤圭洰棰勭畻閲戦', templet:function(d){return emptyShow(d.money)}}
+ ,{field: 'money', align: 'right',title: '椤圭洰棰勭畻閲戦', templet:function(d){return emptyShow(d.money+"涓�")}}
+ ,{field: 'transactionRate', align: 'right',title: '椤圭洰棰勪及鎴愪氦鐜�', templet:function(d){return emptyShow(d.transactionRate+"%")}}
,{field: 'director$', align: 'left',title: '椤圭洰璐熻矗浜�', templet:function(d){return emptyShow(d.director$)}}
,{field: 'remarks', align: 'left',title: '澶囨敞', templet:function(d){return emptyShow(d.remarks)}}
,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'}
@@ -285,6 +286,22 @@
layer.msg("鐢叉柟鍗曚綅涓嶈兘涓虹┖", {icon: 2});
return false;
}
+ if (!data.field.transactionRate) {
+ layer.msg("棰勮鎴愪氦鐜囦笉鑳戒负绌�", {icon: 2});
+ return false;
+ }
+ if (!data.field.status) {
+ layer.msg("椤圭洰鐘舵�佷笉鑳戒负绌�", {icon: 2});
+ return false;
+ }
+ if (!data.field.pcd) {
+ layer.msg("鐪佸競鍖轰笉鑳戒负绌�", {icon: 2});
+ return false;
+ }
+ if (!data.field.director) {
+ layer.msg("璐熻矗浜轰笉鑳戒负绌�", {icon: 2});
+ return false;
+ }
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/order/"+(mData?'update':'add')+"/auth",
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index fd45064..e2b8150 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -34,6 +34,10 @@
margin-left: 4px;
line-height: 32px;
}
+
+ .testColorBlack{
+ color: black;
+ }
</style>
</head>
@@ -43,86 +47,86 @@
<div class="layui-fluid">
<div class="layui-row layui-col-space15">
- <div class="layui-col-xs12 layui-col-md8">
+ <div class="layui-col-xs12 layui-col-md8" >
<div class="layui-card" style="">
- <div class="layui-card-header">鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
- <div class="layui-card-body" style="padding-bottom: 20px;">
+ <div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
+ <div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
<div class="layui-row">
- <div>鍥㈤槦鏁版嵁</div>
+ <div class="testColorBlack">鍥㈤槦鏁版嵁</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
+ <div class="numberInfoSubTitle testColorBlack" >骞村害閿�鍞洰鏍�</div>
<div class="numberInfoValue">
<span id="companyYearTarget">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">宸插畬鎴愰攢鍞换鍔�</div>
+ <div class="numberInfoSubTitle testColorBlack">宸插畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
<span id="companySuccess">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鏈畬鎴愰攢鍞换鍔�</div>
+ <div class="numberInfoSubTitle testColorBlack">鏈畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
<span id="companyProgress">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">瀹屾垚鐜�</div>
+ <div class="numberInfoSubTitle testColorBlack">瀹屾垚鐜�</div>
<div class="numberInfoValue"><span id="companyRate">92</span>%</div>
</div>
</div>
</div>
</div>
- <div class="layui-card" style="">
- <div class="layui-card-header">瀹炴椂閿�鍞儏鍐�</div>
- <div class="layui-card-body" style="padding-bottom: 20px;">
+ <div class="layui-card" style="background-color: #ffffff">
+ <div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">瀹炴椂閿�鍞儏鍐�</div>
+ <div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
<div class="layui-row">
- <div>涓汉鏁版嵁</div>
+ <div class="testColorBlack">涓汉鏁版嵁</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
+ <div class="numberInfoSubTitle testColorBlack">骞村害閿�鍞洰鏍�</div>
<div class="numberInfoValue">
<span id="personYearTarget">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">宸插畬鎴愰攢鍞换鍔�</div>
+ <div class="numberInfoSubTitle testColorBlack">宸插畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
<span id="personSuccess">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鏈畬鎴愰攢鍞换鍔�</div>
+ <div class="numberInfoSubTitle testColorBlack">鏈畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
<span id="personProgress">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">瀹屾垚鐜�</div>
+ <div class="numberInfoSubTitle testColorBlack">瀹屾垚鐜�</div>
<div class="numberInfoValue"><span id="personRate">92</span>%</div>
</div>
</div>
<div class="layui-row" style="margin-top: 40px;">
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">璺熻釜椤圭洰鏁伴噺</div>
+ <div class="numberInfoSubTitle testColorBlack">璺熻釜椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
<a href="#" id="openProgress" style="color: #1E9FFF"><span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em></a>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">璺熻釜椤圭洰閲戦</div>
+ <div class="numberInfoSubTitle testColorBlack">璺熻釜椤圭洰閲戦</div>
<div class="numberInfoValue">
<span id="progressMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鎴愪氦椤圭洰鏁伴噺</div>
+ <div class="numberInfoSubTitle testColorBlack">鎴愪氦椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
<a href="#" id="openSuccess" style="color: #1E9FFF"><span id="successCount">121</span><em class="numberInfoSuffix">涓�</em></a>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鎴愪氦椤圭洰閲戦</div>
+ <div class="numberInfoSubTitle testColorBlack">鎴愪氦椤圭洰閲戦</div>
<div class="numberInfoValue">
<span id="successMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
@@ -133,15 +137,14 @@
</div>
<div class="layui-col-xs12 layui-col-md4">
- <div class="layui-card" style="height: 403px;overflow: hidden;">
+ <div class="layui-card" style="height: 403px;overflow: hidden;background-color: #FFFA1C1C;height: 438px">
<div class="layui-card-header" style="display: flex;justify-content: space-between;">
<div>鍏徃鍏憡</div>
<div><a href="#" id="openCompanyPost" style="color: #1E9FFF">鏌ョ湅鏇村>></a></div>
</div>
- <div class="layui-card-body" id="companyPostId">
+ <div class="layui-card-body" id="companyPostId" style="background-color: #FFC6A02D">
</div>
</div>
-
</div>
<div class="layui-col-xs12">
@@ -305,7 +308,16 @@
success: function (res) {
let data = res.data
for (var i = 0; i < data.length; i++) {
- let div = "<tr>";
+ let div = "";
+ if (i==0){
+ div += "<tr style='color: red'>";
+ }else if (i==1){
+ div += "<tr style='color: blueviolet'>";
+ }else if (i==2){
+ div += "<tr style='color: #0181ee'>";
+ }else {
+ div += "<tr>";
+ }
if (i < 3) {
div += "<td><span class='layui-badge layui-bg-cyan'>" + (i+1) + "</span></td>"
}else {
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index b1132ea..bc8d21c 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -135,13 +135,13 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐪佸競鍖� : </label>
+ <label class="layui-form-label layui-form-required">鐪佸競鍖� : </label>
<div class="layui-input-block">
<input id="cascaderVal" name="pcd" placeholder="璇烽�夋嫨" class="layui-hide"/>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐熻矗浜�: </label>
+ <label class="layui-form-label layui-form-required">璐熻矗浜�: </label>
<div class="layui-input-block cool-auto-complete">
<input class="layui-input" name="director" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" style="display: none">
<input id="director$" name="director$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" onfocus=this.blur()>
@@ -152,9 +152,10 @@
</div>
</div>
</div>
+
<div class="layui-form-item">
- <label class="layui-form-label">椤圭洰鐘舵�� : </label>
- <div class="layui-input-block">
+ <label class="layui-form-label layui-form-required">椤圭洰鐘舵�� : </label>
+ <div class="layui-input-block" >
<input type="radio" name="status" value="0" title="璺熻釜涓�"/>
<input type="radio" name="status" value="1" title="瀹屾垚"/>
<input type="radio" name="status" value="2" title="鍏抽棴"/>
diff --git a/src/main/webapp/views/order/order_more.html b/src/main/webapp/views/order/order_more.html
index 0d9891c..b7274f9 100644
--- a/src/main/webapp/views/order/order_more.html
+++ b/src/main/webapp/views/order/order_more.html
@@ -52,7 +52,7 @@
</div>
<div class="layui-row">
<!-- 鍩烘湰淇℃伅 -->
- <div class="layui-col-md9">
+ <div class="layui-col-md12">
<div class="layui-card">
<div class="layui-card-header">
鍩烘湰淇℃伅
@@ -142,20 +142,20 @@
</div>
</div>
</div>
- <!-- 璺熻繘浜� -->
- <div class="layui-col-md3" style="width: 24%;margin-left: 1%">
- <div class="layui-card">
- <div class="layui-card-header">
- <span>璺熻繘浜�</span>
- <span lay-filter="followerAdd" lay-submit style="float: right;cursor: pointer;">
- <i class="layui-icon" style="font-size: 20px;color: #1890ff;"></i>
- </span>
- </div>
- <div class="layui-card-body">
- <table id="followersTable" lay-filter="followersTable"></table>
- </div>
- </div>
- </div>
+<!-- <!– 璺熻繘浜� –>-->
+<!-- <div class="layui-col-md3" style="width: 24%;margin-left: 1%">-->
+<!-- <div class="layui-card">-->
+<!-- <div class="layui-card-header">-->
+<!-- <span>璺熻繘浜�</span>-->
+<!-- <span lay-filter="followerAdd" lay-submit style="float: right;cursor: pointer;">-->
+<!-- <i class="layui-icon" style="font-size: 20px;color: #1890ff;"></i>-->
+<!-- </span>-->
+<!-- </div>-->
+<!-- <div class="layui-card-body">-->
+<!-- <table id="followersTable" lay-filter="followersTable"></table>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
@@ -220,7 +220,7 @@
// 璁惧鏄庣粏
form.val('formAdvForm', order);
// 璺熻繘浜�
- initFollowers(order.id);
+ // initFollowers(order.id);
layDateRender();
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
--
Gitblit v1.9.1