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

src/business/gitopn/event/index.js

-import Api from "~/service/Api"
+import Api from '~/service/Api';
 
 export default {
-    methods: {
-        // 提交
-        handleSubmit() {
-            console.log('提交', this.model)
-        },
-        // 检核
-        async handleCheck() {
-            // this.$refs['modelForm'].validate((valid) => {
-            //     console.log('valid', valid)
-            // })
-            const loading = this.loading("正在校验数据")
-            const rtnmsg = await Api.post(this.requestPrefix + "/checkAll", {
-                ...this.model,
-                transName: this.trnName,
-                userId: window.sessionStorage.userId || 'ZL'
-            })
-            if (rtnmsg.respCode === SUCCESS) {
-                this.updateValueSet(rtnmsg.codeSet)
-            }
+  methods: {
+    // 提交
+    handleSubmit() {
+      console.log('提交', this.model);
+    },
+    // 检核
+    async handleCheck() {
+      // this.$refs['modelForm'].validate((valid) => {
+      //     console.log('valid', valid)
+      // })
+      const loading = this.loading('正在校验数据');
+      const rtnmsg = await Api.post(this.requestPrefix + '/checkAll', {
+        ...this.model,
+        transName: this.trnName,
+        userId: window.sessionStorage.userId || 'ZL',
+      });
+      if (rtnmsg.respCode === SUCCESS) {
+        this.updateValueSet(rtnmsg.codeSet);
+      }
 
-            if (rtnmsg.respCode === SUCCESS) {
-                const fieldErrors = rtnmsg.fieldErrors;
-                this.updateModel(rtnmsg.data);
-                if (fieldErrors && Object.keys(fieldErrors).length === 0) {
-                    // 清除之前的校验状态
-                    this.getRoot().$refs.modelForm.clearValidate();
-                    this.$notify({
-                        title: "成功",
-                        message: "校验成功",
-                        type: "success",
-                    });
-                    return
-                }
-            }
-            loading.close()
-        },
-        // 暂存
-        handleStash() {
-            console.log('暂存')
-        },
-        // 点击获取按钮拉取当前key字段下的表单数据
-        queryFormData(key) {
-            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/gitopn/getOwnRef', params)
-            if (res.respCode == SUCCESS) {
-                loading.close()
-                this.model.gidgrp.rec.ownref = res.data
-            }
-        },
-        // 获取gitopn弹框表格数据
-        async queryGridEtyPromptDialogData(type, ptytyp) {
-            let params = {
-                userId: window.sessionStorage.userId || 'ZL',
-                ptytyp: ptytyp,
-                extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey
-            }
-            let res = await Api.post('/service/ptspta/list', params)
-            if (res.respCode == SUCCESS) {
-                this.root.$refs['etyDialog'].show = true
-                this.root.promptData.data = res.data.ptaInfos
-                this.root.promptData.type = type
-            }
-        },
-        // 选中gitopn弹框表格的行数据
-        async selectGridEtyPromptData(row) {
-            let params = {
-                ...row
-            }
-            let res = await Api.post('/service/ptspta/fetch', params)
-            if (res.respCode == SUCCESS) {
-                this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data)
-            }
-        },
-        // 业务信息=》基本信息=》支出目的
-        purposChange(key, value) {
-            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/gitopn/initHndtyp', params)
-            if (res.respCode == SUCCESS) {
-                this.$set(this.codes, 'voHndtyp', res.data)
-            }
+      if (rtnmsg.respCode === SUCCESS) {
+        const fieldErrors = rtnmsg.fieldErrors;
+        this.updateModel(rtnmsg.data);
+        if (fieldErrors && Object.keys(fieldErrors).length === 0) {
+          // 清除之前的校验状态
+          this.getRoot().$refs.modelForm.clearValidate();
+          this.$notify({
+            title: '成功',
+            message: '校验成功',
+            type: 'success',
+          });
+          return;
+        }
+      }
+      loading.close();
+    },
+    // 暂存
+    handleStash() {
+      console.log('暂存');
+    },
+    // 点击获取按钮拉取当前key字段下的表单数据
+    queryFormData(key) {
+      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/gitopn/getOwnRef', params);
+      if (res.respCode == SUCCESS) {
+        loading.close();
+        this.model.gidgrp.rec.ownref = res.data;
+      }
+    },
+    // 获取gitopn弹框表格数据
+    async queryGridEtyPromptDialogData(type, ptytyp) {
+      let params = {
+        userId: window.sessionStorage.userId || 'ZL',
+        ptytyp: ptytyp,
+        extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
+      };
+      let res = await Api.post('/service/ptspta/list', params);
+      if (res.respCode == SUCCESS) {
+        this.root.$refs['etyDialog'].show = true;
+        this.root.promptData.data = res.data.ptaInfos;
+        this.root.promptData.type = type;
+      }
+    },
+    // 选中gitopn弹框表格的行数据
+    async selectGridEtyPromptData(row) {
+      let params = {
+        ...row,
+      };
+      let res = await Api.post('/service/ptspta/fetch', params);
+      if (res.respCode == SUCCESS) {
+        this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
+      }
+    },
+    // 业务信息=》基本信息=》支出目的
+    purposChange(key, value) {
+      this.handleChangeForm(key, value);
+    },
+    // 初始化保函开立类型码表下拉列表
+    async queryHndtypCodeTableList(trnName) {
+      let params = {
+        gitp: {
+          swiftflg: this.model.gitp.swiftflg,
         },
-        // 是否SWIFT格式修改--联动保函开立类型
-        handleChangeSwiftflg() {
-            this.queryHndtypCodeTableList(this.root.trnName)
+        gidgrp: {
+          rec: {
+            purpos: this.model.gidgrp.rec.purpos,
+          },
         },
-        // 支出目的修改--联动保函开立类型
-        handleChangePurpos() {
-            this.queryHndtypCodeTableList(this.root.trnName)
-        }
+        transName: trnName.toUpperCase(),
+      };
+      let res = await Api.post('/service/gitopn/initHndtyp', params);
+      if (res.respCode == SUCCESS) {
+        this.$set(this.codes, 'voHndtyp', res.data);
+      }
+    },
+    // 是否SWIFT格式修改--联动保函开立类型
+    handleChangeSwiftflg() {
+      this.queryHndtypCodeTableList(this.root.trnName);
+    },
+    // 支出目的修改--联动保函开立类型
+    handleChangePurpos() {
+      this.queryHndtypCodeTableList(this.root.trnName);
     },
-}
\ No newline at end of file
+  },
+};

src/business/gitopn/model/check.js

@@ -71,7 +71,7 @@ export default {
         {max: 8,message:"长度不能超过8"}
     ],
     "gitp.indirectswiadd":[
-        {type: "string", required: true, message: "必输项"},
+        {required: true, message: "必输项"},
         {max: 9750,message:"长度不能超过9750"}
     ],
     "gidgrp.rec.orcrat":[
@@ -203,7 +203,7 @@ export default {
         {max: 65,message:"长度不能超过65"}
     ],
     "gidgrp.blk.gtxgidtxtc":[
-        {type: "string", required: true, message: "必输项"},
+        {required: true, message: "必输项"},
         {max: 32500,message:"长度不能超过32500"}
     ],
     "gitp.recget.sdamod.dadsnd":[

src/business/gitopn/views/Ovwpc.vue

@@ -46,21 +46,13 @@
           </c-col>
           <c-col :span="24">
             <c-col :span="12">
-              <el-form-item label="保函类型 " prop="gidgrp.rec.gartypc">
+              <el-form-item label="保函类型" prop="gidgrp.rec.gartypc">
                 <c-select
                   v-model="model.gidgrp.rec.gartypc"
                   style="width: 100%"
                   placeholder="请选择保函类型 "
-                  :code="getValues('gidgrp.rec.gartypc','gartypc')"
+                  :code="codes.gartypc"
                 >
-                <!--  -->
-                  <!-- <el-option
-                    v-for="item in codes.gartypc"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option> -->
                 </c-select>
               </el-form-item>
             </c-col>
@@ -243,7 +235,6 @@
                 size="small"
                 type="primary"
                 style="margin: 5px 0 0 10px;width:100px;float:left"
-                @click="onGitpButdifexptxt"
               >
                 查看系统文本
               </c-button>
@@ -252,7 +243,6 @@
                 size="small"
                 type="primary"
                 style="margin: 5px 0 0 10px;width:100px;float:left"
-                @click="onGitpButdifhisexptxt"
               >
                 查看历史文本
               </c-button>

src/business/infgid/event/index.js

-import Api from "~/service/Api"
+import Api from '~/service/Api';
 export default {
-    methods: {
-        async handleSearch() {
-            let opndatfrom = this.model.infcon.opndatfrom;
-            if(!opndatfrom || opndatfrom == ''){
-                this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
-                return;
-            }
-            let opndatto = this.model.infcon.opndatto;
-            if(!opndatto || opndatto == ''){
-                this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
-                return;
-            }
-            let params = {
-                ...this.model.infcon,
-                fenlishi: this.model.fenlishi,
-                seapurpos: this.model.seapurpos,
-                seagtyp: this.model.seagtyp,
-                fromflg: this.model.fromflg,
-                cmtflg: this.model.cmtflg,
-                fingua: this.model.fingua,
-            }
-            let rtnmsg = await Api.post('/service/infgid', params)
-            if (rtnmsg.respCode == SUCCESS) { 
-                this.stmData.data = [];
-                this.stmData.data = rtnmsg.data;
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
-        },
-        async handleReset() {
-            this.model.infcon.seaownref = ""
-            this.model.infcon.opndatfrom = new Date();
-            this.model.infcon.opndatto = new Date();
-            this.isGuarantee = "";
-            this.model.infcon.nam = "";
-            this.model.infcon.pty.extkey = "";
-            this.model.infcon.seapty = "";
-            this.model.infcon.searef = "";
-            this.model.infcon.pty.nam = "";
-            this.model.infcon.searol = "";
-            this.model.infcon.usr.extkey = "";
-            this.model.infcon.seasta = "";
-            this.model.infcon.seacur = "";
-            this.model.infcon.seaamtfr = "";
-            this.model.infcon.seaamtto = "";
-            this.model.seagtyp = ""; 
-            this.model.infcon.relflg = "";
-            this.model.infcon.hndtyp = "";
-            this.model.infcon.cxmflg = "";
-            this.model.seapurpos = "";
-            this.model.seahndtyp = "";
-            this.model.infcon.segtyp = "";
-            this.model.fromflg = "";
-            this.model.fenlishi = "";
-            this.model.cmtflg = "";
-            this.model.fingua = "";
-        },
-    }
-}
\ No newline at end of file
+  methods: {
+    async handleSearch() {
+      let opndatfrom = this.model.infcon.opndatfrom;
+      if (!opndatfrom || opndatfrom == '') {
+        this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
+        return;
+      }
+      let opndatto = this.model.infcon.opndatto;
+      if (!opndatto || opndatto == '') {
+        this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
+        return;
+      }
+      let params = {
+        ...this.model.infcon,
+        fenlishi: this.model.fenlishi,
+        seapurpos: this.model.seapurpos,
+        seagtyp: this.model.seagtyp,
+        fromflg: this.model.fromflg,
+        cmtflg: this.model.cmtflg,
+        fingua: this.model.fingua,
+      };
+      let rtnmsg = await Api.post('/service/infgid', params);
+      if (rtnmsg.respCode == SUCCESS) {
+        this.stmData.data = [];
+        this.stmData.data = rtnmsg.data;
+      } else {
+        this.$notify.error({ title: '错误', message: '服务请求失败！' });
+      }
+    },
+    async handleReset() {
+      this.model.infcon.seaownref = '';
+      this.model.infcon.opndatfrom = new Date();
+      this.model.infcon.opndatto = new Date();
+      this.isGuarantee = '';
+      this.model.infcon.nam = '';
+      this.model.infcon.pty.extkey = '';
+      this.model.infcon.seapty = '';
+      this.model.infcon.searef = '';
+      this.model.infcon.pty.nam = '';
+      this.model.infcon.searol = '';
+      this.model.infcon.usr.extkey = '';
+      this.model.infcon.seasta = '';
+      this.model.infcon.seacur = '';
+      this.model.infcon.seaamtfr = '';
+      this.model.infcon.seaamtto = '';
+      this.model.seagtyp = '';
+      this.model.infcon.relflg = '';
+      this.model.infcon.hndtyp = '';
+      this.model.infcon.cxmflg = '';
+      this.model.seapurpos = '';
+      this.model.seahndtyp = '';
+      this.model.infcon.segtyp = '';
+      this.model.fromflg = '';
+      this.model.fenlishi = '';
+      this.model.cmtflg = '';
+      this.model.fingua = '';
+    },
+  },
+};