Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
6aad4a91 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 0f7f530a c47d1fe2
Expand all
Inline Side-by-side
Showing 14 changed files with 44 additions and 84 deletions
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-22 16:27:35
* @LastEditTime: 2023-08-30 15:52:11
-->
<template>
<!-- 受理信息 -->
......@@ -10,7 +10,6 @@
:model="ruleForm"
:rules="rules"
:class="{ readonly: editDisabled }"
class="loadingtext"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -313,20 +312,6 @@
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="不动产登记证明号：" prop="bdcqzh">
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item
label="区县代码："
prop="qlxx.qxdm"
:rules="rules.qxdmrules"
>
<el-input v-model="ruleForm.qlxx.qxdm"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="在建建筑物抵押范围：">
<el-input v-model="ruleForm.diyaq.zjjzwdyfw"></el-input>
......@@ -401,24 +386,6 @@
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="是否预告登记：">
<el-select v-model="ruleForm.diyaq.sfygdj">
<el-option
v-for="item in dictData['A6']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"></el-option>
</el-select>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="在建建筑物坐落：">
<el-input v-model="ruleForm.diyaq.zjzzwzl"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="登记原因：">
<el-input v-model="ruleForm.diyaq.djyy"></el-input>
......
/*
* @Description:workFramezu.vue组件的方法 头部按钮弹框方法
* @Autor: miaofang
* @LastEditTime: 2023-08-10 14:13:32
* @LastEditTime: 2023-08-30 16:15:41
*/
import { getPrintTemplateByCode } from "@/api/print";
import { getQllxByBdcdyid } from "@/api/djbDetail.js";
......@@ -43,7 +43,6 @@ export default {
this.flowInitParam();
},
methods: {
//加载流程初始参数
/**
* @description: 加载流程初始参数
* @author: renchao
......
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-08-28 08:44:31
* @LastEditTime: 2023-08-30 13:59:09
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -194,7 +194,6 @@
});
});
},
//批量按钮点击事件
/**
* @description: 批量按钮点击事件
* @author: renchao
......@@ -203,9 +202,7 @@
this.currentSelectProps.batchOperation = true;
this.activeIndex = "-1";
this.$parent.stepForm(0);
},
//批量操作
/**
* @description: 批量操作
* @author: renchao
......@@ -216,7 +213,6 @@
dataList: this.unitData,
}, '50%', true)
},
//申请单元点击事件
/**
* @description: 申请单元点击事件
* @param {*} index
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-25 09:53:27
* @LastEditTime: 2023-08-30 16:03:09
-->
<template>
<div>
......@@ -66,13 +66,13 @@
)
}
},
{
label: '身份证读卡器',
align: 'center',
render: (h, scope) => {
return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button>
}
},
// {
// label: '身份证读卡器',
// align: 'center',
// render: (h, scope) => {
// return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button>
// }
// },
{
prop: "sqrmc",
label: "姓名/名称"
......@@ -124,12 +124,12 @@
let that = this
this.$nextTick(() => {
if (val.length == 0 || !val) {
that.tableDataList = _.cloneDeep([{
sqrmc: '',
dlrzjlx: '',
dlrzjh: '',
fr: ''
}])
// that.tableDataList = _.cloneDeep([{
// sqrmc: '',
// dlrzjlx: '',
// dlrzjh: '',
// fr: ''
// }])
} else {
that.tableDataList = _.cloneDeep(val)
}
......@@ -164,7 +164,7 @@
* @param {*} value
* @author: renchao
*/
handleupdateDetail (value) {
handleupdateDetail (value) {
let arr = this.tableData.map(item => item.zjh)
if (this.isaddupdate) {
if (!arr.includes(value.zjh)) {
......@@ -174,7 +174,7 @@
this.$message.error('证件号不能重复');
}
} else {
if (!arr.includes(value.zjh)||this.tableData[this.dataIndex].zjh==value.zjh) {
if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
this.tableDataList[this.dataIndex] = _.cloneDeep(value);
this.$emit('upDateQlrxxList', this.tableDataList)
} else {
......@@ -205,9 +205,8 @@
* @author: renchao
*/
deleClick (index, row) {
this.tableData.splice(index, 1)
this.tableData.splice(index, 1)
},
/**
* @description: 身份证读取
* @param {*} row
......@@ -244,7 +243,7 @@
*/
editClick (index, row) {
this.details = row
this.details.gyfs=this.gyfs
this.details.gyfs = this.gyfs
this.dataIndex = index
this.dialog = true
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 09:17:44
* @LastEditTime: 2023-08-30 14:13:47
*/
import { getPrintTemplateByCode } from "@/api/print";
import { uploadUndo } from "@/api/clxx";
......@@ -14,9 +14,9 @@ import {
getWorkFlowImage,
getPrintApplicationInfo,
deleteFlow,
unClaimTask
unClaimTask,
getZdInfo
} from "@/api/workFlow.js";
import { mapGetters } from 'vuex'
import { getZrzbsmList } from "@/api/search.js";
import { ywPopupDialog } from "@/utils/popup.js";
export default {
......@@ -43,7 +43,6 @@ export default {
this.flowInitParam();
},
methods: {
//加载流程初始参数
/**
* @description: 加载流程初始参数
* @author: renchao
......@@ -174,7 +173,10 @@ export default {
break;
// 图形定位
case "B-TXDW":
this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '85%', true)
getZdInfo(this.currentSelectProps.bdcdyid).then(res => {
this.bsmZd = res?.result[0]?.bsmZd
this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '85%', true)
})
break;
case "back": //退回按钮
this.$popupDialog("退回", "workflow/components/th", {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-09 14:54:20
* @LastEditTime: 2023-08-30 14:14:55
-->
<template>
<div class="container">
......@@ -132,11 +132,7 @@
* @author: renchao
*/
getCurrentSelectProps (val) {
console.log(val, 'valvalvalval');
this.currentSelectProps = val
getZdInfo(val.bdcdyid).then(res => {
this.bsmZd = res?.result[0]?.bsmZd
})
},
/**
* @description: beforeunloadHandler
......@@ -158,7 +154,6 @@
unClaimTask(this.bsmSlsq, this.bestepid);
}
},
//申请单元点击事件
/**
* @description: 申请单元点击事件
* @param {*} index
......@@ -167,7 +162,7 @@
stepForm (index) {
getStepFormInfo(this.currentSelectProps).then((res) => {
if (res.code === 200) {
this.fresh++;
// this.fresh++;
//获取单元对应的所有表单信息
this.tabList = res.result;
//默认加载第一个表单信息
......
......@@ -2,13 +2,9 @@
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 14:08:27
* @LastEditTime: 2023-08-30 13:51:05
*/
export default {
data () {
return {
}
},
watch: {
'ruleForm.sldy.gyfs': {
handler: function (val, oldVal) {
......@@ -22,5 +18,5 @@ export default {
},
immediate: true
}
},
}
}
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-30 11:08:19
* @LastEditTime: 2023-08-30 16:15:53
-->
<template>
<div class="slxx">
<el-form
:model="ruleForm"
:rules="rules"
v-Loading="loading"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -167,7 +168,7 @@
<el-input v-model="ruleForm.lq.xdm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="16">
<el-form-item label="附记：">
<el-input
v-model="ruleForm.lq.fj"
......@@ -285,6 +286,7 @@
export default {
mixins: [ywmix],
mounted () {
this.loading = true
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -307,15 +309,19 @@
? (this.ruleForm.slsq.fzfs = "1")
: this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
setTimeout(() => {
this.loading = false
}, 200)
}
});
})
},
components: { qlrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
...mapGetters(["dictData", "flag"])
},
data () {
return {
loading: false,
disabled: true,
tdytOption: [],
czrOptions: [],
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-30 10:34:54
* @LastEditTime: 2023-08-30 14:57:59
-->
<template>
<div class="slxx">
......@@ -167,7 +167,7 @@
<el-input v-model="ruleForm.lq.xdm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="16">
<el-form-item label="附记：">
<el-input
v-model="ruleForm.lq.fj"
......