Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
8cb836ad by tianhaohao@pashanhoo.com
Options

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

2 parents cef1678b 8f5b08b3
Expand all
Inline Side-by-side
Showing 35 changed files with 131 additions and 100 deletions
import { log } from 'bpmn-js-token-simulation';
import { mapGetters } from 'vuex'
import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
export default {
......@@ -9,13 +10,23 @@ export default {
}
}
},
created() {
},
computed: {
...mapGetters(['dictData']),
},
mounted () {
window.addEventListener('keydown', this.handkeyCode, true)//开启监听键盘按下事件
this.handleSearch()
},
methods: {
handkeyCode(e) {
if(e.keyCode === 13){
console.log("安");
this.handleSearch()
}
},
handleSearch(){
this.pageData.currentPage = 1
if (this.fetchData) {
......
import Vue from 'vue'
import axios from 'axios'
import request from '@/utils/request';
import { Message } from "element-ui";
export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
if (!treeList || !treeList.length) {
......@@ -111,7 +114,6 @@ export function down (index, data) {
}
}
export function getUrlParam (paraName) {
let url = document.location.toString();
let arrObj = url.split('?');
......@@ -133,3 +135,29 @@ export function getUrlParam (paraName) {
return '';
}
}
/**
* @description: 身份证读卡器
* @author: renchao
*/
export function getIdCardInfo (level) {
const resultMap = {
A: '10 颗星',
default: axios.post(Vue.prototype.BASE_API.IDCARDURL),
}
return resultMap[level] || resultMap.default
}
/**
* @description: 高拍仪组件
* @author: renchao
*/
export function getAltimeterInfo () {
let data = {
"filepath": "base64",
"rotate": "0",
"cutpage": "0",
"camidx": "0",
"ColorMode": "0",
"quality": "3"
}
return axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data))
}
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-14 11:10:26
* @LastEditTime: 2023-06-16 11:12:13
-->
<template>
<div class="rlPopup">
......@@ -46,7 +46,7 @@
</div>
</template>
<script>
import axios from 'axios'
import { getAltimeterInfo } from '@/utils/operation.js'
import PhotoZoom from '@/components/PhotoZoom'
import { uploadSjClmx, deleteClmx } from "@/api/clxx.js";
import publicPicture from '@/components/publicPicture/index.vue'
......@@ -149,20 +149,11 @@
const file = new File([blob], options);
return file;
}
let data = {
"filepath": "base64",
"rotate": "0",
"cutpage": "0",
"camidx": "0",
"ColorMode": "0",
"quality": "3"
}
axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data)).then((res) => {
getAltimeterInfo().then(res => {
let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
let file = blobToFile(blob);
var formData = new FormData();
formData.append('file', file.raw)
formData.append('file', file)
formData.append("bsmSj", this.previewImg.bsmSj);
formData.append("bsmSlsq", this.previewImg.bsmSlsq);
uploadSjClmx(formData).then((res) => {
......
......@@ -30,7 +30,7 @@
:key="index"
>
<div>
<p>{{ item.qllxmc }} ||{{ item.operate }}</p>
<p>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
<!-- <p class="title-detail">{{ item.zl }}</p> -->
</div>
<i
......@@ -263,5 +263,8 @@ export default {
}
.blxx {
border: #b0d9f8 solid 1px;
.tpcolor{
color: red;
}
}
</style>
......
......@@ -24,7 +24,7 @@
</div>
<el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
</div>
<image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......@@ -34,12 +34,12 @@
</template>
<script>
import { mapGetters } from "vuex";
import clxxAddDialog from "./components/tabsconcent/clxxAddDialog.vue";
import clxxAddDialog from "./components/clxxAddDialog.vue";
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
import { popupDialog } from "@/utils/popup.js";
export default {
components: { clxxAddDialog, imagePreview},
components: { clxxAddDialog, imagePreview },
data () {
return {
isDialog: false,
......
<!--
* @Description : 房地产权1
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:45:00
* @LastEditTime : 2023-06-16 10:23:27
-->
<template>
<div class="djxxTable">
......@@ -111,23 +111,22 @@
},
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// });
// });
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
......
<!--
* @Description : 房地产权2
* @Autor : miaofang
* @LastEditTime : 2023-06-14 10:52:48
* @LastEditTime : 2023-06-16 10:24:19
-->
<template>
<div class="djxxTable">
......@@ -108,23 +108,23 @@ export default {
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// });
// });
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
......
<!--
* @Description :国有建设用地使用权
* @Autor : miaofang
* @LastEditTime : 2023-06-13 13:55:51
* @LastEditTime : 2023-06-16 10:23:54
-->
<template>
<div class="djxxTable">
......@@ -115,23 +115,23 @@
},
// 编辑
editDialog(row){
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
this.$parent.addRepairRecord(row)
this.$message({
type: 'success',
message: '补录成功!'
});
}).catch(() => {
this.$message({
type: 'info',
message: '取消编辑'
});
});
// this.$message({
// type: 'success',
// message: '补录成功!'
// });
// }).catch(() => {
// this.$message({
// type: 'info',
// message: '取消编辑'
// });
// });
// this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
// datalist:this.columns,
......
......@@ -10,7 +10,7 @@
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
<div class="spyj_form" v-for="(item, index) in tableData" :key="index">
<div class="item_left">
{{ item.jdmc }}初审意见
{{ item.jdmc }}意见
</div>
<div class="item_right">
<el-row>
......@@ -101,7 +101,9 @@
getSpyjList(formdata).then((res) => {
this.$endLoading()
if (res.code === 200 && res.result) {
this.tableData = res.result ? res.result : []
console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
if (res.result.length == 0) {
that.isNoData = true
}
......
......@@ -98,14 +98,24 @@ export function getForm (tabName, djywbm) {
break;
// 受理信息
case "slxx":
form = require("@/views/djbworkflow/djbBook/slxx.vue");
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
// break;
// case "spyj":
// form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
// break;
// case "slxx":
// form = require("@/views/djbworkflow/djbBook/slxx.vue");
// break;
case "clxx":
form = require("@/views/djbworkflow/djbBook/clxx.vue");
break;
case "spyj":
form = require("@/views/djbworkflow/djbBook/spyj.vue");
break;
// case "clxx":
// form = require("@/views/djbworkflow/components/clxxUnify.vue");
// break;
......
......@@ -126,7 +126,7 @@ export default {
getCurrentSelectProps (val) {
this.currentSelectProps = val
if(this.currentSelectProps.bsmRepair){
this.tabset()
this.tabset(val)
}else{
this.getdjblist()
}
......@@ -159,11 +159,11 @@ export default {
},
tabset(){
tabset(val){
this.tabName = '';
this.tabList = [
{
name: "受理信息",
name:val.qllxmc+ "补录信息",
value: "slxx",
sort: 1,
},
......@@ -185,10 +185,6 @@ export default {
},
// stepForm(index){
// console.log(index);
// },
//右侧表单选项卡事件
beforeLeave (activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName)
......@@ -201,11 +197,13 @@ export default {
break;
}
}
console.log("this.$route.query.sqywbm",this.$route.query.sqywbm);
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
},
// 增加补录记录
addRepairRecord(row){
console.log("this.currentSelectProps",this.currentSelectProps);
let from={
bsmQlxx:"",
bsmSlsq:this.bsmSlsq,
......@@ -216,6 +214,7 @@ export default {
if(row){
from.bsmQlxx=row.bsmQlxx
from.operate="U"
from.qllx=row.qllx
}
addRepairRecord(from).then((res) => {
......
......@@ -66,9 +66,9 @@
<el-select v-model="scope.row.sqrzjlxbm" class="width100">
<el-option
v-for="item in zjzlData"
:key="item.value"
:label="item.label"
:value="item.value">
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</template>
......@@ -113,10 +113,10 @@
</div>
</template>
<script>
import axios from 'axios'
import store from '@/store/index.js'
import { getLodop } from "@/utils/LodopFuncs"
import { datas } from "./addjtfcdata";
import { getLodop } from "@/utils/LodopFuncs"
import { getIdCardInfo } from '@/utils/operation.js'
import { getPrintTemplateByCode } from "@/api/system";
import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx";
export default {
......@@ -359,7 +359,7 @@
this.isSearch = false;
},
handleRead (row, type) {
axios.post(this.BASE_API.IDCARDURL).then(res => {
getIdCardInfo().then(res => {
if (res.data.code == 0) {
let data = res.data.IDCardInfo
row.sqrxm = data.name
......@@ -372,7 +372,6 @@
if (type == 'sqr') {
this.form.qlrList = _.cloneDeep(this.form.sqrList)
}
console.log(this.form.sqrList);
} else {
this.$message({
message: res.data.message,
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:46
* @LastEditTime: 2023-06-16 11:12:40
-->
<template>
<div class="clxx">
......@@ -33,7 +33,7 @@
</div>
</div>
</div>
<image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
<image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
@prevPriview="prevPriview" />
</div>
</div>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-14 13:14:26
* @LastEditTime: 2023-06-16 10:38:23
-->
<template>
<div>
......@@ -12,8 +12,8 @@
</div>
</template>
<script>
import axios from 'axios'
import { mapGetters } from 'vuex'
import { getIdCardInfo } from '@/utils/operation.js'
import addQlr from './dialog/addQlr.vue'
export default {
components: {
......@@ -195,7 +195,7 @@
// 身份证读取
readClick (row) {
axios.post(this.BASE_API.IDCARDURL).then(res => {
getIdCardInfo().then(res => {
if (res.data.code == 0) {
let data = res.data.IDCardInfo
row.sqrmc = data.name
......
......@@ -100,7 +100,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
selectCfdj({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
......
......@@ -171,7 +171,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
if (!this.isJump) {
//从业务办理进入
......
......@@ -70,7 +70,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectNydsyqQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -98,7 +98,6 @@
methods: {
//默认加载表格信息
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.bsmSqyw = this.bsmSqyw;
selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -57,7 +57,7 @@
import table from "@/utils/mixin/table";
import { datas, sendThis } from "../javascript/selectDjbbl.js";
import { getDjbBysearch } from "@/api/zhcx.js";
import jump from "../components/mixin/jump";
import jump from "../components/mixin/djbbljump";
export default {
name: "djbcx",
mixins: [table, jump],
......@@ -140,7 +140,6 @@
this.$message.error("请至少选择一条数据");
return;
}
console.log("this.sqywInfo", this.sqywInfo, this.sqywInfo.nodetype == "djqx");
let from = {
bsmSqyw: this.bsmSqyw,
bdcdysz: this.bdcdysz,
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectFwsyq({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -83,7 +83,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectJsydQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -79,7 +79,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectZdjbxx({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectYgdj200({ ...this.queryForm, ...this.pageData }).then((res) => {
......
......@@ -75,7 +75,6 @@
},
methods: {
queryClick () {
console.log("申请业务单一流向状态", this.sqywInfo.sqywdylx);
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
selectYgdy({ ...this.queryForm, ...this.pageData }).then((res) => {
......