BPTOPN交易页面新增并修改BUG

src/config/CodeTable/index.js

@@ -6027,6 +6027,10 @@ const CodeTable = {
         { value: "3", label: "不申报" },
         { value: "4", label: "买方信贷" },
     ],
+    szflg3: [
+        { value: "2", label: "境内收支" },
+        { value: "3", label: "不申报" },
+    ],
     sztyp: [
         { label: "跨境收支", value: "1" },
         { label: "境内交易", value: "2" },

src/model/Bptopn/index.js

@@ -273,6 +273,33 @@ export default class Bptopn{
 							outchargeccy:"",			//  国外银行扣费（涉外收入申报专用）		.bopmod.outchargeccy
 							outchargeamt:"",			//  国外银行扣费（涉外收入申报专用）		.bopmod.outchargeamt
 							acttyp:"",			//  款项来源		.bopmod.acttyp
+							dbdgrp:{
+								bas:{
+									rptno:"",			//	申报号码		.bopmod.dbdgrp.bas.rptno
+									actiontype:"",			//	操作类型		.bopmod.dbdgrp.bas.actiontype
+									ownextkey:"",			//	地区机构号		.bopmod.dbdgrp.bas.ownextkey
+									buscode:"",			//	银行业务编号		.bopmod.dbdgrp.bas.buscode
+									custype:"",			//	收款人类型		.bopmod.dbdgrp.bas.custype
+									custnm:"",			//	收款人名称		bopmod.dbdgrp.bas.custnm
+									oppuser:"",			//	付款人名称		.bopmod.dbdgrp.bas.oppuser
+									idcode:"",			//	身份证件号码		.bopmod.dbdgrp.bas.idcode
+									lcyamt:"",			//	结汇金额		.bopmod.dbdgrp.bas.lcyamt
+									fcyamt:"",			//	现汇金额		.bopmod.dbdgrp.bas.fcyamt
+									othamt:"",			//	其它金额		.bopmod.dbdgrp.bas.othamt
+									txccy:"",			//	收入款币种及金额		.bopmod.dbdgrp.bas.txccy
+									txamt:"",			//	收入款金额		.bopmod.dbdgrp.bas.txamt
+									actiondesc:"",			//	修改/删除原因		.bopmod.dbdgrp.bas.actiondesc
+									methods:"",			//	结算方式		.bopmod.dbdgrp.bas.methods
+									custcod:"",			//	组织机构代码		.bopmod.dbdgrp.bas.custcod
+									acp:"",			//	确认		.bopmod.dbdgrp.bas.acp
+									exrate:"",			//	结汇汇率		.bopmod.dbdgrp.bas.exrate
+									lcyacc:"",			//	人民币帐号/银行卡号		.bopmod.dbdgrp.bas.lcyacc
+									fcyacc:"",			//	外汇帐号/银行卡号		.bopmod.dbdgrp.bas.fcyacc
+									othacc:"",			//	其它帐号/银行卡号		.bopmod.dbdgrp.bas.othacc
+									inchargeccy:"",			//	国内银行扣费		.bopmod.dbdgrp.bas.inchargeccy
+									inchargeamt:"",			//	国内银行扣费金额		.bopmod.dbdgrp.bas.inchargeamt
+								},
+							},
 						},
 						cfabpt:{
 							cfaflg:"",			//  数据采集标志		.cfabpt.cfaflg

src/views/Business/Bptopn/Dclpp.vue

@@ -55,16 +55,6 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="期末余额" prop="cfabpt.recp.dclp.loanopenbalan">
-          <c-input
-            v-model="model.cfabpt.recp.dclp.endbalan"
-            maxlength="32"
-            placeholder="请输入期末余额"
-            disabled
-          ></c-input>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
         <el-form-item label="提款币种" prop="cfabpt.recp.dclp.withcurrence">
           <c-select
             v-model="model.cfabpt.recp.dclp.withcurrence"
@@ -85,25 +75,6 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="结汇金额" prop="cfabpt.recp.dclp.settamount">
-          <c-input
-            v-model="model.cfabpt.recp.dclp.settamount"
-            maxlength="32"
-            placeholder="请输入结汇金额"
-          ></c-input>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
-        <el-form-item label="资金用途" prop="cfabpt.recp.dclp.useofunds">
-          <c-select
-            v-model="model.cfabpt.recp.dclp.useofunds"
-            style="width: 100%"
-            placeholder="请选择资金用途"
-          >
-          </c-select>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
         <el-form-item label="还本币种" prop="cfabpt.recp.dclp.princurr">
           <c-select
             v-model="model.cfabpt.recp.dclp.princurr"
@@ -133,35 +104,6 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="付息币种" prop="cfabpt.recp.dclp.inpaycurr">
-          <c-select
-            v-model="model.cfabpt.recp.dclp.inpaycurr"
-            style="width: 100%"
-            placeholder="请选择付息币种"
-            :code="codes.curtxt1"
-          >
-          </c-select>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
-        <el-form-item label="付息金额" prop="cfabpt.recp.dclp.inpayamount">
-          <c-input
-            v-model="model.cfabpt.recp.dclp.inpayamount"
-            maxlength="32"
-            placeholder="请输入付息金额"
-          ></c-input>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
-        <el-form-item label="购汇付息金额" prop="cfabpt.recp.dclp.pinpayamount">
-          <c-input
-            v-model="model.cfabpt.recp.dclp.pinpayamount"
-            maxlength="32"
-            placeholder="请输入购汇付息金额"
-          ></c-input>
-        </el-form-item>
-      </c-col>
-      <c-col :span="24">
         <el-form-item label="备注" prop="cfabpt.recp.dclp.remark">
           <c-input
             type="textarea"
@@ -215,6 +157,67 @@
         </c-col>
       </c-col>
 
+      <c-col :span="24"><el-form-item label=""></el-form-item></c-col>
+      <c-col :span="24"><el-form-item label=""></el-form-item></c-col>
+      
+      <c-col :span="24">
+        <el-form-item label="期末余额" prop="cfabpt.recp.dclp.loanopenbalan">
+          <c-input
+            v-model="model.cfabpt.recp.dclp.endbalan"
+            maxlength="32"
+            placeholder="请输入期末余额"
+            disabled
+          ></c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="结汇金额" prop="cfabpt.recp.dclp.settamount">
+          <c-input
+            v-model="model.cfabpt.recp.dclp.settamount"
+            maxlength="32"
+            placeholder="请输入结汇金额"
+          ></c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="资金用途" prop="cfabpt.recp.dclp.useofunds">
+          <c-select
+            v-model="model.cfabpt.recp.dclp.useofunds"
+            style="width: 100%"
+            placeholder="请选择资金用途"
+          >
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="付息币种" prop="cfabpt.recp.dclp.inpaycurr">
+          <c-select
+            v-model="model.cfabpt.recp.dclp.inpaycurr"
+            style="width: 100%"
+            placeholder="请选择付息币种"
+            :code="codes.curtxt1"
+          >
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="付息金额" prop="cfabpt.recp.dclp.inpayamount">
+          <c-input
+            v-model="model.cfabpt.recp.dclp.inpayamount"
+            maxlength="32"
+            placeholder="请输入付息金额"
+          ></c-input>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item label="购汇付息金额" prop="cfabpt.recp.dclp.pinpayamount">
+          <c-input
+            v-model="model.cfabpt.recp.dclp.pinpayamount"
+            maxlength="32"
+            placeholder="请输入购汇付息金额"
+          ></c-input>
+        </el-form-item>
+      </c-col>
     </c-col>
   </div>
 </template>

src/views/Business/Bptopn/Rzkx.vue

@@ -95,7 +95,7 @@
               v-model="model.financ.ref2"
               maxlength="20"
               placeholder="请输入业务编号"
-              :disabled="model.financ.rzkx1 == '' || model.financ.rzkx1 == null"
+              :disabled="model.financ.rzkx2 == '' || model.financ.rzkx2 == null"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -114,7 +114,7 @@
               v-model="model.financ.ref3"
               maxlength="20"
               placeholder="请输入业务编号"
-              :disabled="model.financ.rzkx1 == '' || model.financ.rzkx1 == null"
+              :disabled="model.financ.rzkx3 == '' || model.financ.rzkx3 == null"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -133,7 +133,7 @@
               v-model="model.financ.ref4"
               maxlength="20"
               placeholder="请输入业务编号"
-              :disabled="model.financ.rzkx1 == '' || model.financ.rzkx1 == null"
+              :disabled="model.financ.rzkx4 == '' || model.financ.rzkx4 == null"
             ></c-input>
           </el-form-item>
         </c-col>

src/views/Business/Bptopn/Wg.vue

@@ -4,10 +4,11 @@
       <c-col :span="6">
         <el-form-item label="申报类型" prop="bopmod.szflg">
           <c-select
-            :disabled="!((model.bpdgrp.rec.fintyp=='F'||model.bpdgrp.rec.fintyp=='U')&&model.bpdgrp.rec.pnttyp!='')"
+            :disabled="!((model.bpdgrp.rec.fintyp=='F' || model.bpdgrp.rec.fintyp=='U') && model.bpdgrp.rec.pnttyp!='')"
             v-model="model.bopmod.szflg"
             style="width: 100%"
             placeholder="请选择申报类型"
+            :code="codes.szflg3"
           >
           </c-select>
         </el-form-item>
@@ -18,7 +19,12 @@
       </c-col>
 
       <c-col :span="5">
-        <c-checkbox v-model="model.bopmod.basflg">基础数据</c-checkbox>
+        <c-checkbox 
+          :disabled="model.bopmod.szflg=='' || model.bopmod.szflg=='3' || model.bopmod.szflg=='4'"
+          v-model="model.bopmod.basflg"
+        >
+          基础数据
+        </c-checkbox>
       </c-col>
 
       <!-- <c-col :span="5">
@@ -37,6 +43,7 @@
           prop="bopmod.acttyp"
         >
           <c-select
+            :disabled="model.bopmod.szflg!='1'"
             v-model="model.bopmod.acttyp"
             style="width: 100%"
             placeholder="请选择款项来源"
@@ -51,6 +58,7 @@
       <c-col :span="24">
         <el-form-item label="地区机构号" prop="bopmod.ownextkey">
           <c-select
+            :disabled="model.bopmod.szflg!='1' && model.bopmod.szflg!='2'"
             v-model="model.bopmod.ownextkey"
             style="width: 100%"
             placeholder="请选择地区机构号"
@@ -66,6 +74,7 @@
           prop="bopmod.outchargeccy"
         >
           <c-select
+            disabled
             v-model="model.bopmod.outchargeccy"
             style="width: 100%"
             placeholder="请选择国外银行扣费（涉外收入申报专用）"
@@ -77,6 +86,7 @@
       <c-col :span="12">
         <el-form-item label="金额" prop="bopmod.outchargeamt">
           <c-input
+            :disabled="!(model.bopmod.szflg=='1' && model.bopmod.basflg!='')"
             v-model="model.bopmod.outchargeamt"
             placeholder="请输入国外银行扣费（涉外收入申报专用）"
           ></c-input>

src/views/Business/Bptopn/index.vue

@@ -132,6 +132,16 @@
             </c-content>
           </el-tab-pane>
 
+          <!--PD000006 -->
+          <el-tab-pane 
+            v-if="model.bopmod.szflg=='2' && model.bopmod.basflg=='X'"
+            label="境内收入申报单－基础信息" name="basp2"
+          >
+            <c-content>
+              <m-basp2 :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
+
           <!--PD000005 -->
           <el-tab-pane label="国内外汇贷款数据采集" name="cfap">
             <c-content>
@@ -213,6 +223,7 @@ import Dinpan from "./Dinpan";
 import Limitbody from "~/views/Public/Limitbody";
 import Conp from "./Conp";
 import Dclpp from "./Dclpp";
+import Basp2 from "./Basp2";
 
 export default {
   name: "Bptopn",
@@ -235,6 +246,7 @@ export default {
     "m-limitbody": Limitbody,
     "m-conp": Conp,
     "m-dclpp": Dclpp,
+    "m-basp2": Basp2,
   },
   provide() {
     return {