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

 /*
  * @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-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-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) {