Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
821e66db by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents b831478f 91135e95
Inline Side-by-side
Showing 4 changed files with 42 additions and 38 deletions
......@@ -182,26 +182,26 @@
this.$store.state.oldZdbsm = '';
switch (row.dylx) {
case "zd":
this.$store.state.zdbsm = row.glbsm;
this.getRightTree(row.glbsm,'0,1,2');
this.$store.state.zdbsm = res.result;
this.getRightTree(res.result,'0,1,2');
break;
case "zrz":
this.$store.state.zrzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
this.$store.state.zrzbsm = res.result;
this.getTreeByBsm(res.result,row.dylx,'0,1,2');
break;
case "h":
case "h0":
case "h1":
this.$store.state.hbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,'h','0,1,2');
this.$store.state.hbsm = res.result;
this.getTreeByBsm(res.result,'h','0,1,2');
break;
case "dz":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
this.$store.state.dzbsm = res.result;
this.getTreeByBsm(res.result,row.dylx,'0,1,2');
break;
case "gzw":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
this.$store.state.dzbsm = res.result;
this.getTreeByBsm(res.result,row.dylx,'0,1,2');
break;
default:
......@@ -214,7 +214,7 @@
this.$router.push({
path: path,
query: {
bsm: row.glbsm,
bsm: res.result,
source: 2,
auth:'1'
}
......
......@@ -2,7 +2,7 @@
<!-- <div class="content_box"> -->
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<!-- <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane> -->
<el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd">
<jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
......@@ -32,13 +32,13 @@ import lshs from "./lshs";
import fjcl from "./fjcl/fjcl"
import Lcgz from "./lcgz"
import {queryStatus} from "@api/search"
// import Fldcb from "@components/Fldcb/Fldcb"
import Fldcb from "@components/Fldcb/Fldcb"
import {getQjZdjbxxDetailById} from '@api/zd'
export default {
name: "",
components: {
// zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Lcgz
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz
//zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Lcgz
},
props: {},
......@@ -93,9 +93,9 @@ export default {
case 'mjftb':
this.mjftbVisible = true;
break;
// case 'fldcb':
// this.fldbcVisible = true;
// break;
case 'fldcb':
this.fldbcVisible = true;
break;
case 'jzd':
this.jzdVisible = true;
break;
......
......@@ -40,11 +40,13 @@ export default {
"workflowPeriod": "current",
"workitemInstanceId": this.$route.query.workitemInstanceId
}
vm.loadingShow('数据获取中');
getActivityDetail(params).then((res) => {
console.log(res.processInstance.templetId);
templateLoad(res.processInstance.templetId).then((res1) => {
console.log(this.$x2js.xml2js(res1).Process,'Process');
getProcessOutline(res.processInstance.id).then((res2) => {
vm.loadingHide();
this.flowData = this.$x2js.xml2js(res1).Process;
console.log(res2.activityOutlines,'res.activityOutlines');
this.flowState = res2.activityOutlines;
......@@ -59,7 +61,9 @@ export default {
this.flowShow = true;
})
})
.catch((error) => {});
.catch((error) => {
vm.loadingHide();
});
})
.catch((error) => {});
})
......
......@@ -9,7 +9,7 @@
<tr>
<td colspan="2" class="tdright">行政区</td>
<td colspan="2">
<el-select
<el-select name="xzq"
:disabled="disabled"
class="formSelect"
v-model="formData.xzqbsm"
......@@ -26,7 +26,7 @@
</td>
<td colspan="2" class="tdright">地籍区</td>
<td colspan="2">
<el-select
<el-select name="djq"
class="formSelect"
:disabled="disabled"
v-model="formData.djqbsm"
......@@ -44,7 +44,7 @@
<td colspan="2" class="tdright">地籍子区</td>
<td colspan="2">
<el-select class="formSelect" @change="changeDjzq" :disabled="disabled" v-model="formData.djzqbsm">
<el-option
<el-option name="djzq"
v-for="item in $store.state.djzqList"
:key="item.bsm"
:label="item.mc"
......@@ -57,7 +57,7 @@
<tr>
<td colspan="2" class="tdright">权利类型</td>
<td colspan="4">
<el-select class="formSelect" :disabled="disabled" v-model="formData.qllxbsm">
<el-select name="qllx" class="formSelect" :disabled="disabled" v-model="formData.qllxbsm">
<el-option
v-for="item in $store.state.qllxList"
:key="item.bsm"
......@@ -69,7 +69,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>宗地特征码</td>
<td colspan="4">
<el-select class="formSelect" ref="zdtzm" :disabled="disabled"
<el-select name="zdtzm" class="formSelect" ref="zdtzm" :disabled="disabled"
v-model="formData.zdtzmbsm">
<el-option
v-for="item in $store.state.zdtzmList"
......@@ -84,7 +84,7 @@
<tr>
<td colspan="2" class="tdright">权利设定方式</td>
<td colspan="4">
<el-select class="formSelect" :disabled="disabled" v-model="formData.qlsdfs">
<el-select name="qlsdfs" class="formSelect" :disabled="disabled" v-model="formData.qlsdfs">
<el-option
v-for="item in $store.state.qlsdfsList"
:key="item.bsm"
......@@ -96,7 +96,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>宗地代码</td>
<td colspan="4" class="psr">
<input :disabled="disabled" @blur="inputBlur($event)" ref="zddm" on maxlength="19"
<input name="zddm" :disabled="disabled" @blur="inputBlur($event)" ref="zddm" on maxlength="19"
type="text"
class="formInput percent80"
v-model="formData.zddm"
......@@ -110,12 +110,12 @@
<tr>
<td colspan="2" class="tdright">地籍号</td>
<td colspan="4">
<input type="text" :disabled="disabled" class="formInput" v-model="formData.djh"/>
<input name="djh" type="text" :disabled="disabled" class="formInput" v-model="formData.djh"/>
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
<td colspan="4" class="psr">
<input
<input name="bdcdyh"
type="text" :disabled="disabled" @blur="inputBlur($event)" ref="bdcdyh"
maxlength="28"
class="formInput"
......@@ -127,7 +127,7 @@
<tr>
<td colspan="2" class="tdright">项目名称</td>
<td colspan="4" class="psr">
<input :disabled="disabled"
<input name="xmmc" :disabled="disabled"
type="text"
class="formInput "
v-model="formData.xmmc"
......@@ -135,7 +135,7 @@
</td>
<td colspan="2" class="tdright">预编宗地代码</td>
<td colspan="4" class="psr">
<input :disabled="disabled"
<input name="ybzddm" :disabled="disabled"
type="text"
class="formInput "
v-model="formData.ybzddm"
......@@ -154,7 +154,7 @@
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-select-tree
<el-select-tree name="gmjjhyfl"
style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
......@@ -170,13 +170,13 @@
</td>
<td colspan="2" class="tdright">价格(元)</td>
<td colspan="4" class="psr">
<input :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/>
<input id="jgid" :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
<td colspan="10">
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
<input name="zl" type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
class="formInput" v-model="formData.zl"/>
</td>
</tr>
......@@ -294,28 +294,28 @@
<td colspan="2" rowspan="4" class="tdright">宗地四至</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="disabled"
<input name="zdszb" type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="disabled"
class="formInput" v-model="formData.zdszb"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>东至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="disabled"
<input name="zdszd" type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="disabled"
class="formInput" v-model="formData.zdszd"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>南至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="disabled"
<input name="zdszn" type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="disabled"
class="formInput" v-model="formData.zdszn"/>
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>西至</td>
<td colspan="8" class="psr">
<input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="disabled"
<input name="zdszx" type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="disabled"
class="formInput" v-model="formData.zdszx"/>
</td>
</tr>
......@@ -332,7 +332,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>宗地面积(㎡)</td>
<td colspan="4" >
<input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zdmj"
<input name="zdmj" type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zdmj"
onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/>
</td>
</tr>
......