a1cbf66c by 焦小希

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

2 parents 5315656b 6f0e5832
......@@ -4,7 +4,7 @@ var self = new Vue({
return {
search: '',
flowid: 't1001_8a8610de737b99270173937337e00133',
userid: 't0101_8a8610de737b99270173941e5c50017e',
userName: '案件查处',
pageNum:1,
pageSize:10,
total:0,
......@@ -34,15 +34,18 @@ var self = new Vue({
},
methods: {
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, {
axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', null,{
params: {
flowid: this.flowid,
userId: this.userid,
keyword: this.search
userName: this.userName,
pageIndex:this.pageNum,
pageSize:this.pageSize,
}
}).then(res => {
debugger
this.total=res.data.data.total;
this.tabaledata = res.data.data.list;
this.tabaledata = res.data.data.Data[0];
}).catch(res=>{
console.log(res)
});
......@@ -111,10 +114,10 @@ var self = new Vue({
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.id;
var projectid = data.PROJECTID;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = data.stats ? data.stats : '';
var stats = 'projecting';
var projecttype = data.FLOWNAME;
var PROJECTSTATUS = encodeURI(encodeURI(data.PROJECTSTATUS));
var FLOWREVISIONID = data.FLOWREVISIONID;
......
......@@ -125,27 +125,27 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="ajlx"
prop="PHAJLX"
label="案件类型"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......@@ -159,7 +159,7 @@
>
</el-table-column>
<el-table-column
prop="djsj"
prop="CREATETIME"
label="登记时间"
align="center"
width="200"
......@@ -171,7 +171,7 @@
</template>
</el-table-column>
<el-table-column
prop="jssj"
prop="RECEIVETIME"
label="接收时间"
align="center"
width="200"
......@@ -198,7 +198,7 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
width="300"
label="案件名称"
align="center"
......@@ -211,14 +211,14 @@
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......@@ -232,14 +232,14 @@
>
</el-table-column>
<el-table-column
prop="djsh"
prop="CREATETIME"
label="登记时间"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="jssi"
prop="RECEIVETIME"
label="接收时间"
align="center"
width="200"
......@@ -279,14 +279,14 @@
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......@@ -300,14 +300,14 @@
>
</el-table-column>
<el-table-column
prop="djsh"
prop="CREATETIME"
label="登记时间"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="jssi"
prop="RECEIVETIME"
label="接收时间"
align="center"
width="200"
......@@ -334,7 +334,7 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
width="300"
label="案件名称"
align="center"
......@@ -347,14 +347,14 @@
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......@@ -368,14 +368,14 @@
>
</el-table-column>
<el-table-column
prop="djsh"
prop="CREATETIME"
label="登记时间"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="jssi"
prop="RECEIVETIME"
label="接收时间"
align="center"
width="200"
......
......@@ -4,14 +4,14 @@ var self = new Vue({
return {
search:'',
projectId:null,
userId:'t0101_8a8610de737b99270173941e5c50017e',
userName: '案件查处',
flowid: 't1001_8a8610de737b99270173937337e00133',
pageNum:1,
pageSize:10,
total:0,
// 表格数据
tabaledata:[
{
/* {
xh:'1',
ajmc:'关于拍卖出让87.608亩国有建设用地使用权的请示(GX3-18-25)',
anlx:'双随机',
......@@ -60,7 +60,7 @@ var self = new Vue({
ljr:'向小华',
djsh:'2020-07-05',
jssi:'2020-07-05',
},
},*/
],
isActive:1,
}
......@@ -70,16 +70,17 @@ var self = new Vue({
},
methods:{
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/haveToDo/'+this.pageNum+'/'+this.pageSize, {
axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
params: {
flowid: this.flowid,
userId: this.userId,
keyword: this.search
pageIndex:this.pageNum,
pageSize:this.pageSize,
flowId: this.flowid,
userName: this.userName,
}
}).then(res => {
console.log(res)
this.total=res.data.data.total;
this.tabaledata = res.data.data.list;
this.total=res.data.total;
this.tabaledata = res.data.data.Data[0];
}).catch(res=>{
console.log(res)
});
......@@ -93,7 +94,7 @@ var self = new Vue({
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.id;
var projectid = data.PROJECTID;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = 'dealedproject';
......
......@@ -129,27 +129,27 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="ajlx"
prop="PHAJLX"
label="案件类型"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......@@ -163,7 +163,7 @@
>
</el-table-column>
<el-table-column
prop="djsj"
prop="CREATETIME"
label="登记时间"
align="center"
width="200"
......@@ -197,27 +197,27 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="ajlx"
prop="PHAJLX"
label="案件类型"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......@@ -265,27 +265,27 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="ajlx"
prop="PHAJLX"
label="案件类型"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......@@ -333,27 +333,27 @@
width="55">
</el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
width="300"
label="案件名称"
align="center"
></el-table-column>
<el-table-column
prop="ajlx"
prop="PHAJLX"
label="案件类型"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="200"
......
......@@ -6,7 +6,7 @@ var self = new Vue({
projectId:null,
userId:null,
flowid: 't1001_8a8610de737b99270173937337e00133',
userid: 't0101_8a8610de737b99270173941e5c50017e',
userName: '案件查处',
pageNum:1,
pageSize:2,
total:0,
......@@ -27,15 +27,16 @@ var self = new Vue({
},
handleCurrentChange(){},
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, {
axios.get(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', {
params: {
flowid: this.flowid,
userId: this.userid,
keyword: this.search
pageIndex:this.pageNum,
pageSize:this.pagesize,
flowId: this.flowid,
userName: this.userName,
}
}).then(res => {
this.total=res.data.data.total;
this.tabaledata = res.data.data.list;
this.total=res.data.total;
this.tabaledata =res.data.data.Data[0];
}).catch();
},
......
......@@ -120,62 +120,62 @@
width="55">
</el-table-column>
<el-table-column
prop="xmbh"
prop="PHXMBH"
width="130"
label="项目编号"
align="center"
></el-table-column>
<el-table-column
prop="xmmc"
prop="PHXMMC"
label="项目名称"
align="center"
width="450"
>
</el-table-column>
<el-table-column
prop="djbh"
prop="PHDJBH"
label="地籍编号"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="ydmj"
prop="PHYDMJ"
label="用地面积(亩)"
align="center"
width="180"
>
</el-table-column>
<el-table-column
prop="zdwz"
prop="PHZDWZ"
label="宗地位置"
align="center"
width="400"
>
</el-table-column>
<el-table-column
prop="tdyt"
prop="PHTDYT"
label="土地用途"
align="center"
width="150"
>
</el-table-column>
<el-table-column
prop="zrdw"
prop="PHZRDW"
label="责任单位"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="ssqy"
prop="PHSSQY"
label="所属区域"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="cjsj"
prop="CREATETIME"
label="创建时间"
align="center"
width="100"
......
......@@ -104,15 +104,17 @@ var self = new Vue({
},
methods:{
getData() {
axios.get(CONF_NEWGHSC_SERVERURL + '/ghjg/backlog/'+this.pageNum+'/'+this.pageSize, {
axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', {
params: {
flowid: this.flowid,
userId: this.userid,
pageIndex:this.pageNum,
pageSize:this.pagesize,
flowId: this.flowid,
userName: this.userName,
keyword: this.search
}
}).then(res => {
this.total=res.data.data.total;
this.tabaledata = res.data.data.list;
this.total=res.data.Data.total;
this.tabaledata = res.data.data.Data[0];
}).catch(res=>{
console.log(res)
});
......@@ -133,7 +135,7 @@ var self = new Vue({
jumpdetailPage(data) {
var taskid = data.TASKID;
var detailType = data.detailType;
var projectid = data.id;
var projectid = data.PROJECTID;
var flowInstanceId =data.INSTANCEID;
var titleEncode = encodeURI(encodeURI(data.PROJECTNAME));
var stats = 'dealedproject';
......