Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
9185df97 by 蔡俊立
Options

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

2 parents 7acbb05e 165e6b48
Expand all
Inline Side-by-side
Showing 9 changed files with 153 additions and 185 deletions
......@@ -12,5 +12,8 @@ const getters = {
addDict: state => state.dict.addDict,
dictData: state => state.dict.dictData,
djbxx: state => state.djbxx.djbxx,
// 受理信息
oldDetail: state => state.slxx.oldDetail,
newDetail: state => state.slxx.newDetail
}
export default getters
......
const state = {
oldDetail: {},
newDetail: {}
}
const mutations = {
SET_OLDDETAIL: (state, data) => {
state.oldDetail = data
},
SET_NEWDETAIL: (state, data) => {
state.newDetail = data
}
}
const actions = {
setQlrxxOld ({ commit }, data) {
commit('SET_OLDDETAIL', data)
},
setQlrxxNew ({ commit }, data) {
commit('SET_NEWDETAIL', data)
}
}
export default {
namespaced: true,
state,
mutations,
actions
}
const state = {
bsmSqyw: '',
djqxObj: {
djqxbm: "",
djqxmc: ""
},
djywbm: ''
}
const mutations = {
SET_BSMSQYW: (state, data) => {
state.bsmSqyw = data
},
SET_DJQXOBJ: (state, data) => {
state.djqxObj = data
},
SET_DJYWBM: (state, data) => {
state.djywbm = data
},
}
const actions = {
setBsmSqyw ({ commit }, data) {
commit('SET_BSMSQYW', data)
},
setDjqxObj ({ commit }, data) {
commit('SET_DJQXOBJ', data)
},
setDjywbm ({ commit }, data) {
commit('SET_DJYWBM', data)
}
}
export default {
namespaced: true,
state,
mutations,
actions
}
<template>
<div>
<lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :data="tableData">
<lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList">
</lb-table>
<addQlr v-model="dialog" :details="details" />
<addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" />
</div>
</template>
<script>
......@@ -27,21 +27,10 @@ export default {
default: '1'
}
},
watch: {
tableData: {
handler: function (val, oldVal) {
if (val.length == 0) {
this.tableDataList = [{}]
} else {
this.tableDataList = _.cloneDeep(val)
}
},
immediate: true,
deep: true
}
},
data () {
return {
key: 0,
dataIndex: 0,
dialog: false,
details: {},
tableDataList: [],
......@@ -112,18 +101,20 @@ export default {
},
watch: {
tableData: {
handler (newValue, oldValue) {
this.$emit('updateValue', newValue)
},
deep: true
},
'$route.query.bsmSlsq': {
handler (newValue, oldValue) {
// 获取列表数据
// this.details =
handler: function (val, oldVal) {
let that = this
if (val.length == 0 || !val) {
that.tableDataList = _.cloneDeep([{
sqrmc: '',
dlrzjlx: '',
dlrzjh: '',
fr: ''
}])
} else {
that.tableDataList = _.cloneDeep(val)
}
},
immediate: true,
deep: true
},
gyfs: {
......@@ -146,9 +137,10 @@ export default {
}
},
methods: {
// 获取列表数据
getList () {
updateDetail (value) {
this.tableDataList[this.dataIndex] = value
this.key++
this.$emit('upDateQlrxxList', this.tableDataList)
},
// 添加
handleAdd () {
......@@ -161,8 +153,11 @@ export default {
// 身份证读取
readClick () { },
// 修改
handleEdit () {
handleEdit (index, row) {
console.log(row, 'rowrowrowrowrow');
this.dataIndex = index
this.dialog = true
this.details = row
},
handleView () {
this.dialog = true
......
......@@ -12,8 +12,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名/名称" prop="xm">
<el-input v-model="ruleForm.xm" maxlegth="15"></el-input>
<el-form-item label="姓名/名称" prop="sqrmc">
<el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -32,12 +32,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话" prop="lxdh" :rules="$rules.common.phone">
<el-input v-model="ruleForm.lxdh" maxlength="11"></el-input>
<el-form-item label="联系电话" prop="dh" :rules="$rules.common.phone">
<el-input v-model="ruleForm.dh" maxlength="11"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性别" prop="xb">
<el-form-item label="性别">
<el-select clearable v-model="ruleForm.xb" class="width100" placeholder="请选择">
<el-option v-for="item in dictData['A43']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......@@ -47,17 +47,17 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="法人名称" prop="frmc">
<el-form-item label="法人名称">
<el-input v-model="ruleForm.frmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="国家/地区" prop="gjdq">
<el-form-item label="国家/地区">
<el-input v-model="ruleForm.gjdq"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="户籍所在省市" prop="szss">
<el-form-item label="户籍所在省市">
<el-input v-model="ruleForm.szss"></el-input>
</el-form-item>
</el-col>
......@@ -65,12 +65,12 @@
<el-row>
<el-col :span="16">
<el-form-item label="地址" prop="dz">
<el-form-item label="地址">
<el-input v-model="ruleForm.dz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮编" prop="yb">
<el-form-item label="邮编">
<el-input v-model="ruleForm.yb"></el-input>
</el-form-item>
</el-col>
......@@ -78,17 +78,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="发证机关" prop="fzjg">
<el-form-item label="发证机关">
<el-input v-model="ruleForm.fzjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电子邮件" prop="dzyj">
<el-form-item label="电子邮件">
<el-input v-model="ruleForm.dzyj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利比例" prop="qlbl">
<el-form-item label="权利比例">
<el-input v-model="ruleForm.qlbl"></el-input>
</el-form-item>
</el-col>
......@@ -96,12 +96,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="工作单位" prop="gzdw">
<el-form-item label="工作单位">
<el-input v-model="ruleForm.gzdw"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="代理机构" prop="dljg">
<el-form-item label="代理机构">
<el-input v-model="ruleForm.dljg"></el-input>
</el-form-item>
</el-col>
......@@ -109,17 +109,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="联系电话" prop="lxdh" :rules="$rules.common.phone">
<el-form-item label="联系电话" :rules="$rules.common.phone">
<el-input v-model="ruleForm.lxdh" maxlength="11"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="代理人姓名" prop="dlrxm">
<el-form-item label="代理人姓名">
<el-input v-model="ruleForm.dlrxm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="代理人证件类型" prop="dlrzjlx">
<el-form-item label="代理人证件类型">
<el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择">
<el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......@@ -129,7 +129,7 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="代理人证件号" prop="dlrzjh">
<el-form-item label="代理人证件号">
<el-input v-model="ruleForm.dlrzjh" maxlength="20"></el-input>
</el-form-item>
</el-col>
......@@ -137,12 +137,12 @@
</el-form>
</dialogBox>
</template>
<script>
import { mapGetters } from 'vuex'
export default {
props: {
value: { type: Boolean, default: false },
details: { type: Object, default: {} }
},
computed: {
...mapGetters(["dictData"]),
......@@ -152,10 +152,10 @@ export default {
myValue: this.value,
ruleForm: {
qlrlx: '',
xm: '',
sqrmc: '',
zjzl: '',
zjh: '',
lxdh: '',
dh: '',
xb: '',
frmc: '',
gjdq: '',
......@@ -175,64 +175,28 @@ export default {
qlrlx: [
{ required: true, message: '权利人类型', trigger: 'change' }
],
xm: [
sqrmc: [
{ required: true, message: '姓名/名称', trigger: 'blur' }
],
zjzl: [
{ required: true, message: '证件种类', trigger: 'chagyfsnge' }
{ required: true, message: '证件种类', trigger: 'change' }
],
zjh: [
{ required: true, message: '证件号', trigger: 'blur' }
],
xb: [
{ required: true, message: '性别', trigger: 'change' }
],
frmc: [
{ required: true, message: '法人名称', trigger: 'blur' }
],
gjdq: [
{ required: true, message: '国家/地区', trigger: 'blur' }
],
szss: [
{ required: true, message: '户籍所在省市', trigger: 'blur' }
],
dz: [
{ required: true, message: '地址', trigger: 'blur' }
],
yb: [
{ required: true, message: '邮编', trigger: 'blur' }
],
fzjg: [
{ required: true, message: '发证机关', trigger: 'blur' }
],
dzyj: [
{ required: true, message: '电子邮件', trigger: 'blur' }
],
qlbl: [
{ required: true, message: '权利比例', trigger: 'blur' }
],
gzdw: [
{ required: true, message: '工作单位', trigger: 'blur' }
],
dljg: [
{ required: true, message: '代理机构', trigger: 'blur' }
],
dlrxm: [
{ required: true, message: '代理人姓名', trigger: 'blur' }
],
dlrzjlx: [
{ required: true, message: '代理人证件类型', trigger: 'change' }
],
dlrzjh: [
{ required: true, message: '代理人证件号', trigger: 'blur' }
]
}
}
},
watch: {
value (val) {
this.myValue = val;
this.myValue = _.cloneDeep(val)
},
details: {
handler: function (val, oldVal) {
this.ruleForm = val
},
deep: true
}
},
methods: {
closeDialog () {
......@@ -240,17 +204,22 @@ export default {
this.$refs['ruleForm'].resetFields();
},
submitForm () {
this.$refs['ruleForm.'].validate((valid) => {
if (valid) {
this.$emit("input", false);
} else {
console.log('error submit!!');
return false;
}
});
},
},
};
this.$emit("input", false);
this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
// this.$refs['ruleForm'].validate((valid) => {
// if (valid) {
// this.$message({
// message: '修改成功!',
// type: 'success'
// })
// } else {
// this.$message.error('请完善必填项');
// }
// })
}
}
}
</script>
<style scoped lang="scss">
.submit-button {
......
......@@ -54,7 +54,7 @@
</div>
<!-- 表单内容区域 -->
<div class="rightContainer">
<el-tabs v-model="tabName" @tab-click="tabClick">
<el-tabs v-model="tabName" :before-leave="beforeLeave">
<el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
</el-tab-pane>
</el-tabs>
......@@ -63,10 +63,6 @@
</div>
</div>
<fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" :isJump="true" @updateDialog="updateDialog" />
<!-- <dialogBox title="流程图" width="60%" v-model="myValue" @closeDialog="closeDialog">
<process-viewer :key="`designer-${loadIndex}`" style="height:500px" :xml="xmlData" :finished-info="finishedInfo"
:all-comment-list="historyTaskList" @ch="changeLoadIndex" />
</dialogBox> -->
</div>
</template>
......@@ -82,6 +78,7 @@ import {
getNextLinkInfo,
completeTask,
} from "@/api/fqsq.js";
import { mapGetters } from "vuex"
import { deleteBdcdy } from "@/api/ywbl.js";
import ProcessViewer from './components/processViewer.vue'
import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
......@@ -135,6 +132,9 @@ export default {
this.loadBdcdylist();
this.flowInitParam();
},
computed: {
...mapGetters(["oldDetail", "newDetail"])
},
methods: {
changeLoadIndex () {
this.loadIndex++
......@@ -365,7 +365,7 @@ export default {
case "signout":
window.close();
break;
case "record":
case "B9":
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("bestepid", this.bestepid);
......@@ -405,8 +405,14 @@ export default {
}
},
//表单选项卡事件
tabClick (tab, event) {
this.getFromRouter(tab.name);
beforeLeave (activeName, oldActiveName) {
console.log(this.oldDetail, this.newDetail);
if (!_.isEqual(this.oldDetail, this.newDetail)) {
this.$message.error('界面内容有所变化,请先保存')
return false
} else {
if (activeName && activeName != 0) this.getFromRouter(activeName)
}
},
//切换选项卡内容组件
getFromRouter (tabname) {
......
......@@ -150,7 +150,8 @@
</el-form-item>
</el-col>
</el-row>
<InformationTable :tableData="ruleForm.qlrxx" :viewtype="$route.query.viewtype" :gyfs="ruleForm.gyfs" />
<InformationTable :tableData="ruleForm.qlrxx" @upDateQlrxxList="upDateQlrxxList"
:viewtype="$route.query.viewtype" :gyfs="ruleForm.gyfs" />
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
......@@ -183,16 +184,18 @@ export default {
formdata.append("bsmSldy", this.propsParam.bsmSldy);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {}
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas
}
if (this.ruleForm.gyfs == '1') {
this.ruleForm.qlrxx = [{}]
}
this.$store.dispatch('slxx/setQlrxxOld', {
qlrxx: this.ruleForm.qlrxx,
fj: this.ruleForm.fj,
gyfs: this.ruleForm.gyfs,
djyy: this.ruleForm.djyy
})
}
})
},
......@@ -200,40 +203,40 @@ export default {
computed: {
...mapGetters(["dictData", "flag"])
},
watch: {
ruleForm: {
handler: function (newValue) {
this.$store.dispatch('slxx/setQlrxxNew', {
qlrxx: this.ruleForm.qlrxx,
fj: this.ruleForm.fj,
gyfs: this.ruleForm.gyfs,
djyy: this.ruleForm.djyy
})
},
deep: true
}
},
data () {
return {
disabled: true,
czrOptions: [],
ruleForm: {
// ywh: "",
// slry: "",
// slsj: "",
// qllx: "",
// djlx: "",
// djqx: "",
// zddm: "",
// bdcdyh: "",
// qlxzmc: "",
// zdmj: "",
// zl: "",
// tdyt: "",
// qlsdfs: "",
// qdjg: "",
// tdsyqx: "",
// syqqzsj: "",
// fj: "",
// qlrxx: [],
// djyy: "",
// gyfs: "1",
// sffbcz: "",
// czr: "",
},
ruleForm: {},
//传递参数
propsParam: {},
rules: {}
}
},
methods: {
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrxx = _.cloneDeep(val)
// this.$store.dispatch('slxx/setQlrxxNew', {
// qlrxx: this.ruleForm.qlrxx,
// fj: this.ruleForm.fj,
// gyfs: this.ruleForm.gyfs,
// djyy: this.ruleForm.djyy
// })
},
list (bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
......
......@@ -133,10 +133,10 @@ export default {
let that = this;
this.$popup({
title: "楼盘表",
width: "100%",
width: "50%",
btnShow: true,
editItem: "xxxxxxxxxx",
height: "1200px",
height: "800px",
formData: {
bsmSlsq: this.bsmSlsq,
dataList: this.unitData,
......