Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request fukai/vue-gjjs!25

src/config/CodeTable/index.js

@@ -6355,6 +6355,7 @@ const CodeTable = {
         { label: "03-外币暂存账户", value: "03" },
     ],
     typgar: [
+        { label: "农民工工资保函", value: "1" },
         { label: "延期付款保函", value: "K" },
         { label: "租赁保函", value: "N" },
         { label: "银关保函", value: "U" },
@@ -7121,6 +7122,11 @@ const CodeTable = {
         { label: "电子汇总征税保函", value: "02" },
     ],
 
+    segtyppop: [
+        { label: "上海自贸区海关保函", value: "01" },
+        { label: "海关税款担保保函", value: "02" },
+    ],
+
     gtxinr: [
         { label: "性能保函2", value: "00000008" },
         { label: "预付款保函", value: "00000006" },

src/views/Business/Getopn/Ovwp1.vue

@@ -748,7 +748,7 @@
                 placeholder="请选择特殊保函类型"
               >
                 <el-option
-                  v-for="item in codes.segtyp"
+                  v-for="item in codes.segtyppop"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -1634,7 +1634,7 @@ export default {
 
   computed: {
     flag() {
-      return this.model.gidgrp.apl.pts.extkey == "";
+      return this.model.gidgrp.ben.pts.extkey == "";
     },
   },
   methods: {

src/views/Business/Gitpop/Ovwp1.vue

@@ -313,7 +313,7 @@
                 placeholder="请选择保函文本类型"
               >
                 <el-option
-                  v-for="item in codes.seagtyp"
+                  v-for="item in codes.typgar"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -474,7 +474,7 @@
                 placeholder="请选择特殊保函类型"
               >
                 <el-option
-                  v-for="item in codes.segtyp"
+                  v-for="item in codes.segtyppop"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"