Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/components/IStreamInput.vue

+<template>
+    <div>
+        <c-input
+            v-bind="$attrs"
+            v-model="value"
+            @change="onChange"
+        ></c-input>
+    </div>
+</template>
+
+<script>
+export default {
+    props:['model'],
+    created:function(){
+      this.model["rows"] = this.model["rows"]||[];
+      this.value=this.model["rows"].join("\n");
+    },
+    data:function(){
+        return {
+            value:""
+        }
+    },
+    methods:{
+        onChange(){
+          this.model["rows"]=this.value.split("\n");
+          console.log(this.model["rows"]);
+          this.$emit("change",this.value);
+        }
+    }
+    
+}
+</script>

src/model/Ditopn/Pattern.js

@@ -595,14 +595,14 @@ export default {
         { type: "string", required: false, message: "必输项" },
         { max: 14, message: "长度不能超过14" }
     ],
-    "mtabut.coninf.oitinf.oit.inftxt": [
-        { type: "string", required: false, message: "必输项" },
-        { max: 60, message: "长度不能超过60" }
-    ],
-    "mtabut.coninf.oitset.oit.inftxt": [
-        { type: "string", required: false, message: "必输项" },
-        { max: 60, message: "长度不能超过60" }
-    ],
+    // "mtabut.coninf.oitinf.oit.inftxt": [
+    //     { type: "string", required: false, message: "必输项" },
+    //     { max: 60, message: "长度不能超过60" }
+    // ],
+    // "mtabut.coninf.oitset.oit.inftxt": [
+    //     { type: "string", required: true, message: "必输项" },
+    //     { max: 60, message: "长度不能超过60" }
+    // ],
 
     "mtabut.coninf.conexedat": [
         { required: false, message: "输入正确的日期" }

src/model/Public/Mtabut/index.js

@@ -5,14 +5,14 @@ export default class Mtabut {
                 oitinf: {
                     labinftxt: "",			//  Label for INFTXT		.mtabut.coninf.oitinf.labinftxt
                     oit: {
-                        inftxt: "",			//  Infotext		.mtabut.coninf.oitinf.oit.inftxt
+                        inftxt: {},			//  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: {},			//  Infotext		.mtabut.coninf.oitset.oit.inftxt
                         inflev: "",			//  Infotext Level		.mtabut.coninf.oitset.oit.inflev
                     },
                 },

src/views/Public/Coninfp.vue

@@ -7,16 +7,16 @@
           label="General"
           prop="mtabut.coninf.oitinf.oit.inftxt"
         >
-          <c-input
+          <i-stream-input
             type="textarea"
-            :rows="6"
-            @change="valueChange($event, 'mtabut.coninf.oitinf.oit.inflev')"
-            v-model="model.mtabut.coninf.oitinf.oit.inftxt"
+            rows="6"
             maxlength="60"
             resize="none"
             show-word-limit
             placeholder="请输入Infotext"
-          ></c-input>
+            @change="valueChange($event, 'mtabut.coninf.oitinf.oit.inflev')"
+            :model="model.mtabut.coninf.oitinf.oit.inftxt"
+          ></i-stream-input>
         </el-form-item>
       </c-col>
       <c-col :span="7" :offset="1">
@@ -37,16 +37,16 @@
     <c-col :span="24">
       <c-col :span="15">
         <el-form-item label="Settlement" prop="mtabut.coninf.oitset.oit.inftxt">
-          <c-input
+          <i-stream-input
             type="textarea"
-            :rows="6"
-            @change="valueChange($event, 'mtabut.coninf.oitset.oit.inflev')"
-            v-model="model.mtabut.coninf.oitset.oit.inftxt"
+            rows="6"
             maxlength="60"
             resize="none"
             show-word-limit
             placeholder="请输入Infotext"
-          ></c-input>
+            @change="valueChange($event, 'mtabut.coninf.oitset.oit.inflev')"
+            :model="model.mtabut.coninf.oitset.oit.inftxt"
+          ></i-stream-input>
         </el-form-item>
       </c-col>
       <c-col :span="7" :offset="1">
@@ -90,7 +90,9 @@
 // 附言页签,勿改
 import _ from "~/utils/Lodash.js";
 import CommonProcess from "~/mixin/CommonProcess";
+import IStreamInput from '~/components/IStreamInput'
 export default {
+  components: {IStreamInput},
   inject: ["root"],
   props: ["model", "codes"],
   mixins: [CommonProcess],