Commit 835f8f58 authored by 周远喜's avatar 周远喜

ok

parent 41da0337
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
@on-selection-change="selectionChange" @on-selection-change="selectionChange"
@on-select="onSelect" @on-select="onSelect"
@on-select-all="allChange" @on-select-all="allChange"
@on-sort-change="sortChange"
:row-key="rowKey" :row-key="rowKey"
stripe stripe
></Table> ></Table>
...@@ -153,6 +154,8 @@ export default { ...@@ -153,6 +154,8 @@ export default {
search: { search: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
sortBy: "id",
isDesc:true,
conditions: [], conditions: [],
}, },
searchConditions: this.search, searchConditions: this.search,
...@@ -417,6 +420,12 @@ export default { ...@@ -417,6 +420,12 @@ export default {
} }
}); });
}, },
sortChange(column, key, order) {
this.search.sortBy = key;
this.search.isDesc = order == "desc";
this.search.pageIndex = 1;
this.load();
},
saveUserconfig() { saveUserconfig() {
let url = `${window.systemUrl}/config/update`; let url = `${window.systemUrl}/config/update`;
var content = []; var content = [];
...@@ -572,6 +581,7 @@ export default { ...@@ -572,6 +581,7 @@ export default {
}); });
return name; return name;
}, },
//批量取消 //批量取消
cancelBatch() { cancelBatch() {
this.footerToolbar = false; this.footerToolbar = false;
......
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
name: "", name: "",
data() { data() {
return { return {
action: `${technologyUrl}routingheader/paged`, action: `${systemUrl}/user/paged`,
easySearch: { easySearch: {
keys: { keys: {
op: "unicode,name,code", op: "unicode,name,code",
...@@ -38,8 +38,8 @@ export default { ...@@ -38,8 +38,8 @@ export default {
}, },
}, },
columns: [{ columns: [{
key: "code", key: "id",
title: this.l("code"), title: "姓名",
align: "left", align: "left",
width: 200, width: 200,
sortable:true, sortable:true,
...@@ -47,136 +47,24 @@ export default { ...@@ -47,136 +47,24 @@ export default {
high: true high: true
}, },
{ {
key: "name", key: "userName",
title: this.l("name"), title: "姓名",
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
tooltip: true,d
},
{
key: "phase",
title: this.l("phase"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.phase"
},
{
key: "versionid",
title: this.l("version"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.version"
},
{
title: this.l("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
code: "process.RoutingStatus"
},
{
key: "routingType",
title: this.l("routingType"),
align: "center",
width: 100,
high: true,
code: "Process.Routing.routingType"
},
{
key: "drawingNo",
title: this.l("drawingNo"),
align: "left",
high: true
},
{
key: "productName",
title: this.l("productName"),
align: "left",
high: true,
tooltip: true, tooltip: true,
sortable:true,
}, },
{ {
key: "productId", key: "cardNo",
title: this.l("productId"), title: "姓名",
align: "left",
import: true,
hide: true,
},
{
key: "productBomId",
title: this.l("productBomId"),
align: "left",
import: true,
hide: true,
},
{
key: "departmentName",
title: this.l("departmentName"),
width: 100,
align: "left", align: "left",
easy: true,
sortable:true,
high: true, high: true,
tooltip: true, tooltip: true,
}, },
{ ],
key: "departmentId",
title: this.l("departmentId"),
align: "left",
import: true,
hide: true,
},
{
key: "isEffect",
title: this.l("isEffect"),
align: "center",
width: 80,
high: true,
code: "Process.Status"
},
//{ key: "id", title: this.$t("id"), hide: true, align: "left" },
// { key:"upId",title:this.l("upId") ,align:"left" ,high:true },
// { key:"upDetailId",title:this.l("upDetailId") ,hide:true ,align:"left" ,high:true },
//{ key: "classId", title: this.l("classId"), align: "left", hide: true },
//{ key: "unicode", title: this.l("unicode"),align: "left",easy: false,hide: true},
// { key:"approvalStatus",title:this.l("approvalStatus") ,align:"left" ,high:true ,code:'process.RoutingStatus' },
// { key:"approvalStatusRemark",title:this.l("approvalStatusRemark") ,align:"left" ,high:true },
// { key:"auditUserId1",title:this.l("auditUserId1") ,align:"left" ,high:true },
// { key:"auditUserId2",title:this.l("auditUserId2") ,align:"left" ,high:true },
// { key:"platesnum",title:this.l("platesnum") ,align:"left" ,high:true },
// { key: "isMain", title: this.l("isMain"),align: "center",width: 80,high: true,code: "Process.state"},
//{key: "creatorUserId",title: this.l("author"),align: "left", high: true,type: "user",hide: true},
//{key: "versionnotes",title: this.l("versionnotes"),align: "left", high: true,hide: true},
//{key: "versionid", title: this.l("versionid"), align: "left", hide: true, code: "Process.Routing.version"},
{
key: "creationTime",
title: this.$t("creationTime"),
align: "left",
hide: true
},
{
key: "creatorUserId",
title: this.$t("creatorUserId"),
align: "left",
hide: true,
type: "user"
},
{
key: "lastModificationTime",
title: this.$t("lastModificationTime"),
align: "left",
hide: true
},
{
key: "lastModifierUserId",
title: this.$t("lastModifierUserId"),
align: "left",
hide: true,
type: "user"
}],
}; };
}, },
......
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