|
@@ -29,7 +29,7 @@
|
|
|
...props,
|
|
|
checkStrictly: true,
|
|
|
expandTrigger: 'hover',
|
|
|
- }" v-model="xzqCode" clearable ref="cascader" class="cascader-style" style="width: 90%"
|
|
|
+ }" v-model="xzqCode" clearable ref="cascader" @change="setXzqdm" class="cascader-style" style="width: 90%"
|
|
|
popper-class="popper-cascader" :filterable="true" :show-all-levels="false"></el-cascader>
|
|
|
</el-form-item>
|
|
|
<el-button type="primary" @click="changeForm" style="margin-left: 20px">查询</el-button>
|
|
@@ -46,6 +46,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="instid" label="流程主键" align="center">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="nodename" label="流程节点名称" align="center">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="createby" label="创建用户" align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="solid" label="方案主键" align="center">
|
|
@@ -371,16 +373,16 @@ export default {
|
|
|
if (qxyh.formInline.status == 1) {
|
|
|
getLandMyAttendsData(qxyh.formInline).then((res) => {
|
|
|
qxyh.tableData1 = res.data;
|
|
|
- qxyh.formInline.total = res.data.length || 999;
|
|
|
+ qxyh.formInline.total = res.total || 999;
|
|
|
});
|
|
|
} else if (qxyh.formInline.status == 3) {
|
|
|
getLandGetRevisePageData(qxyh.formInline).then((res) => {
|
|
|
qxyh.tableData2 = res.data;
|
|
|
- qxyh.formInline.total = res.data.length || 999;
|
|
|
+ qxyh.formInline.total = res.total || 999;
|
|
|
});
|
|
|
} else if (qxyh.formInline.status == 2) {
|
|
|
getLandGetAllTasks(qxyh.formInline).then((res) => {
|
|
|
- qxyh.formInline.total = res.data.length || 999;
|
|
|
+ qxyh.formInline.total = res.total || 999;
|
|
|
//待办的村庄规划需要检查补正的状态,未补正的可以上传成果包
|
|
|
if (
|
|
|
qxyh.formInline.planType == 2 ||
|
|
@@ -407,12 +409,12 @@ export default {
|
|
|
getLandMyAttendsData(qxyh.formInline).then((res) => {
|
|
|
qxyh.formInline.current = 1;
|
|
|
qxyh.tableData1 = res.data;
|
|
|
- qxyh.formInline.total = res.data.length || 999;
|
|
|
+ qxyh.formInline.total = res.total || 999;
|
|
|
});
|
|
|
} else if (qxyh.formInline.status == 2) {
|
|
|
getLandGetAllTasks(qxyh.formInline).then((res) => {
|
|
|
qxyh.formInline.current = 1;
|
|
|
- qxyh.formInline.total = res.data.length || 999;
|
|
|
+ qxyh.formInline.total = res.total || 999;
|
|
|
//待办的村庄规划需要检查补正的状态,未补正的可以上传成果包
|
|
|
if (
|
|
|
qxyh.formInline.planType == 2 ||
|
|
@@ -433,7 +435,7 @@ export default {
|
|
|
getLandGetRevisePageData(qxyh.formInline).then((res) => {
|
|
|
qxyh.formInline.current = 1;
|
|
|
qxyh.tableData2 = res.data;
|
|
|
- qxyh.formInline.total = res.data.length || 999;
|
|
|
+ qxyh.formInline.total = res.total || 999;
|
|
|
});
|
|
|
} else {
|
|
|
ElMessage.error("请选择规划类型");
|