Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
5de904b9 by tianhaohao@pashanhoo.com
Options

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

2 parents 134ba77c 3b4b0bc7
Inline Side-by-side
Showing 14 changed files with 143 additions and 43 deletions
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-21 16:35:04
* @LastEditTime: 2023-07-04 16:07:37
-->
<template>
<div class="rlPopup">
......@@ -26,13 +26,13 @@
<el-upload class="fileUpdate" ref="upload" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
:on-change="handleChange"
accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
<el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype">上传</el-button>
<el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype && ableOperation">上传</el-button>
</el-upload>
<el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
v-if="!this.$route.query.viewtype && thumbnailImages.length>0">删除</el-button>
v-if="!this.$route.query.viewtype && thumbnailImages.length>0 && ableOperation">删除</el-button>
<div v-if="!this.$route.query.viewtype" class="pl-5">
<el-button type="primary" @click="handleOpenScan">{{scanTitle}}</el-button>
<el-button type="primary" @click="handleViewScan" v-if="isScan">拍照</el-button>
<el-button type="primary" @click="handleOpenScan" v-if="ableOperation">{{scanTitle}}</el-button>
<el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
</div>
</div>
<ul>
......@@ -58,6 +58,10 @@
previewImg: {
type: Object,
default: () => { }
},
ableOperation: {
type: Boolean,
default: true
}
},
components: {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-21 15:34:44
* @LastEditTime: 2023-07-04 16:05:44
-->
<template>
<div class="clxx">
......@@ -33,7 +33,7 @@
</div>
</div>
</div>
<image-preview ref='imageRef' v-if="tableData.length>0" :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>
......@@ -49,6 +49,8 @@
components: { clxxAddDialog, imagePreview },
data () {
return {
//表单是否可操作
ableOperation: true,
isDialog: false,
menuList: [
{
......@@ -214,6 +216,7 @@
...mapGetters(["dictData"])
},
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.clmlInitList()
},
methods: {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-21 16:29:37
* @LastEditTime: 2023-07-04 16:08:03
-->
<template>
<div class="clxx">
......@@ -22,9 +22,11 @@
</div>
</div>
</div>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()"
v-if="!this.$route.query.viewtype && ableOperation">新增</el-button>
</div>
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" :ableOperation="ableOperation" @updateList="updateList"
@nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......@@ -42,6 +44,8 @@
components: { clxxAddDialog, imagePreview, clxxDetailDialog },
data () {
return {
//表单是否可操作
ableOperation: true,
isDialog: false,
iclass: "",
// 材料目录选中
......@@ -63,6 +67,7 @@
...mapGetters(["dictData"])
},
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.clmlInitList(1)
},
methods: {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-30 14:32:40
* @LastEditTime: 2023-07-04 15:04:59
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -20,6 +20,7 @@
<script>
import { datas } from "../../javascript/zsyl.js";
import { getSlsqBdcqzList } from "@/api/bdcqz.js"
import { log } from 'bpmn-js-token-simulation';
export default {
name: "zsyl",
props: {
......@@ -57,7 +58,6 @@
}
},
mounted () {
debugger
this.columns = datas.columns();
if (this.formData.bdcqz) {
//从缮证进入
......
......@@ -65,9 +65,10 @@
</el-table-column>
<el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
<el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
<el-table-column label="创建时间" prop="createTime" width="160" align="center" />
<el-table-column label="办结时间" prop="endTime" width="160" align="center" />
<el-table-column label="操作方式" prop="businessName" align="center"/>
<el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="操作方式" prop="controls" align="center"/>
<el-table-column label="意见" prop="idea" align="center"/>
</el-table>
</div>
......@@ -118,6 +119,14 @@
this.clearViewer()
},
methods: {
formatDate(row, column) {
let data = row[column.property]
if(data == null) {
return null
}
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
},
processReZoom () {
this.defaultZoom = 1
this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
......@@ -240,6 +249,7 @@
item.comments.forEach(element => {
if(element.type=="COMPLETE"){
this.formData.allCommentList[index].idea=element.message
this.formData.allCommentList[index].controls="完成"
}
});
this.formData.allCommentList[index].agent=item.assignee.name
......
......@@ -130,6 +130,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -207,6 +215,7 @@
</template>
<script>
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
......@@ -228,7 +237,7 @@
}
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -246,6 +255,12 @@
}
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
......@@ -258,6 +273,7 @@
this.ruleForm.ywrList = _.cloneDeep(val);
},
onSubmit () {
console.log("this.ruleForm",);
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
......
......@@ -133,6 +133,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -191,6 +199,7 @@
</template>
<script>
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
......@@ -214,7 +223,7 @@
}
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -272,6 +281,12 @@
}
});
},
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:58:04
-->
......@@ -124,6 +124,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -179,6 +187,7 @@
</template>
<script>
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
......@@ -198,7 +207,7 @@
}
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -247,6 +256,12 @@
};
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
list (bsmSldy) {
var formdata = new FormData();
formdata.append("bsmSldy", bsmSldy);
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:59:02
-->
......@@ -125,6 +125,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -194,6 +202,7 @@
<script>
import { mapGetters } from "vuex"
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"
import tdytTable from "@/views/workflow/components/tdytTable";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
export default {
mounted () {
......@@ -214,7 +223,7 @@
})
})
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"])
},
......@@ -233,6 +242,12 @@
}
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val))
......@@ -281,6 +296,7 @@
})
}
}
console.log("this.ruleFormmmmmmmmm",this.ruleForm);
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
......@@ -304,4 +320,4 @@
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
\ No newline at end of file
</style>
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:59:49
-->
......@@ -127,6 +127,14 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
</div>
<tdytTable
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -189,6 +197,7 @@
<script>
import { mapGetters } from "vuex";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
export default {
mounted () {
......@@ -206,7 +215,7 @@
this.$endLoading();
});
},
components: { qlrCommonTable },
components: { qlrCommonTable,tdytTable },
computed: {
...mapGetters(["dictData", "flag"])
},
......@@ -228,6 +237,12 @@
};
},
methods: {
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-29 11:13:35
* @LastEditTime: 2023-07-04 16:23:54
-->
<template>
<!-- 受理信息 -->
......@@ -88,41 +88,41 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="农用地面积：">
<el-input v-model="ruleForm.tdsyq.nydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.nydmj" 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 v-model="ruleForm.tdsyq.gdmj"></el-input>
<el-input v-model="ruleForm.tdsyq.gdmj" 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 v-model="ruleForm.tdsyq.ldmj"></el-input>
<el-input v-model="ruleForm.tdsyq.ldmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="草地面积：">
<el-input v-model="ruleForm.tdsyq.cdmj"></el-input>
<el-input v-model="ruleForm.tdsyq.cdmj" 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 v-model="ruleForm.tdsyq.qtnydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.qtnydmj" 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 v-model="ruleForm.tdsyq.jsydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.jsydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="未利用地面积：">
<el-input v-model="ruleForm.tdsyq.wlydmj"></el-input>
<el-input v-model="ruleForm.tdsyq.wlydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -256,12 +256,12 @@
type: 'success'
})
store.dispatch('user/refreshPage', true);
this.$popupCacel()
} else {
this.$message.error(res.message);
}
})
}
this.$popupCacel()
},
handleSelectionChange (val) {
this.bdcdysz = val
......
......@@ -30,8 +30,8 @@
</div>
<!-- 一并申请 -->
<div v-if="selectType == 'together'" class="right-situation el-card">
<div class="right-title">一并申请</div>
<ul>
<div class="right-title">一并申请</div>
<ul>
<li :class="item.selected ? 'cactive' : ''" v-for="(item, index) in djqxList" :key="index"
@dblclick="dblclick(djqxList, index, item)" @click="selectSqywClick(djqxList, index)">
<dt>{{ item.nodename }}</dt>
......@@ -91,7 +91,7 @@
</div>
</template>
<script>
import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz,getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
export default {
data () {
return {
......@@ -147,13 +147,13 @@
if (this.selectType == 'amend') {
this.getRepairBiz();
}
if (this.selectType == 'together') {
if (this.selectType == 'together') {
getTogetherBiz().then(res => {
if (res) {
console.log("res", res);
this.djqxList = res.result;
}
})
if (res) {
console.log("res", res);
this.djqxList = res.result;
}
})
}
},
//权利类型菜单事件
......
......@@ -24,7 +24,7 @@
},
mounted () {
if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm,this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
this.router = this.loadView(view);
} else {
let view = queueDjywmc(this.$route.query?.sqywbm);
......@@ -33,6 +33,7 @@
},
methods: {
loadView (view) {
console.log(view, 'view');
return (r) =>
require.ensure([], () => r(require(`./components/${view}.vue`)));
},
......