Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 13:45:50
+ * @LastEditTime: 2023-09-18 15:07:44
 -->
 <template>
   <div class="djxxTable">
@@ -11,10 +11,10 @@
 </template>
 
 <script>
-  import djbDetail from "./components/djbDetail.vue"
   import { datas } from "./qlxxFormData.js";
   import { getSjlx } from "@/utils/dictionary.js";
   import { getCfdjList } from "@/api/djbDetail.js";
+  import djbDetail from "./components/djbDetail.vue"
   export default {
     components: {
       djbDetail

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 13:14:31
+ * @LastEditTime: 2023-09-18 15:04:32
 -->
 <template>
   <div class="djxxTable">

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-18 13:41:23
+ * @LastEditTime: 2023-09-18 15:04:54
 -->
 <template>
   <div class="djxxTable">
@@ -11,10 +11,10 @@
 </template>
 
 <script>
-  import djbDetail from "./components/djbDetail.vue"
   import { datas } from "./qlxxFormData.js";
   import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
   import { getDiyiqList } from "@/api/djbDetail.js";
+  import djbDetail from "./components/djbDetail.vue"
   export default {
     components: {
       djbDetail

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-18 13:42:34
+ * @LastEditTime: 2023-09-18 15:01:13
 -->
 <template>
   <div class="djxxTable">
@@ -18,7 +18,6 @@
     components: {
       djbDetail
     },
-
     data () {
       return {
         shows: false,

@@ -13,8 +13,8 @@
 <script>
   import { datas } from "./qlxxFormData.js";
   import { getYgdjList } from "@/api/djbDetail.js";
-  import djbDetail from "./components/djbDetail.vue"
   import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
+  import djbDetail from "./components/djbDetail.vue"
   export default {
     components: {
       djbDetail,

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-18 13:46:21
+ * @LastEditTime: 2023-09-18 15:06:35
 -->
 <template>
   <div class="djxxTable">