Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
aa6e4ee2 by yangwei
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents aa899d32 7993a0bd
Inline Side-by-side
Showing 7 changed files with 76 additions and 61 deletions
......@@ -8,7 +8,7 @@
宗地代码： <br />
<p class="label-detail">（ZDDM）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ZDDM" placeholder="宗地代码"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.zddm" placeholder="宗地代码"></el-input>
</el-form-item>
</el-col>
......@@ -18,7 +18,7 @@
变化原因： <br />
<p class="label-detail">（BHYY）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.BHYY" placeholder="变化原因"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.bhyy" placeholder="变化原因"></el-input>
</el-form-item>
</el-col>
......@@ -28,7 +28,7 @@
变化内容： <br />
<p class="label-detail">（BHNR）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.BHNR" placeholder="变化内容"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.bhnr" placeholder="变化内容"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -41,7 +41,7 @@
<p class="label-detail">（DJSJ）</p>
</span>
<el-date-picker :disabled="$store.state.business.Edit" type="datetime" placeholder="选择日期" clearable
v-model="ruleForm.DJSJ" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
v-model="ruleForm.djsj" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
......@@ -51,7 +51,7 @@
登簿人： <br />
<p class="label-detail">（DBR）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.DBR" placeholder="登簿人"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.dbr" placeholder="登簿人"></el-input>
</el-form-item>
</el-col>
......@@ -61,7 +61,7 @@
附记： <br />
<p class="label-detail">（FJ）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.FJ" placeholder="附记"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.fj" placeholder="附记"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -72,7 +72,7 @@
区县代码： <br />
<p class="label-detail">（QXDM）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.QXDM" placeholder="区县代码"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.qxdm" placeholder="区县代码"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -11,9 +11,8 @@
标识码： <br />
<p class="label-detail">（BSM）</p>
</span>
<p :class="{ 'disabled': $store.state.business.Edit }">
{{ naturalForm.naturalList[index].bsm }}
</p>
<el-input :disabled="$store.state.business.Edit" v-model="naturalForm.naturalList[index].bsm"
placeholder="标识码"></el-input>
</el-form-item>
</el-col>
......
......@@ -8,9 +8,7 @@
标识码： <br />
<p class="label-detail">（BSM）</p>
</span>
<p :class="{ 'disabled': $store.state.business.Edit }">
{{ ruleForm.BSM }}
</p>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.bsm" placeholder="标识码"></el-input>
</el-form-item>
</el-col>
......@@ -20,7 +18,7 @@
要素代码： <br />
<p class="label-detail">（YSDM）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.YSDM" placeholder="要素代码"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ysdm" placeholder="要素代码"></el-input>
</el-form-item>
</el-col>
......
......@@ -8,7 +8,7 @@
要素代码： <br />
<p class="label-detail">（YSDM）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.YSDM" placeholder="要素代码"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ysdm" placeholder="要素代码"></el-input>
</el-form-item>
</el-col>
......@@ -18,7 +18,7 @@
业务号： <br />
<p class="label-detail">（YWH）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.YWH" placeholder="业务号"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ywh" placeholder="业务号"></el-input>
</el-form-item>
</el-col>
......@@ -28,7 +28,7 @@
不动产单元号： <br />
<p class="label-detail">（BDCDYH）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.BDCDYH" placeholder="不动产单元号"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.bdcdyh" placeholder="不动产单元号"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -40,7 +40,7 @@
查封机关： <br />
<p class="label-detail">（CFJG）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.CFJG" placeholder="查封机关"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.cfjg" placeholder="查封机关"></el-input>
</el-form-item>
</el-col>
......@@ -50,7 +50,7 @@
查封类型： <br />
<p class="label-detail">（CFLX）</p>
</span>
<el-select :disabled="$store.state.business.Edit" v-model="ruleForm.CFLX" placeholder="查封类型">
<el-select :disabled="$store.state.business.Edit" v-model="ruleForm.cflx" placeholder="查封类型">
<el-option v-for="item in dicData['A32']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
</el-option>
</el-select>
......@@ -63,7 +63,7 @@
查封文件： <br />
<p class="label-detail">（CFWJ）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.CFWJ" placeholder="查封文件"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.cfwj" placeholder="查封文件"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -75,7 +75,7 @@
查封文号： <br />
<p class="label-detail">（CFWH）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.CFWH" placeholder="查封文号"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.cfwh" placeholder="查封文号"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -85,7 +85,7 @@
<p class="label-detail">（CFQSSJ）</p>
</span>
<el-date-picker :disabled="$store.state.business.Edit" type="date" placeholder="选择开始日期"
:picker-options="pickerOptionsStart" clearable v-model="ruleForm.CFQSSJ"
:picker-options="pickerOptionsStart" clearable v-model="ruleForm.cfqssj"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
......@@ -97,7 +97,7 @@
<p class="label-detail">（CFJSSJ）</p>
</span>
<el-date-picker :disabled="$store.state.business.Edit" placeholder="选择结束日期" clearable
:picker-options="pickerOptionsEnd" v-model="ruleForm.CFJSSJ" value-format="yyyy-MM-dd">
:picker-options="pickerOptionsEnd" v-model="ruleForm.cfjssj" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -110,7 +110,7 @@
查封范围： <br />
<p class="label-detail">（CFFW）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.CFFW" placeholder="查封范围"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.cffw" placeholder="查封范围"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -119,7 +119,7 @@
区县代码： <br />
<p class="label-detail">（QXDM）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.QXDM" placeholder="区县代码"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.qxdm" placeholder="区县代码"></el-input>
</el-form-item>
</el-col>
......@@ -129,7 +129,7 @@
登记机构： <br />
<p class="label-detail">（DJJG）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.DJJG" placeholder="登记机构"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.djjg" placeholder="登记机构"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -141,7 +141,7 @@
登簿人： <br />
<p class="label-detail">（DBR）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.DBR" placeholder="登簿人"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.dbr" placeholder="登簿人"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -151,7 +151,7 @@
<p class="label-detail">（DJSJ）</p>
</span>
<el-date-picker :disabled="$store.state.business.Edit" type="date" placeholder="选择日期" clearable
v-model="ruleForm.DJSJ" value-format="yyyy-MM-dd"></el-date-picker>
v-model="ruleForm.djsj" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -160,7 +160,7 @@
解封业务号： <br />
<p class="label-detail">（JFYWH）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.JFYWH" placeholder="解封业务号"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.jfywh" placeholder="解封业务号"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -172,7 +172,7 @@
解封机关： <br />
<p class="label-detail">（JFJG）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.JFJG" placeholder="解封机关"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.jfjg" placeholder="解封机关"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -181,7 +181,7 @@
解封文件： <br />
<p class="label-detail">（JFWJ）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.JFWJ" placeholder="解封文件"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.jfwj" placeholder="解封文件"></el-input>
</el-form-item>
</el-col>
......@@ -191,7 +191,7 @@
解封文号： <br />
<p class="label-detail">（JFWH）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.JFWH" placeholder="解封文号"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.jfwh" placeholder="解封文号"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -203,7 +203,7 @@
解封登簿人： <br />
<p class="label-detail">（JFDBR）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.JFDBR" placeholder="解封登簿人"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.jfdbr" placeholder="解封登簿人"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -213,7 +213,7 @@
<p class="label-detail">（JFDJSJ）</p>
</span>
<el-date-picker :disabled="$store.state.business.Edit" type="date" placeholder="选择日期" clearable
v-model="ruleForm.JFDJSJ" value-format="yyyy-MM-dd"></el-date-picker>
v-model="ruleForm.jfdjsj" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
......@@ -223,7 +223,7 @@
附记： <br />
<p class="label-detail">（FJ）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.FJ" placeholder="附记"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.fj" placeholder="附记"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -235,7 +235,7 @@
权属状态： <br />
<p class="label-detail">（QSZT）</p>
</span>
<el-select :disabled="$store.state.business.Edit" v-model="ruleForm.QSZT" placeholder="查封类型">
<el-select :disabled="$store.state.business.Edit" v-model="ruleForm.qszt" placeholder="权属状态">
<el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
</el-option>
</el-select>
......
......@@ -8,7 +8,7 @@
要素代码： <br />
<p class="label-detail">（YSDM）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.YSDM" placeholder="要素代码"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ysdm" placeholder="要素代码"></el-input>
</el-form-item>
</el-col>
......@@ -18,7 +18,7 @@
业务号： <br />
<p class="label-detail">（YWH）</p>
</span>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.YWH" placeholder="业务号"></el-input>
<el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ywh" placeholder="业务号"></el-input>
</el-form-item>
</el-col>
......
import filter from '@/utils/filter.js'
let vm = null
const sendThis = (_this) => {
vm = _this
}
class data extends filter {
constructor() {
super()
......@@ -6,6 +10,32 @@ class data extends filter {
columns () {
return [
{
label: '序号',
type: 'index',
width: '50',
render: (h, scope) => {
return (
<div>
{(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
</div>
)
}
},
{
label: '汇交状态',
render: (h, scope) => {
return (
<div>
<span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span>
<span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span>
<span v-show={scope.row.exchangeState == 2} class='warehousing'>上报失败</span>
<span v-show={scope.row.exchangeState == 3} class='adopt'>上报成功响应成功</span>
<span v-show={scope.row.exchangeState == 4} class='warehousing'>响应失败</span>
</div>
)
}
},
{
prop: "areacode",
label: "行政区代码",
width: 100,
......@@ -43,20 +73,13 @@ class data extends filter {
{
prop: "uploadtime",
label: "汇交时间",
},
{
label: '汇交状态',
render: (h, scope) => {
return (
<div>
{
scope.row.exchangeState == '1' ? <span class='adopt'>成功</span> : <span class='warehousing'>失败</span>
}
</div>
)
}
},
]
}
}
export default new data()
let datas = new data()
export {
datas,
sendThis
}
......
......@@ -81,7 +81,7 @@
<script>
// 上报报文查询
// 引入表头数据
import data from "./data";
import { datas, sendThis } from "./data";
// 引入表格混入方法
import table from "@/utils/mixin/table";
// 引入详情弹框
......@@ -130,15 +130,7 @@ export default {
// table数据
tableData: {
// 表头数据
columns: [
{
label: "序号",
type: "index",
width: "50",
index: this.indexMethod,
},
]
.concat(data.columns())
columns: datas.columns()
.concat([
{
label: "操作",
......@@ -185,6 +177,9 @@ export default {
title: ''
};
},
mounted () {
sendThis(this);
},
methods: {
// 重置表单
resetForm () {
......