Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

src/business/brtacp/views/index.vue

@@ -117,7 +117,7 @@
         root: this
       }
     },
-    mixins: [event,operationFunc,],
+    mixins: [event,operationFunc],
     data(){
       return {
         tabVal: "ovwp",

src/business/brteus/model/index.js

@@ -75,7 +75,7 @@ export default class Brteus {
           advtyp: '',
           docsta: '',
           ownref: '',
-          totamt: '',
+          totamt: '0',
           totdat: '',
           advdat: '',
           stadat: '',
@@ -119,6 +119,7 @@ export default class Brteus {
           expdat: '',
           ownref: '',
           branchinr:"00000014",
+          inr: '',
         },
         cbs: {
           opn1: {

src/business/brtudp/event/buildCommons.js

@@ -27,7 +27,8 @@ export default {
     }
     let dataObj = {
       rec: {
-        objtyp: 'lid',
+        objtyp: 'brd',
+        objinr:model.brdgrp.rec.objinr,
         ownref: model.brdgrp.rec.ownref,
         opndat: model.brdgrp.rec.opndat,
         expdat: model.brdgrp.rec.expdat,

src/business/brtudp/model/index.js

@@ -59,6 +59,8 @@ export default class Brtudp {
                     }
                 },
                 rec: {
+                    inr:'',
+                    branchinr:'',
                     tenmaxday: '',
                     predat: '',
                     relgodflg: '',
@@ -239,6 +241,8 @@ export default class Brtudp {
             },
             lidgrp: {
                 rec: {
+                    inr: '',
+                    branchinr: '',
                     expdat: '',
                     ownref: ''
                 },

src/business/letame/model/index.js

@@ -196,28 +196,6 @@ export default class Letame {
           },
           rmbrol: ''
       },
-      trnmod: {
-          swiadd: {
-              newnomtop: '',
-              shpfro: '',
-              shpper: '',
-              amedat: '',
-              pordis: '',
-              addamtcov: '',
-              newnomton: '',
-              amenbr: '',
-              addamt: '',
-              amecur: '',
-              newshpdat: '',
-              newamt: '',
-              shpto: '',
-              newexpdat: '',
-              ameamt: '',
-              newcur: '',
-              porloa: '',
-              nomspc: ''
-          }
-      },
     setmod: new Pub().data.Setmod,
     mtabut: new Pub().data.Mtabut,
     trnmod: new Pub().data.Trnmod,

src/business/letame/views/Aamp.vue

@@ -64,19 +64,16 @@
   </div>
 </template>
 <script>
-import Api from '~/service/Api'
-import commonProcess from '~/mixin/commonProcess'
-import CodeTable from '~/config/CodeTable'
-import Event from '~/model/Letame/Event'
+import event from '../event'
 
 export default {
-  inject: ['root'],
-  props: ['model', 'codes'],
-  mixins: [commonProcess],
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [event],
   data() {
     return {}
   },
-  methods: { ...Event },
+  methods: {},
   created: function () {},
 }
 </script>

src/business/letame/views/Adcpame.vue

@@ -67,19 +67,16 @@
   </div>
 </template>
 <script>
-import Api from '~/service/Api'
-import commonProcess from '~/mixin/commonProcess'
-import CodeTable from '~/config/CodeTable'
-import Event from '~/model/Letame/Event'
+import event from '../event'
 
 export default {
-  inject: ['root'],
-  props: ['model', 'codes'],
-  mixins: [commonProcess],
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [event],
   data() {
     return {}
   },
-  methods: { ...Event },
+  methods: {},
   created: function () { },
 }
 </script>

src/business/letame/views/index.vue

 <template>
   <div class="eContainer">
     <c-page title="出口信用证修改">
-      <el-form
-        :model="model"
-        :rules="rules"
-        ref="modelForm"
-        label-width="120px"
-        label-position="right"
-        size="small"
-        :validate-on-rule-change="false"
-      >
+      <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
+        :validate-on-rule-change="false">
         <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
 
           <el-tab-pane label="业务信息" name="ovwp">
@@ -23,32 +16,28 @@
               <m-limitbody :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
-    
-            <!--PD000027 -->
-            <el-tab-pane label="表外记账" name="engp">
-              <c-content>
-                  <!-- 表外记账 -->
-                  <m-engp :model="model" :codes="codes" />
-              </c-content>
-            </el-tab-pane>
 
-            <!--PD000027 -->
-            <el-tab-pane label="费用/账务" name="setmod">
-              <c-content>
-                <m-setmod
-                  :model="model"
-                  :codes="codes"
-                  @changeSetmodModel="changeSetmodModel"
-                />
-              </c-content>
-            </el-tab-pane>
+          <!--PD000027 -->
+          <el-tab-pane label="表外记账" name="engp">
+            <c-content>
+              <!-- 表外记账 -->
+              <m-engp :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
-            <!--PD000027 -->
-            <el-tab-pane label="会计分录" name="glepan">
-              <c-content>
-                  <m-glentry :model="model" :codes="codes" />
-              </c-content>
-            </el-tab-pane>
+          <!--PD000027 -->
+          <el-tab-pane label="费用/账务" name="setmod">
+            <c-content>
+              <m-setmod :model="model" :codes="codes" @changeSetmodModel="changeSetmodModel" />
+            </c-content>
+          </el-tab-pane>
+
+          <!--PD000027 -->
+          <el-tab-pane label="会计分录" name="glepan">
+            <c-content>
+              <m-glentry :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
           <el-tab-pane label="备查/附言" name="addbcb">
             <c-content>
@@ -69,60 +58,39 @@
               <m-doctre :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
-    
+
         </c-tabs>
       </el-form>
-      <c-grid-ety-prompt-dialog
-        ref="etyDialog"
-        :promptData="promptData"
-        @select-ety="selectEty"
-      >
-      </c-grid-ety-prompt-dialog>
-      <c-grid-ety-prompt-dialog
-          ref="doxpDialog"
-          :isPty="false"
-          :promptData="promptData"
-          @select-ety="selectMsg"
-      >
-      </c-grid-ety-prompt-dialog>
-      <c-function-btn
-        :handleSubmit="handleSubmit"
-        :handleCheck="handleCheck"
-        :handleStash="handleStash"
-      >
+      <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
       </c-function-btn>
     </c-page>
   </div>
 </template>
 <script>
-import Addbcb from "./Addbcb";
-import Api from '~/service/Api'
-import CodeTable from '~/config/CodeTable'
-import Letame from '~/model/Letame'
-import commonProcess from '~/mixin/commonProcess'
-import commonFuncs from "~/mixin/commonFuncs"
-import Check from '~/model/Letame/Check'
-import Default from '~/model/Letame/Default'
-import Pattern from '~/model/Letame/Pattern'
-import Amep from './Amep'
-import Ovwp from './Ovwp'
-import Detp from './Detp'
-import Aamp from './Aamp'
-import Ptyp from './Ptyp'
-import Ovwp1 from './Ovwp1'
 
-import Inspame from './Inspame'
-
-import Doxpame from "~/views/Public/Doxpame";
-import Engp from "~/views/Public/Engp";
-import Setpan from '~/views/Public/Setpan';
-import Glepan from "~/views/Public/Glepan";
-import Coninfp from "~/views/Public/Coninfp";
-import Docpan from "~/views/Public/Docpan";
-import Doctre from '~/views/Public/Doctre';
-import Limitbody from '~/views/Public/Limitbody';
+import event from '../event';
+import operationFunc from "~/mixin/operationFunc";
+import CodeTable from "~/config/CodeTable";
+import formRules from '../model/check';
+import Letame from "../model";
 
+import Amep from './Amep';
+import Ovwp from './Ovwp';
+import Detp from './Detp';
+import Aamp from './Aamp';
+import Ptyp from './Ptyp';
+import Ovwp1 from './Ovwp1';
+import Inspame from './Inspame';
+import Addbcb from "./Addbcb";
 
+// import Doxpame from "~/components/business/doxpame/views";
+import Engp from "~/components/business/engp/views";
+// import Setpan from "~/components/business/setpan/views";
+// import Glepan from "~/components/business/glepan/views";
+import Coninfp from "~/components/business/coninfp/views";
+import Docpan from "~/components/business/docpan/views";
+import Doctre from "~/components/business/doctre/views";
+import Limitbody from "~/components/business/limitbody/views";
 
 
 export default {
@@ -130,15 +98,16 @@ export default {
   components: {
     'm-amep': Amep,
     'm-ovwp': Ovwp,
+    'm-ovwp1': Ovwp1,
     'm-detp': Detp,
     'm-aamp': Aamp,
     "m-addbcb": Addbcb,
     'm-ptyp': Ptyp,
-    "m-doxpame": Doxpame,
+    // "m-doxpame": Doxpame,
     'm-inspame': Inspame,
     'm-engp': Engp,
-    'm-setpan': Setpan,
-    'm-glepan': Glepan,
+    // 'm-setpan': Setpan,
+    // 'm-glepan': Glepan,
     'm-coninfp': Coninfp,
     'm-docpan': Docpan,
     'm-doctre': Doctre,
@@ -149,40 +118,23 @@ export default {
       root: this,
     }
   },
-  mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
+  mixins: [event, operationFunc],
   data() {
     return {
       tabVal: 'ovwp',
       trnName: 'letame',
       model: new Letame().data,
-      checkRules: Check,
-      defaultRules: Default,
-      pattern: Pattern,
-      rules: null,
-      codes: { ...CodeTable },
-      activeNames: ["engp"],
+      rules: formRules,
+      codes: {
+        ...CodeTable
+      },
+      activeNames: ["setpan"],
     }
   },
   methods: {
-    myTabClick(tab) {
-      this.tabClick(tab)
-      /**
-       *  do it yourself
-       **/
-    },
   },
-  created: async function () {
-    console.log('进入letame交易')
-    let rtnmsg = await this.init({})
-    if (rtnmsg.respCode == SUCCESS) {
-      this.updateModel(rtnmsg.data)
-      //TODO 处理数据逻辑
-      if (this.isInDisplay) {
-        this.restoreDisplay();
-      }
-    } else {
-      this.$notify.error({ title: '错误', message: '服务请求失败！' })
-    }
+  mounted() {
+    this.init()
   },
 }
 </script>