托书查询调整

src/views/book/book-list.vue

@@ -69,19 +69,27 @@
                   @change="orderDataChange"
                 />
                 <!-- <a-date-picker style="width: 100%" v-model="queryParam.shippingOrderDate" @change="orderDataChange" > </a-date-picker> -->
-              </a-form-item>
+              </a-form-item> 
             </a-col>
             <a-col :md="5" :sm="8">
                 <a-form-item label="船期">
-                  <a-date-picker
+                  <!-- <a-date-picker
                     placeholder="请选择"
                     style="width:100%;"
                     format="YYYY-MM-DD"
                     valueFormat="YYYY-MM-DD"
                     v-model="queryParam.theFinalShippingDate"
+                  /> -->
+                  <a-range-picker
+                    :placeholder="['开始时间', '结束时间']"
+                    format="YYYY-MM-DD"
+                    style="width: 100%"
+                    v-model="theFinalShippingDate"
+                    @change="orderDataChange2"
                   />
                 </a-form-item>
               </a-col>
+
               <a-col :md="5" :sm="8">
                 <a-form-item label="供应商">
                     <j-search-select-tag
@@ -101,6 +109,26 @@
                   <a-input placeholder="请输入外销发票" v-model="queryParam.exportInvoiceNo"></a-input>
                 </a-form-item>
               </a-col>
+              <a-col :md="5" :sm="8">
+                <a-form-item label="分销点">
+                    <j-search-select-tag
+                        placeholder="请输入分销点"
+                        v-model="queryParam.distributionPoint"
+                        dict="view_distributionPoint,distributionPoint,distributionPoint">
+                    </j-search-select-tag>
+                </a-form-item>
+              </a-col>
+
+              <a-col :md="5" :sm="8">
+                <a-form-item label="制单人">
+                    <j-search-select-tag
+                        placeholder="请选择制单人"
+                        v-model="queryParam.createBy"
+                        dict="view_shipping_create_by,create_by,create_by">
+                    </j-search-select-tag>
+                </a-form-item>
+              </a-col>
+
               <a-col :md="5" :sm="8">
                 <a-form-model-item label="发票推送状态">
                   <a-select v-model="queryParam.timeStuta">
@@ -230,6 +258,8 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
+import Vue from 'vue'
+import { USER_INFO } from "@/store/mutation-types"
 
 import { downFile ,getAction,deleteAction,postActio} from '@/api/manage'
 
@@ -384,6 +414,7 @@ export default {
       ],
       bookListData: [],
       shippingOrderDate:[], //单据日期区间
+      theFinalShippingDate:[], //单据日期区间
       id: '',
       selectedRowKeys:[],//选中行id
       loadingU8:false,
@@ -403,7 +434,7 @@ export default {
   },
 
   created() {
-    this.getDefaultTime()
+    this.getDefaultTime() 
     // this.getBookList( )
   },
   watch:{
@@ -447,6 +478,10 @@ export default {
     this.shippingOrderDate[1]= moment(new Date()).format('YYYY-MM-DD')
     this.queryParam.shippingOrderDateB =  (lastM!==''&&lastM)?(moment( lastM).format('YYYY-MM-DD')):''
     this.queryParam.shippingOrderDateE =  moment(new Date()).format('YYYY-MM-DD')
+
+    var user = Vue.ls.get(USER_INFO)  
+    var createBy_dictText = user.realname
+    this.queryParam.createBy = createBy_dictText
     // return [y, m, '01'].join("-");
     },
     // 查询按钮
@@ -475,6 +510,9 @@ export default {
     // 新增
     addBookDrawer() {
       console.log('新增托书')
+      var user = Vue.ls.get(USER_INFO) 
+      var createBy_dictText = user.realname
+      console.log('制单人  '+createBy_dictText)
       this.$refs.addBookDrawer.visible = true
       this.$refs.addBookDrawer.query ='1'
     },
@@ -727,6 +765,11 @@ export default {
        this.queryParam.shippingOrderDateE = (data.length==2&&data)?(moment( data[1]).format('YYYY-MM-DD')):''
     },
 
+    orderDataChange2(data){
+       this.queryParam.theFinalShippingDateB = (data.length==2&&data)?(moment( data[0]).format('YYYY-MM-DD')):''
+       this.queryParam.theFinalShippingDateE = (data.length==2&&data)?(moment( data[1]).format('YYYY-MM-DD')):''
+    },
+
     // // 分页、排序、筛选变化时触发
     handleTableChange(pagination, filters, sorter) {
       // console.log('当前页信息>>>>',pagination)