wangzhuo 1 vuosi sitten
vanhempi
commit
6267c7ef1b
2 muutettua tiedostoa jossa 192 lisäystä ja 149 poistoa
  1. 5 5
      src/api/iosBasicData/bvessels.js
  2. 187 144
      src/views/iosBasicData/bvessels/index.vue

+ 5 - 5
src/api/iosBasicData/bvessels.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getBvesselsList = (current, size, params) => {
   return request({
-    url: '/api/blade.los/bvessels/list',
+    url: '/api/blade-los/bvessels/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getBvesselsList = (current, size, params) => {
 
 export const getBvesselsDetail = (id) => {
   return request({
-    url: '/api/blade.los/bvessels/detail',
+    url: '/api/blade-los/bvessels/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getBvesselsDetail = (id) => {
 
 export const removeBvessels = (ids) => {
   return request({
-    url: '/api/blade.los/bvessels/remove',
+    url: '/api/blade-los/bvessels/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const removeBvessels = (ids) => {
 
 export const addBvessels = (row) => {
   return request({
-    url: '/api/blade.los/bvessels/submit',
+    url: '/api/blade-los/bvessels/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const addBvessels = (row) => {
 
 export const updateBvessels = (row) => {
   return request({
-    url: '/api/blade.los/bvessels/submit',
+    url: '/api/blade-los/bvessels/submit',
     method: 'post',
     data: row
   })

+ 187 - 144
src/views/iosBasicData/bvessels/index.vue

@@ -17,6 +17,8 @@
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
+               @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 293)"
+               @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 293)"
                @on-load="onLoad">
       <template slot="menuLeft">
         <el-button type="danger"
@@ -47,7 +49,8 @@
           total: 0
         },
         selectionList: [],
-        option: {
+        option: {},
+        optionBack: {
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -59,87 +62,87 @@
           selection: true,
           dialogClickModal: false,
           column: [
-            {
-              label: "主键",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入主键",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建人 Id",
-              prop: "createUser",
-              rules: [{
-                required: true,
-                message: "请输入创建人 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建人",
-              prop: "createUserName",
-              rules: [{
-                required: true,
-                message: "请输入创建人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建部门 Id",
-              prop: "createDept",
-              rules: [{
-                required: true,
-                message: "请输入创建部门 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建部门",
-              prop: "createDeptName",
-              rules: [{
-                required: true,
-                message: "请输入创建部门",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改人 Id",
-              prop: "updateUser",
-              rules: [{
-                required: true,
-                message: "请输入修改人 Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改人",
-              prop: "updateUserName",
-              rules: [{
-                required: true,
-                message: "请输入修改人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "修改时间",
-              prop: "updateTime",
-              rules: [{
-                required: true,
-                message: "请输入修改时间",
-                trigger: "blur"
-              }]
-            },
+            // {
+            //   label: "主键",
+            //   prop: "id",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入主键",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "创建人 Id",
+            //   prop: "createUser",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入创建人 Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "创建人",
+            //   prop: "createUserName",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入创建人",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "创建部门 Id",
+            //   prop: "createDept",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入创建部门 Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "创建部门",
+            //   prop: "createDeptName",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入创建部门",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "创建时间",
+            //   prop: "createTime",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入创建时间",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "修改人 Id",
+            //   prop: "updateUser",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入修改人 Id",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "修改人",
+            //   prop: "updateUserName",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入修改人",
+            //     trigger: "blur"
+            //   }]
+            // },
+            // {
+            //   label: "修改时间",
+            //   prop: "updateTime",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入修改时间",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "船舶编码",
               prop: "code",
@@ -170,51 +173,54 @@
             {
               label: "船舶注册国家代码",
               prop: "cntyCode",
-              rules: [{
-                required: true,
-                message: "请输入船舶注册国家代码",
-                trigger: "blur"
-              }]
+              width: "120"
+              // rules: [{
+              //   required: true,
+              //   message: "请输入船舶注册国家代码",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "船舶注册国家名称",
               prop: "cntyName",
-              rules: [{
-                required: true,
-                message: "请输入船舶注册国家名称",
-                trigger: "blur"
-              }]
+              width: "120"
+              // rules: [{
+              //   required: true,
+              //   message: "请输入船舶注册国家名称",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "船舶呼号",
               prop: "afrno",
-              rules: [{
-                required: true,
-                message: "请输入船舶呼号",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入船舶呼号",
+              //   trigger: "blur"
+              // }]
             },
             {
-              label: "IMONO 国际海事组织编号",
+              label: "IMONO",
               prop: "imono",
-              rules: [{
-                required: true,
-                message: "请输入IMONO 国际海事组织编号",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入IMONO 国际海事组织编号",
+              //   trigger: "blur"
+              // }]
             },
             {
-              label: "MMSI 水上移动通信业务标识码",
+              label: "MMSI",
               prop: "mmsi",
-              rules: [{
-                required: true,
-                message: "请输入MMSI 水上移动通信业务标识码",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入MMSI 水上移动通信业务标识码",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "船公司 Id",
               prop: "carrierId",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入船公司 Id",
@@ -224,15 +230,18 @@
             {
               label: "船公司名称",
               prop: "carrierName",
-              rules: [{
-                required: true,
-                message: "请输入船公司名称",
-                trigger: "blur"
-              }]
+              width: "100",
+              display:false,
+              // rules: [{
+              //   required: true,
+              //   message: "请输入船公司名称",
+              //   trigger: "blur"
+              // }]
             },
             {
               label: "港务局编码",
               prop: "portOfficeCode",
+              width: "100",
               rules: [{
                 required: true,
                 message: "请输入港务局编码",
@@ -242,6 +251,7 @@
             {
               label: "港务局中文船名",
               prop: "portOfficeCnName",
+              width: "120",
               rules: [{
                 required: true,
                 message: "请输入港务局中文船名",
@@ -251,6 +261,7 @@
             {
               label: "港务局英文船名",
               prop: "portOfficeEnName",
+              width: "120",
               rules: [{
                 required: true,
                 message: "请输入港务局英文船名",
@@ -260,6 +271,7 @@
             {
               label: "港务局船公司代码",
               prop: "portOfficeCarrierCode",
+              width: "120",
               rules: [{
                 required: true,
                 message: "请输入港务局船公司代码",
@@ -278,38 +290,43 @@
             {
               label: "版本",
               prop: "version",
-              rules: [{
-                required: true,
-                message: "请输入版本",
-                trigger: "blur"
-              }]
+              display:false,
+              // rules: [{
+              //   required: true,
+              //   message: "请输入版本",
+              //   trigger: "blur"
+              // }]
             },
             {
-              label: "状态(0 正常 1停用)",
+              label: "状态",
               prop: "status",
-              rules: [{
-                required: true,
-                message: "请输入状态(0 正常 1停用)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否已删除(0 否 1是)",
-              prop: "isDeleted",
-              rules: [{
-                required: true,
-                message: "请输入是否已删除(0 否 1是)",
-                trigger: "blur"
-              }]
+              type: "select",
+              dicData:[{
+                label:'启用',
+                value:0
+              },{
+                label:'停用',
+                value:1
+              }],
+              value: 0
             },
+            // {
+            //   label: "是否已删除(0 否 1是)",
+            //   prop: "isDeleted",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入是否已删除(0 否 1是)",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "备注",
               prop: "remarks",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
+              // rules: [{
+              //   required: true,
+              //   message: "请输入备注",
+              //   trigger: "blur"
+              // }]
             },
           ]
         },
@@ -320,10 +337,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() {
@@ -334,6 +351,9 @@
         return ids.join(",");
       }
     },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(293), this.optionBack);
+    },
     methods: {
       rowSave(row, done, loading) {
         addBvessels(row).then(() => {
@@ -443,7 +463,30 @@
           this.loading = false;
           this.selectionClear();
         });
-      }
+      },
+      //自定义列保存
+      async saveColumnTwo(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumnTwo(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        }
     }
   };
 </script>