基础资料F10.12

src/views/iosBasicData/baccelements/index.vue

@@ -74,6 +74,12 @@
         selectionList: [],
         option: {},
         optionBack: {
+            addBtnText:'新建核算要素',
+            addTitle:'新建核算要素',
+            editBtnText:'编辑',
+            editTitle:'编辑核算要素',
+            viewBtnText:'查看',
+            viewTitle:'查看核算要素',
           height:'auto',
           stripe: true,
           calcHeight: 30,
@@ -203,6 +209,8 @@
             {
               label: "版本",
               prop: "version",
+                hide:true,
+                display:false,
             },
             {
               label: "状态",

src/views/iosBasicData/baccitemstype/baccitems.vue

@@ -146,6 +146,7 @@ export default {
 
             // 获取到的数据
             form:{
+                status:0,
                 accItemsList:[]
             },
             // 基础资料数据

src/views/iosBasicData/baccitemstype/index.vue

@@ -27,7 +27,7 @@
                   <el-button type="primary"
                              size="small"
                              icon="el-icon-plus"
-                             @click="addbtnfun()">新增
+                             @click="addbtnfun()">新增核算项目
                   </el-button>
                   <el-button type="danger"
                              size="small"

src/views/iosBasicData/bcntrtypes/index.vue

@@ -40,6 +40,11 @@
             </el-button>
         </template>
       <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-plus"
+                     @click="addbtnfun()">新建集装箱
+          </el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
@@ -47,6 +52,30 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+        <template slot-scope="scope" slot="menu">
+            <el-button
+                type="text"
+                icon="el-icon-view"
+                size="small"
+                @click.stop="rowViewfun(scope.row,scope.index)"
+            >查看
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowEditfun(scope.row,scope.index)"
+            >编辑
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowDel(scope.row,scope.index)"
+            >删除
+            </el-button>
+
+        </template>
     </avue-crud>
 
       <el-dialog
@@ -136,12 +165,18 @@
         selectionList: [],
         option:{},
         optionBack: {
+            addBtnText:'新建集装箱',
+            addTitle:'新建集装箱',
+            editBtnText:'编辑',
+            editTitle:'编辑集装箱',
+            viewBtnText:'查看',
+            viewTitle:'查看集装箱',
           height:'auto',
           stripe: true,
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 24,
+          searchMenuSpan: 6,
             labelWidth:120,
           border: true,
           index: true,
@@ -149,27 +184,27 @@
           selection: true,
           dialogClickModal: false,
           column: [
+            // {
+            //   label: "箱型 ISO 代码",
+            //   prop: "code",
+            //     width: 100,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入箱型 ISO 代码,20GP,40HC etc.",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "箱型 95 码",
+            //   prop: "code95",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入箱型 95 码,22G1, 45R1 etc.",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
-              label: "箱型 ISO 代码",
-              prop: "code",
-                width: 100,
-              rules: [{
-                required: true,
-                message: "请输入箱型 ISO 代码,20GP,40HC etc.",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "箱型 95 码",
-              prop: "code95",
-              rules: [{
-                required: true,
-                message: "请输入箱型 95 码,22G1, 45R1 etc.",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "海关代码",
+              label: "代码",
               prop: "customsCode",
                 search: true,
               rules: [{
@@ -179,22 +214,22 @@
               }]
             },
             {
-              label: "箱型 GP",
+              label: "箱型",
               prop: "cntrType",
-              rules: [{
-                required: true,
-                message: "请输入箱型 GP, HC, COLOAD etc.",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入箱型 GP, HC, COLOAD etc.",
+              //   trigger: "blur"
+              // }]
             },
             {
-              label: "尺码 V20",
+              label: "尺码",
               prop: "cntrSize",
-              rules: [{
-                required: true,
-                message: "请输入尺码 V20, V40, COLOAD etc.",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入尺码 V20, V40, COLOAD etc.",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "中文名称",
@@ -219,47 +254,47 @@
             {
               label: "皮重 KGS",
               prop: "tareWeight",
-              rules: [{
-                required: true,
-                message: "请输入皮重 KGS",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入皮重 KGS",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "净重",
               prop: "netWeight",
-              rules: [{
-                required: true,
-                message: "请输入净重，即货重 KGS",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入净重，即货重 KGS",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "毛重",
               prop: "grossWeight",
-              rules: [{
-                required: true,
-                message: "请输入毛重，即最大总重 KGS",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入毛重，即最大总重 KGS",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "体积 CBM",
               prop: "volume",
-              rules: [{
-                required: true,
-                message: "请输入体积 CBM",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入体积 CBM",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "TEU",
               prop: "teu",
-              rules: [{
-                required: true,
-                message: "请输入TEU",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入TEU",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "是否普柜",
@@ -362,6 +397,7 @@
               {
                   label: "创建时间",
                   prop: "createTime",
+                  width:160,
                   display:false,
               },
               {
@@ -378,6 +414,7 @@
               {
                   label: "修改时间",
                   prop: "updateTime",
+                  width:160,
                   display:false,
               },
               {
@@ -398,10 +435,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.bcntrtypes_add, false),
-          // viewBtn: this.vaildData(this.permission.bcntrtypes_view, false),
-          // delBtn: this.vaildData(this.permission.bcntrtypes_delete, false),
-          // editBtn: this.vaildData(this.permission.bcntrtypes_edit, false)
+          addBtn: this.vaildData(this.permission.bcntrtypes_add, false),
+          viewBtn: this.vaildData(this.permission.bcntrtypes_view, false),
+          delBtn: this.vaildData(this.permission.bcntrtypes_delete, false),
+          editBtn: this.vaildData(this.permission.bcntrtypes_edit, false)
         };
       },
       ids() {
@@ -441,13 +478,35 @@
         },
         // 扩展数据编辑
         extendedDataEdit(index,row) {
-            row.edit = !row.edit
+            this.$set(row,'edit',!row.edit)
+            // row.edit = !row.edit
         },
         // 扩展数据删除
         extendedDataDelete(index,row) {
             this.form.extendedDataArr.splice(index,1)
         },
 
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
+        // 查看
+        rowViewfun(row,index){
+            this.extendedDisabled = true
+            this.$refs.crud.rowView(row,index)
+        },
+        // 编辑
+        rowEditfun(row,index){
+            bcntrtypesDetail(row.id).then(res => {
+                this.form = res.data.data;
+                this.form.extendedDataArr.map(item=>{
+                    item.edit = false
+                })
+                this.$refs.crud.rowEdit(row,index)
+            });
+        },
+
 
       rowSave(row, done, loading) {
           row.extendedDataArr.map(item=>{

src/views/iosBasicData/bcommodity/index.vue

@@ -29,6 +29,11 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-plus"
+                     @click="addbtnfun()">新建包装
+          </el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
@@ -77,6 +82,12 @@
         selectionList: [],
         option:{},
         optionBack: {
+            addBtnText:'新建货物',
+            addTitle:'新建货物',
+            editBtnText:'编辑',
+            editTitle:'编辑货物',
+            viewBtnText:'查看',
+            viewTitle:'查看货物',
           height:'auto',
           stripe: true,
           calcHeight: 30,
@@ -127,11 +138,11 @@
                 type:'select',
                 clearable:false,
                 dicData:[],
-              rules: [{
-                required: true,
-                message: "请输入计量单位",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入计量单位",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "NCM CODE",
@@ -269,6 +280,11 @@
             //     }
             // }
         },
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
         // 表格组件抛出的选择数据
         selectionBunits(list){
             console.log(list,271)
@@ -300,21 +316,28 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return bcommodityRemove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
+          if (row.status === 1) {
+              this.$confirm("确定将选择数据删除?", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+              })
+                  .then(() => {
+                      return bcommodityRemove(row.id);
+                  })
+                  .then(() => {
+                      this.onLoad(this.page);
+                      this.$message({
+                          type: "success",
+                          message: "操作成功!"
+                      });
+                  });
+          }else {
+              this.$message({
+                  message: '非禁用状态无法删除',
+                  type: 'warning'
+              });
+          }
       },
       handleDelete() {
         if (this.selectionList.length === 0) {

src/views/iosBasicData/bcountrys/index.vue

@@ -29,11 +29,15 @@
                 </avue-text-ellipsis>
             </template>
             <template slot="menuLeft">
+                <el-button type="primary"
+                           size="small"
+                           icon="el-icon-plus"
+                           @click="addbtnfun()">新建国家
+                </el-button>
                 <el-button type="danger"
                            size="small"
                            icon="el-icon-delete"
                            plain
-                           v-if="permission.bcountrys_delete"
                            @click="handleDelete">删 除
                 </el-button>
             </template>
@@ -59,6 +63,12 @@ export default {
             selectionList: [],
             option:{},
             optionBack: {
+                addBtnText:'新建国家',
+                addTitle:'新建国家',
+                editBtnText:'编辑',
+                editTitle:'编辑国家',
+                viewBtnText:'查看',
+                viewTitle:'查看国家',
                 height:'auto',
                 stripe: true,
                 calcHeight: 30,
@@ -85,11 +95,6 @@ export default {
                         label: "国际三字码",
                         prop: "unCode",
                         rules: [{
-                            // max: 3,
-                            required: true,
-                            message: "请输入三个字符",
-                            trigger: "blur"
-                        },{
                             pattern:/^[a-zA-Z0-9]{1,3}$/,
                             message:"请输入英文字母或数字",
                             trigger:'blur'
@@ -118,18 +123,15 @@ export default {
                     {
                         label: "版本",
                         prop: "version",
-                        rules: [{
-                            required: true,
-                            message: "请输入版本",
-                            trigger: "blur"
-                        }]
+                        hide:true,
+                        display:false,
                     },
                     {
                         label: "状态",
                         prop: "status",
                         type:'select',
                         dicData:[{
-                            label:'正常',
+                            label:'启用',
                             value:0
                         },{
                             label:'停用',
@@ -211,7 +213,7 @@ export default {
         // 表格多个按钮权限控制，采用函数方式可以精确到行控制
         permissionList() {
             return {
-                // addBtn: this.vaildData(this.permission.bcountrys_add, false),
+                addBtn: this.vaildData(this.permission.bcountrys_add, false),
                 // viewBtn: this.vaildData(this.permission.bcountrys_view, false),
                 // delBtn: this.vaildData(this.permission.bcountrys_delete, false),
                 // editBtn: this.vaildData(this.permission.bcountrys_edit, false)
@@ -229,6 +231,11 @@ export default {
         this.option = await this.getColumnData(this.getColumnName(287), this.optionBack);
     },
     methods: {
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
         // 新增数据后点击确定触发该事件 （新增确认）
         rowSave(row, done, loading) {
             bcountrysSubmit(row).then(() => {
@@ -259,21 +266,28 @@ export default {
         },
         // 行数据删除触发 （删除）
         rowDel(row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return bcountrysRemove(row.id);
+            if (row.status === 1) {
+                this.$confirm("确定将选择数据删除?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
                 })
-                .then(() => {
-                    this.onLoad(this.page);
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
+                    .then(() => {
+                        return bcountrysRemove(row.id);
+                    })
+                    .then(() => {
+                        this.onLoad(this.page);
+                        this.$message({
+                            type: "success",
+                            message: "操作成功!"
+                        });
                     });
+            }else {
+                this.$message({
+                    message: '非禁用状态无法删除',
+                    type: 'warning'
                 });
+            }
         },
         // 多选删除触发
         handleDelete() {

src/views/iosBasicData/bfeesdefine/index.vue

@@ -168,11 +168,17 @@
         selectionList: [],
         option:{},
         optionBack: {
+            addBtnText:'新建费用信息',
+            addTitle:'新建费用信息',
+            editBtnText:'编辑',
+            editTitle:'编辑费用信息',
+            viewBtnText:'查看',
+            viewTitle:'查看费用信息',
           height:'auto',
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 24,
+          searchMenuSpan: 6,
           border: true,
           index: true,
           viewBtn: true,
@@ -223,76 +229,76 @@
                 label: "费用类别",
                 prop: "feesTypeName",
                 formslot:true,
-                rules: [{
-                      required: true,
-                      message: "请选择费用类别",
-                      trigger: "blur"
-                }]
+                // rules: [{
+                //       required: true,
+                //       message: "请选择费用类别",
+                //       trigger: "blur"
+                // }]
             },
             {
               label: "计量单位",
               prop: "unitNo",
                 formslot:true,
-              rules: [{
-                required: true,
-                message: "请输入计量单位",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入计量单位",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "币别",
               prop: "curNo",
                 formslot:true,
-              rules: [{
-                required: true,
-                message: "请输入币别",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入币别",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "核算ID",
               prop: "accElementId",
-                rules: [{
-                    required: true,
-                    message: "请输入核算要素ID",
-                    trigger: "blur"
-                }]
+                // rules: [{
+                //     required: true,
+                //     message: "请输入核算要素ID",
+                //     trigger: "blur"
+                // }]
             },
             {
               label: "核算名称",
               prop: "accElementName",
-              rules: [{
-                required: true,
-                message: "请输入财务核算要素名称",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入财务核算要素名称",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "科目 Id",
               prop: "accId",
-                rules: [{
-                    required: true,
-                    message: "请输入科目 Id",
-                    trigger: "blur"
-                }]
+                // rules: [{
+                //     required: true,
+                //     message: "请输入科目 Id",
+                //     trigger: "blur"
+                // }]
             },
             {
               label: "科目编号",
               prop: "accNo",
-              rules: [{
-                required: true,
-                message: "请输入科目编号",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入科目编号",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "科目全称",
               prop: "accFullName",
-              rules: [{
-                required: true,
-                message: "请输入科目全称",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入科目全称",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "版本",
@@ -323,11 +329,12 @@
                     label:'停用',
                     value:1
                 }],
-              rules: [{
-                required: true,
-                message: "请输入状态",
-                trigger: "blur"
-              }]
+                value:0
+              // rules: [{
+              //   required: true,
+              //   message: "请输入状态",
+              //   trigger: "blur"
+              // }]
             },
               {
                   label: "主键",

src/views/iosBasicData/blines/index.vue

@@ -23,6 +23,11 @@
                @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 292)"
                @on-load="onLoad">
       <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-plus"
+                     @click="addbtnfun()">新建航线
+          </el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
@@ -30,6 +35,30 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+        <template slot-scope="scope" slot="menu">
+            <el-button
+                type="text"
+                icon="el-icon-view"
+                size="small"
+                @click.stop="rowViewfun(scope.row,scope.index)"
+            >查看
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowEditfun(scope.row,scope.index)"
+            >编辑
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowDel(scope.row,scope.index)"
+            >删除
+            </el-button>
+
+        </template>
         <template slot="remarks" slot-scope="scope">
             <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
                 <small slot="more">...</small>
@@ -37,14 +66,14 @@
         </template>
         <template slot="carrierNameForm">
             <search-query ref="SearchQuery"
-                          :datalist="carrierData"
+                          :datalist="corpData"
                           title="船公司"
                           :filterable="true"
                           :clearable="true"
                           :remote="true"
-                          :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                          @remoteMethod="shippingCompanyfun" @corpChange="corpChange" >
-                插槽
+                          :forParameter="{key:'id',label:'cnName',value:'id'}"
+                          @remoteMethod="getBcorpsListfun" @corpChange="corpCorpChange" >
+                <bcorps></bcorps>
             </search-query>
         </template>
         <template slot="extendedDataArr" slot-scope="scope">
@@ -126,17 +155,18 @@
   import {blinesList, blinesDetail, blinesSubmit, blinesRemove} from "@/api/iosBasicData/blines";
   import {mapGetters} from "vuex";
   import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+  import bcorps from "@/views/iosBasicData/bcorps/index.vue";
+  import {getBcorpsList} from "@/api/iosBasicData/bcorps";
 
   export default {
-      components: { SearchQuery},
+      components: {bcorps, SearchQuery},
     data() {
       return {
-          // 船公司数据
-          carrierData:[],
+          // 客户(船公司)数据
+          corpData:[],
           // 扩展数据弹窗
           dialogVisible:false,
           extendedDisabled:false,
-
         form: {
             extendedDataArr:[],
         },
@@ -150,11 +180,17 @@
         selectionList: [],
         option:{},
         optionBack: {
+            addBtnText:'新建航线',
+            addTitle:'新建航线',
+            editBtnText:'编辑航线',
+            editTitle:'编辑航线',
+            viewBtnText:'查看航线',
+            viewTitle:'查看航线',
           height:'auto',
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 24,
+          searchMenuSpan: 6,
           border: true,
           index: true,
           viewBtn: true,
@@ -317,10 +353,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.blines_add, false),
-          // viewBtn: this.vaildData(this.permission.blines_view, false),
-          // delBtn: this.vaildData(this.permission.blines_delete, false),
-          // editBtn: this.vaildData(this.permission.blines_edit, false)
+          addBtn: this.vaildData(this.permission.blines_add, false),
+          viewBtn: this.vaildData(this.permission.blines_view, false),
+          delBtn: this.vaildData(this.permission.blines_delete, false),
+          editBtn: this.vaildData(this.permission.blines_edit, false)
         };
       },
       ids() {
@@ -333,6 +369,7 @@
     },
       async created() {
           this.option = await this.getColumnData(this.getColumnName(292), this.optionBack);
+          this.getBcorpsListfun()
       },
     methods: {
         // 扩展数据表格点击查询详情
@@ -360,26 +397,48 @@
         },
         // 扩展数据编辑
         extendedDataEdit(index,row) {
-            row.edit = !row.edit
+            this.$set(row,'edit',!row.edit)
+            // row.edit = !row.edit
         },
         // 扩展数据删除
         extendedDataDelete(index,row) {
             this.form.extendedDataArr.splice(index,1)
         },
 
-        // 获取船公司数据
-        shippingCompanyfun(cnName){
-            // getBunitsList(1, 10,{cnName}).then(res=>{
-            //     this.unitNoData = res.data.data.records
-            // })
+        // 获取客户(船公司)数据
+        getBcorpsListfun(cnName){
+            getBcorpsList(1,10,{cnName}).then(res=>{
+                this.corpData = res.data.data.records
+            })
         },
         // 船公司选中的回调
-        corpChange(value){
-            // for(let item of this.unitNoData) {
-            //     if (item.id == value) {
-            //         this.form.unitNo = item.cnName
-            //     }
-            // }
+        corpCorpChange(value){
+            for(let item of this.corpData) {
+                if (item.id == value) {
+                    this.$set(this.form,'carrierId',item.id)
+                    this.$set(this.form,'carrierName',item.cnName)
+                }
+            }
+        },
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
+        // 查看
+        rowViewfun(row,index){
+            this.extendedDisabled = true
+            this.$refs.crud.rowView(row,index)
+        },
+        // 编辑
+        rowEditfun(row,index){
+            blinesDetail(row.id).then(res => {
+                this.form = res.data.data;
+                this.form.extendedDataArr.map(item=>{
+                    item.edit = false
+                })
+                this.$refs.crud.rowEdit(row,index)
+            });
         },
 
       rowSave(row, done, loading) {

src/views/iosBasicData/blocations/index.vue

@@ -74,6 +74,13 @@
         selectionList: [],
         option: {},
         optionBack: {
+            addBtnText:'新建地址信息',
+            addTitle:'新建地址信息',
+            editBtnText:'编辑',
+            editTitle:'编辑地址信息',
+            viewBtnText:'查看',
+            viewTitle:'查看地址信息',
+            labelWidth:120,
           height:'auto',
           stripe: true,
           searchIcon: true,
@@ -205,22 +212,21 @@
             {
               label: "国家地区代码",
               prop: "cntyCode",
-              search: true,
+                width:160,
             },
             {
               label: "国家地区英文名称",
               prop: "cntyName",
-              search: true,
+                width:160,
             },
             {
               label: "州代码",
               prop: "stateCode",
-              search: true,
             },
             {
               label: "州英文名称",
               prop: "stateName",
-              search: true,
+                width:160,
             },
             {
               label: "版本",

src/views/iosBasicData/bpackages/index.vue

@@ -29,6 +29,11 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-plus"
+                     @click="addbtnfun()">新建包装
+          </el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
@@ -55,6 +60,20 @@
                 @click.stop="rowViewfun(scope.row,scope.index)"
             >查看
             </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowEditfun(scope.row,scope.index)"
+            >编辑
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowDel(scope.row,scope.index)"
+            >删除
+            </el-button>
         </template>
 
     </avue-crud>
@@ -101,12 +120,12 @@
                               type="text"
                               size="mini"
                               :disabled="extendedDisabled"
-                              @click="extendedDataEdit(scope.$index, scope.row)">{{scope.row.edit?'保存':'编辑'}}</el-button>
+                              @click.stop="extendedDataEdit(scope.$index, scope.row)">{{scope.row.edit?'保存':'编辑'}}</el-button>
                           <el-button
                               size="mini"
                               type="text"
                               :disabled="extendedDisabled"
-                              @click="extendedDataDelete(scope.$index, scope.row)">删除</el-button>
+                              @click.stop="extendedDataDelete(scope.$index, scope.row)">删除</el-button>
                       </template>
                   </el-table-column>
               </el-table>
@@ -144,6 +163,12 @@
         selectionList: [],
         option:{},
         optionBack: {
+            addBtnText:'新建包装',
+            addTitle:'新建包装',
+            editBtnText:'编辑包装',
+            editTitle:'编辑包装',
+            viewBtnText:'查看包装',
+            viewTitle:'查看包装',
           height:'auto',
           stripe: true,
           calcHeight: 30,
@@ -189,20 +214,16 @@
             {
               label: "标准编码",
               prop: "standardCode",
-              rules: [{
-                required: true,
-                message: "请输入标准编码",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入标准编码",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "换算率%",
               prop: "exrate",
               rules: [{
-                required: true,
-                message: "请输入换算率%",
-                trigger: "blur"
-              },{
                   pattern:/[1-9]\d*.\d*|0\.\d*[1-9]\d*/,
                   message:"请输入数字",
                   trigger:'blur'
@@ -232,11 +253,11 @@
                   type:'tree',
                   formslot:true,
                   dicData:[],
-                  rules: [{
-                      required: true,
-                      message: "请输入EDI CODE",
-                      trigger: "blur"
-                  }]
+                  // rules: [{
+                  //     required: true,
+                  //     message: "请输入EDI CODE",
+                  //     trigger: "blur"
+                  // }]
               },
               {
                   label: "主键",
@@ -317,10 +338,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.bpackages_add, false),
+          addBtn: this.vaildData(this.permission.bpackages_add, false),
           viewBtn: this.vaildData(this.permission.bpackages_view, false),
-          // delBtn: this.vaildData(this.permission.bpackages_delete, false),
-          // editBtn: this.vaildData(this.permission.bpackages_edit, false)
+          delBtn: this.vaildData(this.permission.bpackages_delete, false),
+          editBtn: this.vaildData(this.permission.bpackages_edit, false)
         };
       },
       ids() {
@@ -338,6 +359,7 @@
         // 扩展数据详情的---------------------------------------
         // 扩展数据添加
         extendedDataAdd(){
+            console.log(this.form.extendedDataArr,'this.form.extendedDataArr')
             this.form.extendedDataArr.map(item=>{
                 item.edit = false
             })
@@ -347,7 +369,8 @@
         },
         // 扩展数据编辑
         extendedDataEdit(index,row) {
-            row.edit = !row.edit
+            this.$set(row,'edit',!row.edit)
+            // row.edit = !row.edit
         },
         // 扩展数据删除
         extendedDataDelete(index,row) {
@@ -404,11 +427,26 @@
           console.log(error);
         });
       },
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
         // 查看
         rowViewfun(row,index){
             this.extendedDisabled = true
             this.$refs.crud.rowView(row,index)
         },
+        // 编辑
+        rowEditfun(row,index){
+            bpackagesDetail(row.id).then(res => {
+                this.form = res.data.data;
+                this.form.extendedDataArr.map(item=>{
+                    item.edit = false
+                })
+                this.$refs.crud.rowEdit(row,index)
+            });
+        },
         // 数据删除
       rowDel(row) {
           if (row.status === 1) {

src/views/iosBasicData/bports/index.vue

@@ -28,7 +28,7 @@
                   <el-button type="primary"
                              size="small"
                              icon="el-icon-plus"
-                             @click="addbtnfun()">新增
+                             @click="addbtnfun()">新建港口
                   </el-button>
                   <el-button type="danger"
                              size="small"
@@ -97,11 +97,17 @@
         selectionList: [],
         option:{},
         optionBack: {
+            addBtnText:'新建港口ss',
+            addTitle:'新建港口',
+            editBtnText:'编辑港口',
+            editTitle:'编辑港口',
+            viewBtnText:'查看港口',
+            viewTitle:'查看港口',
           height:'auto',
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 24,
+          searchMenuSpan: 6,
           border: true,
           index: true,
           viewBtn: true,
@@ -121,12 +127,6 @@
             {
               label: "国际编码",
               prop: "unCode",
-                search: true,
-              rules: [{
-                required: true,
-                message: "请输入国际编码",
-                trigger: "blur"
-              }]
             },
             {
               label: "中文名称",
@@ -151,22 +151,10 @@
             {
               label: "国家代码",
               prop: "cntyCode",
-                search: true,
-              rules: [{
-                required: true,
-                message: "请输入国家代码",
-                trigger: "blur"
-              }]
             },
             {
               label: "国家名称",
               prop: "cntyName",
-                search: true,
-              rules: [{
-                required: true,
-                message: "请输入国家名称",
-                trigger: "blur"
-              }]
             },
             {
               label: "是否海港",
@@ -179,11 +167,6 @@
                     label:'是',
                     value:1
                 }],
-              rules: [{
-                required: true,
-                message: "请输入是否海港",
-                trigger: "blur"
-              }]
             },
             {
               label: "是否空港",
@@ -196,11 +179,6 @@
                     label:'是',
                     value:1
                 }],
-              rules: [{
-                required: true,
-                message: "请输入是否空港",
-                trigger: "blur"
-              }]
             },
             {
               label: "是否内陆港",
@@ -214,11 +192,6 @@
                     label:'是',
                     value:1
                 }],
-              rules: [{
-                required: true,
-                message: "请输入是否内陆港",
-                trigger: "blur"
-              }]
             },
             {
               label: "扩展数据",
@@ -413,21 +386,29 @@
       //   });
       // },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return bportsRemove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
+          if (row.status === 1) {
+              this.$confirm("确定将选择数据删除?", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+              })
+                  .then(() => {
+                      return bportsRemove(row.id);
+                  })
+                  .then(() => {
+                      this.onLoad(this.page);
+                      this.$message({
+                          type: "success",
+                          message: "操作成功!"
+                      });
+                  });
+          }else {
+              this.$message({
+                  message: '非禁用状态无法删除',
+                  type: 'warning'
+              });
+          }
+
       },
       handleDelete() {
         if (this.selectionList.length === 0) {

src/views/iosBasicData/bports/portsTerms.vue

@@ -197,6 +197,10 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
 
                 // 获取到的数据
                 form:{
+                    isSeaPort:0,
+                    isAirPort:0,
+                    isInlandPort:0,
+                    status:0,
                     extendedDataArr:[],
                     bportsTermsList:[],
                 },
@@ -215,11 +219,6 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
                         {
                             label: "国际编码",
                             prop: "unCode",
-                            rules: [{
-                                required: true,
-                                message: "请输入国际编码",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "中文名称",
@@ -242,20 +241,10 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
                         {
                             label: "国家代码",
                             prop: "cntyCode",
-                            rules: [{
-                                required: true,
-                                message: "请输入国家代码",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "国家名称",
                             prop: "cntyName",
-                            rules: [{
-                                required: true,
-                                message: "请输入国家名称",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "是否海港",
@@ -268,11 +257,6 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
                                 label:'是',
                                 value:1
                             }],
-                            rules: [{
-                                required: true,
-                                message: "请输入是否海港",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "是否空港",
@@ -285,11 +269,6 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
                                 label:'是',
                                 value:1
                             }],
-                            rules: [{
-                                required: true,
-                                message: "请输入是否空港",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "是否内陆港",
@@ -303,11 +282,6 @@ import {bportsDetail, bportsSubmit} from "@/api/iosBasicData/bports";
                                 label:'是',
                                 value:1
                             }],
-                            rules: [{
-                                required: true,
-                                message: "请输入是否内陆港",
-                                trigger: "blur"
-                            }]
                         },
                         {
                             label: "状态",

src/views/iosBasicData/bserviceterms/index.vue

@@ -55,6 +55,11 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-plus"
+                     @click="addbtnfun()">新建服务条款
+          </el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
@@ -63,6 +68,29 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+        <template slot-scope="scope" slot="menu">
+            <el-button
+                type="text"
+                icon="el-icon-view"
+                size="small"
+                @click.stop="rowViewfun(scope.row,scope.index)"
+            >查看
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowEditfun(scope.row,scope.index)"
+            >编辑
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowDel(scope.row,scope.index)"
+            >删除
+            </el-button>
+        </template>
     </avue-crud>
 
     <el-dialog
@@ -281,11 +309,7 @@
                   type:'tree',
                   formslot:true,
                   dicData:[],
-                  rules: [{
-                      required: true,
-                      message: "请输入EDI CODE",
-                      trigger: "blur"
-                  }]
+
             },
             // {
             //   label: "JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]",
@@ -341,10 +365,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.bserviceterms_add, false),
-          // viewBtn: this.vaildData(this.permission.bserviceterms_view, false),
-          // delBtn: this.vaildData(this.permission.bserviceterms_delete, false),
-          // editBtn: this.vaildData(this.permission.bserviceterms_edit, false)
+          addBtn: this.vaildData(this.permission.bserviceterms_add, false),
+          viewBtn: this.vaildData(this.permission.bserviceterms_view, false),
+          delBtn: this.vaildData(this.permission.bserviceterms_delete, false),
+          editBtn: this.vaildData(this.permission.bserviceterms_edit, false)
         };
       },
       ids() {
@@ -371,7 +395,8 @@
         },
         // 扩展数据编辑
         extendedDataEdit(index,row) {
-            row.edit = !row.edit
+            this.$set(row,'edit',!row.edit)
+            // row.edit = !row.edit
         },
         // 扩展数据删除
         extendedDataDelete(index,row) {
@@ -392,6 +417,26 @@
                 .catch(_ => {});
         },
         // 表格操作------------------------------------------------------------
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
+        // 查看
+        rowViewfun(row,index){
+            this.extendedDisabled = true
+            this.$refs.crud.rowView(row,index)
+        },
+        // 编辑
+        rowEditfun(row,index){
+            getBservicetermsDetail(row.id).then(res => {
+                this.form = res.data.data;
+                this.form.extendedDataArr.map(item=>{
+                    item.edit = false
+                })
+                this.$refs.crud.rowEdit(row,index)
+            });
+        },
       rowSave(row, done, loading) {
           row.extendedDataArr.map(item=>{
               delete item.edit

src/views/iosBasicData/btrademodes/index.vue

@@ -44,6 +44,11 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-plus"
+                     @click="addbtnfun()">新建贸易费用
+          </el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
@@ -52,6 +57,29 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+        <template slot-scope="scope" slot="menu">
+            <el-button
+                type="text"
+                icon="el-icon-view"
+                size="small"
+                @click.stop="rowViewfun(scope.row,scope.index)"
+            >查看
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowEditfun(scope.row,scope.index)"
+            >编辑
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowDel(scope.row,scope.index)"
+            >删除
+            </el-button>
+        </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -205,22 +233,11 @@
             {
               label: "简称",
               prop: "shortName",
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入简称",
-                trigger: "blur"
-              }]
             },
             {
               label: "单一窗口代码",
               prop: "codeSw",
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入单一窗口代码",
-                trigger: "blur"
-              }]
+                width:160,
             },
             {
               label: "版本",
@@ -270,10 +287,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.btrademodes_add, false),
-          // viewBtn: this.vaildData(this.permission.btrademodes_view, false),
-          // delBtn: this.vaildData(this.permission.btrademodes_delete, false),
-          // editBtn: this.vaildData(this.permission.btrademodes_edit, false)
+          addBtn: this.vaildData(this.permission.btrademodes_add, false),
+          viewBtn: this.vaildData(this.permission.btrademodes_view, false),
+          delBtn: this.vaildData(this.permission.btrademodes_delete, false),
+          editBtn: this.vaildData(this.permission.btrademodes_edit, false)
         };
       },
       ids() {
@@ -285,6 +302,26 @@
       }
     },
     methods: {
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
+        // 查看
+        rowViewfun(row,index){
+            this.extendedDisabled = true
+            this.$refs.crud.rowView(row,index)
+        },
+        // 编辑
+        rowEditfun(row,index){
+            getBtrademodesDetail(row.id).then(res => {
+                this.form = res.data.data;
+                this.form.extendedDataArr.map(item=>{
+                    item.edit = false
+                })
+                this.$refs.crud.rowEdit(row,index)
+            });
+        },
       rowSave(row, done, loading) {
         addBtrademodes(row).then(() => {
           this.onLoad(this.page);

src/views/iosBasicData/bunits/index.vue

@@ -74,6 +74,12 @@
         selectionList: [],
         option: {},
         optionBack: {
+            addBtnText:'新建计量单位',
+            addTitle:'新建计量单位',
+            editBtnText:'编辑',
+            editTitle:'编辑计量单位',
+            viewBtnText:'查看',
+            viewTitle:'查看计量单位',
           height:'auto',
           stripe: true,
           searchIcon: true,
@@ -205,12 +211,8 @@
             {
               label: "单一窗口代码",
               prop: "codeSw",
+                width:160,
               search: true,
-              rules: [{
-                required: true,
-                message: "请输入单一窗口代码",
-                trigger: "blur"
-              }]
             },
             {
               label: "数量规则",

src/views/iosBasicData/bvessels/index.vue

@@ -68,6 +68,11 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-plus"
+                     @click="addbtnfun()">新建船名
+          </el-button>
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
@@ -76,6 +81,29 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+        <template slot-scope="scope" slot="menu">
+            <el-button
+                type="text"
+                icon="el-icon-view"
+                size="small"
+                @click.stop="rowViewfun(scope.row,scope.index)"
+            >查看
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowEditfun(scope.row,scope.index)"
+            >编辑
+            </el-button>
+            <el-button
+                type="text"
+                icon="el-icon-edit"
+                size="small"
+                @click.stop="rowDel(scope.row,scope.index)"
+            >删除
+            </el-button>
+        </template>
     </avue-crud>
 
     <el-dialog
@@ -163,6 +191,13 @@
         selectionList: [],
         option: {},
         optionBack: {
+            addBtnText:'新建船名',
+            addTitle:'新建船名',
+            editBtnText:'编辑船名',
+            editTitle:'编辑船名',
+            viewBtnText:'查看船名',
+            viewTitle:'查看船名',
+            labelWidth:120,
           height:'auto',
           stripe: true,
           searchIcon: true,
@@ -323,11 +358,11 @@
               prop: "carrierId",
               search: true,
               hide:true,
-              rules: [{
-                required: true,
-                message: "请输入船公司 Id",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入船公司 Id",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "船公司名称",
@@ -340,44 +375,44 @@
               prop: "portOfficeCode",
               search: true,
               width: "100",
-              rules: [{
-                required: true,
-                message: "请输入港务局编码",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入港务局编码",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "港务局中文船名",
               prop: "portOfficeCnName",
               search: true,
               width: "120",
-              rules: [{
-                required: true,
-                message: "请输入港务局中文船名",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入港务局中文船名",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "港务局英文船名",
               prop: "portOfficeEnName",
               search: true,
               width: "120",
-              rules: [{
-                required: true,
-                message: "请输入港务局英文船名",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入港务局英文船名",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "港务局船公司代码",
               prop: "portOfficeCarrierCode",
               search: true,
               width: "120",
-              rules: [{
-                required: true,
-                message: "请输入港务局船公司代码",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入港务局船公司代码",
+              //   trigger: "blur"
+              // }]
             },
             {
                   label: "EDI CODE",
@@ -385,11 +420,11 @@
                   type:'tree',
                   formslot:true,
                   dicData:[],
-                  rules: [{
-                      required: true,
-                      message: "请输入EDI CODE",
-                      trigger: "blur"
-                  }]
+                  // rules: [{
+                  //     required: true,
+                  //     message: "请输入EDI CODE",
+                  //     trigger: "blur"
+                  // }]
             },
             // {
             //   label: "JSON 对象数组，用于不查询的扩展数据, 例如：[{name: "key1", value: "value1"}]",
@@ -445,10 +480,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.bvessels_add, false),
-          // viewBtn: this.vaildData(this.permission.bvessels_view, false),
-          // delBtn: this.vaildData(this.permission.bvessels_delete, false),
-          // editBtn: this.vaildData(this.permission.bvessels_edit, false)
+          addBtn: this.vaildData(this.permission.bvessels_add, false),
+          viewBtn: this.vaildData(this.permission.bvessels_view, false),
+          delBtn: this.vaildData(this.permission.bvessels_delete, false),
+          editBtn: this.vaildData(this.permission.bvessels_edit, false)
         };
       },
       ids() {
@@ -475,7 +510,8 @@
         },
         // 扩展数据编辑
         extendedDataEdit(index,row) {
-            row.edit = !row.edit
+            // row.edit = !row.edit
+            this.$set(row,'edit',!row.edit)
         },
         // 扩展数据删除
         extendedDataDelete(index,row) {
@@ -496,6 +532,27 @@
                 .catch(_ => {});
         },
         // 表格操作------------------------------------------------------------
+        // 新增
+        addbtnfun(){
+            this.form.status = 0
+            this.$refs.crud.rowAdd()
+        },
+        // 查看
+        rowViewfun(row,index){
+            this.extendedDisabled = true
+            this.$refs.crud.rowView(row,index)
+        },
+        // 编辑
+        rowEditfun(row,index){
+            getBvesselsDetail(row.id).then(res => {
+                this.form = res.data.data;
+                this.form.extendedDataArr.map(item=>{
+                    item.edit = false
+                })
+                this.$refs.crud.rowEdit(row,index)
+            });
+        },
+
       rowSave(row, done, loading) {
           row.extendedDataArr.map(item=>{
               delete item.edit

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -1,3 +1,4 @@
+<!--费用模板-->
 <template>
   <div>
       <basic-container v-if="isShow">
@@ -27,7 +28,7 @@
                   <el-button type="primary"
                              size="small"
                              icon="el-icon-plus"
-                             @click="addbtnfun()">新增
+                             @click="addbtnfun()">新增费用模板
                   </el-button>
                   <el-button type="danger"
                              size="small"
@@ -93,7 +94,7 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 24,
+          searchMenuSpan: 6,
           border: true,
           index: true,
           viewBtn: true,

src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -255,12 +255,12 @@ export default {
               label: "国际三字码",
               prop: "unCode",
               span: 6,
-              rules: [{
-                required: true,
-                message: "请输入国际三字码",
-                trigger: "blur"
-              }]
-            }, 
+              // rules: [{
+              //   required: true,
+              //   message: "请输入国际三字码",
+              //   trigger: "blur"
+              // }]
+            },
             {
               label: "中文名称",
               prop: "cnName",
@@ -270,7 +270,7 @@ export default {
                 message: "请输入中文名称",
                 trigger: "blur"
               }]
-            }, 
+            },
             {
               label: "英文名称",
               prop: "enName",
@@ -285,22 +285,22 @@ export default {
               label: "货币符号",
               prop: "symbol",
               span: 6,
-              rules: [{
-                required: true,
-                message: "请输入货币符号",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入货币符号",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "是否本币",
               prop: "isLocal",
               type: "select",
               span: 6,
-              rules: [{
-                required: true,
-                message: "请选择是否本币",
-                trigger: "blur"
-              }],
+              // rules: [{
+              //   required: true,
+              //   message: "请选择是否本币",
+              //   trigger: "blur"
+              // }],
               dicData:[{
                 label:'非本币',
                 value:0
@@ -314,11 +314,11 @@ export default {
               label: "对本币汇率",
               prop: "exrate",
               span: 6,
-              rules: [{
-                required: true,
-                message: "请输入对本币汇率",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入对本币汇率",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "国家代码",
@@ -355,13 +355,13 @@ export default {
                 }
               ],
               span: 6,
-              rules: [
-                {
-                  required: true,
-                  message: " ",
-                  trigger: "change"
-                }
-              ]
+              // rules: [
+              //   {
+              //     required: true,
+              //     message: " ",
+              //     trigger: "change"
+              //   }
+              // ]
             },
             {
               label: "汇率年度",
@@ -369,13 +369,13 @@ export default {
               type: "year",
               valueFormat: "yyyy",
               span: 6,
-              rules: [
-                {
-                  required: true,
-                  message: " ",
-                  trigger: "blur"
-                }
-              ]
+              // rules: [
+              //   {
+              //     required: true,
+              //     message: " ",
+              //     trigger: "blur"
+              //   }
+              // ]
             },
             {
               label: "月份",
@@ -473,7 +473,7 @@ export default {
               prop: "button",
               span: 6
             }
-            
+
         ]
       },
       optionList: optionList
@@ -665,7 +665,7 @@ export default {
         this.findObject(this.optionList.column, "exrateMonth").hide = true;
       }
     },
-    
+
         // 更改表格颜色
         headerClassName(tab){
             //颜色间隔

src/views/iosBasicData/rateManagement/index.vue

@@ -28,7 +28,7 @@
         </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
-            查看
+            编辑
           </el-button>
           <!-- <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
             编辑
@@ -92,7 +92,7 @@ export default {
         searchIcon: true,
           searchIndex: 3,
           calcHeight: 30,
-        addBtnText: "新单",
+        addBtnText: "新建币别及汇率",
         stripe: true,
         column: [
           {