|
@@ -156,7 +156,8 @@
|
|
{
|
|
{
|
|
title:'审核人',
|
|
title:'审核人',
|
|
align:"center",
|
|
align:"center",
|
|
- dataIndex: 'shr'
|
|
|
|
|
|
+ // dataIndex: 'shr'
|
|
|
|
+ dataIndex: 'shusername'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title:'审批人',
|
|
title:'审批人',
|
|
@@ -181,13 +182,14 @@
|
|
{
|
|
{
|
|
title:'用户名称',
|
|
title:'用户名称',
|
|
align:"center",
|
|
align:"center",
|
|
- dataIndex: 'tcdw'
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- title:'用户简称',
|
|
|
|
- align:"center",
|
|
|
|
- dataIndex: 'brief'
|
|
|
|
|
|
+ // dataIndex: 'tcdw'
|
|
|
|
+ dataIndex: 'yhname'
|
|
},
|
|
},
|
|
|
|
+ // {
|
|
|
|
+ // title:'用户简称',
|
|
|
|
+ // align:"center",
|
|
|
|
+ // dataIndex: 'brief'
|
|
|
|
+ // },
|
|
{
|
|
{
|
|
title:'计划开始时间',
|
|
title:'计划开始时间',
|
|
align:"center",
|
|
align:"center",
|
|
@@ -220,7 +222,8 @@
|
|
{
|
|
{
|
|
title:'填写时间',
|
|
title:'填写时间',
|
|
align:"center",
|
|
align:"center",
|
|
- dataIndex: 'createtime',
|
|
|
|
|
|
+ // dataIndex: 'createtime',
|
|
|
|
+ dataIndex: 'txtime',
|
|
customRender:function (text) {
|
|
customRender:function (text) {
|
|
return !text?"":(text.length>10?text.substr(0,10):text)
|
|
return !text?"":(text.length>10?text.substr(0,10):text)
|
|
}
|
|
}
|
|
@@ -244,10 +247,12 @@
|
|
},
|
|
},
|
|
],
|
|
],
|
|
url: {
|
|
url: {
|
|
- list: "/kyBgInfo/kyBgInfo/getGSDeatilList",
|
|
|
|
|
|
+ // list: "/kyBgInfo/kyBgInfo/getGSDeatilList", // 采集的科研报工
|
|
|
|
+ list: "/kyBgInfoNew/kyBgInfoNew/getGSDeatilList", // 导入的科研报工
|
|
// delete: "/kyBgInfo/kyBgInfo/delete",
|
|
// delete: "/kyBgInfo/kyBgInfo/delete",
|
|
// deleteBatch: "/kyBgInfo/kyBgInfo/deleteBatch",
|
|
// deleteBatch: "/kyBgInfo/kyBgInfo/deleteBatch",
|
|
- exportXlsUrl: "/kyBgInfo/kyBgInfo/exportGSDetail",
|
|
|
|
|
|
+ // exportXlsUrl: "/kyBgInfo/kyBgInfo/exportGSDetail", // 采集的科研报工
|
|
|
|
+ exportXlsUrl: "/kyBgInfoNew/kyBgInfoNew/exportGSDetail", // 导入的科研报工
|
|
// importExcelUrl: "kyBgInfo/kyBgInfo/importExcel",
|
|
// importExcelUrl: "kyBgInfo/kyBgInfo/importExcel",
|
|
|
|
|
|
},
|
|
},
|