Commit 2ae9fd85 by 陈浩建

Merge remote-tracking branch 'origin/master'

parents c405aa5d 560bbb5f
...@@ -315,6 +315,7 @@ ...@@ -315,6 +315,7 @@
scopedSlots: {customRender: "orderTypeScope"} scopedSlots: {customRender: "orderTypeScope"}
}, },
{dataIndex: "preType", width:80, title:'销售时段', align : "center"}, {dataIndex: "preType", width:80, title:'销售时段', align : "center"},
{dataIndex: "dataErrorRemark", width:200, title:'数据错误提示', align : "center"},
{dataIndex: "lockState", width:80, title:'是否锁定', align : "center"}, {dataIndex: "lockState", width:80, title:'是否锁定', align : "center"},
{dataIndex: 'networkName', width: 200, title: '所属网点', align: "center"}, {dataIndex: 'networkName', width: 200, title: '所属网点', align: "center"},
{dataIndex: 'networkCode', width: 130, title: '网点编码', align: "center"}, {dataIndex: 'networkCode', width: 130, title: '网点编码', align: "center"},
......
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