修改内贸业务我的订单列表查询条件

src/api/kaihe/domesticTrade/myOrder.js

@@ -8,6 +8,24 @@ export function listCorps(query) {
     params: query
   })
 }
+
+// 获取对应角色的用户
+export function selectUserByRole() {
+  return request({
+    url: '/system/user/selectUserByRole',
+    method: 'get'
+  })
+}
+// 获取对应订舱单位
+export function bookingParty() {
+  return request({
+    url: '/basicdata/corps/list',
+    method: 'get',
+    params:{
+      fTypeid: 1
+    }
+  })
+}
 export function listName(query) {
   return request({
     url: '/shipping/cntrno/getTCntrnoChange',

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -22,35 +22,82 @@
              style="margin-top:20px">
       <el-row>
         <el-col :span="6">
-          <el-form-item label="订舱号" prop="fBillno">
-            <el-input size="small" width="240px" clearable v-model="queryParams.fBillno"/>
+          <el-form-item label="船名" prop="fVslid">
+            <el-select
+                size="small"
+                style="width: 240px;"
+                v-model="queryParams.fVslid"
+            >
+              <el-option
+                  v-for="item in vesselOptions"
+                  :key="item.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="运输条款" prop="fServiceitems">
-            <el-select size="small" width="240px" clearable v-model="queryParams.fServiceitems">
+          <el-form-item label="航次" prop="fVoyid">
+            <el-select
+                v-model="queryParams.fVoyid"
+                filterable
+                clearable
+                remote
+                size="small"
+                style="width: 240px"
+            >
               <el-option
-                  v-for="item in serviceitems"
-                  :key="item.dictValue"
-                  :label="item.dictLabel"
-                  :value="item.dictValue"/>
+                  v-for="item in voyageOptions"
+                  :key="item.fId"
+                  :label="item.fNo"
+                  :value="item.fId"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="提单号" prop="fMblno">
-            <el-input size="small" width="240px" clearable v-model="queryParams.fMblno"></el-input>
+          <el-form-item label="起运港口" prop="fLoadportid">
+            <el-select
+                v-model="queryParams.fLoadportid"
+                filterable
+                remote
+                clearable
+                size="small"
+                style="width: 240px;"
+                class="elSelect"
+                placeholder="请输入模糊查找目的港口"
+            >
+              <el-scrollbar>
+                <el-option
+                    v-for="(dict, index) in fMblnoOptions"
+                    :key="dict.fId"
+                    :label="dict.fName"
+                    :value="dict.fId"
+                ></el-option>
+              </el-scrollbar>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="箱型" prop="fCntrid">
-            <el-select size="small" v-model="queryParams.fCntrid" clearable :remote-method="cntrRemoteMethod">
-              <el-option
-                  v-for="(dict, index) in container"
-                  :key="dict.fId"
-                  :label="dict.fNo"
-                  :value="dict.fId"
-              ></el-option>
+          <el-form-item label="目的港口" prop="fDestportid">
+            <el-select
+                v-model="queryParams.fDestportid"
+                filterable
+                clearable
+                remote
+                size="small"
+                style="width: 240px;"
+                class="elSelect"
+                placeholder="请输入模糊查找目的港口"
+            >
+              <el-scrollbar>
+                <el-option
+                    v-for="(dict, index) in fMblnoOptions"
+                    :key="dict.fId"
+                    :label="dict.fName"
+                    :value="dict.fId"
+                ></el-option>
+              </el-scrollbar>
             </el-select>
           </el-form-item>
         </el-col>
@@ -59,58 +106,73 @@
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label="箱量" prop="fCntrcount">
-                <el-input size="small" width="240px" clearable v-model="queryParams.fCntrcount"/>
+              <el-form-item label="提单号" prop="fMblno">
+                <el-input size="small" style="width: 240px" clearable v-model="queryParams.fMblno"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="收货人" prop="fConsigneername">
-                <el-input size="small" width="240px" clearable v-model="queryParams.fConsigneername"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="船名" prop="fVslid">
+              <el-form-item label="订舱单位" prop="fCorpid">
                 <el-select
+                    v-model="queryParams.fCorpid"
+                    clearable
+                    filterable
                     size="small"
-                    width="240px"
-                    v-model="queryParams.fVslid"
+                    placeholder="请选择订舱单位"
+                    style="width: 240px"
                 >
                   <el-option
-                      v-for="item in vesselOptions"
-                      :key="item.fId"
+                      v-for="(item, index) in fCorpid"
+                      :key="index.fId"
                       :label="item.fName"
                       :value="item.fId"
-                  />
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="航次" prop="fVoyid">
+              <el-form-item label="业务员" prop="createBy">
                 <el-select
-                    v-model="queryParams.fVoyid"
+                    v-model="queryParams.createBy"
+                    clearable
                     filterable
-                    remote
                     size="small"
-                    style="width: 200px"
+                    placeholder="请选择业务员"
+                    style="width: 240px"
                 >
                   <el-option
-                      v-for="item in voyageOptions"
-                      :key="item.fId"
-                      :label="item.fNo"
-                      :value="item.fId"/>
+                      v-for="(item, index) in createBy"
+                      :key="index.userId"
+                      :label="item.userName"
+                      :value="item.userId"
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="订舱日期" prop="cLoadDate">
+                <el-date-picker
+                    v-model="queryParams.cLoadDate"
+                    type="daterange"
+                    range-separator="至"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    :default-time="['00:00:00', '23:59:59']"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="装货时间" prop="cLoadDate">
+              <el-form-item label="开船日期" prop="timeInterval">
                 <el-date-picker
-                    v-model="queryParams.cLoadDate"
+                    v-model="queryParams.timeInterval"
                     type="daterange"
                     range-separator="至"
                     style="width: 240px"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    :default-time="['00:00:00', '23:59:59']"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期">
                 </el-date-picker>
@@ -319,13 +381,14 @@
 </template>
 
 <script>
-import {listCorps, getcntrName, delCorps, changeCorpsStatus, exportInventory,cancelAllocation,confirmAllocation} from "@/api/kaihe/domesticTrade/myOrder";
+import {bookingParty,selectUserByRole,listCorps, getcntrName, delCorps, changeCorpsStatus, exportInventory,cancelAllocation,confirmAllocation} from "@/api/kaihe/domesticTrade/myOrder";
 import Cookies from 'js-cookie'
 import {addSet, resetModule, select} from '@/api/system/set'
 import Vue from 'vue'
 import draggable from "vuedraggable";
 import {getVesselName} from '@/api/finance/applyForInvoice/chargeInvoice'
 import {getVoyageName} from '@/api/finance/applyForInvoice/feeDetail'
+import {portInquiry} from "@/api/kaihe/domesticTrade/orderInformation";
 
 Vue.directive('dialogDrag', {
   bind(el, binding, vnode, oldVnode) {
@@ -560,11 +623,23 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      fMblnoOptions:[],
+      createBy:[],
+      fCorpid:[]
     };
   },
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
+    portInquiry().then(res =>{
+      this.fMblnoOptions = res.rows;
+    })
+    selectUserByRole().then(res => {
+      this.createBy = res.rows
+    })
+    bookingParty().then(res=>{
+      this.fCorpid = res.rows
+    })
     this.getList();
     this.cntrRemoteMethod()
     this.vessleRemthod()