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

src/views/ecw/box/indexSea.vue

@@ -124,7 +124,7 @@
               <el-dropdown-item command="error">异常登记</el-dropdown-item>
               <el-dropdown-item command="cost">费用登记</el-dropdown-item>
               <el-dropdown-item command="delete">删除</el-dropdown-item>
-              <el-dropdown-item command="editLadingBill">编辑提货单</el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.ldStatus==47" command="editLadingBill">编辑提货单</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click">

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -6,7 +6,7 @@
         <div class="node-area">
           <div v-for="node in nodes" :key="node.title" @click="nodeClick(index, node)" class="node-div">
             <div>
-              <img :src="getImgSrc(node)" alt="">
+              <img :src="getImgSrc(node)" alt="" :width="width" :height="height">
               <p>{{node.title}}</p>
             </div>
           </div>
@@ -78,6 +78,14 @@ export default {
   props: {
     shipmentObj: Object,
     seaBaseData: Array,
+    width: {
+      type: String,
+      default: '76px'
+    },
+    height: {
+      type: String,
+      default: '76px'
+    }
   },
   data() {
     return {

src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue

@@ -26,7 +26,7 @@
         </el-card>
 
         <!-- 海运流程图 -->
-        <seaProcess :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
+        <seaProcess :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" width="66px" height="66px" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
 
         <!-- 海运步骤图 -->
         <seaStepDetail :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />

src/views/ecw/customerCommission/index.vue

@@ -92,29 +92,22 @@
       </el-table-column>
       <el-table-column label="运输方式" align="center" prop="transportId">
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
+          <dict-tag v-if="scope.row.transportId" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
+          <div v-else>全部</div>
         </template>
       </el-table-column>
       <el-table-column label="始发地/目的地 " align="center" prop="departureId" show-overflow-tooltip :formatter="originDestination">
       </el-table-column>
       <el-table-column label="报关方式" align="center" prop="customsType" show-overflow-tooltip>
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.SHIPPING_DECLARATION_TYPE" :value="scope.row.customsType" />
+          <dict-tag v-if="scope.row.customsType" :type="DICT_TYPE.SHIPPING_DECLARATION_TYPE" :value="scope.row.customsType" />
+          <div v-else>全部</div>
         </template>
       </el-table-column>
       <el-table-column label="备案" align="center" prop="approval">
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.COMMISSION_PRODUCT_APPROVAL" :value="scope.row.approval" />
-        </template>
-      </el-table-column>
-      <el-table-column label="未付佣金" align="center" prop="darkReturnType">
-        <template slot-scope="scope">
-<!--          <dict-tag :type="DICT_TYPE.COMMISSION_DARK_TYPE" :value="scope.row.darkReturnType" />-->
-        </template>
-      </el-table-column>
-      <el-table-column label="已付佣金" align="center" prop="darkReturnType">
-        <template slot-scope="scope">
-<!--          <dict-tag :type="DICT_TYPE.COMMISSION_DARK_TYPE" :value="scope.row.darkReturnType" />-->
+          <dict-tag v-if="scope.row.approval" :type="DICT_TYPE.COMMISSION_PRODUCT_APPROVAL" :value="scope.row.approval" />
+          <div v-else>全部</div>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
@@ -241,9 +234,10 @@ export default {
         }).catch(() => {});
     },
     originDestination(row){
+
       let index1 = this.exportCityList.findIndex(item =>item.id == row.departureId);
       let index2 = this.importCityList.findIndex(item => item.id == row.objectiveId);
-      let flag = `${index1 === -1 ? '' : this.exportCityList[index1].titleZh}/${index2 === -1 ? '' : this.importCityList[index2].titleZh}`;
+      let flag = `${index1 === -1 ? '全部' : this.exportCityList[index1].titleZh}/${index2 === -1 ? '全部' : this.importCityList[index2].titleZh}`;
        return flag
     },
   }

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

@@ -25,7 +25,7 @@
       </el-form>
     </div>
     <div  slot="footer" class="dialog-footer">
-      <el-button @click="submit">提交</el-button>
+      <el-button type="primary" @click="submit">提交</el-button>
       <el-button @click="$emit('update:show',false)">取消</el-button>
     </div>
   </el-dialog>