船名10.13

src/views/iosBasicData/bvessels/index.vue

@@ -20,6 +20,15 @@
         <el-button type="primary" size="small" @click="dialogVisible = true">EDI CODE
         </el-button>
       </template>
+        <template slot-scope="{type,disabled,row}" slot="carrierNameForm">
+            <search-query ref="SearchQuery" :disabled="extendedDisabled" :selectValue="form.carrierName"
+                          :datalist="corpData" title="船公司" :filterable="true" :clearable="true"
+                          :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                          @remoteMethod="getBcorpsListfun"
+                          @corpChange="corpCorpChange">
+                <bcorps></bcorps>
+            </search-query>
+        </template>
       <template slot="code" slot-scope="scope">
         <avue-text-ellipsis :text="scope.row.code" :height="30" use-tooltip placement="top">
           <small slot="more">...</small>
@@ -64,8 +73,16 @@
         </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 type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(scope.row, scope.index)">删除
         </el-button>
+          <el-button v-if="scope.row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
+                     @click.stop="statusfun(scope.row.id,0)">
+              启用
+          </el-button>
+          <el-button v-if="scope.row.status == 0" type="text" icon="el-icon-turn-off" style="color: #e83c3a" size="small"
+                     @click.stop="statusfun(scope.row.id,1)">
+              停用
+          </el-button>
       </template>
     </avue-crud>
 
@@ -100,7 +117,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false; extendedDisabled = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false; extendedDisabled = false">确 定</el-button>
+        <el-button type="primary" @click="extendedDatafun">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -128,12 +145,19 @@ import { getBvesselsList, getBvesselsDetail, addBvessels, updateBvessels, remove
 import { mapGetters } from "vuex";
 
 import { getToken } from "@/util/auth";
+import { getBcorpsList } from "@/api/iosBasicData/bcorps";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 
 export default {
+    components: {bcorps, SearchQuery},
   data() {
     return {
       // 扩展数据弹窗
       dialogVisible: false,
+        extendedDisabled:false,
+        // 船公司数据
+        corpData:[],
 
       form: {
         extendedDataArr: []
@@ -173,7 +197,8 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
+        ageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
       selectionList: [],
       option: {
@@ -201,88 +226,8 @@ export default {
         viewBtn: true,
         selection: true,
         dialogClickModal: false,
+          menuWidth:260,
         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: "code",
@@ -347,21 +292,18 @@ export default {
             prop: "mmsi",
           },
           {
-            label: "船公司 Id",
+            label: "船公司 ID",
             prop: "carrierId",
             search: true,
             hide: true,
-            // rules: [{
-            //   required: true,
-            //   message: "请输入船公司 Id",
-            //   trigger: "blur"
-            // }]
+              display: false,
           },
           {
             label: "船公司名称",
             prop: "carrierName",
             width: "100",
-            display: false,
+              formslot: true,
+            // display: false,
           },
           {
             label: "港务局编码",
@@ -429,11 +371,6 @@ export default {
           //   }]
           // },
           {
-            label: "版本",
-            prop: "version",
-            display: false,
-          },
-          {
             label: "状态",
             prop: "status",
             type: "select",
@@ -446,15 +383,39 @@ export default {
             }],
             value: 0
           },
-          // {
-          //   label: "是否已删除（0 否 1是）",
-          //   prop: "isDeleted",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入是否已删除（0 否 1是）",
-          //     trigger: "blur"
-          //   }]
-          // },
+            {
+                label: "创建人",
+                prop: "createUserName",
+                display: false,
+            },
+            {
+                label: "创建部门",
+                prop: "createDeptName",
+                display: false,
+            },
+            {
+                label: "创建时间",
+                prop: "createTime",
+                width: "160",
+                display: false,
+            },
+            {
+                label: "修改人",
+                prop: "updateUserName",
+                display: false,
+            },
+            {
+                label: "修改时间",
+                prop: "updateTime",
+                width: "160",
+                display: false,
+            },
+          {
+            label: "是否已删除（0 否 1是）",
+            prop: "isDeleted",
+              hide: true,
+              display: false,
+          },
           {
             label: "备注",
             prop: "remarks",
@@ -489,8 +450,44 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(293), this.optionBack);
+      this.getBcorpsListfun()
   },
   methods: {
+      // 禁用启用按钮
+      statusfun(id,status){
+          this.$confirm("确定将选择数据更改状态?", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+          }).then(()=>{
+              getBvesselsDetail(id).then(res=>{
+                  let obj = res.data.data;
+                  obj.status = status
+                  updateBvessels(obj).then(()=>{
+                      this.onLoad(this.page);
+                      this.$message({
+                          type: "success",
+                          message: "操作成功!"
+                      });
+                  })
+              })
+          })
+      },
+      // 获取客户(船公司)数据
+      getBcorpsListfun(cnName) {
+          getBcorpsList(1, 10, {corpTypeName:'船公司', cnName }).then(res => {
+              this.corpData = res.data.data.records
+          })
+      },
+      // 船公司选中的回调
+      corpCorpChange(value) {
+          for (let item of this.corpData) {
+              if (item.cnName == value) {
+                  this.$set(this.form, 'carrierId', item.id)
+                  this.$set(this.form, 'carrierName', item.cnName)
+              }
+          }
+      },
     // 导出
     handleExport() {
       var condition = ''
@@ -539,9 +536,9 @@ export default {
     // 扩展数据详情的---------------------------------------
     // 扩展数据添加
     extendedDataAdd() {
-      this.form.extendedDataArr.map(item => {
-        item.edit = false
-      })
+      // this.form.extendedDataArr.map(item => {
+      //   item.edit = false
+      // })
       this.form.extendedDataArr.push({
         edit: true
       })
@@ -569,6 +566,30 @@ export default {
         })
         .catch(_ => { });
     },
+      // 扩展数据的确认
+      extendedDatafun(){
+          for(let item of this.form.extendedDataArr) {
+              if (!item.name) {
+                  this.$message({
+                      type: "warning",
+                      message: "请填写名称!"
+                  });
+                  return
+              }
+              if (!item.value) {
+                  this.$message({
+                      type: "warning",
+                      message: "请填写键值!"
+                  });
+                  return;
+              }
+          }
+          this.dialogVisible = false;
+          this.extendedDisabled = false
+          this.form.extendedDataArr.map(item => {
+              item.edit = false
+          })
+      },
     // 表格操作------------------------------------------------------------
     // 新增
     addbtnfun() {