Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…
Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
1321a953 · WF1020 · a5ce0729 · 7c74efbe · 1321a953 · 1321a953
Commit 1321a953 authored May 19, 2023 by WF1020
7 changed files
--- a/src/business/litame/model/index.js
+++ b/src/business/litame/model/index.js
@@ -3,244 +3,243 @@ import Pub from '~/components/business/commonModel/index.js';
 export default class Litame {
  constructor() {
    this.data = {
-      bcbtyp6: '',
-        modtyp: '',
-        bcbtyp7: '',
-        bcbtyp4: '',
-        bcbtyp5: '',
-        bcbtyp2: '',
-        bcbtyp3: '',
-        bcbtyp1: '',
-        bcbdat: '',
-        litp: {
-            usr: {
-                extkey: ''
-            },
-            aamp: {
-                aammod: {
-                    addamtflg: ''
-                }
-            }
-        },
-        bgftktyp: '',
-        litamep: {
-            amenbr: '',
-            cre707flg: '',
-            maxcur: '',
-            engcur: '',
-            lcrdocamep: {
-                modflg: '',
-                modmanflg: '',
-                usrblk: ''
-            },
-            spcbenamep: {
-                modflg: '',
-                modmanflg: '',
-                usrblk: ''
-            },
-            spcrcbamep: {
-                modflg: '',
-                modmanflg: '',
-                usrblk: ''
-            },
-            lcrgodamep: {
-                modflg: '',
-                modmanflg: '',
-                usrblk: ''
-            },
-            maxamt: '',
-            adlcndamep: {
-                modflg: '',
-                modmanflg: '',
-                usrblk: ''
-            },
-            engamt: ''
-        },
-        number: '',
-        litameadv: '',
-        ameadvrmk: '',
-        oldlidgrp: {
-            blk: {
-                narhis: ''
-            },
-            rec: {
-                expdat: '',
-                nomton: '',
-                shpdat: '',
-                nomtop: '',
-                prepertxts18: '',
-                prepers18: ''
-            },
-            cbs: {
-                max: {
-                    cur: '',
-                    amt: ''
-                },
-                nom1: {
-                    amt: ''
-                }
-            }
-        },
-        lidgrp: {
-            a2b: {
-              pts: new Pts().data,
-            },
-            blk: {
-                insbnk: '',
-                feetxt: '',
-                mixdet: '',
-                shpper: '',
-                adlcnd: '',
-                addamtcov: '',
-                avbwthtxt: '',
-                defdet: '',
-                lcrdoc: '',
-                lcrgod: '',
-                spcben: '',
-                lcrdocame: '',
-                dftat: '',
-                adlcndame: '',
-                spcbename: '',
-                spcrcbame: '',
-                spcrcb: '',
-                lcrgodame: ''
-            },
-            rec: {
-                ownusr:'',
-                tenmaxday: '',
-                nomton: '',
-                expplc: '',
-                stacty: '',
-                dkflg: '',
-                rmbflg: '',
-                nomtop: '',
-                avbwth: '',
-                opndat: '',
-                revflg: '',
-                spcbenflg: '',
-                shpdat: '',
-                nam: '',
-                prepertxts18: '',
-                redclsflg: '',
-                nomspc: '',
-                shptrss18: '',
-                spcrcbflg: '',
-                shpfro: '',
-                lcrtyp: '',
-                ownref: '',
-                preadvdt: '',
-                avbby: '',
-                pordis: '',
-                shppar: '',
-                apprul: '',
-                prepers18: '',
-                guaflg: '',
-                expdat: '',
-                shpto: '',
-                rptref: '',
-                chato: '',
-                cnfdet: '',
-                regref: '',
-                porloa: '',
-                apprultxt: '',
-            },
-            adv: {
-              pts: new Pts().data,
-            },
-            con: {
-                namelc: '',
-                pts: new Pts().data,
-            },
-            ini: {
-              pts: new Pts().data,
-            },
-            cbs: {
-                opn2: {
-                    cur: '',
-                    amt: ''
-                },
-                max: {
-                    cur: '',
-                    amt: ''
-                },
-                nom1: {
-                    cur: '',
-                    amt: '',
-                },
-                max2: {
-                    cur: '',
-                    amt: '',
-                }
-            },
-            rmb: {
-              pts: new Pts().data,
-            },
-            drw: {
-              pts: new Pts().data,
-            },
-            ben: {
-              pts: new Pts().data,
-            },
-            apl: {
-              pts: new Pts().data,
-            },
-            avb: {
-              pts: new Pts().data,
-            }
-        },
-        liaall: {
-            limmod: {
-                ownref: '',
-                dggrd: '',
-                limpts: {
-                    wrk: {
-                      pts: new Pts().data,
-                    },
-                    oth: {
-                      pts: new Pts().data,
-                    },
-                    pfcod1: '',
-                    pfcod2: '',
-                    nonrevflg1: '',
-                    nonrevflg2: ''
-                },
-                comamt: '',
-                ccvamt: '',
-                limgrd: '',
-                lmegrd: '',
-                tygrd: ''
-            }
-        },
-        trnmod: {
-            swiadd: {
-                trnchato: '',
-                newnomtop: '',
-                purpos: '',
-                amedat: '',
-                addamtcov: '',
-                newnomton: '',
-                prepers18: '',
-                amenbr: '',
-                nartxt: '',
-                addamt: '',
-                amecur: '',
-                newshpdat: '',
-                newamt: '',
-                newexpdat: '',
-                trnfeetxt: '',
-                ameamt: '',
-                newcur: '',
-                prepertxts18: '',
-                nomspc: '',
-                reqcan: ''
-            }
-        },
-        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,
-      };
+			bcbtyp6: '',
+			modtyp: '',
+			bcbtyp7: '',
+			bcbtyp4: '',
+			bcbtyp5: '',
+			bcbtyp2: '',
+			bcbtyp3: '',
+			bcbtyp1: '',
+			bcbdat: '',
+			litp: {
+				usr: {
+					extkey: ''
+				},
+				aamp: {
+					aammod: {
+						addamtflg: ''
+					}
+				}
+			},
+			bgftktyp: '',
+			litamep: {
+				amenbr: '',
+				cre707flg: '',
+				maxcur: '',
+				engcur: '',
+				lcrdocamep: {
+					modflg: '',
+					modmanflg: '',
+					usrblk: ''
+				},
+				spcbenamep: {
+					modflg: '',
+					modmanflg: '',
+					usrblk: ''
+				},
+				spcrcbamep: {
+					modflg: '',
+					modmanflg: '',
+					usrblk: ''
+				},
+				lcrgodamep: {
+					modflg: '',
+					modmanflg: '',
+					usrblk: ''
+				},
+				maxamt: '',
+				adlcndamep: {
+					modflg: '',
+					modmanflg: '',
+					usrblk: ''
+				},
+				engamt: ''
+			},
+			number: '',
+			litameadv: '',
+			ameadvrmk: '',
+			oldlidgrp: {
+				blk: {
+					narhis: ''
+				},
+				rec: {
+					expdat: '',
+					nomton: '0',
+					shpdat: '',
+					nomtop: '0',
+					prepertxts18: '',
+					prepers18: ''
+				},
+				cbs: {
+					max: {
+						cur: '',
+						amt: ''
+					},
+					nom1: {
+						amt: ''
+					}
+				}
+			},
+			lidgrp: {
+				a2b: {
+					pts: new Pts().data,
+				},
+				blk: {
+					insbnk: '',
+					feetxt: '',
+					mixdet: '',
+					shpper: '',
+					adlcnd: '',
+					addamtcov: '',
+					avbwthtxt: '',
+					defdet: '',
+					lcrdoc: '',
+					lcrgod: '',
+					spcben: '',
+					lcrdocame: '',
+					dftat: '',
+					adlcndame: '',
+					spcbename: '',
+					spcrcbame: '',
+					spcrcb: '',
+					lcrgodame: ''
+				},
+				rec: {
+					ownusr:'',
+					tenmaxday: '',
+					nomton: '',
+					expplc: '',
+					stacty: '',
+					dkflg: '',
+					rmbflg: '',
+					nomtop: '',
+					avbwth: '',
+					opndat: '',
+					revflg: '',
+					spcbenflg: '',
+					shpdat: '',
+					nam: '',
+					prepertxts18: '',
+					redclsflg: '',
+					nomspc: '',
+					shptrss18: '',
+					spcrcbflg: '',
+					shpfro: '',
+					lcrtyp: '',
+					ownref: '',
+					preadvdt: '',
+					avbby: '',
+					pordis: '',
+					shppar: '',
+					apprul: '',
+					prepers18: '',
+					guaflg: '',
+					expdat: '',
+					shpto: '',
+					rptref: '',
+					chato: '',
+					cnfdet: '',
+					regref: '',
+					porloa: '',
+					apprultxt: '',
+					branchInr:'00000047',
+				},
+				adv: {
+					pts: new Pts().data,
+				},
+				con: {
+					namelc: '',
+					pts: new Pts().data,
+				},
+				ini: {
+					pts: new Pts().data,
+				},
+				cbs: {
+					opn2: {
+						cur: '',
+						amt: ''
+					},
+					max: {
+						cur: '',
+						amt: ''
+					},
+					nom1: {
+						cur: '',
+						amt: '',
+					},
+					max2: {
+						cur: '',
+						amt: '',
+					}
+				},
+				rmb: {
+					pts: new Pts().data,
+				},
+				drw: {
+					pts: new Pts().data,
+				},
+				ben: {
+					pts: new Pts().data,
+				},
+				apl: {
+					pts: new Pts().data,
+				},
+				avb: {
+					pts: new Pts().data,
+				}
+			},
+			liaall: {
+				limmod: {
+					ownref: '',
+					dggrd: '',
+					limpts: {
+						wrk: {
+							pts: new Pts().data,
+						},
+						oth: {
+							pts: new Pts().data,
+						},
+						pfcod1: '',
+						pfcod2: '',
+						nonrevflg1: '',
+						nonrevflg2: ''
+					},
+					comamt: '',
+					ccvamt: '',
+					limgrd: '',
+					lmegrd: '',
+					tygrd: ''
+				}
+			},
+			swiadd: {
+				trnchato: '',
+				newnomtop: '',
+				purpos: '',
+				amedat: '',
+				addamtcov: '',
+				newnomton: '',
+				prepers18: '',
+				amenbr: '',
+				nartxt: '',
+				addamt: '',
+				amecur: '',
+				newshpdat: '',
+				newamt: '',
+				newexpdat: '',
+				trnfeetxt: '',
+				ameamt: '',
+				newcur: '',
+				prepertxts18: '',
+				nomspc: '',
+				reqcan: ''
+			},
+			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,
+		};
  }
 }
--- a/src/business/litame/views/index.vue
+++ b/src/business/litame/views/index.vue
@@ -125,7 +125,6 @@ import Addbcb from './Addbcb';
 import Dorpame from './Dorpame';
 import Dogpame from './Dogpame';
 import Adcpame from './Adcpame';
-
 import Engp from '~/components/business/engp/views';
 import Ccvpan from '~/components/business/ccvpan/views';
 import Coninfp from '~/components/business/coninfp/views';

--- a/src/business/litdck/event/index.js
+++ b/src/business/litdck/event/index.js
@@ -31,7 +31,7 @@ export default {
        // lidinr: this.$route.query.inr
        lidgrp:{
          rec:{
-            inr: "00000266",
+            inr:'00000266',
          }
        }
      });

--- a/src/business/litdck/model/check.js
+++ b/src/business/litdck/model/check.js
@@ -219,21 +219,21 @@ export default {
  'brdgrp.rec.rptref':[
    { required: true, message: '必输项'},
  ],
-  'mtabut.coninf.oitinf.oit.inftxt':[
-    {type: 'string', required: false, message: '必输项'},
-    {max: 60,message:'长度不能超过60'}
-  ],
-  'mtabut.coninf.oitset.oit.inftxt':[
-    {type: 'string', required: false, message: '必输项'},
-    {max: 60,message:'长度不能超过60'}
-  ],
-  'mtabut.coninf.conexedat':[
-    {type: 'string', required: false, message: '输入正确的日期'}
-  ],
-  'mtabut.coninf.usr.extkey':[
-    {type: 'string', required: false, message: '必输项'},
-    {max: 8,message:'长度不能超过8'}
-  ],
+  // 'mtabut.coninf.oitinf.oit.inftxt':[
+  //   {type: 'string', required: false, message: '必输项'},
+  //   {max: 60,message:'长度不能超过60'}
+  // ],
+  // 'mtabut.coninf.oitset.oit.inftxt':[
+  //   {type: 'string', required: false, message: '必输项'},
+  //   {max: 60,message:'长度不能超过60'}
+  // ],
+  // 'mtabut.coninf.conexedat':[
+  //   {type: 'string', required: false, message: '输入正确的日期'}
+  // ],
+  // 'mtabut.coninf.usr.extkey':[
+  //   {type: 'string', required: false, message: '必输项'},
+  //   {max: 8,message:'长度不能超过8'}
+  // ],
  'trnmod.trndoc.advnam':[
    {type: 'string', required: false, message: '必输项'},
    {max: 50,message:'长度不能超过50'}
@@ -329,13 +329,13 @@ export default {
  'brdgrp.srm.djuref':[
    {type: 'string', required: false, },
  ],
-  'invtyp' :[
+  'invtyp':[
    {type: 'string', required: true, message: '必输项'}
  ],
-  'outlen.szflg':[
+  'szflg':[
    {type: 'string', required: true, message: '必输项'}
  ],
-  'outlen.acttyp':[
+  'acttyp':[
    {type: 'string', required: false, message: '必输项'}
  ],
  'brdgrp.srm.djutyp':[
@@ -345,8 +345,8 @@ export default {
  * Litdck Check规则
  */
 	'invtyp': null,
-	'outlen.acttyp': null,
-	'outlen.szflg' : null,
+	'acttyp': null,
+	'szflg' : null,
 	'liaall.misamt': null,
 	'liaall.limmod.limpts.oth.pts.extkey': null,
 	'liaall.limmod.ownref': null,

--- a/src/business/litdck/model/index.js
+++ b/src/business/litdck/model/index.js
@@ -75,13 +75,12 @@ export default class Litdck {
        addamtflg: ''
      }
    },
-    outlen: {
-      acttyp: '',
-      szflg: ''
-    },
+    acttyp: '',
+    szflg: '',
    invtyp: '',
    lidgrp: {
      rec: {
+        branchInr:'00000047',
        revflg: '',
        expdat: '',
        expplc: '',

--- a/src/business/litdck/views/Litdckp.vue
+++ b/src/business/litdck/views/Litdckp.vue
@@ -215,9 +215,9 @@
        </el-form-item>
      </c-col>
      <c-col :span="12">
-        <el-form-item label="申报类型" prop="outlen.szflg">
+        <el-form-item label="申报类型" prop="szflg">
          <c-select
-            v-model="model.outlen.szflg"
+            v-model="model.szflg"
            style="width: 100%"
            :code="codes.szflg"
          >
@@ -327,7 +327,7 @@
        <el-form-item label="款项去向" prop="outlen.acttyp">
          <c-select
            :disabled="this.flag1"
-            v-model="model.outlen.acttyp"
+            v-model="model.acttyp"
            :code="codes.acttyp"
          ></c-select>
        </el-form-item>
@@ -563,7 +563,6 @@
 </template>
 <script>
 import event from '../event';
-import Api from '~/service/Api';

 export default {
  inject: ['root'],
@@ -577,10 +576,10 @@ export default {
    };
  },
  watch: {
-    'model.outlen.szflg': {
+    'model.szflg': {
      immediate: true,
      handler(val, oldval) {
-        if (this.model.outlen.szflg == '1') {
+        if (this.model.szflg == '1') {
          this.flag1 = false;
        } else {
          this.flag1 = true;

--- a/src/business/litdck/views/index.vue
+++ b/src/business/litdck/views/index.vue
@@ -10,8 +10,6 @@
           <el-button size="small">智能提示</el-button>
        /div>
     -->
-
-
      <el-form
        :model="model"
        :rules="rules"
@@ -89,15 +87,11 @@
              <m-doctre :model="model" :codes="codes" />
            </c-content>
          </el-tab-pane>
-
+          <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
+        </c-function-btn>
        </c-tabs>
      </el-form>
-      <c-function-btn
-        :handleSubmit="handleSubmit"
-        :handleCheck="handleCheck"
-        :handleStash="handleStash"
-      >
-      </c-function-btn>
+      
      <c-grid-ety-prompt-dialog
        ref="etyDialog"
        :promptData="promptData"