Merge branch '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-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

@@ -344,7 +344,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">

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