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/Botcan/index.js

@@ -5,6 +5,8 @@ import Pub from "../Public"
 export default class Botcan{
     constructor () {
         this.data = {
+			botdrrl1blk:"",
+			botcoll1blk:"",
 						strinf:"",			//  Narrative		.strinf
 						bodgrp:{
 							rec:{

src/model/Botdav/Pattern.js

@@ -78,21 +78,21 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.rec.rcvdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
 
     "bodgrp.rec.shpdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.drr.adrelc":[
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.rec.predat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.rec.advdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.col.pts.ref":[
         {type: "string", required: false, message: "必输项"},
@@ -113,7 +113,7 @@ export default {
     ],
 
     "bodgrp.rec.matdat":[
-        { required: false, message: "输入正确的日期"}
+        //{ required: false, message: "输入正确的日期"}
     ],
 
     "bodgrp.col.namelc":[

src/model/Botdcr/Pattern.js

@@ -50,7 +50,7 @@ export default {
     ],
 
     "bodgrp.rec.matdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.rec.matpercnt":[
         {type: "number", required: false, message: "必输项"},
@@ -66,10 +66,10 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
     "bodgrp.rec.rcvdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.rec.predat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
 
     "rejtypsel":[

src/model/Botrad/Pattern.js

@@ -50,7 +50,7 @@ export default {
     ],
 
     "bodgrp.rec.matdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.rec.matpercnt":[
         {type: "number", required: false, message: "必输项"},
@@ -66,10 +66,10 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
     "bodgrp.rec.rcvdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.rec.predat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "bodgrp.blk.colinssnm":[
         {type: "string", required: false, message: "必输项"},

src/model/Botset/index.js

@@ -5,6 +5,8 @@ import Pub from "../Public"
 export default class Botset{
     constructor () {
         this.data = {
+			botdrrl1blk:"",
+			botcoll1blk:"",
 						bodgrp:{
 							blk:{
 								colins:"",			//  Collection Instructions		.bodgrp.blk.colins

src/views/Business/Botdav/Ovwp.vue

@@ -28,7 +28,7 @@
     <c-col :span="11">
       <c-col :span="24">
         <c-col :span="12">
-          <el-form-item label="Responsible User" prop="ditp.usr.extkey" style="width: 100%">
+          <el-form-item label="Responsible User" prop="botp.usr.extkey" style="width: 100%">
             <c-row>
               <c-col :span="20">
                 <c-input style="width: 95%" v-model="model.botp.usr.extkey" maxlength="8" placeholder="请输入User ID"

src/views/Business/Botdcr/Ptyp.vue

@@ -142,7 +142,6 @@ export default {
             },
         },
     created:function(){
-        onsole.log(this.root);
     }
 }
 </script>

src/views/Business/Botrad/Ptyp.vue

@@ -167,7 +167,6 @@
             },
         },
         created: function () {
-            onsole.log(this.root);
         }
     }
 </script>