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

src/business/betcan/event/buildCommons.js

@@ -113,9 +113,9 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'GID',
-        objinr: model.gidgrp.rec.objinr,
-        ownref: model.gidgrp.rec.ownref,
+        objtyp: 'bed',
+        objinr: model.bedgrp.rec.objinr,
+        ownref: model.bedgrp.rec.ownref,
       },
     };
     return params
@@ -124,9 +124,9 @@ export default {
     let params = {
       ...this.buildCommonData(model, trnName),
       rec: {
-        objtyp: 'lid',
-        objinr: model.brdgrp.rec.objinr,
-        ownref: model.brdgrp.rec.ownref,
+        objtyp: 'bed',
+        objinr: model.bedgrp.rec.objinr,
+        ownref: model.bedgrp.rec.ownref,
         swiftflg: model.brtp.swiftflg,
       },
     };

src/business/betcan/model/index.js

 import Pts from '~/components/business/commonModel/Pts';
 import Pub from '~/components/business/commonModel/index.js';
 export default class Betcan {
-  constructor() {
-    this.data = {
-      sndmsg: '',
-      ledgrp: {
-          rec: {
-              ownref: ''
-          },
-          cbs: {
-              opn1: {
-                  cur: '',
-                  amt: ''
-              }
-          }
-      },
-      rebkpflg: '',
-      strinf: '',
-      bedgrp: {
-          rec: {
-              predat: '',
-              rcvdat: '',
-              doctypcod: '',
-              docsta: '',
-              ownref: '',
-              orddat: '',
-              matdat: '',
-              nam: ''
-          },
-          cbs: {
-              opn1: {
-                  cur: '',
-                  amt: ''
-              },
-              opn2: {
-                  amt: ''
-              },
-              max: {
-                  cur: '',
-                  amt: ''
-              }
-          },
-          iss: {
-              pts: {
-                  ref: '',
-                  nam: ''
-              }
-          },
-          ben: {
-              pts: {
-                  ref: '',
-                  nam: ''
-              }
-          },
-          apl: {
-              pts: {
-                  ref: '',
-                  nam: ''
-              }
-          }
-      },  
-    setmod: new Pub().data.Setmod,
-    mtabut: new Pub().data.Mtabut,
-    trnmod: new Pub().data.Trnmod,
-    liaall: new Pub().data.Liaall,
-    liaccv: new Pub().data.Liaccv,
-    docpan: new Pub().data.Docpan,
-    };
-  }
+    constructor() {
+        this.data = {
+            brdgrp: {
+                adv: {
+                    pts: new Pts().data,
+                },
+                prb: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
+                acb: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
+                apl: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
+                ben: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
+                blk: {
+                    chaded: '',
+                    docdisflg: '',
+                    chaadd: '',
+                    docdis: '',
+                },
+                rec: {
+                    inr: '',
+                    branchinr: '',
+                    totcur: '',
+                    ownref: '',
+                    disdat: '',
+                    totamt: '',
+                    nam: '',
+                    docprbrol: ''
+                },
+                cbs: {
+                    opn1: {
+                        cur: ''
+                    },
+                    opn2: {
+                        cur: ''
+                    },
+                    max: {
+                        cur: '',
+                        amt: ''
+                    },
+                    max2: {
+                        amt: ''
+                    }
+                },
+                matp: {
+                    mattxtlab: ''
+                }
+            },
+            brtp: {
+                furide: '',
+                matp: {
+                    mattxtlab: ''
+                }
+            },
+            gidgrp: {
+                blk: {
+                    chaded: '',
+                    amtspc: '',
+                    accspc: '',
+                },
+                acb: {
+                    pts: new Pts().data,
+                },
+                apl: {
+                    pts: new Pts().data,
+                },
+                ben: {
+                    pts: new Pts().data,
+                },
+                ctr: {
+                    pts: new Pts().data,
+                },
+                iss: {
+                    pts: new Pts().data,
+                },
+                rec: {
+                    expdat: '',
+                    purpos: '',
+                    liadat: '',
+                    ownref: '',
+                    exptyp: '',
+                    purcan: '',
+                    nam: '',
+                    gartyp: '',
+                    purposin: '',
+                    reddat: '',
+                    redamt: '0',
+                    outcur: '',
+                    redcur: '',
+                    outamt: '0',
+                    branchinr: '',
+                },
+                cbs: {
+                    opn1: {
+                        cur: '',
+                        amt: '0',
+                    },
+                    max: {
+                        cur: '',
+                        amt: '0',
+                    },
+                },
+            },
+            sndmsg: '',
+            ledgrp: {
+                adv: {
+                    pts: new Pts().data,
+                },
+                prb: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
+                acb: {
+                    adrelc: '',
+                    dbfadrblkcn: '',
+                    namelc: '',
+                    pts: new Pts().data,
+                },
+                rec: {
+                    ownref: ''
+                },
+                cbs: {
+                    opn1: {
+                        cur: '',
+                        amt: ''
+                    }
+                }
+            },
+            rebkpflg: '',
+            strinf: '',
+            bedgrp: {
+                rec: {
+                    predat: '',
+                    rcvdat: '',
+                    doctypcod: '',
+                    docsta: '',
+                    ownref: '',
+                    orddat: '',
+                    matdat: '',
+                    nam: ''
+                },
+                cbs: {
+                    opn1: {
+                        cur: '',
+                        amt: ''
+                    },
+                    opn2: {
+                        amt: ''
+                    },
+                    max: {
+                        cur: '',
+                        amt: ''
+                    }
+                },
+                iss: {
+                    pts: {
+                        ref: '',
+                        nam: ''
+                    }
+                },
+                ben: {
+                    pts: {
+                        ref: '',
+                        nam: ''
+                    }
+                },
+                apl: {
+                    pts: {
+                        ref: '',
+                        nam: ''
+                    }
+                }
+            },
+            setmod: new Pub().data.Setmod,
+            mtabut: new Pub().data.Mtabut,
+            trnmod: new Pub().data.Trnmod,
+            liaall: new Pub().data.Liaall,
+            liaccv: new Pub().data.Liaccv,
+            docpan: new Pub().data.Docpan,
+        };
+    }
 }

src/business/betcan/views/Canp.vue

@@ -43,13 +43,13 @@
         </c-col>
         <c-col :span="7">
           <el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
-            <c-input-currency v-model="model.bedgrp.cbs.max.amt" style="text-align: left; width: 100%"
-              placeholder="请输入金额" @keyup.enter.native="
+            <c-input-currency v-model="model.bedgrp.cbs.max.amt" style="text-align: left; width: 100%" placeholder="请输入金额"
+              @keyup.enter.native="
                 defaultFunction(
                   'bedgrp.cbs.max.amt',
                   model.bedgrp.cbs.max.amt
                 )
-              " disabled></c-input-currency>
+                " disabled></c-input-currency>
           </el-form-item>
         </c-col>
         <c-col :span="7">
@@ -213,6 +213,4 @@ export default {
   created: function () { },
 }
 </script>
-<style>
-
-</style>
+<style></style>

src/business/betcan/views/index.vue

@@ -18,30 +18,26 @@
           </el-tab-pane>
 
           <!--PD000027 -->
-            <el-tab-pane label="表外记账" name="engp">
-              <c-content>
-                  <!-- 表外记账 -->
-                  <m-engp :model="model" :codes="codes" />
-              </c-content>
-            </el-tab-pane>
+          <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="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>
+          <!--PD000027 -->
+          <el-tab-pane label="会计分录" name="glepan">
+            <c-content>
+              <m-glentry :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
           <!--PD000510 -->
           <el-tab-pane label="备查/附言" name="addbcb">
@@ -64,8 +60,8 @@
           </el-tab-pane>
         </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="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
+      </c-grid-ety-prompt-dialog> -->
       <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
         <!-- <el-button size="small">用户确认</el-button>
         <el-button size="small">检核</el-button>
@@ -79,21 +75,26 @@
   </div>
 </template>
 <script>
-import Betcan from "~/model/Betcan";
 import event from '../event';
 import operationFunc from "~/mixin/operationFunc";
+import CodeTable from "~/config/CodeTable"
 import formRules from '../model/check'
+import Betcan from "../model";
 
 import Ovwp from './Ovwp'
 import Canp from './Canp'
 import Addbcb from "./Addbcb"
 
-import Limitbody from "~/components/business/limitbody/views";
 import Engp from "~/components/business/engp/views";
+// import Ccvpan from "~/components/business/ccvpan/views";
 import Setmod from "~/components/business/setmod/views";
-// import Glepan from "~/components/business/glepan/views";
+import Glentry from "~/components/business/glentry/views";
 import Docpan from "~/components/business/docpan/views";
 import Doctre from "~/components/business/doctre/views";
+import Limitbody from "~/components/business/limitbody/views";
+import Glepan from "~/components/business/glentry/views";
+
+
 
 export default {
   name: 'Betcan',
@@ -103,10 +104,10 @@ export default {
     'm-canp': Canp,
     'm-limitbody': Limitbody,
     'm-engp': Engp,
-    "m-ccvpan": Ccvpan,
+    // "m-ccvpan": Ccvpan,
     "m-setmod": Setmod,
     "m-glentry": Glentry,
-    // 'm-glepan': Glepan,
+    'm-glepan': Glepan,
     'm-addbcb': Addbcb,
     'm-docpan': Docpan,
     'm-doctre': Doctre,
@@ -124,19 +125,17 @@ export default {
       trnType: '',
       model: new Betcan().data,
       rules: formRules,
-        codes: {
-          ...CodeTable
-        },
-        activeNames: ["setpan"],
+      codes: {
+        ...CodeTable
+      },
+      activeNames: ["setpan"],
     }
   },
   methods: {},
-  mounted () {
-      this.init()
+  mounted() {
+    this.init()
   },
 }
 </script>
-<style>
-
-</style>
+<style></style>
 

src/business/litdck/model/index.js

@@ -22,7 +22,7 @@ export default class Litdck {
           tenmaxday: '',
           rcvdat: '',
           predat: '',
-          advtyp: '750',
+          advtyp: '',
           docflg: '',
           approvcod: '',
           ownref: '',

src/business/litopn/model/check.js

@@ -463,8 +463,8 @@ export default {
   'lidgrp.rec.stagod': [{ required: true, message: '必输项' }],
 
   'lidgrp.rec.tenmaxday': [
-    { type: 'number', required: true, message: '请输入数字' },
-    { type: 'number', max: 999, message: '不能超过999' },
+    { type: 'string', required: true, message: '请输入数字' },
+    { type: 'string', max: 999, message: '不能超过999' },
     { pattern: /(^-?[1-9][0-9]{0,2}$)|0/, message: '-999至999之间' },
     // ^-?[1-9]\d*$　　 //匹配整数
   ],