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/mixin/commonProcess.js

@@ -239,7 +239,7 @@ export default {
      * 下拉框/多选框 改变时执行rule
      * @param {String} rulePath 路径
      */
-    selectOrCheckboxChangeExecuteRule(rulePath){
+     selectOrCheckboxRule(rulePath){
         this.executeRule(rulePath).then((res) => {
             if (res.respCode == SUCCESS) {
                 Utils.copyValueFromVO(this.model, res.data);

src/model/Detopn/Pattern.js

@@ -49,7 +49,7 @@ export default {
 
     "dedgrp.cbs.nom1.amt":[
         {type: "string", required: true, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
+        {max: 18,message:"整数位不能超过15位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "dedgrp.ben.pts.adrblk":[
@@ -83,7 +83,7 @@ export default {
     ],
     "dedgrp.cbs.max.amt":[
         {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
+        {max: 18,message:"整数位不能超过15位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "dedgrp.ben.pts.extact":[

src/model/Public/Mtabut/index.js

@@ -5,14 +5,18 @@ export default class Mtabut {
                 oitinf: {
                     labinftxt: "",			//  Label for INFTXT		.mtabut.coninf.oitinf.labinftxt
                     oit: {
-                        inftxt: {},			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
+                        inftxt: {
+                            rows: []
+                        },			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
                         inflev: "",			//  Infotext Level		.mtabut.coninf.oitinf.oit.inflev
                     },
                 },
                 oitset: {
                     labinftxt: "",			//  Label for INFTXT		.mtabut.coninf.oitset.labinftxt
                     oit: {
-                        inftxt: {},			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
+                        inftxt: {
+                            rows:[]
+                        },			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
                         inflev: "",			//  Infotext Level		.mtabut.coninf.oitset.oit.inflev
                     },
                 },

src/views/Business/Detopn/Detp1.vue

@@ -8,7 +8,7 @@
             v-model="model.dedgrp.rec.isyifu"
             style="width: 100%"
             placeholder="请选择是否可议付"
-            @change="selectOrCheckboxChangeExecuteRule('dedgrp.rec.isyifu')"
+            @change="selectOrCheckboxRule('dedgrp.rec.isyifu')"
           >
             <el-option
               v-for="item in codes.isyifu"

src/views/Business/Detopn/Ovwp.vue

@@ -388,18 +388,6 @@
             </c-col>
 
             <!-- <c-col :span="24">
-        <c-col :span="13">
-          <el-form-item label="货运时间" prop="dedgrp.rec.shpdat">
-            <c-date-picker
-              type="date"
-              v-model="model.dedgrp.rec.shpdat"
-              style="width: 95%"
-              placeholder="请选择Shipment Date"
-            ></c-date-picker>
-          </el-form-item>
-        </c-col>
-      </c-col> -->
-            <c-col :span="24">
                 <c-form-item label="货运时间" prop="dedgrp.rec.shpdat">
                     <c-date-picker
                         type="date"
@@ -408,7 +396,7 @@
                         placeholder="请选择Shipment Date"
                     ></c-date-picker>
                 </c-form-item>
-            </c-col>
+            </c-col> -->
 
             <c-col :span="24">
                 <el-form-item label="转运" prop="dedgrp.rec.shptrs">

src/views/Public/Coninfp.vue

@@ -14,12 +14,7 @@
                         resize="none"
                         show-word-limit
                         placeholder="请输入Infotext"
-                        @change="
-                            valueChange(
-                                $event,
-                                'mtabut.coninf.oitinf.oit.inflev'
-                            )
-                        "
+                        @change="selectOrCheckboxRule('mtabut.coninf.oitinf.oit.inftxt')"
                         :model="model.mtabut.coninf.oitinf.oit.inftxt"
                     ></i-stream-input>
                 </el-form-item>
@@ -53,12 +48,7 @@
                         resize="none"
                         show-word-limit
                         placeholder="请输入Infotext"
-                        @change="
-                            valueChange(
-                                $event,
-                                'mtabut.coninf.oitset.oit.inflev'
-                            )
-                        "
+                        @change="selectOrCheckboxRule('mtabut.coninf.oitset.oit.inftxt')"
                         :model="model.mtabut.coninf.oitset.oit.inftxt"
                     ></i-stream-input>
                 </el-form-item>
@@ -139,7 +129,7 @@ export default {
                 var temp = this.model.mtabut.coninf.oitinf.oit.inftxt.rows;
                 if(temp != null){
                     for(let i = 0; i < temp.length; i++){
-                        if(temp[i].trim() > 0){
+                        if(temp[i].trim().length > 0){
                             return false;
                         }
                     }
@@ -152,7 +142,7 @@ export default {
                 var temp = this.model.mtabut.coninf.oitset.oit.inftxt.rows;
                 if(temp != null){
                     for(let i = 0; i < temp.length; i++){
-                        if(temp[i].trim() > 0){
+                        if(temp[i].trim().length > 0){
                             return false;
                         }
                     }