brtsnd

src/business/brtsnd/event/buildCommons.js

@@ -19,42 +19,23 @@ export default {
   },
   buildCommonData (model, trnName) {
     let ptsptaList = [];
-    // if (model.lidgrp.apl.pts.extkey) {
-    //   ptsptaList.push(this.buildPtspta(model.lidgrp.apl));
-    // }
-    // if (model.lidgrp.adv.pts.extkey) {
-    //   ptsptaList.push(this.buildPtspta(model.lidgrp.adv));
-    // }
-    // if (model.lidgrp.ben.pts.extkey) {
-    //   ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
-    // }
+    if (model.brdgrp.apl.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.brdgrp.apl));
+    }
+    if (model.brdgrp.prb.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.brdgrp.prb));
+    }
+    if (model.brdgrp.ben.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.brdgrp.ben));
+    }
     let dataObj = {
       rec: {
         objtyp: 'LID',
-        ownref: model.lidgrp.rec.ownref,
-        opndat: model.lidgrp.rec.opndat,
-        expdat: model.lidgrp.rec.expdat,
-        branchInr: model.lidgrp.rec.branchInr,
-        hndtyp: model.lidgrp.rec.hndtyp,
-        gartyp: model.lidgrp.rec.gartyp,
-        fingua: model.lidgrp.rec.fingua,
-        segtyp: model.lidgrp.ghd.segtyp,
-        fromflg: model.lidgrp.rec.fromflg,
-        othersno: model.lidgrp.rec.othersno,
-        sndto: model.lidgrp.rec.sndto,
-        swiftflg: model.gitp.swiftflg,
-        giduil: model.lidgrp.rec.giduil,
-        purpos: model.lidgrp.rec.purpos,
-        revflg: model.lidgrp.rec.revflg,
-        cnfsta: model.lidgrp.rec.cnfsta,
+        ownref:model.brdgrp.rec.ownref
       },
       cbsMap: {
-        MAX: model.lidgrp.cbs.max,
-        OPN1: model.lidgrp.cbs.opn1,
-        MAC: model.lidgrp.cbs.mac,
-        MAC2: model.lidgrp.cbs.mac2,
-        OPC2: model.lidgrp.cbs.opc2,
-        CNF: model.lidgrp.cbs.cnf,
+        MAX: model.brdgrp.cbs.max,
+        OPN1: model.brdgrp.cbs.opn1,
       },
       ptsList: ptsptaList,
       transName: trnName,
@@ -118,7 +99,6 @@ export default {
       ...this.buildCommonData(model, trnName),
       rec: {
         objtyp: 'LID',
-        objinr: model.lidgrp.rec.objinr,
         ownref: model.lidgrp.rec.ownref,
       },
     };
@@ -129,7 +109,6 @@ export default {
       ...this.buildCommonData(model, trnName),
       rec: {
         objtyp: 'LID',
-        objinr: model.lidgrp.rec.objinr,
         ownref: model.lidgrp.rec.ownref,
         swiftflg: model.gitp.swiftflg,
       },

src/business/brtsnd/model/check.js

@@ -12,7 +12,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "lidgrp.rec.expdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "lidgrp.cbs.opn1.cur":[
         {type: "string", required: false, message: "必输项"},
@@ -54,10 +54,10 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
     "brdgrp.rec.rcvdat":[
-        {type: "date", required: true, message: "输入正确的日期"}
+        { required: true, message: "输入正确的日期"}
     ],
     "brdgrp.rec.advdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.ben.pts.ref":[
         {type: "string", required: false, message: "必输项"},
@@ -65,10 +65,10 @@ export default {
     ],
 
     "brdgrp.rec.matdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.rec.stadat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.ben.pts.nam":[
         {type: "string", required: false, message: "必输项"},
@@ -85,7 +85,7 @@ export default {
     ],
 
     "brdgrp.rec.predat":[
-        {type: "date", required: true, message: "输入正确的日期"}
+        { required: true, message: "输入正确的日期"}
     ],
 
     "brtp.prbp.ptsget.sdamod.dadsnd":[
@@ -153,7 +153,7 @@ export default {
     ],
 
     "brtp.prechkdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
 
 
@@ -164,10 +164,10 @@ export default {
 
 
     "brdgrp.rec.totdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.rec.disdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.blk.comcon":[
         {type: "string", required: false},
@@ -190,10 +190,10 @@ export default {
     ],
 
     "brdgrp.rec.relgoddat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.rec.expdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.blk.carnam":[
         {type: "string", required: false, message: "必输项"},
@@ -210,7 +210,7 @@ export default {
     ],
 
     "brdgrp.rec.tradat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        { required: false, message: "输入正确的日期"}
     ],
     "brdgrp.blk.relstoadr":[
         {type: "string", required: false, message: "必输项"},

src/business/brtsnd/views/Ovwp.vue

 <template>
 <div class="eibs-tab">
-    <el-collapse v-model="activeNames" @change="handleChange">
+    <el-collapse v-model="activeNames" >
         <el-collapse-item title="寄单" name="payp">
             <m-payp :model="model" :codes="codes" />
         </el-collapse-item>

src/business/brtsnd/views/Ovwp1.vue

@@ -13,7 +13,7 @@
             <c-date-picker type="date"  v-model="model.brtp.prechkdat" style="width:100%"  placeholder="请选择预计核验日期"></c-date-picker>
         </el-form-item>
        </c-col>
-                                    </div>
+  </div>
 </template>
 <script>
 import event from "../event"

src/business/brtsnd/views/Payp.vue

@@ -374,7 +374,6 @@
                 <c-button
                   size="small"
                   type="primary"
-                  @click="onPrbpDet"
                   icon="el-icon-info"
                 >
                 </c-button>
@@ -426,7 +425,6 @@
                 <c-button
                   size="small"
                   type="primary"
-                  @click="onOthpDet"
                   icon="el-icon-info"
                 >
                 </c-button>

src/business/brtsnd/views/index.vue

@@ -76,7 +76,7 @@
 <script>
 import CodeTable from "~/config/CodeTable"
 import Brtsnd from "../model"
-import commonFuncs from "~/mixin/commonFuncs"
+import operationFunc from "~/mixin/operationFunc"
 import Check from "../model/check"
 import event from '../event'
 import Payp from "./Payp"
@@ -121,7 +121,7 @@ export default {
             root: this
         }
     },
-    mixins: [ event,commonFuncs], // 里面包含了Default、Check等的公共处理
+    mixins: [ event,operationFunc],
     data() {
         return {
             tabVal: "ovwp",