From 0c496c28edcfc87f4431a32f76a0569c1d939d72 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 17:18:37 +0800
Subject: [PATCH] #优化
---
src/main/webapp/static/js/order/order.js | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 664e5c9..9ed24f6 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -59,7 +59,7 @@
case 1:
// 妯℃澘涓嬭浇
layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/mould/鐢叉柟鍗曚綅瀵煎叆妯℃澘.xls";
+ location.href = baseUrl + "/mould/璺熻釜椤圭洰瀵煎叆妯℃澘.xls";
layer.closeAll('loading');
break
case 2:
@@ -120,6 +120,11 @@
})
}
+ let where = {}
+ if (getQueryVariable('status') !== false) {
+ where = {status: getQueryVariable('status')}
+ }
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#order',
@@ -132,31 +137,30 @@
height: 'full-148',
// size: 'sm',
skin: 'line',
+ where: where,
cols: [[
{type: 'checkbox'}
- // ,{field: 'id', align: 'center',title: 'ID'}
- // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
- ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�'}
- ,{field: 'userId$', align: 'center',title: '鎵�灞炰汉鍛�'}
- ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅'}
- ,{field: 'uuid', align: 'center',title: '瀹㈡埛浠ｅ彿'}
- ,{field: 'name', align: 'center',title: '瀹㈡埛鍚嶇О'}
- ,{field: 'money', align: 'center',title: '鎬婚噾棰�'}
- ,{field: 'company$', align: 'center',title: '鎵�灞炲叕鍙�'}
- ,{field: 'remarks', align: 'center',title: '澶囨敞'}
- ,{field: 'director$', align: 'center',title: '璐熻矗浜�'}
- ,{field: 'province', align: 'center',title: '鐪�', hide: true}
- ,{field: 'city', align: 'center',title: '甯�', hide: true}
- ,{field: 'district', align: 'center',title: '鍘�', hide: true}
- ,{field: 'town', align: 'center',title: '闀�', hide: true}
- ,{field: 'addr', align: 'center',title: '璇︾粏鍦板潃', hide: true}
- ,{field: 'files', align: 'center',title: '闄勪欢', hide: true}
- ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', hide: true}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide: true}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{field: 'memo', align: 'center',title: '娉ㄩ噴', hide: true}
+ ,{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: true}
+ ,{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:120}
]],
@@ -233,6 +237,18 @@
}
})
break;
+ case 'cstmrMore':
+ top.cstmrByMore = data.cstmrId;
+ admin.popupRight({
+ type: 1,
+ window: "top",
+ area: "1250px",
+ url: "../cstmr/cstmr_more.html",
+ end: function () {
+ // $(".layui-laypage-btn")[0].click();
+ }
+ })
+ break;
case 'edit':
showEditModel(data);
break;
@@ -254,13 +270,39 @@
let companySel = loadCompanySel();
if (mData) {
$('#cascaderVal').val(mData.pcd);
- cstmrSel.setValue({name: cstmrId$, value: cstmrId});
- companySel.setValue({name: company$, value: company});
+ if (mData.cstmrId) { cstmrSel.setValue([{name: mData.cstmrId$, value: mData.cstmrId}]); }
+ if (mData.company) { companySel.setValue([{name: mData.company$, value: mData.company}]); }
}
layDateRender(mData);
cascaderRender();
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
+ data.field.company = companySel.getValue()[0] ? companySel.getValue()[0].value : null;
+ if (!data.field.company) {
+ layer.msg("鎵�灞炲叕鍙镐笉鑳戒负绌�", {icon: 2});
+ return false;
+ }
+ if (!data.field.cstmrId) {
+ 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",
@@ -282,7 +324,6 @@
})
return false;
});
-
$(layero).children('.layui-layer-content').css('overflow', 'visible');
layui.form.render('select');
}
--
Gitblit v1.9.1