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

src/model/Brtame/Pattern.js

@@ -17,7 +17,7 @@ export default {
     ],
 
     "lidgrp.cbs.nom1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -31,7 +31,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "lidgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -101,7 +101,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "brdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -136,7 +136,7 @@ export default {
     ],
     "brdgrp.blk.relstoadr":[
         {type: "string", required: true, message: "必输项"},
-        {max: 35,message:"长度不能超过35"}
+        {max: 180,message:"长度不能超过180"}
     ],
 
     "brdgrp.blk.vesnam":[

src/model/Brtame/index.js

@@ -87,6 +87,10 @@ export default class Brtame{
 									cur:"",			//  Amount of Shipment		.brdgrp.cbs.max.cur
 									amt:"",			//  Balance		.brdgrp.cbs.max.amt
 								},
+                                opn1:{
+									cur:"",			//  Amount of Shipment		.brdgrp.cbs.max.cur
+									amt:"",			//  Balance		.brdgrp.cbs.max.amt
+								},
 							},
 							blk:{
 								vesnam:"",			//  Vessel Name		.brdgrp.blk.vesnam

src/views/Business/Brtame/index.vue

@@ -72,6 +72,7 @@ import Api from "~/service/Api";
 import CodeTable from "~/config/CodeTable";
 import Brtame from "~/model/Brtame";
 import commonProcess from "~/mixin/commonProcess";
+import commonFuncs from "~/mixin/commonFuncs";
 import Check from "~/model/Brtame/Check";
 import Default from "~/model/Brtame/Default";
 import Pattern from "~/model/Brtame/Pattern";
@@ -102,7 +103,7 @@ export default {
             root: this,
         };
     },
-    mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
+    mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
     data() {
         return {
             tabVal: "rog",
@@ -113,7 +114,9 @@ export default {
             defaultRules: Default,
             pattern: Pattern,
             rules: null,
-            codes: {},
+            codes: {
+                ...CodeTable
+            },
         };
     },
     methods: {

src/views/Public/AppBenPre.vue

+<template>
+    <div>
+        <c-col :span="24">
+            <div v-for="(item, idx) in rol" :key="idx">
+                <c-ptsmsg
+                    :model="model"
+                    :argadr="{
+                        title: item.title,
+                        grp: `${argadr.trans}`,
+                        rol: item.trans,
+                    }"
+                    :disabled="true"
+                ></c-ptsmsg>
+            </div>
+        </c-col>
+    </div>
+</template>
+<script>
+import Api from "~/service/Api";
+import commonProcess from "~/mixin/commonProcess";
+import Ptsmsg from "~/views/Public/Ptsmsg";
+// 机构信息模块
+export default {
+    inject: ["root"],
+    mixins: [commonProcess],
+    components: {
+        "c-ptsmsg": Ptsmsg,
+    },
+    props: {
+        model: {
+            type: Object,
+            default: undefined,
+        },
+        argadr: {
+            type: Object,
+            default: function () {
+                return {
+                    title: "", //角色名称
+                    trans: "", //所属模块
+                };
+            },
+        },
+        rol: {
+            type: Array,
+            default: () => [],
+        },
+    },
+    data() {
+        return {
+            data: [],
+        };
+    },
+    watch: {},
+    methods: {},
+
+    created: function () {},
+};
+</script>
+<style>
+</style>

src/views/Public/Setpan.vue

@@ -106,7 +106,7 @@
                 </el-table-column>
                 <el-table-column label="Payee" width="101px">
                     <template slot-scope="scope">
-                        <c-select v-model="scope.row.payee">
+                        <c-select v-model="scope.row.ptypay">
                             <el-option
                                 v-for="item in codes.payee"
                                 :key="item.value"