letdrw修改

src/business/letdrw/event/buildCommons.js

@@ -50,14 +50,17 @@ export default {
       },
       cbsMap: {
         MAX: model.ledgrp.cbs.max,
-        OLDMAX: model.ledgrp.cbs.oldmax,
+        OLDMAX: model.oldledgrp.cbs.max,
+        OLDMAX2: model.oldledgrp.cbs.max2,
         MAX2: model.ledgrp.cbs.max2,
         NOM1: model.ledgrp.cbs.nom1,
         OPN1: model.ledgrp.cbs.opn1,
-        MAC: model.ledgrp.cbs.mac,
-        MAC2: model.ledgrp.cbs.mac2,
-        OPC2: model.ledgrp.cbs.opc2,
-        CNF: model.ledgrp.cbs.cnf,
+        // MAC: model.ledgrp.cbs.mac,
+        // MAC2: model.ledgrp.cbs.mac2,
+        // OPC2: model.ledgrp.cbs.opc2,
+        // CNF: model.ledgrp.cbs.cnf,
+        BEDMAX: model.bedgrp.cbs.max,
+        BEDMAX2: model.bedgrp.cbs.max2,
       },
       ptsList: ptsptaList,
       transName: trnName,

src/business/letdrw/model/index.js

@@ -11,6 +11,30 @@ export default class Letdrw {
                 folwupopt: ''
             },
             number: '',
+            oldledgrp: {
+                rec: {
+                    expdat: '',
+                    nomton: '',
+                    shpdat: '',
+                    nomtop: '',
+                    prepertxts18: '',
+                    prepers18: ''
+                },
+                cbs: {
+                    max: {
+                        cur:"",			
+                        amt:"",
+                    },
+                    max2: {
+                        cur:"",			
+                        amt:"",
+                    },
+                    nom1: {
+                        cur:"",			
+                        amt:"",
+                    }
+                }
+            },
             ledgrp: {
                 a2b: {
                     pts: new Pts().data,

src/business/letdrw/views/index.vue

@@ -28,24 +28,28 @@
             </c-content>
           </el-tab-pane>
 
-          <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
+        <el-tab-pane label="表外记账" name="engp">
             <c-content>
-              <div class="eibs-tab">
-                <el-collapse v-model="activeNames">
-                  <el-collapse-item title="表外记账" name="engp">
-                    <!-- 表外记账 -->
-                    <m-engp :model="model" :codes="codes"/>
-                  </el-collapse-item>
-                  <el-collapse-item title="结算" name="setpan">
-                    <!-- 结算 -->
-                    <m-setpan :model="model" :codes="codes"/>
-                  </el-collapse-item>
-                  <el-collapse-item title="会计分录" name="glepan">
-                    <!-- 会计分录 -->
-                    <m-glepan :model="model" :codes="codes"/>
-                  </el-collapse-item>
-                </el-collapse>
-              </div>
+              <!-- 表外记账 -->
+              <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="glepan">
+            <c-content>
+              <m-glentry :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
 
@@ -103,12 +107,12 @@ import Addbcb from "./Addbcb";
 
 import Doxp from '~/views/Public/Doxp'
 import Coninfp from '~/views/Public/Coninfp'
-import Setpan from '~/components/business/setmod/views'
+import Setmod from '~/components/business/setmod/views'
 import Docpan from '~/views/Public/Docpan'
 import Doctre from '~/views/Public/Doctre'
-import Engp from '~/views/Public/Engp'
+import Engp from '~/components/business/engp/views'
 import Limitbody from '~/views/Public/Limitbody'
-import Glepan from "~/views/Public/Glepan";
+import Glentry from "~/components/business/glentry/views";
 import operationFunc from "@/mixin/operationFunc";
 import event from "@/business/letdrw/event";
 
@@ -125,13 +129,13 @@ export default {
     'm-doxp': Doxp,
     'm-revp': Revp,
     'm-engp': Engp,
-    'm-setpan': Setpan,
+    'm-setmod': Setmod,
     'm-coninfp': Coninfp,
     'm-docpan': Docpan,
     'm-doctre': Doctre,
     'm-srmp': Srmp,
     'm-limitbody': Limitbody,
-    "m-glepan": Glepan,
+    "m-glentry": Glentry,
   },
   provide() {
     return {