Skip to content

bdc / bdcdj-web

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

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

2 parents 7639e071 406a5855
Inline Side-by-side
Showing 17 changed files with 66 additions and 60 deletions
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-03 08:59:06
* @LastEditTime: 2023-08-16 11:30:45
*/
import store from '@/store'
......@@ -27,12 +27,18 @@ export function getSjlx (level) {
*/
export function getDictLeabel (level, code) {
const resultMap = store.getters.dictData[code]
const desiredObject = resultMap.find(obj => obj.dcode === level);
if (desiredObject) {
const desiredName = desiredObject.dname;
return desiredName
} else {
return ''
function findNode(tree, func) {
for (const node of tree) {
if (func(node)) return node
if (node.children) {
const res = findNode(node.children, func)
if (res) return res
}
}
return {dname:""}
}
let data = findNode(resultMap, (node) => {
return node.dcode === level
})
return data.dname
}
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 16:29:10
* @LastEditTime: 2023-08-16 11:14:21
-->
<template>
<!-- 受理信息 -->
......@@ -266,7 +266,7 @@
maxlength="13"
v-model="ruleForm.diyaq.dymj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.diyaq.mjdw" style="width: 20%">
<el-select v-model="ruleForm.diyaq.mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -126,7 +126,7 @@
<el-input
v-model="ruleForm.fdcq2.dytdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -143,7 +143,7 @@
<el-input
v-model="ruleForm.fdcq2.fttdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -262,7 +262,7 @@
<el-input
v-model="ruleForm.fdcq2.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -279,7 +279,7 @@
<el-input
v-model="ruleForm.fdcq2.zyjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -296,7 +296,7 @@
<el-input
v-model="ruleForm.fdcq2.ftjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -140,7 +140,7 @@
maxlength="12"
v-model="ruleForm.jsydsyq.syqmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select disabled v-model="mjdw" style="width: 20%">
<el-select disabled v-model="mjdw" style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-14 10:29:57
* @LastEditTime: 2023-08-16 11:15:56
-->
<template>
<!-- 受理信息 -->
......@@ -173,7 +173,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -194,7 +194,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -215,7 +215,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -238,7 +238,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -259,7 +259,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -280,7 +280,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -303,7 +303,7 @@
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -338,7 +338,7 @@
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -388,7 +388,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
......@@ -249,7 +249,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="总层数：">
<el-input oninput = "value=value.replace(/[^\d]/g,'')" maxlength="4" v-model="ruleForm.ygdj.zcs"></el-input>
<el-input oninput="value=value.replace(/[^\d]/g,'')" maxlength="4" v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -261,7 +261,7 @@
<el-select
v-model="ruleForm.ygdj.mjdw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -315,7 +315,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-11 15:33:53
* @LastEditTime: 2023-08-16 11:29:20
-->
<template>
<div class="djxxTable">
......@@ -59,7 +59,7 @@
<script>
import { datas } from "./qlxxFormData.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
import { getLqList } from "@/api/djbDetail.js";
export default {
data() {
......@@ -101,6 +101,9 @@ export default {
this.tableData = res.result;
this.tableData.forEach((item) => {
item.sjlx = getSjlx(item.sjlx);
item.ldsyqxz = getDictLeabel(item.ldsyqxz, 'A45')
item.lz = getDictLeabel(item.lz, 'A26')
item.qy = getDictLeabel(item.qy, 'A52')
});
if (this.tableData.length < datas.columns().emptycolNum) {
this.emptycolNum =
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 11:10:16
* @LastEditTime: 2023-08-16 11:22:21
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -133,8 +133,8 @@
context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 129, 97);
context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 129, 136);
let arr = this.bdcqz.bdcdyh.split('F')
this.bdcqz.bdcdyh = arr[0].slice(0, 6) + ' ' + arr[0].slice(6, 12) + ' ' + arr[0].slice(12, arr[0].length) + ' F' + arr[1]
this.bdcqz.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' +
this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length)
context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 129, 223);
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-04 13:26:31
* @LastEditTime: 2023-08-16 14:08:42
-->
<template>
<div>
......@@ -179,7 +179,6 @@
}
this.key++
},
// 新增
/**
* @description: 新增
* @author: renchao
......
......@@ -75,7 +75,7 @@
<el-select
disabled
v-model="ruleForm.zdjbxx.mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -113,7 +113,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -132,7 +132,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -233,7 +233,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -252,7 +252,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -271,7 +271,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -343,7 +343,7 @@
</el-col>
</el-row>
<qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!ableOperation"
:gyfs="ruleForm.slsq.gyfs" />
:gyfs="ruleForm.qlxx.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
<div class="slxx_title title-block">
......
......@@ -124,7 +124,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -143,7 +143,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -162,7 +162,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -78,7 +78,7 @@
<el-select
disabled
v-model="mjdw"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -97,7 +97,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -118,7 +118,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -139,7 +139,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -162,7 +162,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -183,7 +183,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -204,7 +204,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......@@ -227,7 +227,7 @@
<el-select
v-model="mjdw"
:disabled="!viewEdit"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
......
......@@ -114,7 +114,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
......@@ -121,7 +121,7 @@
<el-select
v-model="ruleForm.ygdj.jedw"
:disabled="!ableOperation"
style="width: 20%">
style="width: 68px">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-15 14:01:37
* @LastEditTime: 2023-08-15 14:36:06
-->
<template>
<div class="from-clues">
......@@ -110,10 +110,8 @@
}
this.loading = true
startBusinessFlow({
bsmSqyw: this.bsmSqyw,
bsmSqyw: this.sqywInfo.bsmSqyw,
bdcdysz: this.bdcdysz,
djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
}).then((res) => {
this.loading = false
if (res.code == 200) {
......