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/Bptopn/Urpp.vue

@@ -85,7 +85,6 @@
           v-model="model.bpdgrp.rec.lctyp"
           :code="codes.lctyp"
           style="width: 100%"
-          disabled
           placeholder="请选择信用证类型"
         >
         </c-select>

src/views/Business/Bptset/Bptset2.vue

@@ -87,9 +87,35 @@
             </el-form-item>
           </c-col>
           <!-- Advanced Party Ref.  融资业务编号 v-if="bpdgrp.rec.fintyp=='F' || bpdgrp.rec.fintyp=='D'"-->
+
+          <!-- 出口押汇 -->
+          <c-col :span="12">
+            <c-form-item label="" prop="bptp.distyp" label-width="0px" style="margin-left: 5px;"
+            v-if="model.bpdgrp.rec.fintyp=='P'">
+              <c-select
+                v-model="model.bptp.purtyp"
+                :code="codes.purtyp"
+                style="width: 100%; "
+                maxlength="17"
+                disabled
+              ></c-select>
+            </c-form-item>
+            <!-- <c-form-item label="" prop="bptp.distyp" label-width="0px" style="margin-left: 5px;"
+            v-else-if="model.bpdgrp.rec.fintyp=='D'">
+              <c-select
+                v-model="model.bptp.distyp"
+                :code="codes.distyp"
+                style="width: 100%; " 
+                maxlength="17"
+                disabled
+              ></c-select>
+            </c-form-item> -->
+          </c-col>
+
+          <!-- 出口贴现 -->
           <c-col :span="12">
             <c-form-item label="" prop="bptp.distyp" label-width="0px" style="margin-left: 5px;"
-            v-if="model.bpdgrp.rec.fintyp=='F' || model.bpdgrp.rec.fintyp=='D'">
+            v-if="model.bpdgrp.rec.fintyp=='D'">
               <c-select
                 v-model="model.bptp.distyp"
                 :code="codes.distyp"

src/views/Business/Bptset/Ovwp.vue

@@ -5,6 +5,17 @@
           <!-- 融资归还 -->
           <m-bptset2 :model="model" :codes="codes" />
         </el-collapse-item>
+        <el-collapse-item 
+          title="福费廷" 
+          name="urpp"
+          v-if="
+                model.bpdgrp.rec.fintyp == 'F' ||
+                model.bpdgrp.rec.fintyp == 'U' ||
+                model.bpdgrp.rec.fintyp == 'G' ||
+                model.bpdgrp.rec.fintyp == 'V'
+                ">
+          <m-urpp :model="model" :codes="codes" />
+        </el-collapse-item>
         <el-collapse-item title="收账通知" name="docpan2">
           <!-- 收账通知 -->
           <m-docpan2 :model="model" :codes="codes" />
@@ -15,11 +26,13 @@
 <script>
 import Bptset2 from "./Bptset2";
 import Docpan2 from "./Docpan";
+import Urpp from "./Urpp";
 
 export default {
   components: {
     "m-bptset2" : Bptset2,
     "m-docpan2" : Docpan2,
+    "m-urpp" : Urpp,
   },
   inject: ["root"],
   props: ["model", "codes"],