Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
84eba7be by 焦小希
Options

Merge branch '3ddc' of http://yun.pashanhoo.com:9090/xian-java/fontweb-dc into 3ddc

2 parents a83785e6 cd02938c
Inline Side-by-side
Showing 7 changed files with 105 additions and 26 deletions
......@@ -97,7 +97,7 @@ var self = new Vue({
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.PROJECTID;
var projectid = data.id;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = data.stats ? data.stats : '';
......@@ -110,7 +110,7 @@ var self = new Vue({
var layerid="";
var coverage="";
var url = CONF_FRONT_SERVERURL
+ 'view/projecttask/detailproject.jsp?projectid=' + 20190 + "&referer=''&stats="
+ 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
+ stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
+ titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
......
......@@ -188,7 +188,7 @@
width="55">
</el-table-column>
<el-table-column
prop="xh"
type="index"
label="序号"
width="55">
</el-table-column>
......@@ -324,7 +324,7 @@
width="55">
</el-table-column>
<el-table-column
prop="xh"
type="index"
label="序号"
width="55">
</el-table-column>
......
......@@ -4,7 +4,11 @@ var self = new Vue({
return {
search:'',
projectId:null,
userId:null,
userId:'t0101_8a8610de737b99270173941e5c50017e',
flowid: 't1001_8a8610de737b99270173937337e00133',
pageNum:1,
pageSize:10,
total:0,
// 表格数据
tabaledata:[
{
......@@ -61,9 +65,53 @@ var self = new Vue({
isActive:1,
}
},
mounted(){
this.getData();
},
methods:{
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/haveToDo/'+this.pageNum+'/'+this.pageSize, {
params: {
flowid: this.flowid,
userId: this.userId,
keyword: this.search
}
}).then(res => {
console.log(res)
this.total=res.data.data.total;
this.tabaledata = res.data.data.list;
}).catch(res=>{
console.log(res)
});
},
handleSizeChange(){
}, clickData(row, column, event) {
this.jumpdetailPage(row);
},
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.id;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = data.stats ? data.stats : '';
var projecttype = data.FLOWNAME;
var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
var FLOWREVISIONID = data.FLOWREVISIONID;
var projectcode = data.PROJECTCODE;
var flowItemTypeKvStr = data.FLOWITEMTYPE?"&flowItemTypeId=" + data.FLOWITEMTYPE:"";
var version = data.FLOWVERSION;
var layerid="";
var coverage="";
var url = CONF_FRONT_SERVERURL
+ 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
+ stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
+ titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
detailPage = window.open(this.handleJumpUrl(url));
parent.saveOpenNew?parent.saveOpenNew(detailPage):sreachparent(opener,"saveOpenNew",detailPage);
},
handleCurrentChange(){},
click(val){
......
......@@ -113,28 +113,29 @@
v-if="isActive==1"
:data="tabaledata"
style="width: 100%;"
height="100%"
height="750px"
border
stripe
:default-sort = "{prop: 'xh', order: 'ascending'}"
@row-click="clickData"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="xh"
type="index"
label="序号"
width="55">
</el-table-column>
<el-table-column
prop="ajmc"
prop="xmmc"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="anlx"
prop="ajlx"
label="案件类型"
align="center"
width="100"
......@@ -162,7 +163,7 @@
>
</el-table-column>
<el-table-column
prop="djsh"
prop="djsj"
label="登记时间"
align="center"
width="200"
......@@ -184,24 +185,25 @@
border
stripe
:default-sort = "{prop: 'xh', order: 'ascending'}"
@row-click="clickData"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="xh"
type="index"
label="序号"
width="55">
</el-table-column>
<el-table-column
prop="ajmc"
prop="xmmc"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="anlx"
prop="ajlx"
label="案件类型"
align="center"
width="100"
......@@ -229,7 +231,7 @@
>
</el-table-column>
<el-table-column
prop="djsh"
prop="djsj"
label="登记时间"
align="center"
width="200"
......@@ -251,24 +253,25 @@
border
stripe
:default-sort = "{prop: 'xh', order: 'ascending'}"
@row-click="clickData"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="xh"
type="index"
label="序号"
width="55">
</el-table-column>
<el-table-column
prop="ajmc"
prop="xmmc"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="anlx"
prop="ajlx"
label="案件类型"
align="center"
width="100"
......@@ -296,7 +299,7 @@
>
</el-table-column>
<el-table-column
prop="djsh"
prop="djsj"
label="登记时间"
align="center"
width="200"
......@@ -318,24 +321,25 @@
border
stripe
:default-sort = "{prop: 'xh', order: 'ascending'}"
@row-click="clickData"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="xh"
type="index"
label="序号"
width="55">
</el-table-column>
<el-table-column
prop="ajmc"
prop="xmmc"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="anlx"
prop="ajlx"
label="案件类型"
align="center"
width="100"
......@@ -363,7 +367,7 @@
>
</el-table-column>
<el-table-column
prop="djsh"
prop="djsj"
label="登记时间"
align="center"
width="200"
......@@ -383,11 +387,11 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="1"
:current-page="pageNum"
:page-sizes="[2, 3, 5]"
:page-size="4"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="8">
:total="total">
</el-pagination>
</div>
</div>
......
......@@ -128,7 +128,7 @@ var self = new Vue({
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.PROJECTID;
var projectid = data.id;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = data.stats ? data.stats : '';
......
......@@ -117,6 +117,32 @@ var self = new Vue({
});
},
clickData(row){
this.jumpdetailPage(row)
},
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.id;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = data.stats ? data.stats : '';
var projecttype = data.FLOWNAME;
var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
var FLOWREVISIONID = data.FLOWREVISIONID;
var projectcode = data.PROJECTCODE;
var flowItemTypeKvStr = data.FLOWITEMTYPE?"&flowItemTypeId=" + data.FLOWITEMTYPE:"";
var version = data.FLOWVERSION;
var layerid="";
var coverage="";
var url = CONF_FRONT_SERVERURL
+ 'view/projecttask/detailproject.jsp?projectid=' + projectid + "&referer=''&stats="
+ stats +"&projectcode="+projectcode+"&taskId=" + taskid + "&flowInstanceId=" + flowInstanceId+'&titleEncode='
+ titleEncode + "&projectStatus=" + PROJECTSTATUS+"&flowRevisionId="+FLOWREVISIONID+flowItemTypeKvStr+"&FLOWVERSION="+version+"&detailType="+detailType;
detailPage = window.open(this.handleJumpUrl(url));
parent.saveOpenNew?parent.saveOpenNew(detailPage):sreachparent(opener,"saveOpenNew",detailPage);
},
handleSizeChange(){
},
......
......@@ -112,6 +112,7 @@
height="100%"
border
stripe
@row-click="clickData"
>
<el-table-column
type="selection"
......