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

src/components/OrderBaseInfo/index.vue

@@ -11,10 +11,10 @@
       <el-descriptions-item :label="$t('目的地')">{{ order.logisticsInfoDto.destTitleZh || '' }}</el-descriptions-item>
       <el-descriptions-item :label="$t('发货人姓名')">{{ order.consignorVO && order.consignorVO.name || ''}}</el-descriptions-item>
       <el-descriptions-item :label="$t('发货人公司')">{{ order.consignorVO && order.consignorVO.company || '' }}</el-descriptions-item>
-      <el-descriptions-item :label="$t('发货人电话')">{{ order.consignorVO && (order.consignorVO.countryCode + order.consignorVO.phone) || '' }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('发货人电话')">{{ order.consignorVO && ('+' + order.consignorVO.countryCode + order.consignorVO.phone) || '' }}</el-descriptions-item>
       <el-descriptions-item :label="$t('收货人姓名')">{{ order.consigneeVO && order.consigneeVO.name || ''}}</el-descriptions-item>
       <el-descriptions-item :label="$t('收货人公司')">{{ order.consigneeVO && order.consigneeVO.company || '' }}</el-descriptions-item>
-      <el-descriptions-item :label="$t('收货人电话')">{{ order.consigneeVO &&(order.consigneeVO.countryCode + order.consigneeVO.phone) || '' }}</el-descriptions-item>
+      <el-descriptions-item :label="$t('收货人电话')">{{ order.consigneeVO &&('+' + order.consigneeVO.countryCode + order.consigneeVO.phone) || '' }}</el-descriptions-item>
       <el-descriptions-item :label="$t('送货时间')">{{ order.deliveryDate || '' }}</el-descriptions-item>
       <el-descriptions-item :label="$t('入仓类型')">{{ getDictDataLabel(DICT_TYPE.ECW_WAREHOUSING_TYPE, order.warehouseType) }}</el-descriptions-item>
       <el-descriptions-item :label="$t('订单号')">{{ order.orderNo }}</el-descriptions-item>

src/views/ecw/order/stocking/components/NewProduct.vue

@@ -215,7 +215,7 @@
     </el-card>
     <el-card style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <span style="font-size: 18px">{{$t('入仓影像')}}</span>
+        <span style="font-size: 18px"><span style="color: red">*</span>{{$t('入仓影像')}}</span>
       </div>
       <div>
         <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="pictureUrls" ></image-and-video-upload>
@@ -520,6 +520,13 @@ export default {
 
         })
 
+        if (this.pictureUrls?.length === 0) {
+          return this.$notify({
+            title: '请上传入仓影像',
+            type: 'warning'
+          });
+        }
+
         // 首次入仓、入仓补充
         return finishPacked({
           brand: this.form.brand,

src/views/ecw/order/stocking/components/Package.vue

@@ -213,7 +213,7 @@
     </el-card>
     <el-card style="margin-top: 15px;">
       <div slot="header" class="clearfix">
-        <span style="font-size: 18px">{{$t('入仓影像')}}</span>
+        <span style="font-size: 18px"><span style="color: red">*</span>{{$t('入仓影像')}}</span>
       </div>
       <div>
         <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="pictureUrls" ></image-and-video-upload>
@@ -533,6 +533,13 @@ export default {
 
         })
 
+        if (this.pictureUrls?.length === 0) {
+          return this.$notify({
+            title: '请上传入仓影像',
+            type: 'warning'
+          });
+        }
+
         // 首次入仓、入仓补充
         return finishPacked({
           brand: this.form.brand,

src/views/ecw/order/stocking/index.vue

@@ -15,14 +15,14 @@
     -->
     <el-table
       v-if="order.orderItemVOList && order.orderItemVOList.length > 0 && orderItemList && orderItemList.length > 0"
-      :data="order.orderItemVOList.filter(item => !!wareItem(item.orderItemId).orderWarehouseInBackItemDoList.length) || []"
+      :data="order.orderItemVOList || []"
       default-expand-all
       style="width: 100%">
       <!--入仓记录-->
       <el-table-column type="expand">
         <template slot-scope="props">
-          <div style="padding-left: 80px">
-            <el-table v-if="wareItem(props.row.orderItemId).orderWarehouseInBackItemDoList" :data="wareItem(props.row.orderItemId).orderWarehouseInBackItemDoList">
+          <div style="padding-left: 80px" v-if="orderWarehouseInList(props.row.orderItemId).length">
+            <el-table :data="orderWarehouseInList(props.row.orderItemId)">
               <el-table-column :label="$t('序号')" width="80px">
                 <template slot-scope="{row, column, $index}">
                   {{$index + 1}}
@@ -160,7 +160,8 @@
         prop="address"
         :label="$t('操作')" width="220">
         <template v-slot="{ row, column, $index }">
-          <el-button-group>
+          <!--没有入仓记录的不显示打包按钮 https://zentao.test.jdshangmen.com/bug-view-5389.html-->
+          <el-button-group v-if="orderWarehouseInList(row.orderItemId).length">
             <template v-if="wareItemPackStatus(row.orderItemId) == 1">
               <el-button size="mini" type="warning" @click="noNeedPack(row)">{{$t('无需打包')}}</el-button>
               <el-button size="mini" type="primary" @click="package(row, $t('打包'))">{{$t('打包')}}</el-button>
@@ -516,6 +517,12 @@ export default {
         return this.orderItemList.find(item => item.orderItemId == orderItemId)
       }
     },
+    // 根据orderItemId获取入仓记录
+    orderWarehouseInList(){
+      return (orderItemId) => {
+        return this.wareItem(orderItemId)?.orderWarehouseInBackItemDoList || []
+      }
+    },
     // 获取打包状态
     wareItemPackStatus(){
       return orderItemId => {

src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue

@@ -142,6 +142,20 @@ export default {
         .catch(_ => {});
     },
     handleSave() {
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (!this.dataList[i].prodId) {
+          return this.$notify({
+            title: '明细' + (i + 1) + ': ' + '请选择品名',
+            type: "warning"
+          })
+        }
+        if (!this.dataList[i].brand) {
+          return this.$notify({
+            title: '明细' + (i + 1) + ': ' + '请选择品牌',
+            type: "warning"
+          })
+        }
+      }
       this.$emit('input', this.dataList)
       this.dialogVisible = false
     }

src/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue

@@ -6,12 +6,12 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="12">
-        <el-form-item :label="$t('中文品名')">
+        <el-form-item :label="$t('中文品名')" required>
           <product-selector v-model="value.prodId" @change="onProductChange" determined :disabled="readonly" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('品牌')">
+        <el-form-item :label="$t('品牌')" required>
           <el-select
             v-model="value.brand"
             :placeholder="$t('可修改')"