海运、空运、海空联运列表

src/views/ecw/box/index.vue → src/views/ecw/box/indexSeaAir.vue

@@ -17,13 +17,13 @@
 
       <el-form-item label="始发地" prop="startWarehouseId">
         <el-select v-model="queryParams.startWarehouseId" placeholder="请选择始发地">
-          <el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item label="目的地" prop="destWarehouseId">
         <el-select v-model="queryParams.destWarehouseId" placeholder="请选择目的地">
-          <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
@@ -47,14 +47,6 @@
       </el-form-item>
 
       
-      <el-form-item label="运输方式" prop="transportType">
-        <el-select v-model="queryParams.transportType" placeholder="请选择运输方式" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
-      </el-form-item>
-
-      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -126,8 +118,6 @@
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="edit">编辑</el-dropdown-item>
-              <el-dropdown-item command="sea">操作-海运</el-dropdown-item>
-              <el-dropdown-item command="air">操作-空运</el-dropdown-item>
               <el-dropdown-item command="seaAir">操作-海空联运</el-dropdown-item>
               <el-dropdown-item command="error">异常登记</el-dropdown-item>
               <el-dropdown-item command="cost">费用登记</el-dropdown-item>
@@ -145,19 +135,13 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
-        <el-form-item label="运输方式" prop="transportType">
-          <el-radio-group v-model="form.transportType" @change="changeTransportType">
-              <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)" :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item label="出货渠道" prop="shippingChannelId" v-if="form.transportType === 3 || form.transportType === 4">
+        <el-form-item label="出货渠道" prop="shippingChannelId">
           <el-select v-model="form.shippingChannelId" placeholder="请选择出货渠道">
             <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId" :key="item.channelId"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="柜型" prop="cabinetId" v-if="form.transportType !== 3">
+        <el-form-item label="柜型" prop="cabinetId">
           <el-select v-model="form.cabinetId" placeholder="请选择柜型">
             <el-option v-for="item in cabinetList" :label="item.name" :value="item.id" :key="item.id"></el-option>
           </el-select>
@@ -165,13 +149,13 @@
 
         <el-form-item label="始发地" prop="startWarehouseId">
           <el-select v-model="form.startWarehouseId" placeholder="请选择始发地">
-            <el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+            <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item label="目的地" prop="destWarehouseId">
           <el-select v-model="form.destWarehouseId" placeholder="请选择目的地">
-            <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+            <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
         
@@ -186,9 +170,9 @@
 
 <script>
   import {createbox, updatebox, deletebox, getbox, getboxPage, exportboxExcel} from "@/api/ecw/box";
-  import {getTradeCityList} from '@/api/ecw/region';
   import {getCabinetPage} from "@/api/ecw/cabinet";
   import { getChannelList } from '@/api/ecw/channel';
+  import { getWarehouseList } from "@/api/ecw/warehouse"
 
   export default {
     name: "box",
@@ -196,7 +180,7 @@
     data() {
       return {
         dateTypes:[
-          {value:'1', label:'预装时间/分拣时间'},
+          {value:'1', label:'预装时间'},
           {value:'2', label:'装柜时间'},
           {value:'3', label:'起运时间'},
           {value:'4', label:'到港时间'},
@@ -233,14 +217,15 @@
           destWarehouseId: null,
           transportType: null,
         },
-        tradeCityList: [],
         cabinetList:[],
         channelList:[],
+        warehouseList: [],
         // 表单参数
         form: {},
         // 表单校验
         rules: {
-          transportType: [{ required: true, message: "运输方式不能为空", trigger: "blur" }],
+          shippingChannelId: [{ required: true, message: "出货渠道不能为空", trigger: "blur" }],
+          cabinetId: [{ required: true, message: "柜型不能为空", trigger: "blur" }],
           startWarehouseId: [{ required: true, message: "始发地不能为空", trigger: "blur" }],
           destWarehouseId: [{ required: true, message: "目的地不能为空", trigger: "blur" }],
 
@@ -248,11 +233,11 @@
       };
     },
     computed: {
-      expoerCityList() {
-        return this.tradeCityList.filter(item => item.type == 2 || item.type == 3)
+      exportWarehouseList() {
+        return this.warehouseList.filter(item => item.tradeType == '2' || item.type == '3')
       },
-      importCityList() {
-        return this.tradeCityList.filter(item => item.type == 1 || item.type == 3)
+      importWarehouseList() {
+        return this.warehouseList.filter(item => item.tradeType == '1' || item.type == '3')
       },
 
       getCabinetName() {
@@ -281,7 +266,7 @@
 
     },
     created() {
-      getTradeCityList().then(res => this.tradeCityList = res.data);
+      getWarehouseList().then(res => this.warehouseList = res.data);
       getCabinetPage(null).then(response => {
         this.cabinetList = response.data.list;
       });
@@ -293,19 +278,13 @@
         getChannelList().then(res => this.channelList = res.data)
       },
 
-      changeTransportType(value) {
-        if(value === 3) {
-          this.form.cabinetId = null;
-        } else if(value == 1 || value == 2) {
-          this.form.shippingChannelId = null;
-        }
-      },
 
       /** 查询列表 */
       getList() {
         this.loading = true;
         // 处理查询参数
         let params = {...this.queryParams};
+        params.transportType = 4;
         this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
         // 执行查询
         getboxPage(params).then(response => {
@@ -364,19 +343,8 @@
             return;
           }
 
-        if(this.form.transportType != 3) {
-          if(!this.form.cabinetId) {
-            this.$message.error('柜型不能为空');
-            return;
-          }
-        }
-
-        if(this.form.transportType == 3 || this.form.transportType == 4) {
-          if(!this.form.shippingChannelId) {
-            this.$message.error('出货渠道不能为空');
-            return;
-          }
-        }
+          this.form.transportType = 4;
+          console.log(this.form);
 
           // 修改的提交
           if (this.form.id != null) {
@@ -430,6 +398,14 @@
           case 'sea':
             this.$router.push('/box/shippingSea/' + row.id)
             break;
+
+          case 'edit':
+            this.handleUpdate(row);
+            break;
+
+          case 'delete':
+            this.handleDelete(row);
+            break;
         }
       },
     }