From ad6b7f0d80337bcddb1d694cc53bd6273c03149e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 11 十月 2023 11:10:58 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/priQuote/priQuote.js | 27 ++++++++-
src/main/webapp/static/js/plan/plan.js | 39 +++++++++++-
src/main/webapp/static/js/order/order.js | 90 ++++++++++++++++++++++-------
3 files changed, 126 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 1a2ec37..2d3e0e7 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -141,30 +141,74 @@
skin: 'line',
where: where,
cols: [[
- {type: 'checkbox'}
- ,{field: 'name', align: 'left',title: '璺熻釜椤圭洰鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 300}
- ,{field: 'uuid', align: 'left',title: '椤圭洰浠ｅ彿'}
- ,{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: '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: '娣诲姞鏃堕棿'}
- ,{field: 'company$', align: 'left',title: '鎵�灞炲叕鍙�', hide: false}
- ,{field: 'orderProductTypeId$', 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}
- ,{field: 'town', align: 'left',title: '闀�', hide: true}
- ,{field: 'status$', align: 'left',title: '鐘舵��'}
- ,{field: 'files', align: 'left',title: '闄勪欢', hide: true}
- ,{field: 'updateBy$', align: 'left',title: '淇敼浜哄憳', hide: true}
- ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
- ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
+ {type: 'checkbox'},
+ {
+ field: 'name',
+ align: 'left',
+ title: '璺熻釜椤圭洰鍚嶇О',
+ style: 'color: #1890ff;cursor:pointer',
+ event: 'more',
+ width: 300
+ },
+ {field: 'uuid', align: 'left',title: '椤圭洰浠ｅ彿'},
+ {
+ 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: '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: '娣诲姞鏃堕棿'},
+ {field: 'company$', align: 'left',title: '鎵�灞炲叕鍙�', hide: false},
+ {field: 'orderProductTypeId$', 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},
+ {field: 'town', align: 'left',title: '闀�', hide: true},
+ {field: 'status$', align: 'left',title: '鐘舵��'},
+ {field: 'files', align: 'left',title: '闄勪欢', hide: true},
+ {field: 'updateBy$', align: 'left',title: '淇敼浜哄憳', hide: true},
+ {field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true},
+ {field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true},
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
+ {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 3af7f75..518566f 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -143,14 +143,45 @@
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100}
,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false}
- ,{field: 'name', align: 'left',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
+ ,{
+ field: 'name',
+ align: 'left',
+ title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�',
+ width: 220,
+ style: 'color: #1890ff;cursor:pointer',
+ event: 'more',
+ hide: false
+ }
,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100,hide: false}
- ,{field: 'planNeed$', align: 'left',title: '鎵�闇�', templet:function(d){return emptyShow(d.planNeed$)},hide: false}
+ ,{
+ field: 'planNeed$',
+ align: 'left',
+ title: '鎵�闇�',
+ templet:function(d){
+ return emptyShow(d.planNeed$)
+ },
+ hide: false
+ }
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100}
// ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true}
- ,{field: 'orderId$', align: 'left',title: '璺熻釜椤圭洰', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'orderMore',hide: false}
- // ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore',hide: true}
+ ,{
+ field: 'orderId$',
+ align: 'left',
+ title: '璺熻釜椤圭洰',
+ width: 220,
+ style: 'color: #1890ff;cursor:pointer',
+ event: 'orderMore',hide: false
+ }
+ // ,{
+ // field: 'cstmrId$',
+ // align: 'left',
+ // title: '鐢叉柟鍗曚綅',
+ // width: 220,
+ // style: 'color: #1890ff;cursor:pointer',
+ // event: 'cstmrMore',
+ // hide: true
+ // }
,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false}
// ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
// ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
diff --git a/src/main/webapp/static/js/priQuote/priQuote.js b/src/main/webapp/static/js/priQuote/priQuote.js
index d7aff82..72ca174 100644
--- a/src/main/webapp/static/js/priQuote/priQuote.js
+++ b/src/main/webapp/static/js/priQuote/priQuote.js
@@ -89,14 +89,35 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide : true}
- ,{field: 'templateName', align: 'center',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'moreCstmr', width: 350,hide: false}
+ ,{
+ field: 'templateName',
+ align: 'center',
+ title: '瀹㈡埛鍚嶇О',
+ style: 'color: #1890ff;cursor:pointer',
+ event: 'moreCstmr',
+ width: 350,
+ hide: false
+ }
,{field: 'cstmrId$', align: 'center',title: '瀹㈡埛id',hide: true}
,{field: 'inOrderNum', align: 'center',title: '鎶ヤ环缂栧彿',hide: false}
// ,{field: 'orderNum', align: 'center',title: '鎶ヤ环棰勭畻鍗曞彿',hide: false}
- ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿', style: 'color: #1890ff;cursor:pointer', event: 'morePlan'}
+ ,{
+ field: 'planId$',
+ align: 'center',
+ title: '瑙勫垝鍗曞彿',
+ style: 'color: #1890ff;cursor:pointer',
+ event: 'morePlan'}
,{field: 'itemId', align: 'center',title: '瑙勫垝鍗曞彿', hide: true}
,{field: 'planName$', align: 'center',title: '瑙勫垝鍗曞悕绉�',hide: false}
- ,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 150,hide: false}
+ ,{
+ field: 'settle$',
+ align: 'center',
+ title: '杩涘害',
+ style: 'color: #1890ff;cursor:pointer',
+ event: 'more',
+ width: 150,
+ hide: false
+ }
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
// ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
--
Gitblit v1.9.1