Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/views/Business/Brtcsg/Canp.vue

 <template>
-  <div class="eibs-tab">
-    <el-collapse v-model="activeNames" @change="handleChange">
-      <el-collapse-item title="注销内容" name="1">
-
-
-
+  <div class="eibs">
    
        <!-- ======================= 左边 ========================= -->
       <c-col :span="12">
@@ -149,8 +144,7 @@
             >
             </c-litTemp>
         </c-col>
-      </el-collapse-item>
-    </el-collapse>
+    
   </div>
 </template>
 <script>
@@ -169,7 +163,7 @@ export default {
     },
   data() {
     return {
-      activeNames: ["1"],
+    
     };
   },
   methods: { 

src/views/Business/Brtcsg/Ovwp.vue

+<template>
+    <div class="eibs-tab">
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <el-collapse-item title="注销内容" name="canp">
+            <m-canp :model="model" :codes="codes" />
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+  </template>
+  <script>
+  import Api from "~/service/Api";
+  import commonProcess from "~/mixin/commonProcess";
+  import CodeTable from "~/config/CodeTable";
+  import Event from "~/model/Brtcsg/Event";
+  import Canp from "./Canp"
+  
+  export default {
+    inject: ["root"],
+    props: ["model", "codes"],
+    mixins: [commonProcess],
+    components: {
+          "m-canp" : Canp,
+      },
+    data() {
+      return {
+        activeNames: ["canp"],
+      };
+    },
+    methods: { 
+      ...Event ,
+    },
+    created: function () {},
+  };
+  </script>
+  <style>
+  </style>
\ No newline at end of file

src/views/Business/Brtcsg/index.vue

@@ -23,9 +23,9 @@
        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
         
             <!--PD000016 注销内容-->
-           <el-tab-pane label="业务信息" name="canp">
+           <el-tab-pane label="业务信息" name="ovwp">
            <c-content>
-                <m-canp :model="model" :codes="codes"/>
+                <m-ovwp :model="model" :codes="codes"/>
                 </c-content>
            </el-tab-pane>
 
@@ -118,7 +118,7 @@ import commonFuncs from "~/mixin/commonFuncs"
 import Check from "~/model/Brtcsg/Check"
 import Default from "~/model/Brtcsg/Default"
 import Pattern from "~/model/Brtcsg/Pattern"
-import Canp from "./Canp"
+import Ovwp from "./Ovwp"
 
 import Engp from "../../Public/Engp"
 import Setpan from "../../Public/Setpan"
@@ -133,7 +133,7 @@ import Limitbody from "../../Public/Limitbody"
 export default {
     name: "Brtcsg",
     components:{
-        "m-canp" : Canp,
+        "m-ovwp" : Ovwp,
         "m-engp" : Engp,
         "m-setpan" : Setpan,
         "m-glepan" : Glepan,
@@ -152,7 +152,7 @@ export default {
     mixins: [commonProcess, commonFuncs],    // 里面包含了Default、Check等的公共处理
     data(){
         return {
-            tabVal: "canp",
+            tabVal: "ovwp",
             trnName: "brtcsg",
             model: new Brtcsg().data,
             checkRules: Check,

src/views/Business/Litrog/Ovwp.vue

+<template>
+    <div class="eibs-tab">
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <el-collapse-item title="提货担保" name="rog">
+            <m-rog :model="model" :codes="codes" />
+      </el-collapse-item>
+      
+      <el-collapse-item title="装运详情" name="shpdet">
+          <!-- 详情 -->
+          <m-shpdet :model="model" :codes="codes" />
+        </el-collapse-item>
+     </el-collapse>
+       
+        </div>
+  </template>
+  <script>
+  import Api from "~/service/Api"
+  import commonProcess from "~/mixin/commonProcess";
+  import CodeTable from "~/config/CodeTable"
+  import Event from "~/model/Litrog/Event"
+  import Rog from "./Rog"
+  import Shpdet from "./Shpdet";
+  
+  export default {
+      components: {
+      "m-shpdet": Shpdet,
+      "m-rog" : Rog,
+  },
+      inject: ['root'],
+      props:["model","codes"],
+      mixins: [commonProcess],
+      data(){
+          return {
+              activeNames: ["rog"],
+  
+          }
+      },
+      methods:{...Event},
+      created:function(){
+  
+      }
+  }
+  </script>
+  <style>
+  
+  </style>
+  
\ No newline at end of file

src/views/Business/Litrog/Rog.vue

 <template>
   <div class="eibs-tab">
-    <el-collapse v-model="activeNames" @change="handleChange">
-      <el-collapse-item title="提货担保" name="1">
+   
       <!-- =======左========== -->
       <el-col :span="11">
         <c-col :span="24">
@@ -306,14 +305,10 @@
         </el-form-item>
        </c-col>
       </el-col>
-    </el-collapse-item>
-    <el-collapse-item title="装运详情" name="2">
-        <!-- 详情 -->
-        <m-shpdet :model="model" :codes="codes" />
-      </el-collapse-item>
-   </el-collapse>
+    
+
      
-                   </div>
+     </div>
 </template>
 <script>
 import Api from "~/service/Api"
@@ -321,18 +316,15 @@ import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
 import Event from "~/model/Litrog/Event"
 
-import Shpdet from "./Shpdet";
 
 export default {
-    components: {
-    "m-shpdet": Shpdet,
-},
+ 
     inject: ['root'],
     props:["model","codes"],
     mixins: [commonProcess],
     data(){
         return {
-            activeNames: ["1"],
+           
 
         }
     },

src/views/Business/Litrog/index.vue

@@ -13,9 +13,9 @@
        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
         
             <!--PD000057 提货担保-->
-           <el-tab-pane label="业务信息" name="rog">
+           <el-tab-pane label="业务信息" name="ovwp">
                 <c-content>
-                <m-rog :model="model" :codes="codes"/>
+                <m-ovwp :model="model" :codes="codes"/>
                 </c-content>
            </el-tab-pane>
  
@@ -109,17 +109,10 @@ import commonFuncs from "~/mixin/commonFuncs"
 import Check from "~/model/Litrog/Check"
 import Default from "~/model/Litrog/Default"
 import Pattern from "~/model/Litrog/Pattern"
-import Rog from "./Rog"
-import Shpdet from "./Shpdet"
-// import Engp from "./Engp"
-// import Ccvpan from "./Ccvpan"
-// import Setpan from "./Setpan"
-// import Glepan from "./Glepan"
-// import Coninfp from "./Coninfp"
-// import Docpan from "./Docpan"
-// import Doctre from "./Doctre"
+
+ import Ovwp from "./Ovwp"
 import Addbcb from "./Addbcb"
-// import Limitbody from "./Limitbody"
+
 
 
 import Engp from "~/views/Public/Engp"
@@ -133,8 +126,7 @@ import Limitbody from "~/views/Public/Limitbody"
 export default {
     name: "Litrog",
     components:{
-        "m-rog" : Rog,
-        "m-shpdet" : Shpdet,
+     
         "m-engp" : Engp,
         "m-ccvpan" : Ccvpan,
         "m-setpan" : Setpan,
@@ -144,6 +136,7 @@ export default {
         "m-doctre" : Doctre,
         "m-addbcb" : Addbcb,
         "m-limitbody" : Limitbody,
+        "m-ovwp" : Ovwp,
     },
     provide() {
         return {
@@ -153,7 +146,7 @@ export default {
     mixins: [commonProcess,commonFuncs],    // 里面包含了Default、Check等的公共处理
     data(){
         return {
-            tabVal: "rog",
+            tabVal: "ovwp",
             trnName: "litrog",
             model: new Litrog().data,
             checkRules: Check,