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/config/CodeTable/index.js

@@ -6666,6 +6666,13 @@ const CodeTable = {
         { label: "SPD 借记国结专户", value: "SPD" },
         { label: "ARD 借记暂收款项账", value: "ARD" },
     ],
+    setgll_dsp1: [
+        { label: "LOC 贷记客户往来账", value: "LOC" },
+        { label: "TPC 贷记国际结算临时账", value: "TPC" },
+        { label: "SPC 贷记国结专户", value: "SPC" },
+        { label: "ARC 贷记暂收款项账", value: "ARC" },
+        { label: "PAC 通过Nostro付款", value: "PAC" },
+    ],
     setgll_modflg: [
         { label: "autom.", value: "-" },
         { label: "原始设置", value: "a" },

src/views/Business/Brtset/Ovwp.vue

@@ -27,16 +27,13 @@
 
 
 
-        <el-collapse-item title="通知付款(MT756)" name="det756" v-if="model.mtabut.clsflg != ''">
+        <el-collapse-item title="通知付款(MT756)" name="det756" v-if="model.setmod.setglg.setgll[0].dsp == 'PAC'">
             <m-det756 :model="model" :codes="codes" />
         </el-collapse-item>
 
-        <el-collapse-item title="头寸调拨(MT202)" name="det202cv" v-if="model.trnmod.cmtflg == 'C'">
+        <el-collapse-item title="头寸调拨(MT202)" name="det202cv" v-if="model.setmod.setglg.setgll[0].dsp == 'PAC'">
             <m-det202cv :model="model" :codes="codes" />
         </el-collapse-item>
-
-      
-
     </el-collapse>
 
 </div>

src/views/Business/Brtset/Utlp.vue

@@ -454,7 +454,35 @@
             ></c-date-picker>
           </el-form-item>
         </c-col>
-      </c-col>
+        <c-col :span="11" :offset="1">
+          <c-col :span="12">
+            <el-form-item label="" prop="trtcre.crefinflg" class="checkbox-left" label-width="0">
+              <c-checkbox v-model="model.trtcre.crefinflg" :disabled="
+                                model.paypsb != '' || model.brdgrp.rec.frepayflg != ''
+                                  ? true
+                                  : false
+                              ">创建融资</c-checkbox>
+            </el-form-item>
+          </c-col>
+          <c-col :span="12">
+            <el-form-item label="" prop="dftcre.dfflag" class="checkbox-left" label-width="0">
+              <c-checkbox v-model="model.dftcre.dfflag">同业代付</c-checkbox>
+            </el-form-item>
+          </c-col>
+        </c-col>
+        <c-col :span="11">
+          <c-col :span="12">
+            <el-form-item label="" prop="paypsb" class="checkbox-left" label-width="0">
+              <c-checkbox v-model="model.paypsb" :disabled="model.brdgrp.rec.frepayflg == '' ? false : true">垫款</c-checkbox>
+            </el-form-item>
+          </c-col>
+          <c-col :span="12">
+            <el-form-item label="" prop="brdgrp.rec.frepayflg" class="checkbox-left" label-width="0">
+              <c-checkbox v-model="model.brdgrp.rec.frepayflg">自由付款标志</c-checkbox>
+            </el-form-item>
+          </c-col>
+        </c-col>
+        </c-col>
       <!-- ====================右边======================= -->
       <c-col :span="12" style="padding-left: 20px">
         <c-col :span="24">
@@ -554,56 +582,6 @@
           </el-form-item>
         </c-col>
 
-        <c-col :span="24" class="">
-          <c-col :span="12">
-            <el-form-item
-              label=" "
-              prop="trtcre.crefinflg"
-              class="checkbox-left"
-            >
-              <c-checkbox
-                v-model="model.trtcre.crefinflg"
-                :disabled="
-                  model.paypsb != '' || model.brdgrp.rec.frepayflg != ''
-                    ? true
-                    : false
-                "
-                >创建融资</c-checkbox
-              >
-            </el-form-item>
-          </c-col>
-
-          <c-col :span="12">
-            <el-form-item label=" " prop="dftcre.dfflag" class="checkbox-left">
-              <c-checkbox v-model="model.dftcre.dfflag">同业代付</c-checkbox>
-            </el-form-item>
-          </c-col>
-        </c-col>
-
-        <c-col :span="24" class="">
-          <c-col :span="12">
-            <el-form-item label=" " prop="paypsb" class="checkbox-left">
-              <c-checkbox
-                v-model="model.paypsb"
-                :disabled="model.brdgrp.rec.frepayflg == '' ? false : true"
-                >垫款</c-checkbox
-              >
-            </el-form-item>
-          </c-col>
-
-          <c-col :span="12">
-            <el-form-item
-              label=" "
-              prop="brdgrp.rec.frepayflg"
-              class="checkbox-left"
-            >
-              <c-checkbox v-model="model.brdgrp.rec.frepayflg"
-                >自由付款标志</c-checkbox
-              >
-            </el-form-item>
-          </c-col>
-        </c-col>
-
         <c-col :span="24">
           <c-col :span="13">
             <el-form-item label="减少付汇金额" prop="setmod.doccur">

src/views/Public/Setpan.vue

@@ -486,7 +486,7 @@
           <template #default="scope">
             <c-select v-model="scope.row.dsp" @change="dspChange(scope.$index)">
               <el-option
-                v-for="item in codes.setgll_dsp"
+                v-for="item in codes.setgll_dsp1"
                 :key="item.value"
                 :label="item.value"
                 :value="item.value"