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

src/views/ecw/box/indexSeaAir.vue

@@ -100,7 +100,7 @@
           size="small"
         >
           <el-option
-            v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)"
+            v-for="dict in this.getDictDatas(DICT_TYPE.BOX_ORDER_SHIPMENT_STATE)"
             :key="dict.value"
             :label="$l(dict, 'label')"
             :value="dict.value"
@@ -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 v-if="scope.row.ldStatus>42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus<42" 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/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -103,7 +103,7 @@
       </el-table>
     </el-card>
 
-    <el-card class="card" v-if="splitData">
+    <el-card class="card" v-if="splitData.id">
       <!-- 列表 -->
       <div slot="header" class="card-title">{{$t('拆单信息')}}</div>
       <div>

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

@@ -233,7 +233,7 @@
               </el-row>
               <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
                 <el-table-column type="index" align="center" :label="$t('序号')" width="50" />
-                <el-table-column :label="$t('品名')" align="center" :prop="$t('prodTitle')" />
+                <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
                 <el-table-column :label="$t('备案')" align="center" prop="brandType">
                   <template slot-scope="scope">
                     <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />