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

src/business/litcan/event/buildCommons.js

@@ -43,7 +43,7 @@ export default {
         fromflg: model.lidgrp.rec.fromflg,
         othersno: model.lidgrp.rec.othersno,
         sndto: model.lidgrp.rec.sndto,
-        swiftflg: model.gitp.swiftflg,
+        // swiftflg: model.gitp.swiftflg,
         liduil: model.lidgrp.rec.liduil,
         purpos: model.lidgrp.rec.purpos,
         revflg: model.lidgrp.rec.revflg,
@@ -134,7 +134,7 @@ export default {
         objtyp: 'LID',
         objinr: model.lidgrp.rec.objinr,
         ownref: model.lidgrp.rec.ownref,
-        swiftflg: model.gitp.swiftflg,
+        // swiftflg: model.gitp.swiftflg,
       },
     };
     return params

src/business/litcan/event/index.js

@@ -103,25 +103,25 @@ export default {
       console.log(key);
     },
     // 业务信息=》基本信息=》保函编号-----获取保函编号
-    async queryOwnref() {
-      let params = {
-        ptainr: this.model.gidgrp.apl.pts.ptainr,
-        businessType: 'LG',
-        tbl: 'LG',
-      };
-      const loading = this.loading();
-      let res = await Api.post('/service/litcan/getOwnRef', params);
-      if (res.respCode == SUCCESS) {
-        loading.close();
-        this.model.gidgrp.rec.ownref = res.data;
-      }
-    },
+    // async queryOwnref() {
+    //   let params = {
+    //     ptainr: this.model.gidgrp.apl.pts.ptainr,
+    //     businessType: 'LG',
+    //     tbl: 'LG',
+    //   };
+    //   const loading = this.loading();
+    //   let res = await Api.post('/service/litcan/getOwnRef', params);
+    //   if (res.respCode == SUCCESS) {
+    //     loading.close();
+    //     this.model.gidgrp.rec.ownref = res.data;
+    //   }
+    // },
     // 获取litcan弹框表格数据
     async queryGridEtyPromptDialogData(type, ptytyp) {
       let params = {
         userId: window.sessionStorage.userId || 'ZL',
         ptytyp: ptytyp,
-        extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
+        extkey: this.model.lidgrp[type.toLowerCase()].pts.extkey,
       };
       let res = await Api.post('/service/ptspta/list', params);
       if (res.respCode == SUCCESS) {
@@ -137,7 +137,7 @@ export default {
       };
       let res = await Api.post('/service/ptspta/fetch', params);
       if (res.respCode == SUCCESS) {
-        this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
+        this.$set(this.model.lidgrp, row.role.toLowerCase(), res.data);
       }
     },
     // 业务信息=》基本信息=》支出目的
@@ -145,27 +145,27 @@ export default {
       this.handleChangeForm(key, value);
     },
     // 初始化保函开立类型码表下拉列表
-    async queryHndtypCodeTableList(trnName) {
-      let params = {
-        gitp: {
-          swiftflg: this.model.gitp.swiftflg,
-        },
-        gidgrp: {
-          rec: {
-            purpos: this.model.gidgrp.rec.purpos,
-          },
-        },
-        transName: trnName.toUpperCase(),
-      };
-      let res = await Api.post('/service/litcan/initHndtyp', params);
-      if (res.respCode == SUCCESS) {
-        this.$set(this.codes, 'voHndtyp', res.data);
-      }
-    },
+    // async queryHndtypCodeTableList(trnName) {
+    //   let params = {
+    //     gitp: {
+    //       swiftflg: this.model.gitp.swiftflg,
+    //     },
+    //     gidgrp: {
+    //       rec: {
+    //         purpos: this.model.gidgrp.rec.purpos,
+    //       },
+    //     },
+    //     transName: trnName.toUpperCase(),
+    //   };
+    //   let res = await Api.post('/service/litcan/initHndtyp', params);
+    //   if (res.respCode == SUCCESS) {
+    //     this.$set(this.codes, 'voHndtyp', res.data);
+    //   }
+    // },
     // 是否SWIFT格式修改--联动保函开立类型
-    handleChangeSwiftflg() {
-      this.queryHndtypCodeTableList(this.root.trnName);
-    },
+    // handleChangeSwiftflg() {
+    //   this.queryHndtypCodeTableList(this.root.trnName);
+    // },
     // 支出目的修改--联动保函开立类型
     handleChangePurpos() {
       this.queryHndtypCodeTableList(this.root.trnName);

src/business/litcan/model/index.js

@@ -8,9 +8,6 @@ export default class Litcan {
 					cur:''
 				}
 			},
-			gitp:{
-				swiftflg:'',
-			},
 			sndmsg: '',
 			lidgrp: {
 				ghd:{
@@ -46,23 +43,13 @@ export default class Litcan {
 					},
 				},
 				apl: {
-					pts: {
-						ref:'',
-						nam:'',
-
-					}
+					pts: new Pts().data,
 				},
 				ben: {
-					pts: {
-						ref:'',
-						nam:'',
-					}
+					pts: new Pts().data,
 				},
 				adv: {
-					pts: {
-						ref:'',
-						nam:'',
-					}
+					pts: new Pts().data,
 				},
 				avbnam: '',			//  指定银行		.lidgrp.avbnam
 			},
@@ -95,69 +82,6 @@ export default class Litcan {
 				adv: {
 					pts: new Pts().data,
 				},
-				apl: {
-					pts: new Pts().data,
-				},
-			},
-			gidgrp: {
-				rec:{
-					objinr:'',
-				},
-				ctr: {
-					pts: new Pts().data,
-				},
-				con: {
-					pts: new Pts().data,
-				},
-				iss: {
-					pts: new Pts().data,
-				},
-				ben: {
-					pts: new Pts().data,
-				},
-				atb: {
-					pts: new Pts().data,
-				},
-				avc: {
-					pts: new Pts().data,
-				},
-				adv: {
-					pts: new Pts().data,
-				},
-				apl: {
-					pts: new Pts().data,
-				},
-				cbs: {
-					max: '',
-				}
-			},
-			liaall: {
-				con: {
-					pts: new Pts().data,
-				},
-				iss: {
-					pts: new Pts().data,
-				},
-				ben: {
-					pts: new Pts().data,
-				},
-				atb: {
-					pts: new Pts().data,
-				},
-				avc: {
-					pts: new Pts().data,
-				},
-			},
-			trnmod: {
-				ctr: {
-					pts: new Pts().data,
-				},
-				con: {
-					pts: new Pts().data,
-				},
-				iss: {
-					pts: new Pts().data,
-				},
 			},
 			byinst: '',			//  On Applicant instruction		.byinst
 			pageId: '',			// ctx的key

src/business/litcan/views/Canp.vue

@@ -64,7 +64,7 @@
         </el-form-item>
        </c-col>
                   
-       <!-- <c-col :span="24">
+       <c-col :span="24">
         <el-form-item label="提货日期" prop="lidgrp.rec.shpdat">
             <c-date-picker disabled type="date"  v-model="model.lidgrp.rec.shpdat" style="width:100%"  placeholder="请选择日期"></c-date-picker>
         </el-form-item>
@@ -73,7 +73,7 @@
         <el-form-item label="有效期限" prop="lidgrp.rec.expdat">
             <c-date-picker disabled type="date"  v-model="model.lidgrp.rec.expdat" style="width:100%"  placeholder="请选择到期日"></c-date-picker>
         </el-form-item>
-       </c-col> -->
+       </c-col>
                   
        <c-col :span="12">
         <el-form-item label="到期地点" prop="lidgrp.rec.expplc">