Commit 5dfc01d0 by 王勇飞

trademark add updated_at desc

parent 85d3cad0
...@@ -54,7 +54,7 @@ class Dao { ...@@ -54,7 +54,7 @@ class Dao {
} }
orderBy() { orderBy() {
//return {"key":"include","value":{model:this.db.models.app}}; //return {"key":"include","value":{model:this.db.models.app}};
return [["created_at", "DESC"]]; return [["updated_at", "DESC"]];
} }
buildQuery(qobj) { buildQuery(qobj) {
var linkAttrs = []; var linkAttrs = [];
......
...@@ -11,6 +11,7 @@ module.exports = { ...@@ -11,6 +11,7 @@ module.exports = {
{ "width": "60", "label": "尼斯", "prop": "nclOneCodes", "isShowTip": true, "isTmpl": false }, { "width": "60", "label": "尼斯", "prop": "nclOneCodes", "isShowTip": true, "isTmpl": false },
{ "width": "170", "label": "商标状态", "prop": "tmStatusName", "isShowTip": true, "isTmpl": false }, { "width": "170", "label": "商标状态", "prop": "tmStatusName", "isShowTip": true, "isTmpl": false },
{ "width": "100", "label": "创建时间", "prop": "created_at", "isShowTip": true, "isTmpl": false }, { "width": "100", "label": "创建时间", "prop": "created_at", "isShowTip": true, "isTmpl": false },
{ "width": "100", "label": "更新时间", "prop": "updated_at", "isShowTip": true, "isTmpl": false },
{ "width": "100", "label": "提报时间", "prop": "submitTime", "isShowTip": true, "isTmpl": false }, { "width": "100", "label": "提报时间", "prop": "submitTime", "isShowTip": true, "isTmpl": false },
{ "width": "70", "label": "来源", "prop": "tmSourceTypeName", "isShowTip": true, "isTmpl": false }, { "width": "70", "label": "来源", "prop": "tmSourceTypeName", "isShowTip": true, "isTmpl": false },
{ "width": "85", "label": "支付状态", "prop": "channelPayStatusName", "isShowTip": true, "isTmpl": false }, { "width": "85", "label": "支付状态", "prop": "channelPayStatusName", "isShowTip": true, "isTmpl": false },
......
...@@ -825,6 +825,11 @@ ...@@ -825,6 +825,11 @@
var time = date.toLocaleDateString(); var time = date.toLocaleDateString();
return time; return time;
} }
if (column.property == "updated_at") {
var date = new Date(row["updated_at"]);
var time = date.toLocaleDateString();
return time;
}
if (column.property == "submitTime") { if (column.property == "submitTime") {
if (!row["submitTime"]) { if (!row["submitTime"]) {
return "---"; return "---";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment