Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/config/CodeTable/index.js

@@ -4995,10 +4995,6 @@ const CodeTable = {
         { label: "Reverse Booking (Document Set)", value: "N" },
         { label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
     ],
-    rebkpflg1: [
-        { label: "Reverse Booking (Document Set)", value: "N" },
-        { label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
-    ],
     refper: [
         { label: "Same Week", value: "W=" },
         { label: "Same Half-Year", value: "H=" },

src/model/Betrcl/Pattern.js

@@ -18,7 +18,7 @@ export default {
     "ledgrp.cbs.opn1.amt": [
         { type: "string", required: false, message: "必输项" },
         { max: 18, message: "整数位不能超过14位" },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "betp.recget.sdamod.dadsnd": [
         { type: "string", required: false, message: "必输项" },

src/model/Bftcan/Pattern.js

@@ -18,7 +18,7 @@ export default {
     "dedgrp.cbs.opn1.amt": [
         { required: false, message: "必输项" },
         { max: 18, message: "整数位不能超过14位" },
-        { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "bftp0.recget.sdamod.dadsnd": [
         { type: "string", required: false, message: "必输项" },

src/views/Business/Betrcl/Rclp.vue

@@ -713,17 +713,17 @@ export default {
           type: "error",
         });
       } else {
-        let selIds;
+        let chkIds;
         if (selection.length === 0) {
-          selIds = []
-          this.model.liaall.tensetstm.rows = []
+          chkIds = []
+          // this.model.liaall.tensetstm.rows = []
           // this.model.liaall.tenstm.rows = []
         } else {
-          selIds = [selection[0] + 1]
+          chkIds = [selection[0] + 1]
         }
         //
         console.log(this.model.liaall.tensetstm);
-        let params = { selDst: "liaall.tenstm", selIds };
+        let params = { chkDst: "liaall.tenstm", chkIds };
         const rtnmsg = await this.executeRule("liaall.tenstm", params);
         if (rtnmsg.respCode == SUCCESS) {
           this.updateModel(rtnmsg.data);

src/views/Business/Betset/Setp.vue

@@ -761,17 +761,17 @@ export default {
           type: "error",
         });
       } else {
-        let selIds;
+        let chkIds;
         if (selection.length === 0) {
-          selIds = []
-          this.model.liaall.tensetstm.rows = []
+          chkIds = []
+          // this.model.liaall.tensetstm.rows = []
           // this.model.liaall.tenstm.rows = []
         } else {
-          selIds = [selection[0] + 1]
+          chkIds = [selection[0] + 1]
         }
         //
         console.log(this.model.liaall.tensetstm);
-        let params = { selDst: "liaall.tenstm", selIds };
+        let params = { chkDst: "liaall.tenstm", chkIds };
         const rtnmsg = await this.executeRule("liaall.tenstm", params);
         if (rtnmsg.respCode == SUCCESS) {
           this.updateModel(rtnmsg.data);

src/views/Business/Bftcan/Canp.vue

@@ -361,9 +361,10 @@
           v-model="model.rebkpflg"
           style="width: 100%"
           placeholder="请选择Booking Procedure"
+          @change="executeDefault('rebkpflg')"
         >
           <el-option
-            v-for="item in codes.rebkpflg1"
+            v-for="item in codes.rebkpflg"
             :key="item.value"
             :label="item.label"
             :value="item.value"

src/views/Business/Bftset/Setp.vue

@@ -332,6 +332,9 @@
             <c-input
               v-model="model.setmod.docamt"
               placeholder="请输入付款金额"
+              @change="eventFunction(
+                    'setmod.docamt'
+                  )"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -354,6 +357,9 @@
               v-model="model.setmod.setamt"
               placeholder="请输入扣费后付款金额"
               disabled
+              @change="eventFunction(
+                    'setmod.setamt'
+                  )"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -376,6 +382,9 @@
               v-model="model.aamset.utlamt"
               placeholder="请输入单据金额"
               disabled
+              @change="eventFunction(
+                    'aamset.utlamt'
+                  )"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -908,17 +917,17 @@ export default {
           type: "error",
         });
       } else {
-        let selIds;
+        let chkIds;
         if (selection.length === 0) {
-          selIds = []
-          this.model.liaall.tensetstm.rows = []
+          chkIds = []
+          // this.model.liaall.tensetstm.rows = []
           // this.model.liaall.tenstm.rows = []
         } else {
-          selIds = [selection[0] + 1]
+          chkIds = [selection[0] + 1]
         }
         //
         console.log(this.model.liaall.tensetstm);
-        let params = { selDst: "liaall.tenstm", selIds };
+        let params = { chkDst: "liaall.tenstm", chkIds };
         const rtnmsg = await this.executeRule("liaall.tenstm", params);
         if (rtnmsg.respCode == SUCCESS) {
           this.updateModel(rtnmsg.data);