瀏覽代碼

货代海运出口11.01

caojunjie 1 年之前
父節點
當前提交
3726598567

+ 3 - 0
src/views/financialManagementF/agreementprice/agreementpriceitems.vue

@@ -147,6 +147,7 @@
                                 <div v-if="item.prop == 'carrierCnName'">
                                     <search-query ref="SearchQuery"
                                                   :datalist="carrierData"
+                                                  :selectValue="agreementPriceForm[item.prop]"
                                                   title="船公司"
                                                   :filterable="true"
                                                   :clearable="true"
@@ -160,6 +161,7 @@
                                 <div v-else-if="item.prop == 'settlementPeriodType'">
                                     <search-query ref="SearchQuery"
                                                   :datalist="settlementPeriodData"
+                                                  :selectValue="agreementPriceForm[item.prop]"
                                                   title="结算周期"
                                                   :filterable="true"
                                                   :clearable="true"
@@ -499,6 +501,7 @@ export default {
         // 费用详细添加
         agreementPricepingCompanyAdd(){
             this.agreementPriceVisible = true
+            this.agreementPriceForm = {}
         },
         // 费用详细编辑
         agreementPriceCompanyEdit(index,row){

+ 61 - 40
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -29,6 +29,20 @@
               <template slot="search" slot-scope="{row,size}">
                   <el-form ref="form" :model="row" label-width="80px">
                       <el-row>
+                          <el-col :span="6" >
+                              <el-form-item label="主单号">
+                                  <el-input placeholder="请输入主单号"
+                                            size="small" style="width:100%" v-model="query.mblno">
+                                  </el-input>
+                              </el-form-item>
+                          </el-col>
+                          <el-col :span="6" >
+                              <el-form-item label="业务号">
+                                  <el-input placeholder="请输入业务号"
+                                            size="small" style="width:100%" v-model="query.billNo">
+                                  </el-input>
+                              </el-form-item>
+                          </el-col>
                           <el-col :span="6">
                               <el-form-item label="单据类型">
                                   <search-query
@@ -42,21 +56,6 @@
                                   </search-query>
                               </el-form-item>
                           </el-col>
-                          <!--billType 单据类型-->
-                          <el-col :span="6">
-                              <el-form-item label="业务号">
-                                  <el-input placeholder="请输入业务号"
-                                            size="small" style="width:100%" v-model="query.billNo">
-                                  </el-input>
-                              </el-form-item>
-                          </el-col>
-                          <el-col :span="6">
-                              <el-form-item label="主单号">
-                                  <el-input placeholder="请输入主单号"
-                                            size="small" style="width:100%" v-model="query.mblno">
-                                  </el-input>
-                              </el-form-item>
-                          </el-col>
                           <el-col :span="6">
                               <el-form-item label="分单号">
                                   <el-input placeholder="请输入分单号"
@@ -64,76 +63,76 @@
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="船名">
                                   <el-input placeholder="请输入船名"
                                             size="small" style="width:100%" v-model="query.vesselCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold" >
                               <el-form-item label="航次">
                                   <el-input placeholder="请输入航次"
                                             size="small" style="width:100%" v-model="query.voyageNo">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold" >
                               <el-form-item label="委托人">
                                   <el-input placeholder="请输入委托人"
                                             size="small" style="width:100%" v-model="query.corpCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="船公司">
                                   <el-input placeholder="请输入船公司"
                                             size="small" style="width:100%" v-model="query.carrierCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="目的港">
                                   <el-input placeholder="请输入目的港"
                                             size="small" style="width:100%" v-model="query.podCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="航线">
                                   <el-input placeholder="请输入航线"
                                             size="small" style="width:100%" v-model="query.lineCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="场站">
                                   <el-input placeholder="请输入场站"
                                             size="small" style="width:100%" v-model="query.cyCode">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="业务来源">
                                   <search-query
-                                                :datalist="srcTypeData"
-                                                :selectValue="query.srcType"
-                                                :filterable="true"
-                                                :clearable="true"
-                                                :remote="true"
-                                                :buttonIf="false"
-                                                @corpChange="corpChange($event,'srcType')">
+                                      :datalist="srcTypeData"
+                                      :selectValue="query.srcType"
+                                      :filterable="true"
+                                      :clearable="true"
+                                      :remote="true"
+                                      :buttonIf="false"
+                                      @corpChange="corpChange($event,'srcType')">
                                   </search-query>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="来源详情">
                                   <el-input placeholder="请输入来源详情"
                                             size="small" style="width:100%" v-model="query.srcCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="9">
+                          <el-col :span="9" v-show="fold">
                               <el-form-item label="ETD">
                                   <el-checkbox v-model="etdDisabled">
                                       <el-date-picker
@@ -153,7 +152,7 @@
 
                               </el-form-item>
                           </el-col>
-                          <el-col :span="9">
+                          <el-col :span="9" v-show="fold">
                               <el-form-item label="ETA">
                                   <el-checkbox v-model="etaDisabled">
                                       <el-date-picker
@@ -172,21 +171,21 @@
                                   </el-checkbox>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="创建部门">
                                   <el-input placeholder="请输入创建部门"
                                             size="small" style="width:100%" v-model="query.createDeptName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="订舱代理">
                                   <el-input placeholder="请输入订舱代理"
                                             size="small" style="width:100%" v-model="query.bookingAgentCnName">
                                   </el-input>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="签单方式">
                                   <search-query
                                       :datalist="issueTypeData"
@@ -200,7 +199,7 @@
                                   </search-query>
                               </el-form-item>
                           </el-col>
-                          <el-col :span="6">
+                          <el-col :span="6" v-show="fold">
                               <el-form-item label="收货人">
                                   <el-input placeholder="请输入收货人"
                                             size="small" style="width:100%" v-model="query.hConsigneeCnName">
@@ -210,7 +209,14 @@
                       </el-row>
                   </el-form>
               </template>
-              <template slot="searchMenu"  slot-scope="{row,size}"></template>
+              <template slot="searchMenu"  slot-scope="{row,size}">
+                  <el-button type="text" @click="shiftCollapsiable">
+                      <span>
+                          {{ fold ? '收起' : '展开' }}
+                          <i :class="fold ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
+                      </span>
+                  </el-button>
+              </template>
 
               <template slot="menuLeft">
                   <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新增海运出口
@@ -262,10 +268,13 @@
                       <small slot="more">...</small>
                   </avue-text-ellipsis>
               </template>
-
               <template slot="expand" slot-scope="{row}" >
                   <SplitList :typeMenu="true" :data="row.billsListAllData" :loading="SplitLoading" ></SplitList>
               </template>
+              <temolate slot="billStatus" slot-scope="{row}">
+                  <!--this.findObject(this.option.column, "billStatus").dicData-->
+                  <span>{{row.billStatus}}</span>
+              </temolate>
           </avue-crud>
       </basic-container>
 
@@ -319,6 +328,9 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
     components:{SearchQuery, feesTemplateItems, billsDetails,SplitList},
     data() {
       return {
+          // 展开和收回
+          fold:false,
+          maxShow:3,
           // 单据类型
           billTypeData:[
               {
@@ -400,7 +412,7 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 24,
+          searchMenuSpan: 6,
           searchLabelWidth:'100',
           border: true,
           index: true,
@@ -842,6 +854,15 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
           this.getWorkDictsfun() // 获取签单方式字典数据
       },
       methods: {
+        // 展开和收起
+          shiftCollapsiable(){
+              this.fold = !this.fold
+              if(this.fold) {
+                  this.option.searchMenuSpan = 24
+              }else {
+                  this.option.searchMenuSpan = 6
+              }
+          },
         // 下拉的回调
           corpChange(value,name) {
               this.query[name] = value