551986bf by 蔡俊立

字典

1 parent a4c5fd3c
......@@ -5,4 +5,4 @@ NODE_ENV=development
VUE_APP_BASE_API = '/api'
# 开发环境
VUE_APP_API_BASE_URL = 'http://192.168.2.38:8008'
VUE_APP_API_BASE_URL = 'http://192.168.2.95:8027'
......
......@@ -278,7 +278,7 @@ class business {
//建设用地、宅基地使用权
async getQlfQlJsydsyqById (bsmSjsb) {
return request({
url: '/QlfQlJsydsyq/getQlfQlJsydsyqById',
url: '/reg/QlfQlJsydsyq/detail',
method: 'get',
params: {
bsmSjsb: bsmSjsb
......@@ -288,8 +288,8 @@ class business {
//修改建设用地、宅基地使用权
async updateQlfQlJsydsyq (data) {
return request({
url: '/QlfQlJsydsyq/updateQlfQlJsydsyq',
method: 'put',
url: '/reg/QlfQlJsydsyq/edit',
method: 'post',
data
})
}
......@@ -512,7 +512,7 @@ class business {
//界址点
async getKttGyJzdById (bsmSjsb) {
return request({
url: '/KttGyJzd/getKttGyJzdById',
url: '/reg/KttGyJzd/detail',
method: 'get',
params: {
bsmSjsb: bsmSjsb
......@@ -522,15 +522,15 @@ class business {
//修改界址点
async updateKttGyJzd (data) {
return request({
url: '/KttGyJzd/updateKttGyJzd',
method: 'put',
url: '/reg/KttGyJzd/edit',
method: 'post',
data
})
}
//界址线信息
async getKttGyJzxById (bsmSjsb) {
return request({
url: '/KttGyJzx/getKttGyJzxById',
url: '/reg/KttGyJzx/detail',
method: 'get',
params: {
bsmSjsb: bsmSjsb
......@@ -540,8 +540,8 @@ class business {
//修改界址线信息
async updateKttGyJzx (data) {
return request({
url: '/KttGyJzx/updateKttGyJzx',
method: 'put',
url: '/reg/KttGyJzx/edit',
method: 'post',
data
})
}
......@@ -926,9 +926,9 @@ class business {
})
}
// 宗地基本信息
async getKttZdjbxxById (bsmSjsb) {
async kttZdjbxxDetail (bsmSjsb) {
return request({
url: '/KttZdjbxx/getKttZdjbxxById',
url: '/reg/KttZdjbxx/detail',
method: 'get',
params: {
bsmSjsb: bsmSjsb
......@@ -938,8 +938,8 @@ class business {
// 宗地基本信息-修改
async updateKttZdjbxx (data) {
return request({
url: '/KttZdjbxx/updateKttZdjbxx',
method: 'put',
url: '/KttZdjbxx/edit',
method: 'post',
data
})
}
......
......@@ -38,12 +38,12 @@ class ruleConfig {
})
}
// 编辑界面列表查询----根据数据表名查询
async getRuleList (dataTable) {
async getRuleList (bsmYwsjb) {
return request({
url: '/SysYwsjb/getSysYwsjbWithSysYwsjbFieldByDataTable',
url: '/sjsb/DataReport/getTableColumn',
method: 'get',
params: {
dataTable: dataTable
bsmYwsjb: bsmYwsjb
}
})
}
......
......@@ -26,7 +26,7 @@ export function getAllDict () {
}
export function getQlxxDictList (data) {
return request({
url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList',
url: SERVER.SERVERAPI + '/rest/sys/dict/getDictList',
method: 'post',
data
})
......
......@@ -53,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :prop="'ruleForm.' + index + '.JZXLB'" :rules="rules.JZXLB">
<span slot="label">
界址线类别: <br />
......@@ -65,9 +65,9 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :prop="'ruleForm.' + index + '.JZXWZ'" :rules="rules.JZXWZ">
<span slot="label">
界址线位置: <br />
......@@ -79,11 +79,11 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :prop="'ruleForm.' + index + '.JXXZ'" class="borderTopNone" :rules="rules.JXXZ">
<span slot="label">
界线性质: <br />
......@@ -95,7 +95,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item :prop="'ruleForm.' + index + '.QSJXXYSBH'" class="borderTopNone" :rules="rules.QSJXXYSBH">
......@@ -161,7 +161,7 @@ export default {
type: String,
default: ''
},
dataTable: {
bsmYwsjb: {
type: String,
default: ''
}
......
......@@ -63,7 +63,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :prop="'ruleForm.' + index + '.JBLX'" :rules="rules.JBLX">
<span slot="label">
界标类型: <br />
......@@ -75,11 +75,11 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :prop="'ruleForm.' + index + '.JZDLX'" :rules="rules.JZDLX">
<span slot="label">
界址点类型: <br />
......@@ -91,7 +91,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item :prop="'ruleForm.' + index + '.XZBZ'" :rules="{ ...rules.XZBZ, ...typeNum }">
......@@ -134,7 +134,7 @@ export default {
type: String,
default: ''
},
dataTable: {
bsmYwsjb: {
type: String,
default: ''
}
......
......@@ -44,7 +44,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="QLLX">
<span slot="label">
权利类型: <br />
......@@ -55,9 +55,9 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="DJLX">
<span slot="label">
登记类型: <br />
......@@ -68,7 +68,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
......@@ -195,7 +195,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="QSZT">
<span slot="label">
权属状态: <br />
......@@ -206,7 +206,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
<message-tips ref="msg" />
......@@ -223,7 +223,7 @@ export default {
type: String,
default: ''
},
dataTable: {
bsmYwsjb: {
type: String,
default: ''
}
......
......@@ -80,7 +80,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="MJDW">
<span slot="label">
面积单位: <br />
......@@ -91,7 +91,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item prop="YT">
......@@ -105,7 +105,7 @@
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="DJ">
<span slot="label">
等级: <br />
......@@ -116,7 +116,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item prop="JG" :rules="{ type: 'number' }">
......@@ -129,7 +129,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="QLLX">
<span slot="label">
权利类型: <br />
......@@ -140,11 +140,11 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="QLXZ">
<span slot="label">
权利性质: <br />
......@@ -153,9 +153,9 @@
<tree-select :disabled="$store.state.business.Edit" :options="dicData['A9']" v-model="ruleForm.QLXZ"
placeholder="权利性质" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="QLSDFS">
<span slot="label">
权利设定方式: <br />
......@@ -166,7 +166,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item prop="RJL">
......@@ -310,7 +310,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item prop="ZT" class="borderTopNone">
<span slot="label">
状态: <br />
......@@ -321,7 +321,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
......@@ -448,7 +448,7 @@ export default {
type: String,
default: ''
},
dataTable: {
bsmYwsjb: {
type: String,
default: ''
}
......@@ -498,7 +498,7 @@ export default {
methods: {
async featchData () {
try {
let { result: res } = await business.getKttZdjbxxById(this.bsmSjsb)
let { result: res } = await business.kttZdjbxxDetail(this.bsmSjsb)
this.ruleForm = res
this.featchRule()
} catch (error) {
......
......@@ -90,7 +90,7 @@
</el-tab-pane>
</el-tabs>
<div class="edit-content">
<component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" :dataTable="dataTable" />
<component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bizmsgid"/>
</div>
<div slot="footer" class="dialog_footer" ref="dialogFooter">
<div class="dialog_button">
......@@ -110,7 +110,7 @@ import { getDetail } from '@/api/sbbwcx.js'
import { MessageBox } from 'element-ui'
export default {
computed: {
...mapGetters(['Edit'])
...mapGetters(['dictData'])
},
props: {
},
......@@ -118,6 +118,7 @@ export default {
return {
dataReport: {},
index: 0,
bsmYwsjb: '',
ruleFormList: {
bizMsgID: '',
asid: '',
......@@ -153,9 +154,7 @@ export default {
//获取表头列表
getDetail({bizmsgid: this.dataReport.bizmsgid}).then(res => {
if(res.code == 200){
this.headerList = res.result
console.log(this.headerList);
this.headerList = res.result
}
})
},
......@@ -165,6 +164,7 @@ export default {
}
this.index = _index
this.bsmYwsjb = this.headerList[val.index].bsmYwsjb
this.editItem = this.loadView(this.activeName)
this.diaData.list.forEach((item) => {
if (item.soleurl == this.activeName) {
......
......@@ -34,7 +34,7 @@ let mixin = {
},
async featchRule () {
try {
let { result: { sysywsjbfieldlist } } = await ruleConfig.getRuleList(this.dataTable)
let { result: { sysywsjbfieldlist } } = await ruleConfig.getRuleList(this.bsmYwsjb)
sysywsjbfieldlist.forEach((item) => {
this.subRules[item.FIELD] = [
{
......
......@@ -60,7 +60,7 @@
<!-- 列表 -->
<div class="from-clues-content">
<lb-table ref="table" :heightNum="300" @selection-change="handleSelectionChange" :page-size="pageData.size"
:current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
:current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
</lb-table>
</div>
......
......@@ -17,7 +17,7 @@
</el-row>
</el-form>
<lb-table :column="column" class="loadingtext" :heightNum="420" :key="key" :expand-row-keys="keyList"
row-key="bsmDict" :tree-props="{ children: 'children' }" :pagination="false" :data="tableData">
row-key="dictid" :tree-props="{ children: 'children' }" :pagination="false" :data="tableData">
</lb-table>
</dialogBox>
</template>
......@@ -62,18 +62,18 @@ export default {
}
},
{
prop: 'DCODE',
prop: 'dcode',
width: '100',
label: '字典项编码',
render: (h, scope) => {
return (
<div>
<el-input placeholder="字典项编码" disabled={this.details.ISENABLE == 2} v-show={scope.row.codeShow} v-fo value={scope.row[scope.column.property]}
<el-input placeholder="字典项编码" disabled={this.details.isenable == 2} v-show={scope.row.codeShow} v-fo value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
<el-input placeholder="字典项编码" disabled={this.details.ISENABLE == 2} v-show={!scope.row.codeShow} value={scope.row[scope.column.property]}
<el-input placeholder="字典项编码" disabled={this.details.isenable == 2} v-show={!scope.row.codeShow} value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.codeShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
</div>
......@@ -81,16 +81,16 @@ export default {
}
},
{
prop: 'DNAME',
prop: 'dname',
label: '字典项名称',
render: (h, scope) => {
return (
<div>
<el-input placeholder="字典项编码" disabled={this.details.ISENABLE == 2} v-show={scope.row.nameShow} v-fo value={scope.row[scope.column.property]}
<el-input placeholder="字典项编码" disabled={this.details.isenable == 2} v-show={scope.row.nameShow} v-fo value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.nameShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
<el-input placeholder="字典项名称" disabled={this.details.ISENABLE == 2} v-show={!scope.row.nameShow} value={scope.row[scope.column.property]}
<el-input placeholder="字典项名称" disabled={this.details.isenable == 2} v-show={!scope.row.nameShow} value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.nameShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
</div>
......@@ -98,17 +98,17 @@ export default {
}
},
{
prop: 'NORMCODE',
prop: 'normcode',
label: '部标编码',
width: '100',
render: (h, scope) => {
return (
<div>
<el-input placeholder="部标编码" disabled={this.details.ISENABLE == 2} v-show={scope.row.normcodeShow} v-fo value={scope.row[scope.column.property]}
<el-input placeholder="部标编码" disabled={this.details.isenable == 2} v-show={scope.row.normcodeShow} v-fo value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.normcodeShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
<el-input placeholder="部标编码" disabled={this.details.ISENABLE == 2} v-show={!scope.row.normcodeShow} value={scope.row[scope.column.property]}
<el-input placeholder="部标编码" disabled={this.details.isenable == 2} v-show={!scope.row.normcodeShow} value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.normcodeShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }} maxlength='8'></el-input>
</div>
......@@ -116,16 +116,16 @@ export default {
}
},
{
prop: 'NORMNAME',
prop: 'normname',
label: '部标名称',
render: (h, scope) => {
return (
<div>
<el-input placeholder="部标名称" disabled={this.details.ISENABLE == 2} v-show={scope.row.normnameShow} v-fo value={scope.row[scope.column.property]}
<el-input placeholder="部标名称" disabled={this.details.isenable == 2} v-show={scope.row.normnameShow} v-fo value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.normnameShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
<el-input placeholder="部标名称" disabled={this.details.ISENABLE == 2} v-show={!scope.row.normnameShow} value={scope.row[scope.column.property]}
<el-input placeholder="部标名称" disabled={this.details.isenable == 2} v-show={!scope.row.normnameShow} value={scope.row[scope.column.property]}
onFocus={() => { this.itemShowFalse(); scope.row.normnameShow = true; }}
onInput={(val) => { scope.row[scope.column.property] = val; this.itemShowFalse(); scope.row.codeShow = true; }}></el-input>
</div>
......@@ -133,12 +133,12 @@ export default {
}
},
{
prop: 'ISENABLE',
prop: 'isenable',
width: '160',
label: '是否禁用',
render: (h, scope) => {
return (
<el-radio-group disabled={this.details.ISENABLE == 2} v-model={scope.row.ISENABLE}>
<el-radio-group disabled={this.details.isenable == 2} v-model={scope.row.isenable}>
<el-radio label="1">启用</el-radio>
<el-radio label="0">禁用</el-radio>
</el-radio-group>
......@@ -177,7 +177,7 @@ export default {
value (val) {
this.myValue = val
},
'details.bsmDict': {
'details.dictid': {
handler: function (newValue) {
if (!this.value) return
this.$startLoading();
......@@ -243,7 +243,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
removeTreeListItem(this.tableData, row.bsmDict)
removeTreeListItem(this.tableData, row.dictid)
this.$message({
type: 'success',
message: '删除成功!'
......@@ -257,7 +257,7 @@ export default {
},
handleSubmit () {
editDictNode({
bsmDict: this.details.rowData.bsmDict,
dictid: this.details.rowData.dictid,
typeid: this.details.rowData.typeid,
children: this.tableData
}).then(res => {
......@@ -285,12 +285,12 @@ export default {
ISENABLE: '1',
NORMCODE: '',
NORMNAME: '',
bsmDict: getUuid(32),
dictid: getUuid(32),
typeid: row.typeid,
}
)
this.keyList = [];
this.keyList.push(row.bsmDict)
this.keyList.push(row.dictid)
},
// 增加
handleAdd () {
......@@ -305,7 +305,7 @@ export default {
ISENABLE: '1',
normcode: '',
normname: '',
bsmDict: getUuid(32),
dictid: getUuid(32),
typeid: this.ruleForm.typeid,
}
)
......@@ -314,15 +314,15 @@ export default {
},
// 上移下移
moveUpward (index, row) {
realMove(row.bsmDict, 'UP', this.tableData)
realMove(row.dictid, 'UP', this.tableData)
this.key++
let id = findParents(this.tableData, row.bsmDict)
let id = findParents(this.tableData, row.dictid)
this.keyList = id
},
moveDown (index, row) {
realMove(row.bsmDict, 'DOWN', this.tableData)
realMove(row.dictid, 'DOWN', this.tableData)
this.key++
let id = findParents(this.tableData, row.bsmDict)
let id = findParents(this.tableData, row.dictid)
this.keyList = id
}
}
......
......@@ -23,11 +23,11 @@ class data extends filter {
}
},
{
prop: "DCODE",
prop: "dcode",
label: "字典类型编码",
},
{
prop: "DNAME",
prop: "dname",
label: "字典类型名称",
},
{
......
......@@ -52,7 +52,7 @@ export default {
return {
isDialog: false,
details: {
bsmDict: '',
dictid: '',
isenable: 1,
rowData: {}
},
......@@ -107,7 +107,7 @@ export default {
editClick (row, val) {
this.details.rowData = row
this.details.isenable = val
this.details.bsmDict = row.bsmDict
this.details.dictid = row.dictid
this.isDialog = true
}
}
......