From 6c6982c0a698f6cebd6642c63f7e22299d9e8602 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 14 九月 2023 12:46:30 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3c5ed50..adb2696 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -120,6 +120,11 @@
})
}
+ let where = {}
+ if (getQueryVariable('status') !== false) {
+ where = {status: getQueryVariable('status')}
+ }
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#order',
@@ -132,6 +137,7 @@
height: 'full-148',
// size: 'sm',
skin: 'line',
+ where: where,
cols: [[
{type: 'checkbox'}
,{field: 'name', align: 'left',title: '璺熻釜椤圭洰鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 300}
@@ -139,11 +145,13 @@
,{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: '娣诲姞鏃堕棿'}
- ,{field: 'company$', align: 'left',title: '鎵�灞炲叕鍙�', hide: true}
+ ,{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}
@@ -260,10 +268,18 @@
success: function (layero, dIndex) {
let cstmrSel = loadCstmrSel();
let companySel = loadCompanySel();
+ if (!mData){
+ companySel.setValue([{name: "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�", value: 4}]);
+ }
if (mData) {
$('#cascaderVal').val(mData.pcd);
if (mData.cstmrId) { cstmrSel.setValue([{name: mData.cstmrId$, value: mData.cstmrId}]); }
if (mData.company) { companySel.setValue([{name: mData.company$, value: mData.company}]); }
+ }else {
+ mData = {
+ director: 25,
+ director$: "闄嗘檽娑�"
+ }
}
layDateRender(mData);
cascaderRender();
@@ -277,6 +293,22 @@
}
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);
@@ -384,6 +416,7 @@
autoRow: true,
filterable: true,
remoteSearch: true,
+ clickClose: true,
radio: true,
remoteMethod: function (val, cb, show) {
$.ajax({
@@ -412,6 +445,7 @@
autoRow: true,
filterable: true,
remoteSearch: true,
+ clickClose: true,
radio: true,
remoteMethod: function (val, cb, show) {
$.ajax({
--
Gitblit v1.9.1