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/model/Litopn/Pattern.js

@@ -219,8 +219,9 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "lidgrp.rec.prepers18":[
-        { required: false, },
-        
+      {type: "number", required: false, message: "请输入数字"},
+      {type: "number",max: 999,message:"不能超过999"},
+      {pattern: /^-?[1-9][0-9]{0,2}$/, message: "应在-999至999之间" }
     ],
 
     "litp.avbp.ptsget.sdamod.dadsnd":[
@@ -320,8 +321,10 @@ export default {
         {max: 65,message:"长度不能超过65"}
     ],
     "lidgrp.rec.tenmaxday":[
-        { required: true, },
-        
+        {type: "number", required: false, message: "请输入数字"},
+        {type: "number",max: 999,message:"不能超过999"},
+        {pattern: /(^-?[1-9][0-9]{0,2}$)|0/, message: "-999至999之间" }
+        // ^-?[1-9]\d*$　　 //匹配整数
     ],
     "lidgrp.rec.porloa":[
         {type: "string", required: false, message: "必输项"},

src/views/Business/Litopn/Detp.vue

@@ -347,7 +347,7 @@
       <c-col :span="24">
         <el-form-item label="提交期限（天）" prop="lidgrp.rec.prepers18">
           <c-input
-            v-model="model.lidgrp.rec.prepers18"
+            v-model.number="model.lidgrp.rec.prepers18"
             style="width: 100%"
             placeholder="请输入天数"
           ></c-input>
@@ -449,7 +449,7 @@
         >
           <c-input
             :disabled="!!(this.model.lidgrp.rec.avbby == 'P')"
-            v-model="model.lidgrp.rec.tenmaxday"
+            v-model.number="model.lidgrp.rec.tenmaxday"
             placeholder="请输入天数"
           ></c-input>
         </el-form-item>

src/views/Public/Engp.vue

@@ -77,6 +77,7 @@
                   label-width="0"
                   :prop="'liaall.liaallg.' + scope.$index + '.acc'"
                 >
+                {{scope.row.acc}}
                   <!-- <c-input
                 v-model="scope.row.acc"
                 style="width: 100%"