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/model/Gitatt/index.js

@@ -33,6 +33,8 @@ export default class Gitatt{
 								purpos:"",
 								exptyp:"",
 								liatypc:"",
+								purposin: "",
+								purpos: "",
 							},
 							cbs:{
 								max:{

src/model/Gitfee/index.js

@@ -29,6 +29,8 @@ export default class Gitfee {
                     gartyp: "",			//  Type of Undertaking		.gidgrp.rec.gartyp
                     expdat: "",			//  Valid until		.gidgrp.rec.expdat
                     liadat: "",			//  Liability until		.gidgrp.rec.liadat
+                    purposin: "",
+                    purpos: "",
                 },
                 cbs: {
                     max: {

src/views/Business/Brtame/Rog.vue

@@ -19,7 +19,7 @@
                                 <c-button
                                     style="
                                         margin: 0 0 0 10px;
-                                        padding: 0 12px;
+                                        padding: 0 12px ;
                                     "
                                     size="small"
                                     type="primary"
@@ -234,7 +234,7 @@
                             v-model="model.lidgrp.rec.lcrtyp"
                             style="width: 100%"
                             placeholder=""
-                            :code="codes.lcrtyp1"
+                            :code="codes.lcrtyp"
                             disabled
                         >
                         </c-select>
@@ -387,6 +387,7 @@ export default {
     data() {
         return {
             flag: true,
+            codes: {...CodeTable},
         };
     },
     methods: { ...Event },

src/views/Business/BusRouter.js

@@ -432,7 +432,7 @@ const BusRouter = [
     { path:'gitpca',component:Gitpca, name:'Gitpca', meta:{title:'关税保函预注销'}},
     { path:'gitfee',component:Gitfee, name:'Gitfee', meta:{title:'进口保函收费'}},
     { path:'getfee',component:Getfee, name:'Getfee', meta:{title:'附加传入信息'}},
-    { path:'gctfee',component:Gctfee, name:'Gctfee', meta:{title:'GCTFEE'}},
+    { path:'gctfee',component:Gctfee, name:'Gctfee', meta:{title:'保函保证金调整'}},
     { path: 'gitatt', component: Gitatt, name: 'Gitatt', meta: { title: '绑定电子凭证' } },
     { path: 'botrad', component: Botrad, name: 'Botrad', meta: { title: '出口托收二次寄单' } },
     { path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '待经办详情' } },

src/views/Business/Gctadd/Gitsetp1.vue

@@ -130,7 +130,7 @@
               v-model="model.gidgrp.rec.gartyp"
               style="width: 100%"
               placeholder="请选择保函种类"
-              :code="codes.typgar2"
+              :code="codes.typgar"
           >
           </c-select>
         </el-form-item>
@@ -366,6 +366,7 @@ export default {
   data() {
     return {
       typ1: true ,
+      codes: {...CodeTable},
     };
   },
   methods: { ...Event },

src/views/Business/Gctcan/Gitsetp1.vue

@@ -195,7 +195,7 @@
             v-model="model.gidgrp.rec.gartyp"
             style="width: 100%"
             placeholder="请选择保函种类"
-            :code="codes.typgar2"
+            :code="codes.typgar"
           >
           </c-select>
         </el-form-item>
@@ -349,7 +349,9 @@ export default {
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {};
+    return {
+      codes: {...CodeTable},
+    };
   },
   methods: { ...Event },
   created: function () {},

src/views/Business/Gitatt/Gitfrep1.vue

@@ -279,7 +279,9 @@ export default {
     mixins: [commonProcess],
     data(){
         return {
-
+          codes: {
+            ...CodeTable,
+          },
         }
     },
     methods:{...Event},

src/views/Business/Gitatt/index.vue

@@ -80,6 +80,7 @@ export default {
             pattern: Pattern,
             rules: null,
             codes: {
+              ...CodeTable,
             },
         }
     },

src/views/Business/Gitfee/Gitsetp1.vue

@@ -69,7 +69,7 @@
       <c-col :span="24">
         <el-form-item label="保函种类" prop="gidgrp.rec.gartyp">
           <c-select disabled v-model="model.gidgrp.rec.gartyp" style="width: 100%" placeholder="请选择保函种类"
-                    :code="codes.typgar2">
+                    :code="codes.typgar">
           </c-select>
         </el-form-item>
       </c-col>
@@ -139,13 +139,18 @@
 <script>
 import commonProcess from "~/mixin/commonProcess";
 import Event from "~/model/Gitfee/Event"
+import CodeTable from "~/config/CodeTable";
 
 export default {
   inject: ['root'],
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {}
+    return {
+      codes: {
+        ...CodeTable,
+      },
+    }
   },
   methods: {...Event},
   created: function () {

src/views/Business/Gitfee/index.vue

@@ -123,8 +123,10 @@ export default {
     let rtnmsg = await this.init({})
     if (rtnmsg.respCode === SUCCESS) {
       this.updateModel(rtnmsg.data)
-      //TODO 处理数据逻辑
-
+       //TODO 处理数据逻辑
+      if (this.isInDisplay) {
+        this.restoreDisplay();
+      }
     } else {
       this.$notify.error({title: '错误', message: '服务请求失败！'});
     }