Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/components/FileUpload/index.vue

@@ -117,7 +117,7 @@ export default {
       if (this.fileType) {
         let fileExtension = "";
         if (file.name.lastIndexOf(".") > -1) {
-          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1).toLowerCase();
         }
         const isTypeOk = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;

src/components/RoutersSelector/index.vue

@@ -213,10 +213,10 @@ export default {
     methods:{
         changeOption(){
             if(!this.option) return
-            this.importCity = +this.option.importCity
-            this.exportCity = +this.option.exportCity
-            this.transportType = this.option.transportId
-            this.channelId = +this.option.channelId
+            this.importCity = +this.option.importCity || null
+            this.exportCity = +this.option.exportCity || null
+            this.transportType = this.option.transportId || null
+            this.channelId = +this.option.channelId || null
         },
         // 全选、全不选 某个运输方式所有线路
         toggleGroupChecker(index, selected){

src/components/Ueditor/index.vue

@@ -4,7 +4,7 @@
 		id="editor"
 		v-model="valueSync"
 		:config="ueditorConfig"
-		style="line-height: 20px; max-width: 600px;"
+		style="line-height: 20px;"
 		></vue-ueditor-wrap>
 	</div>
 </template>

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

@@ -41,7 +41,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item :label="$t('已核销预付金额占总金额比例')+':'" label-width="200px">
+                    <el-form-item :label="$t('已核销预付金额占总金额比例')+':'" label-width="320px">
                         {{orderFee.writeOffAmountScale}}%
                     </el-form-item>
                 </el-col>
@@ -53,15 +53,22 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item :label="$t('预付商品货值占佣金额比例')+':'" label-width="200px">
+                    <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="320px">
                         {{orderFee.paymentGoodsWorthScale}}%
                     </el-form-item>
                 </el-col>
             </el-row>
              <el-row>
+                <el-col :span="6">
                    <el-form-item :label="$t('预付商品方数')+':'">
                        {{orderFee.paymentGoodsVolume}} {{$t('立方米')}}
                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item :label="$t('预付商品货值占订单总运费+清关费比例')+':'" label-width="320px">
+                        {{orderFee.needWorthScale}}%
+                    </el-form-item>
+                  </el-col>
                 </el-row>
               <el-row>
                 <el-col :span="6">
@@ -70,7 +77,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item :label="$t('预付商品方数占总方数比例')+':'" label-width="200px">
+                    <el-form-item :label="$t('预付商品方数占总方数比例')+':'" label-width="320px">
                         {{orderFee.paymentGoodsVolumeScale}}%
                     </el-form-item>
                 </el-col>

src/views/ecw/order/detail.vue

@@ -3,7 +3,8 @@
     <el-card class="card">
       <div slot="header" class="card-title">
         {{$t('订单编号')}}：{{order.orderNo}}
-        <template v-if="order.containerNumber"> - {{order.containerNumber}}</template>
+        <template v-if="order.tidanNo"> - {{order.tidanNo}}</template>
+        <template v-else-if="order.containerNumber"> - {{order.containerNumber}}</template>
       </div>
       <el-row :gutter="20">
         <el-col :span="8" v-if="order.consignorVO">
@@ -40,6 +41,13 @@
           </el-descriptions>
         </el-col>
       </el-row>
+      <el-descriptions class="margin-top" border :column="1" :labelStyle="{width:'150px'}">
+        <el-descriptions-item :label="$t('付款人')">
+         
+          <el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">自定义</el-link>
+          <dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag>
+        </el-descriptions-item>
+      </el-descriptions>
     </el-card>
     <el-card class="card">
       <el-descriptions border :title="$t('物流信息')" :column="2">
@@ -244,6 +252,20 @@
     <print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
     <print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
     <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
+    <el-dialog title="付款人" :visible.sync="showDarweeDialog" v-if="order && order.customDraweeVOList">
+      <el-table :data="order.customDraweeVOList" v-if="order.drawee==3" >
+        <el-table-column label="费用类型" prop="label" width="200px">
+          <template slot-scope="{row}">
+          <dict-tag :type="DICT_TYPE.ECW_CUSTOM_DRAWEE" :value="row.name"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="付款人" width="300px">
+            <template slot-scope="{row}">
+                <dict-tag :type="DICT_TYPE.DRAWEE" :value="row.value" />
+            </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -274,6 +296,7 @@ export default {
   },
   data() {
     return {
+      showDarweeDialog: false,
       // 遮罩层
       loading: false,
       order: null,

src/views/ecw/order/edit.vue

@@ -881,6 +881,10 @@ export default {
                 this.$set(this.form, 'consigneePhone',          res.data.consigneeVO.phone)
             }
             
+            if(this.form.channelId == 0){
+                delete this.form.channelId
+            }
+
             if(res.data.ccIds){
                 this.ccIdArr = res.data.ccIds.split(",").filter(item => item && item != '')
             }

src/views/ecw/order/prepayDeal.vue

@@ -205,7 +205,7 @@
           </el-form-item>
           </el-col>
           <el-col :span="8">
-          <el-form-item :label="$t('已核销预付金额占总金额比例')+':'" label-width="200px">
+          <el-form-item :label="$t('已核销预付金额占总金额比例')+':'" label-width="320px">
               {{orderFee.writeOffAmountScale}}%
           </el-form-item>
           </el-col>
@@ -217,15 +217,23 @@
           </el-form-item>
           </el-col>
           <el-col :span="8">
-          <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="200px">
+          <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="320px">
               {{orderFee.paymentGoodsWorthScale}}%
           </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
+
+          <el-col :span="6">
              <el-form-item :label="$t('预付商品方数')+':'">
                  {{orderFee.paymentGoodsVolume}} {{$t('立方米')}}
              </el-form-item>
+          </el-col>
+          <el-col :span="8">
+          <el-form-item :label="$t('预付商品货值占订单总运费+清关费比例')+':'" label-width="320px">
+              {{orderFee.needWorthScale}}%
+          </el-form-item>
+          </el-col>
         </el-row>
         <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
           <el-col :span="6">
@@ -234,7 +242,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('预付商品方数占总方数比例')+':'" label-width="200px">
+            <el-form-item :label="$t('预付商品方数占总方数比例')+':'" label-width="320px">
                 {{orderFee.paymentGoodsVolumeScale}}%
             </el-form-item>
             </el-col>

src/views/ecw/order/special/Commission.vue

@@ -82,7 +82,7 @@
           {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>
         <div v-if="form.commissionType == 3">
           {{$t('实际佣金返点')}}：
-          {{form.shadeCommissionAmount + form.lightCommissionAmount }}
+          {{totalCommision }}
           {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
         </div>
       </div>
@@ -200,6 +200,9 @@ export default {
     salePrice(){
       if(!this.originPrice) return 0
       return Decimal(this.originPrice).plus(parseFloat(this.form.lightCommissionAmount) || 0)
+    },
+    totalCommision(){
+      return Decimal(this.form.lightCommissionAmount || 0).plus(this.form.shadeCommissionAmount || 0)
     }
   },
   

src/views/ecw/warehouse/index.vue

@@ -307,13 +307,13 @@
     </el-dialog>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="$t('设置路线提单模板')" :visible.sync="templateOpen" width="1000px" @close="ladingFormClose()" append-to-body>
+    <el-dialog :title="$t('设置路线提单模板')" :visible.sync="templateOpen" width="1100px" @close="ladingFormClose()" append-to-body>
       <el-form ref="form" :model="ladingform" :rules="rules" label-width="80px">
         <el-form-item :label="$t('货柜前缀')" prop="prefixCounter">
           <el-input v-model="ladingform.prefixCounter" :placeholder="$t('请输入货柜前缀')" />
         </el-form-item>
         <el-form-item :label="$t('抬头')" prop="titleZh">
-          <ueditor v-model="ladingform.titleZh" :min-height="192"/>
+          <ueditor v-model="ladingform.titleZh" :min-height="192" style="width:960px"/>
         </el-form-item>
 
         <el-card class="box-card">
@@ -363,7 +363,7 @@
         </el-card>
 
         <el-form-item :label="$t('条款')" prop="contentZh">
-          <ueditor v-model="ladingform.contentZh" :min-height="192"/>
+          <ueditor v-model="ladingform.contentZh" :min-height="192" style="width:960px"/>
         </el-form-item>
 
         <el-form-item v-if="showFlag">