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

public/static/plugins/ueditor/ueditor.all.min.js

@@ -19985,7 +19985,7 @@ UE.plugins['table'] = function () {
         "averagedistributerow":1
     };
     me.ready(function () {
-        utils.cssRule('table',
+        /* utils.cssRule('table',
             //选中的td上的样式
             '.selectTdClass{background-color:#edf5fa !important}' +
                 'table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}' +
@@ -19996,7 +19996,7 @@ UE.plugins['table'] = function () {
                 'th{border-top:1px solid #BBB;background-color:#F7F7F7;}' +
                 'table tr.firstRow th{border-top-width:2px;}' +
                 '.ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }' +
-                'td p{margin:0;padding:0;}', me.document);
+                'td p{margin:0;padding:0;}', me.document); */
 
         var tableCopyList, isFullCol, isFullRow;
         //注册del/backspace事件

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/box/indexSea.vue

@@ -124,7 +124,7 @@
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
-              <el-dropdown-item :disabled="scope.row.ldStatus<42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus<46" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">

src/views/ecw/box/indexSeaAir.vue

@@ -226,7 +226,7 @@
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
-              <el-dropdown-item :disabled="scope.row.ldStatus<42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus<46" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">

src/views/ecw/box/ladingBill/index.vue

@@ -64,6 +64,7 @@
             </template>
             <template v-if="scope.row.status === 3">
               {{$t('审核拒绝')}}
+              <el-button type="text" size="small" @click="handleCommand('queryBill',scope.row)">{{$t('重新制作')}}</el-button>
             </template>
           </template>
         </el-table-column>

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -24,7 +24,7 @@
       </div>
     </el-row>
 
-    <el-dialog :title="dialogCfg.title" :visible.sync="visible" width="850px" append-to-body class="shippingSea-dialog">
+    <el-dialog :title="dialogCfg.title" :visible.sync="visible" width="1000px" append-to-body class="shippingSea-dialog">
       <previewBill v-if="visible" :contentHtml="billContent" :currRow="currRow" :type="dialogCfg.type" />
     </el-dialog>
   </el-row>

src/views/ecw/customer/query.vue

@@ -137,7 +137,7 @@
                   <el-form-item>
                     <el-button type="primary" @click="getorderList">{{$t('搜索')}}</el-button>
                     <el-button type="primary" @click="()=>{
-                         queryParams = { rows:10,page:1}; getorderList()
+                         queryParams = { rows:10,page:1}; getorderList();rucangtime  = [];
                     }">{{$t('重置')}}</el-button>
                   </el-form-item>
                 </el-form>
@@ -659,8 +659,7 @@ export default {
    },
     //订单
     getorderList(){
-      infoListOrderPage({customerDetailld:this.id,...this.queryParams}).then(r => {
-        console.log(r)
+      infoListOrderPage({customerDetailId:this.id,...this.queryParams}).then(r => {
         if(r.code === 0){
           this.orderList = r.data.list
           this.orderTotal = r.data.total

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/index.vue

@@ -172,7 +172,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="150px">
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px">
         <template slot-scope="scope">
           <!-- 已删除的订单只需要删除和查看 https://zentao.jdshangmen.com/bug-view-684.html -->
           <template v-if="scope.row.status == 88">
@@ -180,7 +180,7 @@
           </template>
           <template v-else>
             <!--操作相关的-->
-            <el-dropdown>
+            <el-dropdown v-if="exclude(scope.row.inWarehouseState, [204,205,206])">
               <el-button type="text">{{$t('操作')}}</el-button>
               <el-dropdown-menu slot="dropdown">
                 <!-- 编辑 -->
@@ -251,8 +251,8 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-            <template v-if="scope.row.status != 0 && scope.row.inWarehouseState != 206">
-              <el-divider direction="vertical"></el-divider>
+            <template v-if="scope.row.status != 0 && [204,205,206].indexOf(scope.row.inWarehouseState) < 0">
+              <!-- <el-divider direction="vertical"></el-divider> -->
               <!--仓库相关的-->
               <el-dropdown>
                 <el-button type="text">{{$t('仓库')}}</el-button>
@@ -321,7 +321,7 @@
               </el-dropdown>
             </template>
 
-            <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider>
+            <!-- <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider> -->
             <!--打印相关的-->
             <el-dropdown v-if="scope.row.status != 0">
               <el-button type="text">{{$t('打印')}}</el-button>
@@ -649,3 +649,13 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .actions{
+    .el-dropdown{
+      margin-right: 10px;
+      &::last-child{
+        margin-right: 0;
+      }
+    }
+}
+</style>
\ No newline at end of file

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">