b9d5dc01 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 4c9d459e 343c937e
......@@ -4,7 +4,7 @@
* @Author: sakuya
* @Date: 2021年6月10日10:04:07
* @LastEditors: Please set LastEditors
* @LastEditTime: 2023-07-27 14:49:53
* @LastEditTime: 2023-07-28 09:49:26
-->
<template>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:39:57
* @LastEditTime: 2023-07-28 09:34:54
-->
<template>
<div class="clmlmx-box">
......@@ -162,6 +162,7 @@
var formdata = new FormData();
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
formdata.append("clfl", 2);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
......
......@@ -407,6 +407,7 @@
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
......
......@@ -115,12 +115,40 @@
</el-col>
<el-col :span="8">
<el-form-item label="独用土地面积:">
<el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.dytdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分摊土地面积:">
<el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.fttdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -137,10 +165,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="房地产交易价格:">
<div style="display: flex">
<div class="flex">
<el-input
v-model="ruleForm.fdcq2.qjjg"
style="width: 500%"></el-input>
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select v-model="ruleForm.fdcq2.jedw">
<el-option
v-for="item in dictData['A57']"
......@@ -225,17 +255,59 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input v-model="ruleForm.fdcq2.jzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专有建筑面积:">
<el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.zyjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分摊建筑面积:">
<el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.ftjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -647,4 +719,10 @@
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
.el-date-editor.el-input {
width: 100%;
}
.el-table__row {
height: 30px !important;
}
</style>
......
......@@ -45,6 +45,32 @@
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息:">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号:">
<el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
......
......@@ -10,7 +10,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
:class="{readonly: editDisabled }"
:class="{ readonly: editDisabled }"
class="loadingtext"
:show-message="false"
:label-position="flag ? 'top' : ''"
......@@ -43,8 +43,8 @@
土地所有权信息
<div class="triangle"></div>
</div>
<el-row :gutter="10" class="ssqlxx">
<el-col :span="24" v-if="ssqlxxshow">
<el-row :gutter="10">
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息:">
<select-table
v-model="ruleForm.ssQlxx"
......@@ -70,8 +70,6 @@
</select-table>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="不动产单元号:">
<el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
......@@ -95,7 +93,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型:" prop="qlxx.djlx" :rules="rules.djlxrules">
<el-form-item
label="登记类型:"
prop="qlxx.djlx"
:rules="rules.djlxrules"
>
<el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
<el-option
v-for="item in djlxlist"
......@@ -166,77 +168,174 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="农用地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.nydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="耕地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.gdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="林地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.ldmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="草地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.cdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="其他农用地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.qtnydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑使用面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.jsydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="未利用地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.wlydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积单位:">
<el-input
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
></el-input>
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -248,6 +347,7 @@
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
......@@ -310,12 +410,12 @@
<script>
import store from "@/store/index.js";
import { mapGetters } from "vuex";
import { init,getSsQlxx, save } from "@/api/djbRepair.js";
import { init, getSsQlxx, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import selectTable from "@/components/selectTable/index.vue";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable, tdytTable ,selectTable},
components: { qlrCommonTable, tdytTable, selectTable },
computed: {
...mapGetters(["dictData", "flag"]),
// 根据流程判断表单是否为只读
......@@ -329,7 +429,7 @@ export default {
},
data() {
return {
ssqlxxshow:true,
ssqlxxshow: true,
props: {
label: "bdcqzh",
value: "bdcdyid",
......@@ -392,7 +492,7 @@ export default {
czrOptions: [],
ssQlxxList: [],
ruleForm: {},
ableOperation:false,
ableOperation: false,
//传递参数\
rules: {
bdcqzhrules: [
......@@ -406,12 +506,10 @@ export default {
},
};
},
created() {
},
created() {},
mounted() {
this.loadData();
this.ableOperation=this.$parent.ableOperation
this.ableOperation = this.$parent.ableOperation;
},
methods: {
/**
......@@ -429,7 +527,7 @@ export default {
* @author: renchao
*/
djlxchange(val) {
console.log("val",val);
console.log("val", val);
if (val == null || val == 100) {
this.ssqlxxshow = false;
} else {
......@@ -646,5 +744,4 @@ export default {
/deep/.el-form-item__label {
padding-bottom: 0px;
}
</style>
......
......@@ -328,7 +328,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
......@@ -356,7 +373,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额:">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.qdjg"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -241,7 +241,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
style="width: 20%"
>
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
......@@ -269,7 +286,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额:">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.qdjg"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -282,11 +282,6 @@
<el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-input v-model="ruleForm.yydj.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记:">
<el-input v-model="ruleForm.yydj.fj"></el-input>
......
......@@ -12,7 +12,8 @@
<li
@click="operation(item)"
v-for="(item, index) in leftButtonList"
:key="index">
:key="index"
>
<svg-icon class="icon" :icon-class="item.icon" />
<span class="iconName">{{ item.name }}</span>
</li>
......@@ -21,7 +22,8 @@
<li
@click="operation(item)"
v-for="(item, index) in rightButtonList"
:key="index">
:key="index"
>
<svg-icon class="icon" :icon-class="item.icon" />
<span class="iconName">{{ item.name }}</span>
</li>
......@@ -43,18 +45,25 @@
</div>
<!-- 表单内容区域 -->
<div class="rightContainer">
<div class="count">
当前流程所在环节:
<span>{{ this.zbhj }}</span>
</div>
<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">
:key="item.value"
>
</el-tab-pane>
</el-tabs>
<component
:key="fresh"
:is="componentTag"
v-bind="currentSelectProps" />
v-bind="currentSelectProps"
/>
</div>
</div>
</div>
......@@ -63,26 +72,26 @@
</div>
</template>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "./workFrame.scss";
@import "~@/styles/mixin.scss";
@import "./workFrame.scss";
</style>
<script>
import WorkFlow from "./mixin/index";
import { getForm } from "./flowform";
import { getStepFormInfo } from "@/api/workFlow.js";
import NoticeBar from "@/components/NoticeBar/index";
// import ProcessViewer from "./components/processViewer.vue";
import WorkFlow from "./mixin/index";
import { getForm } from "./flowform";
import { getStepFormInfo } from "@/api/workFlow.js";
import NoticeBar from "@/components/NoticeBar/index";
// import ProcessViewer from "./components/processViewer.vue";
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import qllxDailog from "./djbBook/components/qllxDailog";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { addRepairRecord } from "@/api/djbRepair.js";
// 获取权利类型数组
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import qllxDailog from "./djbBook/components/qllxDailog";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { addRepairRecord } from "@/api/djbRepair.js";
// 获取权利类型数组
import { getBdcqljqtsx } from "@/api/djbDetail.js";
export default {
import { getBdcqljqtsx } from "@/api/djbDetail.js";
export default {
components: {
selectBdc,
NoticeBar,
......@@ -90,11 +99,13 @@
qllxDailog,
},
mixins: [WorkFlow],
data () {
data() {
return {
bsmSlsq: this.$route.query.bsmSlsq,
//当前流程所在环节
bestepid: this.$route.query.bestepid,
//当前流程所在环节
zbhj: this.$route.query.zbhj,
//设置那个表单选中
tabName: "",
isEdit: true,
......@@ -114,17 +125,17 @@
_beforeUnload_time: "",
treedata: {},
tabdata: [],
bsmRepair:"",
bsmRepair: "",
defaultNode: {},
clxxForm: "",
//材料信息选择卡索引
clxxIndex: "",
//材料信息选项卡对象
clxxTab: {},
ableOperation:false
ableOperation: false,
};
},
mounted () {
mounted() {
// this.getleftMenubl()
},
......@@ -134,17 +145,17 @@
* @param {*} qllx
* @author: renchao
*/
stepForm (qllx) {
stepForm(qllx) {
this.oneSelectProps.qllx = qllx;
if (this.$refs.Menu.supplementarylist.length) {
getStepFormInfo(this.oneSelectProps).then((res) => {
this.$nextTick(function () {
this.tabList = res.result;
this.tabName = this.tabList[0].value;
this.ableOperation=this.tabList[0].ableOperation
this.ableOperation = this.tabList[0].ableOperation;
this.getFromRouter(this.tabName);
if(this.tabList.length!=8){
if (this.tabList.length != 8) {
let that = this;
this.tabList.forEach(function (item, index) {
if (item.value == "clxx") {
......@@ -152,7 +163,7 @@
that.clxxForm = getForm(item.value, that.$route.query.sqywbm);
that.clxxTab = item;
}
})
});
}
});
});
......@@ -164,8 +175,8 @@
* @param {*} val
* @author: renchao
*/
getCurrentSelectProps (val) {
this.bsmRepair= val.bsmRepair
getCurrentSelectProps(val) {
this.bsmRepair = val.bsmRepair;
if (val.bdcdyid) {
this.oneSelectProps = val;
}
......@@ -185,7 +196,7 @@
* @description: 获取渲染登记簿列表
* @author: renchao
*/
getdjblist () {
getdjblist() {
getBdcqljqtsx({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
......@@ -219,7 +230,7 @@
* @param {*} activeName
* @author: renchao
*/
beforeLeave (activeName) {
beforeLeave(activeName) {
if (activeName && activeName != 0) this.getFromRouter(activeName);
},
//切换选项卡内容组件
......@@ -228,7 +239,7 @@
* @param {*} tabname
* @author: renchao
*/
getFromRouter (tabname) {
getFromRouter(tabname) {
this.componentTag = getForm(tabname);
},
// closefp () {
......@@ -245,7 +256,7 @@
* @param {*} del
* @author: renchao
*/
addRepairRecord (row, del) {
addRepairRecord(row, del) {
let from = {
bsmQlxx: "",
bsmSlsq: this.bsmSlsq,
......@@ -282,7 +293,7 @@
})
.catch((res) => {
console.log("错", res);
})
});
},
// openDialog () {
// this.$store.dispatch('user/refreshPage', false)
......@@ -296,7 +307,22 @@
// this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
// }
}
};
},
};
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.rightContainer {
position: relative;
}
.count {
font-size: 14px;
position: absolute;
right: 25px;
top: 12px;
height: 30px;
span {
font-weight: 600;
color: #3498db;
}
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-04 16:05:44
* @LastEditTime: 2023-07-28 09:35:31
-->
<template>
<div class="clxx">
......@@ -33,7 +33,8 @@
</div>
</div>
</div>
<image-preview ref='imageRef' v-if="tableData.length>0" :ableOperation="ableOperation" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :ableOperation="ableOperation" :previewImg="previewImg" @updateList="updateList"
@nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......@@ -74,7 +75,7 @@
return (
<div>
{
this.ableOperation? '序号' :
this.ableOperation ? '序号' :
<i
class="el-icon-plus pointer"
onClick={() => {
......@@ -91,7 +92,7 @@
return (
<div>
{
this.ableOperation? <span>{scope.$index + 1}</span> :
this.ableOperation ? <span>{scope.$index + 1}</span> :
<i
class="el-icon-minus pointer"
......@@ -258,6 +259,7 @@
var formdata = new FormData();
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("bsmSlsq", this.$parent.bsmSlsq);
formdata.append("clfl", 2);
InitClml(formdata).then((res) => {
if (res.result.code == 200) {
resolve(res.code)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-24 08:53:26
* @LastEditTime: 2023-07-28 09:35:38
-->
<template>
<div class="clxx">
......@@ -113,6 +113,7 @@
var formdata = new FormData();
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("bsmSlsq", this.$parent.bsmSlsq);
formdata.append("clfl", 2);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:39:57
* @LastEditTime: 2023-07-28 09:35:42
-->
<template>
<div class="clmlmx-box">
......@@ -162,6 +162,7 @@
var formdata = new FormData();
formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
formdata.append("clfl", 2);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
......
......@@ -40,7 +40,7 @@
:normalizer="normalizer"
:appendToBody="true"
z-index="9999"
@input="addrow(scope.$index)"
@input="addrow(scope.row)"
/>
</template>
</el-table-column>
......@@ -192,10 +192,10 @@ export default {
// this.tableDataList = this.tableDataList.map((item) => {
// return {
// ...item,
// yt: this.tdyt,
// yt: a.yt,
// };
// });
// this.$emit("upDateTdytxxList", this.tableDataList);
this.$emit("upDateTdytxxList", this.tableDataList);
},
/**
* @description: startTime
......
......@@ -35,6 +35,10 @@
</div>
<!-- 表单内容区域 -->
<div class="rightContainer">
<div class="count">
当前流程所在环节:
<span>{{ this.zbhj }}</span>
</div>
<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>
......@@ -84,6 +88,8 @@
bsmSlsq: this.$route.query.bsmSlsq,
//当前流程所在环节
bestepid: this.$route.query.bestepid,
//当前流程所在环节
zbhj: this.$route.query.zbhj,
//设置那个表单选中
tabName: "",
//设置那个表单选择
......@@ -201,4 +207,19 @@
}
}
</script>
<style scoped lang="scss">
.rightContainer {
position: relative;
}
.count {
font-size: 14px;
position: absolute;
right: 25px;
top: 12px;
height: 30px;
span {
font-weight: 600;
color: #3498db;
}
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:42:32
* @LastEditTime: 2023-07-28 09:31:17
-->
<template>
<div class="clxx">
......@@ -44,7 +44,7 @@
import { mapGetters } from "vuex";
import clxxAddDialog from "./clxxAddDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
export default {
components: { clxxAddDialog, imagePreview },
data () {
......
......@@ -6,46 +6,96 @@
<template>
<div class="from-clues">
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="100px">
<el-form
:model="queryForm"
ref="queryForm"
@submit.native.prevent
label-width="100px"
>
<el-row>
<el-col :span="5">
<el-form-item label="业务来源">
<el-select v-model="queryForm.ywly" class="width100" filterable
@change="handleSelect('ywly', 'ywlymc', 'ywly')" @clear="handleEmpty('ywlymc')" clearable
placeholder="请选择业务来源">
<el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-select
v-model="queryForm.ywly"
class="width100"
filterable
@change="handleSelect('ywly', 'ywlymc', 'ywly')"
@clear="handleEmpty('ywlymc')"
clearable
placeholder="请选择业务来源"
>
<el-option
v-for="item in dictData['ywly']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="权利类型">
<el-select v-model="queryForm.qllx" class="width100" @change="handleSelect('A8', 'qllxmc', 'qllx')"
@clear="handleEmpty('qllxmc')" filterable clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-select
v-model="queryForm.qllx"
class="width100"
@change="handleSelect('A8', 'qllxmc', 'qllx')"
@clear="handleEmpty('qllxmc')"
filterable
clearable
placeholder="请选择权利类型"
>
<el-option
v-for="item in dictData['A8']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="登记类型">
<el-select v-model="queryForm.djlx" class="width100" @change="handleSelect('A21', 'djlxmc', 'djlx')"
@clear="handleEmpty('djlxmc')" filterable clearable placeholder="请选择登记类型">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-select
v-model="queryForm.djlx"
class="width100"
@change="handleSelect('A21', 'djlxmc', 'djlx')"
@clear="handleEmpty('djlxmc')"
filterable
clearable
placeholder="请选择登记类型"
>
<el-option
v-for="item in dictData['A21']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务号">
<el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
<el-input
placeholder="请输入业务号"
v-model="queryForm.ywh"
clearable
class="width100"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
<el-button
type="primary"
native-type="submit"
@click="handleSearch"
>查询</el-button
>
<el-button @click="moreQueryClick">高级查询</el-button>
</el-form-item>
</el-col>
......@@ -53,25 +103,45 @@
<el-row>
<el-col :span="5">
<el-form-item label="不动产单元号">
<el-input placeholder="请输入不动产单元号" v-model="queryForm.bdcdyh" clearable class="width100">
<el-input
placeholder="请输入不动产单元号"
v-model="queryForm.bdcdyh"
clearable
class="width100"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="申请人">
<el-input placeholder="如需要模糊查询,前后输入%" v-model="queryForm.sqrmc" clearable class="width100">
<el-input
placeholder="如需要模糊查询,前后输入%"
v-model="queryForm.sqrmc"
clearable
class="width100"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="申请人证件号">
<el-input placeholder="如需要模糊查询,前后输入%" v-model="queryForm.sqrzjhm" clearable class="width100">
<el-input
placeholder="如需要模糊查询,前后输入%"
v-model="queryForm.sqrzjhm"
clearable
class="width100"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="坐落">
<el-input placeholder="如需要模糊查询,前后输入%" v-model.trim="queryForm.zl" clearable class="width100">
<el-input
placeholder="如需要模糊查询,前后输入%"
v-model.trim="queryForm.zl"
clearable
class="width100"
>
</el-input>
</el-form-item>
</el-col>
......@@ -81,42 +151,65 @@
<ul>
<li v-for="(item, index) in searchList" :key="index">
{{ item.name }}:{{ item.value }}
<i class="el-icon-circle-close" @click="handelItem(item, index)"></i>
<i
class="el-icon-circle-close"
@click="handelItem(item, index)"
></i>
</li>
</ul>
<el-button class="clean-btn" type="text" v-if="searchList.length > 0" @click.native="hanldeCleanAll">清除全部
<el-button
class="clean-btn"
type="text"
v-if="searchList.length > 0"
@click.native="hanldeCleanAll"
>清除全部
</el-button>
</el-row>
</el-form>
</div>
<div class="from-clues-content">
<lb-table :page-size="pageData.size" class="loadingtext" @sort-change="handleSort"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
<lb-table
:page-size="pageData.size"
class="loadingtext"
@sort-change="handleSort"
:current-page.sync="pageData.currentPage"
:total="tableData.total"
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
:column="tableData.columns"
:data="tableData.data"
>
</lb-table>
</div>
<searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
<searchBox
v-model="isSearch"
@getSearch="getSearch"
:advancedForm="otherForm"
/>
</div>
</template>
<script>
import { mapGetters } from "vuex";
import searchBox from "../components/search.vue";
import table from "@/utils/mixin/table";
import searchMin from "../components/mixin/index";
import { datas, sendThis } from "./dbxdata";
import { searchTaskToDo } from "@/api/workflow/search.js";
import { judgeUserTaskPermission, deleteFlow, claimTask } from "@/api/workFlow.js";
export default {
import { mapGetters } from "vuex";
import searchBox from "../components/search.vue";
import table from "@/utils/mixin/table";
import searchMin from "../components/mixin/index";
import { datas, sendThis } from "./dbxdata";
import { searchTaskToDo } from "@/api/workflow/search.js";
import {
judgeUserTaskPermission,
deleteFlow,
claimTask,
} from "@/api/workFlow.js";
export default {
name: "dbx",
components: { searchBox },
mixins: [table, searchMin],
computed: {
...mapGetters(["dictData", "transfer"]),
},
data () {
data() {
return {
queryForm: {
},
queryForm: {},
searchForm: {
ywlymc: "",
qllxmc: "",
......@@ -131,20 +224,20 @@
jumpid: "",
};
},
mounted () {
mounted() {
sendThis(this);
},
watch: {
queryForm: {
handler (newName, oldName) { },
handler(newName, oldName) {},
immediate: true,
},
},
activated () {
activated() {
this.queryClick();
window["getBpageList"] = () => {
this.queryClick();
}
};
},
methods: {
// 列表渲染接口
......@@ -152,7 +245,7 @@
* @description: 列表渲染接口
* @author: renchao
*/
queryClick () {
queryClick() {
this.$startLoading();
this.searchForm.ywh = this.queryForm.ywh;
this.iterationData();
......@@ -174,7 +267,7 @@
* @param {*} val
* @author: renchao
*/
handleSort (val) {
handleSort(val) {
this.queryForm.sortField = val.prop;
this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
this.queryClick();
......@@ -184,7 +277,7 @@
* @param {*} item
* @author: renchao
*/
del (item) {
del(item) {
let formdata = new FormData();
formdata.append("bsmSlsq", item.bsmSlsq);
this.$confirm("确定要删除吗, 是否继续?", "提示", {
......@@ -218,7 +311,7 @@
* @param {*} item
* @author: renchao
*/
ywhClick (item) {
ywhClick(item) {
//判断用户是否拥有该任务的权限,若有则跳转,无权限则给予提示并刷新页面
judgeUserTaskPermission({
bsmSlsq: item.bsmSlsq,
......@@ -235,7 +328,9 @@
item.bestepid +
"&bsmBusiness=" +
"&sqywbm=" +
item.djywbm
item.djywbm +
"&zbhj=" +
item.zbhj
);
window.open(href, `djbworkFrame${item.bsmSlsq}`);
} else {
......@@ -246,12 +341,14 @@
item.bestepid +
"&bsmBusiness=" +
"&sqywbm=" +
item.djywbm
item.djywbm +
"&zbhj=" +
item.zbhj
);
window.open(href, `workFrame${item.bsmSlsq}`);
}
localStorage.setItem('ywbl', JSON.stringify(item));
localStorage.setItem("ywbl", JSON.stringify(item));
//从待办箱进入的调取任务领取接口
claimTask(item.bsmSlsq, item.bestepid);
......@@ -264,11 +361,11 @@
} else {
this.$message.error("用户任务权限判断失败,请联系管理员");
}
})
}
}
}
});
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
......@@ -32,7 +32,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型:" prop="slsq.qllx">
<el-select disabled v-model="ruleForm.sldy.qllx" filterable clearable placeholder="请选择权利类型">
<el-select disabled v-model="ruleForm.sldyList[0].qllx" filterable clearable placeholder="请选择权利类型">
<el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
......@@ -40,7 +40,7 @@
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型:" prop="slsq.djlx">
<el-select disabled v-model="ruleForm.sldy.djlx" filterable clearable placeholder="请选择登记类型">
<el-select disabled v-model="ruleForm.sldyList[0].djlx" filterable clearable placeholder="请选择登记类型">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
</el-select>
......
......@@ -72,7 +72,21 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地面积:">
<el-input v-model="ruleForm.zdjbxx.zdmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.zdjbxx.zdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
:disabled="!ableOperation"
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</div>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
......@@ -88,7 +102,7 @@
<el-col :span="8">
<el-form-item label="取得价格:">
<div style="display:flex">
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw">
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......
......@@ -102,7 +102,7 @@
<el-input
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
disabled
></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw" disabled>
......
......@@ -242,7 +242,8 @@
if (!this.isJump) {
startBusinessFlow({
bsmSqyw: this.bsmSqyw,
sjlx: 'zrz',
//sjlx: 'zrz',
sjlx: this.activeName,
bdcdysz: this.bdcdysz,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
......
......@@ -28,7 +28,7 @@ export default {
"/workFrame?bsmSlsq=" +
data.bsmSlsq +
"&bestepid=" +
data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type
data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type+"&zbhj=受理"
);
window.open(href, "_blank");
this.$popupCacel()
......
......@@ -122,7 +122,7 @@ class data extends filter {
minWidth: '130'
},
{
label: '操作111',
label: '操作',
width: '160',
align: 'center',
fixed: 'right',
......
......@@ -103,7 +103,7 @@ class data extends filter {
minWidth: '130'
},
{
label: '操作111',
label: '操作',
width: '160',
align: 'center',
fixed: 'right',
......