Merge remote-tracking branch 'origin/dev' into dev

src/App.vue

@@ -50,23 +50,35 @@ export default  {
   padding: 50px;
   text-align: center;
 }
-$sizes: 10,20,30,50,100,150,200,500,800,1000;
+$sizes: 0, 10,20,30,50,100,150,200,500,800,1000;
 @for $i from 1 through length($sizes){
   $item: nth($sizes, $i);
   .ml-#{$item}{
-    margin-left: #{$item}px;
+    margin-left: #{$item}px !important;
   }
   .mr-#{$item}{
-    margin-right: #{$item}px;
+    margin-right: #{$item}px !important;
   }
   .mb-#{$item}{
-    margin-bottom: #{$item}px;
+    margin-bottom: #{$item}px !important;
   }
   .mt-#{$item}{
-    margin-top: #{$item}px;
+    margin-top: #{$item}px !important;
+  }
+  .pl-#{$item}{
+    margin-left: #{$item}px !important;
+  }
+  .pr-#{$item}{
+    margin-right: #{$item}px !important;
+  }
+  .pb-#{$item}{
+    margin-bottom: #{$item}px !important;
+  }
+  .pt-#{$item}{
+    margin-top: #{$item}px !important;
   }
   .w-#{$item}{
-    width: #{$item}px;
+    width: #{$item}px !important;
   }
 }
 </style>

src/api/ecw/order.js

@@ -377,6 +377,24 @@ export function getOrderSpecialByApproveId(approveId) {
   })
 }
 
+// 订单号检索功能
+export function getOrderNoSearch(params) {
+  return request({
+    url: '/ecw/order/orderNoSearch',
+    method: 'get',
+    params
+  })
+}
+
+// 提单号检索功能
+export function getBillNoSearch(params) {
+  return request({
+    url: '/ecw/order/billNoSearch',
+    method: 'get',
+    params
+  })
+}
+
 // 根据合并订单编号获得已合单的订单动态
 export function getMergeLogByMergedOrderNo(params){
   return request({

src/api/ecw/zhongPao.js

@@ -34,6 +34,15 @@ export function getZhongPao(id) {
   })
 }
 
+// 获得客户最优惠的重泡货配置
+export function getZhongPaoBest(query) {
+  return request({
+    url: '/ecw/zhong-pao/get-customer-best-zhong-pao',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获得重泡货配置分页
 export function getZhongPaoPage(query) {
   return request({

src/components/ChooseContactDialog/index.vue

@@ -27,6 +27,8 @@
             </div>
         </div>
       </div>
+      <pagination v-show="total > 0" :total="total" :page.sync="form.pageNo" :limit.sync="form.pageSize"
+        @pagination="loadList" />
     </el-dialog>
 </template>
 <script>
@@ -39,11 +41,12 @@ export default {
         return {
             show: true,
             form:{
-                /* pageNo: 1,
-                pageSize: 20, */
+                pageNo: 1,
+                pageSize: 10,
                 searchKey: ''
             },
-            list:[]
+            list:[],
+            total: 0
         }
     },
     created(){
@@ -58,6 +61,7 @@ export default {
         loadList(){
             getCustomerContactsSelect(this.form).then(res => {
                 this.list = res.data.list
+                this.total = res.data.total
             })
         },
         closeDialog(){

src/components/QuickCreateCustomer/index.vue

@@ -124,7 +124,7 @@ export default {
           this.$modal.msgSuccess("新增成功");
           return getCustomerContactsSelect({customerId: res.data})
         }).then(res => {
-          this.$emit('success', res.data[0])
+          this.$emit('success', res.data.list[0])
         })
       });
     },

src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue

@@ -71,8 +71,8 @@
 
     </el-form>
     <el-row class="operate-button" v-if="inReview">
-      <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? '部分退场审核中' : '全部退场审核中'}}</el-button>
-      <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? '取消部分退场审核' : '取消全部退场审核'}}</el-button>
+      <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? '全部退场审核中' : '部分退场审核中'}}</el-button>
+      <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? '取消全部退场审核' : '取消部分退场审核'}}</el-button>
     </el-row>
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">保存</el-button>

src/views/ecw/customerComplaint/index.vue

@@ -169,7 +169,7 @@
           </el-input>
         </el-form-item>
         <el-form-item v-show="form.status == '3'" label="处理时间" required>
-          <el-date-picker type="datetime" v-model="form.handleAt"></el-date-picker>
+          <el-date-picker type="datetime" v-model="form.handleAt" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">

src/views/ecw/order/cargoControl.vue

@@ -74,7 +74,7 @@
 
       <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo" >
         <template slot-scope="scope">
-          <span>{{ scope.row.orderNo }}</span>
+          <router-link :to="`detail?orderId=` + scope.row.orderId">{{ scope.row.orderNo }}</router-link>
         </template>
       </el-table-column>
       <el-table-column :label="$t('唛头')" align="center" prop="marks" />

src/views/ecw/order/components/BatchPickup.vue

 <template>
     <el-dialog :title="$t('批量提货')" visible :before-close="closeDialog" :close-on-click-modal="false">
-        <el-form :model="form">                
+        <el-form ref="form" :model="form" :rules="rules">                
             <el-tabs v-model="current" type="card">
                 <el-tab-pane :label="$t('全部提货')" name="createOrderPickupBatch">
-                    <el-form-item :label="$t('订单号') + '/' + this.$t('提单号')" required>
+                    <el-form-item :label="$t('订单号') + '/' + this.$t('提单号')" prop="orderId">
                         <el-input v-model="form.orderId" :placeholder="$t('例：NA2200001L')"></el-input>
                         <div>{{$t('注：单号之间使用逗号或空格隔开')}}</div>
                     </el-form-item>
-                    <el-form-item :label="$t('提货时间')">
+                    <el-form-item :label="$t('提货时间')" prop="pickTime">
                         <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                     </el-form-item>
                 </el-tab-pane>
@@ -36,6 +36,10 @@ export default {
                 pickTime: '',
                 pickType: 1
             },
+            rules:{
+                orderId: [{required: true, message: this.$t('请填写单号')}],
+                pickTime: [{required: true, message: this.$t('请选择时间')}]
+            }
         }
     },
     computed:{
@@ -46,22 +50,24 @@ export default {
     },
     methods:{
         submit(){
-            if(this.form.orderId == '' || this.form.pickTime==''){
-                return this.$message.error(this.$t('请填写订单号和提货时间'))
-            }
-            let orderIdArr = this.form.orderId.replace(/,/g, ' ').split(' ').filter(item => item !='')
-            let data = []
-            for(let orderId of orderIdArr){
-                data.push({
-                    pickType: 1,
-                    orderId,
-                    pickTime: this.form.pickTime
-                })
-            }
+            this.$refs.form.validate().then(() => {
+                if(this.form.orderId == '' || this.form.pickTime==''){
+                    return this.$message.error(this.$t('请填写订单号和提货时间'))
+                }
+                let orderIdArr = this.form.orderId.replace(/,/g, ' ').split(' ').filter(item => item !='')
+                let data = []
+                for(let orderId of orderIdArr){
+                    data.push({
+                        pickType: 1,
+                        orderId,
+                        pickTime: this.form.pickTime
+                    })
+                }
 
-            ({createOrderPickupBatch, createOrderPickupSplitBatch}[this.current])(data).then(res => {
-                this.$message.success(this.$t("操作成功"));
-                this.form.orderId = ''
+                ({createOrderPickupBatch, createOrderPickupSplitBatch}[this.current])(data).then(res => {
+                    this.$message.success(this.$t("操作成功"));
+                    this.$emit('success')
+                })
             })
         },
         closeDialog(){

src/views/ecw/order/components/Transfer.vue

@@ -6,7 +6,7 @@
                 <el-input v-model="cargoControlName" disabled></el-input>
               </el-form-item>
               <el-form-item :label="$t('原控货手机号')">
-                <el-input :value="cargoControlPhone" disabled></el-input>
+                <el-input :value="consigneeCountryCode + ' ' + cargoControlPhone" disabled></el-input>
               </el-form-item>
               
               <el-form-item :label="$t('新控货人')" prop="name">
@@ -49,6 +49,7 @@ export default {
         orderId: [String, Number],
         cargoControlName: String,
         cargoControlPhone: String,
+        consigneeCountryCode: String,
         orderNo: String,
 
     },

src/views/ecw/order/detail.vue

@@ -121,9 +121,12 @@
             </el-table-column>
             <el-table-column prop="" :label="$t('成交单价')"  width="220px">
               <template slot-scope="{row}">
+                
                 <template v-if="row.charging ==1">
-                  {{$t('全包价')}} {{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
+                  <template v-if="!row.seaFreight">未报价</template>
+                  <template>{{$t('全包价')}} {{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
                 </template>
+                <template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
                 <template v-else>
                   <div>
                       {{$t('运费')}}：{{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}

src/views/ecw/order/index.vue

@@ -241,7 +241,7 @@
     <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" />
     <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
     <print-lading-bill v-if="printLadingBillInfo !== null" v-bind="printLadingBillInfo" @close="printLadingBillInfo=null" />
-    <batch-pickup v-if="showBatchPickup" @close="onBatchClose"/>
+    <batch-pickup v-if="showBatchPickup" @close="onBatchClose" @success="onBatchClose"/>
     <withdrawal v-if="show" :dialog-visible="show"  :orderId="orderId" ></withdrawal>
     <batch-single-application :order-list="orderId" :dialog-visible.sync="warehouseBol"></batch-single-application>
     <fee-application :order-id="orderId" :dialog-visible.sync="feeApplicationBol"></fee-application>

src/views/ecw/order/success.vue

@@ -24,7 +24,7 @@
         <div class="actions">
             <el-button type="primary" @click="$router.replace('detail?orderId=' + order.orderId)">{{$t('查看订单')}}</el-button>
             <el-button type="warning" @click="showNotice = true">{{$t('入仓须知')}}</el-button>
-            <el-button type="info" @click="$router.replace('edit')">{{$t('再来一单')}}</el-button>
+            <el-button type="info" @click="$router.replace('create')">{{$t('再来一单')}}</el-button>
         </div>
 
         <el-dialog :title="$t('查看须知')" :visible.sync="showNotice" width="700px">

src/views/index.vue

@@ -7,7 +7,7 @@
       <line-chart :chart-data="lineChartData" />
     </el-row>
 
-    <el-row>
+    <!-- <el-row>
       <el-col :span="12">
         <ueditor v-model="html" />
       </el-col>
@@ -25,7 +25,7 @@
 
     <el-row>
       <my-process-viewer key="designer" v-model="bpmnXML" v-bind="bpmnControlForm" />
-    </el-row>
+    </el-row> -->
 
     <el-row :gutter="32">
       <el-col :xs="24" :sm="24" :lg="8">