Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/finance/contrast/index.vue

@@ -129,7 +129,6 @@
           </div>
         </el-collapse-transition>
       </el-form>
-
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button

src/views/kaihe/applyForInvoice/feeDetail/index.vue

@@ -998,7 +998,6 @@ export default {
     },
     voyageRemthods(){
       getVoyageName().then(response=>{
-        console.log(response)
         this.voyageOptions = response.rows
       })
     },

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

@@ -37,8 +37,8 @@
           </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 label="提单号" prop="fMblno">
+            <el-input size="small" width="240px" clearable v-model="queryParams.fMblno"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -63,6 +63,46 @@
               </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-select
+                  size="small"
+                  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="fVoyid">
+                <el-select
+                  v-model="queryParams.fVoyid"
+                  filterable
+                  remote
+                  size="small"
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in voyageOptions"
+                    :key="item.fId"
+                    :label="item.fNo"
+                    :value="item.fId"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
               <el-form-item label="装货时间" prop="cLoadDate">
                 <el-date-picker
                   v-model="queryParams.cLoadDate"
@@ -75,8 +115,6 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="6"></el-col>
-            <el-col :span="6"></el-col>
           </el-row>
         </div>
       </el-collapse-transition>
@@ -250,6 +288,8 @@
   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'
   Vue.directive('dialogDrag', {
     bind(el, binding, vnode, oldVnode) {
       const dialogHeaderEl = el.querySelector('.el-dialog__header')
@@ -312,6 +352,8 @@
     },
     data() {
       return {
+        voyageOptions:[],
+        vesselOptions:[],
         show: false,
         activeIndex: '0',
         setRowList: [],
@@ -481,6 +523,8 @@
       this.getRowList = this.tableDate;
       this.getList();
       this.cntrRemoteMethod()
+      this.vessleRemthod()
+      this.voyageRemthods()
       this.getDicts("f_serviceitems").then((response) => {
         if (response.data) {
           this.serviceitems = response.data;
@@ -492,6 +536,17 @@
       this.getList()
     },
     methods: {
+      voyageRemthods(){
+        getVoyageName().then(response=>{
+          this.voyageOptions = response.rows
+        })
+      },
+      //获取船名
+      vessleRemthod() {
+        getVesselName().then(response => {
+          this.vesselOptions = response.rows
+        })
+      },
       handleSelect(key, keyPath) {
         if(key === '0'){
           this.queryParams = {

src/views/login.vue

@@ -52,7 +52,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号-1</a>  青岛途宝软件开发有限公司</span>
+      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛途宝软件开发有限公司</span>
     </div>
   </div>
 </template>