Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

src/page/Frontend/Nxysdb/event/index.js

@@ -5,6 +5,14 @@ import Utils from "~/utils";
 export default {
   methods: {
     async handleSearch() {
+      let dtatyp = this.model.nxpp.dtatyp;
+      if (!dtatyp || dtatyp == "") {
+        this.$notify.error({
+          title: this.$t("financing.错误"),
+          message: this.$t("financing.基础数据类型必输！"),
+        });
+        return;
+      }
       this.load = true;
       let rtnmsg = await Api.post("/frontend/nxysdb/query", {
         ...this.model.nxpp,

src/page/Frontend/Nxysdb/views/Mainpanel.vue

@@ -239,8 +239,10 @@ export default {
       handler(newVal) {
         if (newVal == '2') {
           this.stmData.columns = this.nxyrellstHead;
+          this.stmData.data = "";
         } else {
           this.stmData.columns = this.nxypatlstHead;
+          this.stmData.data = "";
         }
       },
       immediate: true

src/page/Remittance/Cptadv/views/swift/Opnp1.vue

@@ -91,7 +91,7 @@
           </el-form-item>
         </c-col>
         <!-- SG000818 : Uetr -->
-        <c-col :span="24" v-if="model.cpdgrp.rec.swftyp!='OTH'">
+        <!-- <c-col :span="24" v-if="model.cpdgrp.rec.swftyp!='OTH'">
           <el-form-item label="Uetr（121）" prop="cpdgrp.rec.uetr">
             <c-fullbox>
               <c-input disabled v-model="model.cpdgrp.rec.uetr" maxlength="40" placeholder="请输入Uetr"></c-input>
@@ -102,7 +102,7 @@
               </template>
             </c-fullbox>
           </el-form-item>
-        </c-col>
+        </c-col> -->
 
         <c-col :span="24">
           <el-form-item label="解付日期" prop="cpdgrp.rec.paydat">

src/page/Remittance/Cptopn/event/index.js

@@ -285,10 +285,11 @@ export default {
       let res = await Api.post(`/${this.moduleRouter()}/cptopn/calAmt`, this.model);
       loading.close();
       if (res.respCode === SUCCESS) {
-        console.log("计算金额为:"+res.data);
+        console.log("计算金额为:"+res.data.amt);
         if(this.model.calflg == "Y"){
-          this.model.cpdgrp.cbs.nom1.amt = res.data;
-          this.model.cpdgrp.cbs.max.amt = res.data;
+          this.model.cpdgrp.cbs.nom1.amt = res.data.amt;
+          this.model.cpdgrp.cbs.max.amt = res.data.amt;
+          this.model.cpdgrp.rec.f36 = res.data.f36;
           if(this.model.cpdgrp.cbs.nom1.amt != '' && this.model.cpdgrp.cbs.nom1.amt != 0){
             this.buildSetmod();
           }