bot交易bug修改

src/model/Botdav/Pattern.js

@@ -354,7 +354,7 @@ export default {
         {max: 80,message:"长度不能超过80"}
     ],
     "bodgrp.srm.djudat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.srm.djuref":[
         {type: "string", required: false, message: "必输项"},

src/views/Business/Botame/index.vue

@@ -127,6 +127,7 @@ import Engp from "~/views/Public/Engp"
 
 
 export default {
+     name: "botame",
     components:{
         "m-amep" : Amep,
         "m-ovwp" : Ovwp,

src/views/Business/Botdav/Ovwp.vue

@@ -12,7 +12,7 @@
         <c-col :span="1">
         </c-col>
         <c-col :span="3" style="text-align: right">
-          <c-button style="margin:0 0" size="small" type="primary" :disabled="this.flag" @click="onBotpButgetref">
+          <c-button style="margin:0 0" size="small" type="primary" :disabled="this.model.bodgrp.drr.pts.extkey==''" @click="onBotpButgetref">
             获取
           </c-button>
         </c-col>

src/views/Business/Botdav/Ptyp.vue

@@ -27,6 +27,7 @@
         <c-col :span="24">
             <c-table max-height="300px" style="text-align: center;" stripe :list="this.model.botp.ptsaddp.ptsaddg || []"
                 :paginationShow="false" :border="true">
+                <el-table-column label="Additional Parties">
                 <el-table-column label="角色" width="auto" prop="rol">
                     <template slot-scope="scope">
                         <c-select v-model="scope.row.rol" :code="ptyp2">
@@ -71,6 +72,7 @@
                         </el-button>
                     </template>
                 </el-table-column>
+                </el-table-column>
             </c-table>
         </c-col>
 

src/views/Business/Botset/Basp2.vue

@@ -81,19 +81,19 @@
 
        <c-col :span="24">
         <el-form-item label="结汇金额" prop="bopmod.dbdgrp.bas.lcyamt">
-            <c-input  v-model="model.bopmod.dbdgrp.bas.lcyamt"  placeholder="请输入结汇金额"></c-input>
+            <c-input-currency  v-model="model.bopmod.dbdgrp.bas.lcyamt"  placeholder="请输入结汇金额"></c-input-currency>
         </el-form-item>
        </c-col>
 
        <c-col :span="24">
         <el-form-item label="现汇金额" prop="bopmod.dbdgrp.bas.fcyamt">
-            <c-input  v-model="model.bopmod.dbdgrp.bas.fcyamt"  placeholder="请输入现汇金额"></c-input>
+            <c-input-currency  v-model="model.bopmod.dbdgrp.bas.fcyamt"  placeholder="请输入现汇金额"></c-input-currency>
         </el-form-item>
        </c-col>
 
        <c-col :span="24">
         <el-form-item label="其它金额" prop="bopmod.dbdgrp.bas.othamt">
-            <c-input  v-model="model.bopmod.dbdgrp.bas.othamt"  placeholder="请输入其它金额"></c-input>
+            <c-input-currency  v-model="model.bopmod.dbdgrp.bas.othamt"  placeholder="请输入其它金额"></c-input-currency>
         </el-form-item>
        </c-col>
 
@@ -114,7 +114,7 @@
                   
        <c-col :span="14">
         <el-form-item label="" prop="bopmod.dbdgrp.bas.txamt" label-width="5px">
-            <c-input  disabled v-model="model.bopmod.dbdgrp.bas.txamt"  placeholder="请输入收入款币种及金额"></c-input>
+            <c-input-currency  disabled v-model="model.bopmod.dbdgrp.bas.txamt"  placeholder="请输入收入款币种及金额"></c-input-currency>
         </el-form-item>
        </c-col>
        
@@ -239,7 +239,7 @@
                   
        <c-col :span="14">
         <el-form-item label="" prop="bopmod.dbdgrp.bas.inchargeamt" label-width="5px">
-            <c-input disabled v-model="model.bopmod.dbdgrp.bas.inchargeamt"  placeholder="请输入国内银行扣费"></c-input>
+            <c-input-currency disabled v-model="model.bopmod.dbdgrp.bas.inchargeamt"  placeholder="请输入国内银行扣费"></c-input-currency>
         </el-form-item>
        </c-col>
        </el-col>

src/views/Business/Botset/Setp.vue

@@ -295,9 +295,10 @@
 
     <c-col :span="12">
       <c-col :span="24">
-        <c-checkbox v-model="model.bodgrp.rec.focflg" @change="change"
-          >Free of Payment</c-checkbox
-        >
+        <el-form-item label="" prop="bodgrp.rec.focflg">
+        <c-checkbox v-model="model.bodgrp.rec.focflg" 
+          >Free of Payment</c-checkbox>
+        </el-form-item>
       </c-col>
       <c-col :span="12">
         <el-form-item label="Reduction Amt." prop="setmod.doccur">
@@ -333,11 +334,12 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
+        <el-form-item label="" prop="mtabut.clsflg">
         <c-checkbox
           :disabled="this.flag1"
           v-model="model.mtabut.clsflg"
-          >Close Contract</c-checkbox
-        >
+          >Close Contract</c-checkbox>
+        </el-form-item>
       </c-col>
 
       <c-col :span="12">
@@ -436,20 +438,13 @@ export default {
   computed: {
     clsflg: {
       get() {
-        return this.model.mtabut.clsflg === "X";
+        return this.model.mtabut.clsflg === "O";
       },
       set(val) {
-        this.model.mtabut.clsflg = val ? "x" : "";
-      },
-    },
-    focflg: {
-      get() {
-        return this.model.bedgrp.rec.focflg === "X";
-      },
-      set(val) {
-        this.model.bedgrp.rec.focflg = val ? "X" : "";
+        this.model.mtabut.clsflg = val ? "C" : "O";
       },
     },
+    
     flag() {
       return this.model.mtabut.coninf.usr.extkey == "";
     },
@@ -458,34 +453,24 @@ export default {
     this.$nextTick(() => {});
   },
 
-// watch:{
-//         "model.setmod.docamt":function(){
-//             if(this.model.bodgrp.cbs.opn1.amt==this.model.setmod.docamt){
-//             this.model.mtabut.clsflg = "X";
-//     }
-//         },
-//       },
   methods: {
     ...Event,
     async change1(){
       if(this.model.bodgrp.cbs.opn1.amt<=this.model.setmod.docamt){
-            this.model.mtabut.clsflg = "X";
-            this.flag1=false;}
+            this.flag1=false;
+            this.model.mtabut.clsflg = "O";
+          }
       else if(this.model.bodgrp.cbs.opn1.amt>this.model.setmod.docamt){
-            this.model.mtabut.clsflg = "";
             this.flag1=true;
+            this.model.mtabut.clsflg = "C";
     }},
-    async change() {
-      if (this.model.bodgrp.rec.focflg === "X") {
-        this.model.setmod.redamt = this.model.setmod.docamt;
-        // let rtnmsg = await this.executeDefault("setmod.redamt");
-        // this.model.bodgrp.rec.docsta ="D"
-      } else {
-        this.model.setmod.redamt = "0.00";
-        // let rtnmsg = await this.executeDefault("setmod.redamt");
-        // this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
-      }
-    },
+    // async change() {
+    //   if (this.model.bodgrp.rec.focflg === "X") {
+    //     this.model.setmod.redamt = this.model.setmod.docamt;
+    //   } else {
+    //     this.model.setmod.redamt = "0.00";
+    //   }
+    // },
     async multipleSelect(selection) {
             if (selection.length > 1) {
                 this.$notify({
@@ -497,10 +482,8 @@ export default {
                 let chkIds;
                 if (selection.length === 0) {
                     chkIds = [];
-                    this.$nextTick(async () => {
-                        this.model.setmod.docamt = "0.00";
-                    })
                     this.model.liaall.tensetstm.rows = [];
+                    this.flag1=true;
                 } else {
                     chkIds = [selection[0] + 1];
                 }