betrcl、betset、letdrv交易检核及提交

src/config/CodeTable/index.js

@@ -101,7 +101,7 @@ const CodeTable = {
         { label: "系统外还款", value: "1" },
         { label: "正常还款", value: "0" },
     ],
-    acttyp1: [
+    acttyp0: [
         { label: "境外", value: "(JW)" },
         { label: "境内非居民", value: "(JN)" },
     ],

src/model/Betrcl/Pattern.js

@@ -109,7 +109,7 @@ export default {
 
     "payinstxt": [
         { type: "string", required: false, message: "必输项" },
-        { max: 65, message: "长度不能超过65" }
+        { type: "string",max: 300, message: "长度不能超过300" }
     ],
     "bedgrp.rec.lescom": [
         { type: "string", required: false, message: "必输项" },

src/model/Betset/Pattern.js

@@ -18,7 +18,7 @@ export default {
     "ledgrp.cbs.opn1.amt": [
         { type: "string", required: false, message: "必输项" },
         { max: 18, message: "整数位不能超过14位" },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "betp.recget.sdamod.dadsnd": [
         { type: "string", required: false, message: "必输项" },

src/model/Letdrv/Default.js

@@ -63,5 +63,6 @@ export default {
     "mtabut.coninf.conexedat"                      :Utils.defaultFunction,
     "ledgrp.rec.ownref"                      :Utils.defaultFunction,
     "ledgrp.rec.redclsflg"                      :Utils.defaultFunction,
+    "bedgrp.rec.nam"                  :Utils.defaultFunction,
 }
 //你可以添加自动default处理

src/views/Business/Betrcl/Rclp.vue

@@ -207,7 +207,7 @@
             disabled
           >
             <el-option
-              v-for="item in codes.docsta1"
+              v-for="item in codes.docsta"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -330,6 +330,9 @@
               v-model="model.aamset.utlamt"
               placeholder="Please input Doc. Amount Part"
               disabled
+              @change="eventFunction(
+                    'aamset.utlamt'
+                  )"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -352,6 +355,9 @@
               v-model="model.aamset.utlamt2"
               placeholder="Please input Add. Amount Part"
               disabled
+              @change="eventFunction(
+                    'aamset.utlamt2'
+                  )"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -383,7 +389,7 @@
             v-model="model.trnmod.trndoc.nar754"
             maxlength="35"
             show-word-limit
-            placeholder="Please input Narrative :77A:'"
+            placeholder="Please input Narrative :77A:"
           ></c-input>
         </c-form-item>
       </c-col>
@@ -400,7 +406,7 @@
           <c-input
             type="textarea"
             v-model="model.payinstxt"
-            maxlength="65"
+            maxlength="300"
             show-word-limit
             placeholder="Please input Payment instructions to ISS/AVB"
           ></c-input>
@@ -409,6 +415,7 @@
               style="margin-left: 10px; padding: 0 10px"
               size="small"
               type="primary"
+              @click="showGridPromptDialog('payins.buttxmsel',null,null,{TXT:'payinstxt'},{TXT:false},'doxpDialog')"
             >
               ...
             </c-button>

src/views/Business/Betrcl/Remp.vue

@@ -11,7 +11,7 @@
             @change="selectOrCheckboxRule('rmbclm.rmbrol')"
           >
             <el-option
-              v-for="item in codes.payrol"
+              v-for="item in codes.rolall"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -30,10 +30,12 @@
             rol: 'rmbrmb',
           }"
           :noRef="false"
-          :disabled="true"
           :isAdrblk="true"
+          :disabled="true"
           @onSeainf="onSeainf"
           @onAplpDet="onBenpDet"
+          :disabledRef="rmbrolFlag"
+          :disabledExtkey="rmbrolFlag"
         >
         </c-ptap>
       </c-col>
@@ -285,6 +287,16 @@ export default {
   data() {
     return {};
   },
+  computed:{
+    rmbrolFlag: {
+      get() {
+        return (
+          this.model.rmbclm.rmbrol == 'AVB' ||
+          this.model.rmbclm.rmbrol == 'ISS' 
+        )
+      },
+    },
+  },
   methods: { ...Event },
   created: function () {},
 };

src/views/Business/Betrcl/index.vue

@@ -67,6 +67,13 @@
         </el-tab-pane>
       </c-tabs>
     </el-form>
+    <c-grid-ety-prompt-dialog
+      ref="doxpDialog"
+      :isPty="false"
+      :promptData="promptData"
+      @select-ety="selectMsg"
+    >
+    </c-grid-ety-prompt-dialog>
   </div>
 </template>
 <script>
@@ -133,7 +140,9 @@ export default {
     let rtnmsg = await this.init({});
     if (rtnmsg.respCode == SUCCESS) {
       this.updateModel(rtnmsg.data);
-      console.log(this.$refs.rclp);
+      if (this.isInDisplay) {
+        this.restoreDisplay();
+      }
       this.$refs.rclp.$refs.table.$refs.table.toggleAllSelection();
       //TODO 处理数据逻辑
     } else {

src/views/Business/Betset/Cnyp.vue

@@ -58,10 +58,6 @@
           </c-select>
         </el-form-item>
       </c-col>
-    </c-col>
-
-    <!-- right -->
-    <c-col :span="11" :offset="1">
       <c-col :span="24">
         <el-form-item label="是否报送跨境人民币2106表" prop="cnybop.libflg">
           <c-select

src/views/Business/Betset/Docpan1.vue

@@ -16,6 +16,16 @@
           ></c-input>
         </el-form-item>
       </c-col>
+
+      <c-col :span="24">
+        <el-form-item label="Declaration Number" prop="lendoc.decnum">
+          <c-input
+            v-model="model.lendoc.decnum"
+            maxlength="22"
+            placeholder="Please input Declaration Number"
+          ></c-input>
+        </el-form-item>
+      </c-col>
     </c-col>
 
     <!-- right -->
@@ -40,16 +50,6 @@
           </c-fullbox>
         </el-form-item>
       </c-col>
-
-      <c-col :span="24">
-        <el-form-item label="Declaration Number" prop="lendoc.decnum">
-          <c-input
-            v-model="model.lendoc.decnum"
-            maxlength="22"
-            placeholder="Please input Declaration Number"
-          ></c-input>
-        </el-form-item>
-      </c-col>
     </c-col>
 
     <!-- <c-col :span="12">

src/views/Business/Betset/Wg.vue

@@ -42,7 +42,7 @@
             :disabled="!(this.model.bopmod.szflg == '1')"
           >
             <el-option
-              v-for="item in codes.acttyp"
+              v-for="item in codes.acttyp0"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -51,9 +51,7 @@
           </c-select>
         </el-form-item>
       </c-col>
-    </c-col>
-    <!-- right -->
-    <c-col :span="11" :offset="1">
+
       <c-col :span="24">
         <el-form-item label="地区机构号" prop="bopmod.ownextkey">
           <c-select
@@ -69,20 +67,23 @@
 
       <c-col :span="24">
         <c-col :span="12">
-          <el-form-item label="国外银行扣费（涉外收入申报专用）" prop="bopmod.outchargeccy">
+          <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.curtxt1"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
+              <el-option
+                v-for="item in codes.curtxt1"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
             </c-select>
           </el-form-item>
         </c-col>
@@ -91,12 +92,18 @@
             <c-input
               v-model="model.bopmod.outchargeamt"
               placeholder="请输入国外银行扣费（涉外收入申报专用）"
-              :disabled="!(this.model.bopmod.szflg == '1' && this.model.bopmod.basflg!='')"
+              :disabled="
+                !(
+                  this.model.bopmod.szflg == '1' &&
+                  this.model.bopmod.basflg != ''
+                )
+              "
             ></c-input>
           </el-form-item>
         </c-col>
       </c-col>
     </c-col>
+
     <!-- <c-col :span="12">
 	    <c-checkbox v-model="model.bopmod.basflg">基础数据</c-checkbox>
        </c-col>
@@ -157,19 +164,18 @@ export default {
   data() {
     return {};
   },
-  computed:{
-    basflg:{
-      get(){
-        console.log(this.model.bopmod.szflg == "1")
-        if(this.model.bopmod.szflg == "1" || this.model.bopmod.szflg == "2"){
-          return this.model.bopmod.basflg != ""
+  computed: {
+    basflg: {
+      get() {
+        console.log(this.model.bopmod.szflg == "1");
+        if (this.model.bopmod.szflg == "1" || this.model.bopmod.szflg == "2") {
+          return this.model.bopmod.basflg != "";
         }
-        
       },
-      set(val){
-        this.model.bopmod.basflg = val ? "X":"";
-      }
-    }
+      set(val) {
+        this.model.bopmod.basflg = val ? "X" : "";
+      },
+    },
   },
   methods: { ...Event },
   created: function () {},

src/views/Business/Betset/index.vue

@@ -152,6 +152,10 @@ export default {
         if(rtnmsg.respCode == SUCCESS)
         {
            this.updateModel(rtnmsg.data)
+           console.log(this.$refs.setp)
+           if(this.isInDisplay){
+                this.restoreDisplay();
+           }
            this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
            //TODO 处理数据逻辑
 

src/views/Business/Letdrv/Drv.vue

@@ -471,7 +471,7 @@
             @change="selectOrCheckboxRule('bedgrp.rec.docprbrol')"
           >
             <el-option
-              v-for="item in codes.docprbrol"
+              v-for="item in codes.docprbrol0"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -490,8 +490,9 @@
             rol: 'prb',
           }"
           :noRef="false"
-          :disabled="true"
+          :disabled="!(model.bedgrp.rec.docprbrol=='PRB')"
           :isAdrblk="true"
+          :disabledExtkey="model.bedgrp.rec.docprbrol=='BEN'"
           @onSeainf="onSeainf"
           @onAplpDet="onBenpDet"
         >

src/views/Business/Letdrv/Dscins.vue

@@ -171,8 +171,10 @@
             rol: 'oth',
           }"
           :noRef="false"
-          :disabled="true"
+          :disabled="!(model.bedgrp.rec.payrol=='OTH')"
           :isAdrblk="true"
+          :disabledRef="payrolFlag"
+          :disabledExtkey="payrolFlag"
           @onSeainf="onSeainf"
           @onAplpDet="onBenpDet"
         >
@@ -512,6 +514,11 @@ export default {
         this.model.bedgrp.blk.docdisflg = val ? "X" : "";
       },
     },
+    payrolFlag:{
+      get() {
+        return this.model.bedgrp.rec.payrol == "AVB"||this.model.bedgrp.rec.payrol == "ISS";
+      },
+    }
   },
   methods: {
     ...Event,

src/views/Business/Letdrv/index.vue

@@ -68,6 +68,12 @@
       </c-tabs>
     </el-form>
     <c-grid-ety-prompt-dialog
+      ref="etyDialog"
+      :promptData="promptData"
+      v-on:select-ety="selectEty"
+    >
+    </c-grid-ety-prompt-dialog>
+    <c-grid-ety-prompt-dialog
       ref="doxpDialog"
       :isPty="false"
       :promptData="promptData"

src/views/Review/Business/ReviewBetrcl.vue

+<template>
+  <ReviewWrapper>
+    <Betrcl></Betrcl>
+  </ReviewWrapper>
+</template>
+
+<script>
+import Betrcl from "~/views/Business/Betrcl";
+import { ReviewWrapper } from "~/components/gj-common.min.js";
+
+export default {
+  name: "ReviewBetrcl",
+  components: { ReviewWrapper, Betrcl },
+  created() {},
+  mounted() {},
+};
+</script>
+
+<style></style>

src/views/Review/Business/ReviewBetset.vue

+<template>
+  <ReviewWrapper>
+    <Betset></Betset>
+  </ReviewWrapper>
+</template>
+
+<script>
+import Betset from "~/views/Business/Betset";
+import { ReviewWrapper } from "~/components/gj-common.min.js";
+
+export default {
+  name: "ReviewBetset",
+  components: { ReviewWrapper, Betset },
+  created() {},
+  mounted() {},
+};
+</script>
+
+<style></style>

src/views/Review/ReviewRouter.js

@@ -34,6 +34,8 @@ import ReviewLetdrv from "./Business/ReviewLetdrv.vue";
 import ReviewBetacc from "./Business/ReviewBetacc.vue";
 import ReviewDitame from "./Business/ReviewDitame.vue";
 import ReviewLetrsv from "./Business/ReviewLetrsv.vue";
+import ReviewBetrcl from "./Business/ReviewBetrcl.vue";
+import ReviewBetset from "./Business/ReviewBetset.vue";
 
 
 const ReviewRouter = [
@@ -90,6 +92,8 @@ const ReviewRouter = [
     { path: "betacc", component: ReviewBetacc, name: "ReviewBetacc", meta: { title: "复核-Betacc" } },
     { path: "ditame", component: ReviewDitame, name: "ReviewDitame", meta: { title: "复核-Ditame" } },
     { path: "letrsv", component: ReviewLetrsv, name: "ReviewLetrsv", meta: { title: "复核-Letrsv" } },
+    { path: "betrcl", component: ReviewBetrcl, name: "ReviewBetrcl", meta: { title: "复核-Betrcl" } },
+    { path: "betset", component: ReviewBetset, name: "ReviewBetset", meta: { title: "复核-Betset" } },
 
 ];