Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/book/book-list.vue

@@ -17,7 +17,15 @@
                 <a-date-picker style="width: 100%" v-model="queryParam.shippingOrderDate" @change="orderDataChange" > </a-date-picker>
               </a-form-item>
             </a-col>
-
+            <a-col :md="6" :sm="8">
+              <a-form-item label="账套号">
+                 <j-search-select-tag
+                  placeholder="请选择账套号"
+                  v-model="queryParam.pkOrg"
+                  dict="view_account,account,account">
+                </j-search-select-tag>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="8">
               <a-form-item label="客户简称">
                 <!-- <a-input placeholder="请输入客户简称" v-model="queryParam.clientAbbreviation"></a-input> -->

src/views/pre-book/preBookList.vue

@@ -11,16 +11,26 @@
                 <a-input placeholder="请输入预托书号" v-model="queryParam.depositaryReceiptNo"></a-input>
               </a-form-item>
             </a-col>
-
+          
             <a-col :md="6" :sm="8">
               <a-form-item label="托书日期" has-feedback>
                 <a-date-picker style="width: 100%" v-model="queryParam.shippingOrderDate" @change = "changeTime"> </a-date-picker>
               </a-form-item>
             </a-col>
 
+              <a-col :md="6" :sm="8">
+              <a-form-item label="账套号">
+                 <j-search-select-tag
+                  placeholder="请选择账套号"
+                  v-model="queryParam.acSetNo"
+                  dict="view_account,account,account">
+                </j-search-select-tag>
+              </a-form-item>
+            </a-col>
+
+
             <a-col :md="6" :sm="8">
               <a-form-item label="客户简称">
-                <!-- <a-input placeholder="请输入客户简称" v-model="queryParam.clientAbbreviation"></a-input> -->
                  <j-search-select-tag
                   placeholder="请选择客户简称"
                   v-model="queryParam.clientAbbreviation"
@@ -269,7 +279,7 @@ export default {
         depositaryReceiptNo: '',
         shippingOrderDate: '',//托书日期
         clientAbbreviation: '',
-        // createBy: '',
+       acSetNo: '',
         smallPo: '',
         pageNo: '' // 点击的页数
       },
@@ -418,7 +428,7 @@ export default {
         depositaryReceiptNo: '',
         shippingOrderDate: '',//托书日期
         clientAbbreviation: '',
-        // createBy: '',
+        acSetNo: '',
         smallPo: '',
         pageNo: '' // 点击的页数
       }

src/views/shipment-details/shipmentList.vue

@@ -12,7 +12,16 @@
                 <a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
               </a-form-item>
             </a-col>
-
+            <a-col :md="5" :sm="8">
+                <a-form-item label="账套号">
+                  <!-- <a-input placeholder="请输入供应商" v-model="queryParam.supplier"></a-input> -->
+                   <j-search-select-tag
+                  placeholder="请选择账套号"
+                  v-model="queryParam.account"
+                  dict="view_account,account,account">
+                </j-search-select-tag>
+                </a-form-item>
+              </a-col>
             <a-col :md="5" :sm="8">
                 <a-form-item label="款号">
                   <a-input placeholder="请输入款号" v-model="queryParam.itemNumber"></a-input>
@@ -97,6 +106,27 @@
                 </j-search-select-tag>
                 </a-form-item>
               </a-col>
+              <a-col :md="5" :sm="8">
+                <a-form-item label="分销点">
+                  <!-- <a-input placeholder="请输入供应商" v-model="queryParam.supplier"></a-input> -->
+                   <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="客户简称">
+                  <!-- <a-input placeholder="请输入供应商" v-model="queryParam.supplier"></a-input> -->
+                   <j-search-select-tag
+                  placeholder="请选择客户简称"
+                  v-model="queryParam.customerAbbreviation"
+                  dict="view_customer,customername,customername">
+                </j-search-select-tag>
+                </a-form-item>
+              </a-col>
+              
 
               <a-col :md="5" :sm="8">
                 <a-form-model-item label="申报要素是否维护">