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/Gitset/Pattern.js

@@ -297,7 +297,9 @@ export default {
     ],
 
 
-
+    "bopmod.szflg":[
+        {type: "string", required: true, message: "必输项"},
+    ],
 
 
 

src/views/Business/Cctset/Wg.vue

@@ -47,10 +47,57 @@
           </c-select>
         </el-form-item>
       </c-col>
+
+      <c-col :span="24">
+        <el-form-item label="地区机构号" prop="bopmod.ownextkey">
+          <c-select
+            v-model="model.bopmod.ownextkey"
+            style="width: 100%"
+            placeholder="请选择地区机构号"
+            :code="codes.ownextkey3"
+            :disabled="model.bopmod.szflg == '3' || model.bopmod.szflg == ''"
+          >
+          </c-select>
+        </el-form-item>
+      </c-col>
+
+      <c-col :span="12">
+        <el-form-item
+          label="国外银行扣费（涉外收入申报专用）"
+          prop="bopmod.outchargeccy"
+        >
+          <c-select
+            v-model="model.bopmod.outchargeccy"
+            placeholder="请选择国外银行扣费（涉外收入申报专用）"
+            disabled
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in codes.cur"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="12">
+        <el-form-item label="" label-width="5px" prop="bopmod.outchargeamt">
+          <c-input-currency
+            v-model="model.bopmod.outchargeamt"
+            placeholder="请输入国外银行扣费（涉外收入申报专用）"
+            :disabled="model.bopmod.szflg != '1' || model.bopmod.basflg != 'X'"
+            @keyup.enter.native="
+              defaultFunction('bopmod.outchargeamt', model.bopmod.outchargeamt)
+            "
+          ></c-input-currency>
+        </el-form-item>
+      </c-col>
     </c-col>
 
     <!-- ====================右边======================= -->
-    <c-col :span="11" :offset="1">
+    <!-- <c-col :span="11" :offset="1">
       <c-col :span="24">
         <el-form-item label="地区机构号" prop="bopmod.ownextkey">
           <c-select
@@ -102,7 +149,7 @@
           </el-form-item>
         </c-col>
       </c-col>
-    </c-col>
+    </c-col> -->
 
     <!-- <c-col :span="12">
 	    <c-checkbox v-model="model.bopmod.basflg">{{$t('bopgat.CH000016')}}</c-checkbox>
@@ -185,7 +232,7 @@ export default {
     },
   },
 
-  methods: {...Event},
+  methods: { ...Event },
   created: function () {},
 };
 </script>

src/views/Business/Gitset/Det202cv.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <el-col :span="11">
         <c-col :span="24">
-            <el-form-item label="Cover Message MT 202" label-width="400px" style="margin-left:-120px">
+            <el-form-item label="Cover Message MT 202" label-width="200px" >
             </el-form-item>
         </c-col>
 

src/views/Business/Gitset/Det756.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <el-col :span="11">
         <c-col :span="24">
-            <el-form-item label="Details for Message MT 756" label-width="400px" style="margin-left:-120px">
+            <el-form-item label="Details for Message MT 756" label-width="200px" >
             </el-form-item>
         </c-col>
         <c-col :span="24">

src/views/Business/Gitset/Wg.vue

@@ -3,7 +3,7 @@
     <!-- S0000012 : 申报类型 -->
     <c-col :span="12" style="margin-top: 20px">
       <c-col :span="20">
-        <el-form-item label="申报类型">
+        <el-form-item label="申报类型" prop="bopmod.szflg">
           <c-select
             v-model="model.bopmod.szflg"
             style="width: 100%"

src/views/Review/ReviewRouter.js

@@ -227,13 +227,13 @@ const ReviewRouter = [
     { path: "Trtrcl", component: ReviewTrtrcl, name: "ReviewTrtrcl", meta: { title: "复核-Trtrcl" } },
     { path: "Trtcan", component: ReviewTrtcan, name: "ReviewTrtcan", meta: { title: "复核-Trtcan" } },
 
-    { path: "getcrq", component: ReviewBctacc, name: "ReviewGetcrq", meta: { title: "复核-Getcrq" } },
-    { path: "getcan", component: ReviewBctame, name: "ReviewGetcan", meta: { title: "复核-Getcan" } },
-    { path: "gitcrq", component: ReviewBctcan, name: "ReviewGitcrq", meta: { title: "复核-Gitcrq" } },
-    { path: "gitcan", component: ReviewBctdav, name: "ReviewGitcan", meta: { title: "复核-Gitcan" } },
-    { path: "gitset", component: ReviewBctdor, name: "ReviewGitset", meta: { title: "复核-Gitset" } },
-    { path: "gitcrj", component: ReviewBctrad, name: "ReviewGitcrj", meta: { title: "复核-Gitcrj" } },
-    { path: "gctcan", component: ReviewBctsel, name: "ReviewGctcan", meta: { title: "复核-Gctcan" } },
+    { path: "getcrq", component: ReviewGetcrq, name: "ReviewGetcrq", meta: { title: "复核-Getcrq" } },
+    { path: "getcan", component: ReviewGetcan, name: "ReviewGetcan", meta: { title: "复核-Getcan" } },
+    { path: "gitcrq", component: ReviewGitcrq, name: "ReviewGitcrq", meta: { title: "复核-Gitcrq" } },
+    { path: "gitcan", component: ReviewGitcan, name: "ReviewGitcan", meta: { title: "复核-Gitcan" } },
+    { path: "gitset", component: ReviewGitset, name: "ReviewGitset", meta: { title: "复核-Gitset" } },
+    { path: "gitcrj", component: ReviewGitcrj, name: "ReviewGitcrj", meta: { title: "复核-Gitcrj" } },
+    { path: "gctcan", component: ReviewGctcan, name: "ReviewGctcan", meta: { title: "复核-Gctcan" } },
 
     { path: "bttrcl", component: ReviewBttrcl, name: "ReviewBttrcl", meta: { title: "复核-Bttrcl" } },