detdrv交易补充

0cb7545b · liuxin · 597484a7 · 0cb7545b · 0cb7545b · 0cb7545b
Commit 0cb7545b authored Jun 09, 2022 by liuxin
5 changed files
--- a/src/model/Detdrv/Pattern.js
+++ b/src/model/Detdrv/Pattern.js
 export default {

    "bfdgrp.blk.docdis":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 50,message:"长度不能超过50"}
    ],


    "bfdgrp.blk.intdis":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 65,message:"长度不能超过65"}
    ],

@@ -26,23 +26,23 @@ export default {
    ],

    "bfdgrp.oth.namelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.oth.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.oth.dbfadrblkcn":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.oth.adrelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.rec.expmno":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 60,message:"长度不能超过60"}
    ],
    "dedgrp.rec.kzref":[
@@ -51,27 +51,22 @@ export default {
    ],

    "bfdgrp.rec.lescom":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
    "letprbl1blk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 200,message:"长度不能超过200"}
    ],
    "letissl1blk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 200,message:"长度不能超过200"}
    ],
    "bfdgrp.cbs.max.cur":[
        {type: "string", required: false, message: "必输项"},
        {max: 3,message:"长度不能超过3"}
    ],
-    "bfdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],

    "bfdgrp.cbs.max2.amt":[
        {type: "number", required: false, message: "必输项"},
@@ -79,11 +74,11 @@ export default {
        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
    "bfdgrp.blk.chaded":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.blk.chaadd":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.rec.totcur":[
@@ -109,23 +104,23 @@ export default {
    ],

    "bfdgrp.acb.namelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.acb.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.acb.dbfadrblkcn":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.acb.adrelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.blk.nartxt77a":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bftp.rmbp.ptsget.sdamod.dadsnd":[
@@ -142,19 +137,19 @@ export default {
    ],

    "bfdgrp.rmb.namelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.rmb.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.rmb.dbfadrblkcn":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.rmb.adrelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bftp.bebp.ptsget.sdamod.dadsnd":[
@@ -171,19 +166,19 @@ export default {
    ],

    "dedgrp.beb.namelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "dedgrp.beb.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "dedgrp.beb.dbfadrblkcn":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "dedgrp.beb.adrelc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.rec.totdat":[
@@ -315,7 +310,7 @@ export default {
        {type: "date", required: false, message: "输入正确的日期"}
    ],
    "dedgrp.rec.expplc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.prb.pts.nam":[
@@ -339,7 +334,7 @@ export default {
        {max: 3,message:"长度不能超过3"}
    ],
    "bfdgrp.cbs.max.amt":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
        {max: 18,message:"整数位不能超过14位"},
        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
    ],
@@ -362,7 +357,7 @@ export default {
        {type: "date", required: false, message: "输入正确的日期"}
    ],
    "bfdgrp.prb.pts.jigomc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.rec.matdat":[
@@ -373,17 +368,14 @@ export default {
    ],

    "bfdgrp.prb.pts.dizhii":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 35,message:"长度不能超过35"}
    ],
    "bfdgrp.blk.matper":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
        {max: 65,message:"长度不能超过65"}
    ],
-
-
-    "dedgrp.rec.utlnbr":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+    "bfdgrp.rec.invtyp":[
+        {type: "string", required: true, message: "必输项"},
    ],
 }
\ No newline at end of file
--- a/src/model/Detdrv/index.js
+++ b/src/model/Detdrv/index.js
@@ -83,6 +83,7 @@ export default class Detdrv{
 						bftp:{
 							docgrdm:{
 								docdsclab:"",			//  Label of document description		.bftp.docgrdm.docdsclab
+                                docgrd:"",
 							},
 							folwupopt:"",			//  Processing Options		.bftp.folwupopt
 							othp:{

--- a/src/views/Business/Detdrv/Drv.vue
+++ b/src/views/Business/Detdrv/Drv.vue
@@ -384,8 +384,8 @@
                </c-col>

                <c-col :span="24">
-                    <el-form-item label="发票类型" prop="bfdgrp.rec.invtyp">
-                        <c-fullbox>
+                    <c-fullbox>
+                        <el-form-item label="发票类型" prop="bfdgrp.rec.invtyp">
                            <c-select
                                v-model="model.bfdgrp.rec.invtyp"
                                style="width: 100%"
@@ -396,15 +396,18 @@
                                    :key="item.value"
                                    :label="item.label"
                                    :value="item.value"
-                                > </el-option>
-                            </c-select>
-                            <template slot="footer">
-                                <c-checkbox v-model="model.bfdgrp.rec.dscinsflg"
-                                    >输入单据不符点指示</c-checkbox
                                >
-                            </template>
-                        </c-fullbox>
-                    </el-form-item>
+                                </el-option>
+                            </c-select>
+                        </el-form-item>
+                        <template slot="footer">
+                            <c-checkbox
+                                v-model="dscinsflg_flag"
+                                style="margin-left: 10px"
+                                >输入单据不符点指示</c-checkbox
+                            >
+                        </template>
+                    </c-fullbox>
                </c-col>

                <c-col :span="24">
@@ -519,7 +522,17 @@ export default {
    data() {
        return {};
    },
-    methods: { ...Event },
+    methods: { ...Event, dscinsflgChange() {} },
+    computed: {
+        dscinsflg_flag: {
+            get: function () {
+                return this.model.bfdgrp.rec.dscinsflg === "X";
+            },
+            set(val) {
+                this.model.bfdgrp.rec.dscinsflg = val ? "X" : "";
+            },
+        },
+    },
    created: function () {},
 };
 </script>

--- a/src/views/Business/Detdrv/Dscins.vue
+++ b/src/views/Business/Detdrv/Dscins.vue
 <template>
-  <div class="eibs-tab">
-                                               
+    <div class="eibs-tab">
+        <!-- Left -->
+        <c-col :span="12">
+            <c-col :span="24">
+                <el-form-item
+                    label="不符点"
+                    prop="bfdgrp.blk.docdis"
+                    style="width: 100%"
+                >
+                    <c-fullbox>
+                        <c-input
+                            type="textarea"
+                            v-model="model.bfdgrp.blk.docdis"
+                            maxlength="50"
+                            show-word-limit
+                            placeholder="请输入不符点"
+                            disabled
+                        ></c-input>
+                        <template slot="footer">
+                            <c-button
+                                style="margin-left: 10px; padding: 0 10px"
+                                size="small"
+                                type="primary"
+                            >
+                                ...
+                            </c-button>
+                        </template>
+                    </c-fullbox>
+                </el-form-item>
+            </c-col>
+
+            <c-col :span="24">
+                <el-form-item
+                    label="内部不符点"
+                    prop="bfdgrp.blk.intdis"
+                    style="width: 100%"
+                >
+                    <c-fullbox>
+                        <c-input
+                            type="textarea"
+                            v-model="model.bfdgrp.blk.intdis"
+                            maxlength="65"
+                            show-word-limit
+                            placeholder="请输入内部不符点"
+                        ></c-input>
+                        <template slot="footer">
+                            <c-button
+                                style="margin-left: 10px; padding: 0 10px"
+                                size="small"
+                                type="primary"
+                            >
+                                ...
+                            </c-button>
+                        </template>
+                    </c-fullbox>
+                </el-form-item>
+            </c-col>
+
+            <c-col :span="24">
+                <el-form-item label="快递单号" prop="bfdgrp.rec.expmno">
+                    <c-input
+                        type="textarea"
+                        v-model="model.bfdgrp.rec.expmno"
+                        maxlength="60"
+                        show-word-limit
+                        placeholder="请输入快递单号"
+                    ></c-input>
+                </el-form-item>
+            </c-col>
+
+            <c-col :span="24">
+                <el-form-item label="扣减佣金" prop="bfdgrp.rec.lescom">
+                    <c-input
+                        v-model="model.bfdgrp.rec.lescom"
+                        placeholder="请输入扣减佣金"
+                    ></c-input>
+                </el-form-item>
+            </c-col>
+
+            <c-col :span="24">
+                <el-form-item label="参考号" prop="dedgrp.rec.kzref">
+                    <c-input
+                        v-model="model.dedgrp.rec.kzref"
+                        maxlength="35"
+                        placeholder="请输入参考号"
+                    ></c-input>
+                </el-form-item>
+            </c-col>
+        </c-col>

-    <c-col :span="12">
+        <!-- Right -->
+        <c-col :span="12">
+            <c-col :span="24">
+                <el-form-item label="寄单状态" prop="bftp.folwupopt">
+                    <c-fullbox>
+                        <c-select
+                            v-model="model.bftp.folwupopt"
+                            style="width: 100%"
+                            placeholder="请选择寄单状态"
+                        >
+                        </c-select>
+                        <template slot="footer">
+                            <c-checkbox v-model="model.bfdgrp.blk.docdisflg" style="margin-left: 10px"
+                                >录入不符点</c-checkbox
+                            >
+                        </template>
+                    </c-fullbox>
+                </el-form-item>
+            </c-col>
+            <c-col :span="24">
+                <el-form-item label="付款人" prop="bfdgrp.rec.payrol">
+                    <c-select
+                        v-model="model.bfdgrp.rec.payrol"
+                        style="width: 100%"
+                        placeholder="请选择付款人"
+                    >
+                    </c-select>
+                </el-form-item>
+            </c-col>
+            <c-col :span="24">
+                <c-ptap
+                    :model="model"
+                    :argadr="{
+                        title: '付款人',
+                        grp: 'bfdgrp',
+                        rol: 'oth',
+                    }"
+                    :disabled="true"
+                >
+                </c-ptap>
+            </c-col>
+        </c-col>

-       <c-col :span="20">
-        <el-form-item label="不符点" prop="bfdgrp.blk.docdis">
-            <c-input type="textarea" v-model="model.bfdgrp.blk.docdis" maxlength="50" show-word-limit placeholder="请输入不符点" ></c-input>
-        </el-form-item>
+        <!-- <c-col :span="24">
+            <span
+                v-text="model.bftp.docgrdm.docdsclab"
+                data-path=".bftp.docgrdm.docdsclab"
+            >
+            </span>
+        </c-col> -->
+        <c-col :span="24" style="height:24px;margin-top:20px">
+            <el-form-item :label="model.bftp.docgrdm.docdsclab" class="messageLabel">
+            </el-form-item>
        </c-col>
-              
-       <c-col :span="4">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onDocdisButtxmsel">
-            ...
-        </c-button>
-       </c-col>
-                                                                    
-       <c-col :span="20">
-        <el-form-item label="内部不符点" prop="bfdgrp.blk.intdis">
-            <c-input type="textarea" v-model="model.bfdgrp.blk.intdis" maxlength="65" show-word-limit placeholder="请输入内部不符点" ></c-input>
-        </el-form-item>
+        <c-col :span="24" style="height:0px;margin-top:5px">
+            <el-divider></el-divider>
        </c-col>
-                  
-       <c-col :span="4">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onIntdisButtxmsel">
-            ...
-        </c-button>
-       </c-col>
-                                   
-       
-                  
-       
-                  
-       
-                                   
-	<c-col :span="12">
-	    <span  v-text="model.bftp.docgrdm.docdsclab"   data-path=".bftp.docgrdm.docdsclab" > </span>
-	</c-col>
-                                
-
-       </c-col>
-
-       <c-col :span="12">
-
-        <c-col :span="24">
-	    <c-checkbox v-model="model.bfdgrp.blk.docdisflg">录入不符点</c-checkbox>
-       </c-col>
-
        <c-col :span="24">
-        <el-form-item label="寄单状态" prop="bftp.folwupopt">
-            <c-select v-model="model.bftp.folwupopt" style="width:100%" placeholder="请选择寄单状态">
-              </c-select>
-        </el-form-item>
-       </c-col>
-
-
-        <c-col :span="24">
-        <el-form-item label="付款人" prop="bfdgrp.rec.payrol">
-            <c-select v-model="model.bfdgrp.rec.payrol" style="width:100%" placeholder="请选择付款人">
-              </c-select>
-        </el-form-item>
-       </c-col>
-
-       <c-col :span="24">
-       <c-ptap
-          :model="model"
-          :argadr="{
-            title: '付款人',
-            grp: 'bfdgrp',
-            rol: 'oth',
-          }"
-          :disabled="true"
-        >
-        </c-ptap>
+            <c-table :data="model.bftp.docgrdm.docgrd" style="width: 100%">
+                <el-table-column prop="cmail1" label="1st">
+                </el-table-column>
+                <el-table-column prop="cmail2" label="2st">
+                </el-table-column>
+                <el-table-column prop="docnam" label="Document">
+                </el-table-column>
+            </c-table>
        </c-col>

-
-       <c-col :span="24">
-        <el-form-item label="信用证编号" prop="dedgrp.rec.kzref">
-            <c-input  v-model="model.dedgrp.rec.kzref" maxlength="35"  placeholder="请输入信用证编号"></c-input>
-        </el-form-item>
-       </c-col>
-
-       <c-col :span="24">
-        <el-form-item label="快递单号" prop="bfdgrp.rec.expmno">
-            <c-input type="textarea" v-model="model.bfdgrp.rec.expmno" maxlength="60" show-word-limit placeholder="请输入快递单号" ></c-input>
-        </el-form-item>
-        </c-col>
-
-       <c-col :span="24">
-        <el-form-item label="扣减佣金" prop="bfdgrp.rec.lescom">
-            <c-input  v-model="model.bfdgrp.rec.lescom"  placeholder="请输入扣减佣金"></c-input>
-        </el-form-item>
-       </c-col>
-
-
-       </c-col>
-
-
-  </div>
+    </div>
 </template>
 <script>
-import Api from "~/service/Api"
+import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Detdrv/Event"
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Detdrv/Event";
+import Ptap from "~/views/Public/Ptap";

 export default {
-    inject: ['root'],
-    props:["model","codes"],
+    inject: ["root"],
+    props: ["model", "codes"],
    mixins: [commonProcess],
-    data(){
-        return {
-
-        }
+    components: {
+        "c-ptap": Ptap,
    },
-    methods:{...Event},
-    created:function(){
-
-    }
-}
+    data() {
+        return {};
+    },
+    methods: { ...Event },
+    created: function () {},
+};
 </script>
 <style>
-
+.messageLabel >>> .el-form-item__label{
+    text-align: left;
+    font-weight:bold;
+    font-size: 12px;
+}
 </style>
--- a/src/views/Business/Detdrv/index.vue
+++ b/src/views/Business/Detdrv/index.vue
@@ -28,9 +28,15 @@
           </el-tab-pane>
 
            <!--PD000139 -->
-           <el-tab-pane label="不符点通知" name="mt750p">
+           <!-- <el-tab-pane label="不符点通知" name="mt750p">
                <m-mt750p :model="model" :codes="codes"/>
-           </el-tab-pane>
+           </el-tab-pane> -->
+
+           <el-tab-pane label="或有" name="engp">
+            <c-content>
+            <m-engp :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
            <!--PD000147 -->
           <!-- <el-tab-pane label="Advice of Payment" name="mt754p">
@@ -53,11 +59,7 @@
            <m-glepan :model="model" :codes="codes" ref="glepan" />
          </el-tab-pane>

-          <el-tab-pane label="表外" name="engp">
-            <c-content>
-            <m-engp :model="model" :codes="codes" />
-            </c-content>
-          </el-tab-pane> -->
+           -->

          <!-- <el-tab-pane label="保证金" name="ccvpan">
            <m-ccvpan :model="model" :codes="codes" />