Merge remote-tracking branch 'origin/dev' into dev

src/views/purchase/importDeclaration/detailsPage.vue

@@ -57,7 +57,7 @@
         <!--  corpType="KH"/>-->
         <!--</template>-->
         <template slot="customsDeclarationPlaceLabel">
-          <e-crop-jump label="申报地海关:" corp-type="KH"></e-crop-jump>
+          <e-crop-jump label="申报地海关:" corp-type="ZD"></e-crop-jump>
         </template>
         <template slot="declareStatusLabel">
           <e-crop-jump label="申报状态:" corp-type="ZD"></e-crop-jump>
@@ -1150,6 +1150,12 @@ export default {
             if (this.dataList.length === 0) {
               return this.$message.error("商品信息不能为空")
             }
+            if (this.containerList.length === 0){
+              return this.$message.error("集装箱信息不能为空")
+            }
+            if (this.documentsList.length === 0){
+              return this.$message.error("单证信息不能为空")
+            }
             if (this.$refs.boxCost.dataList.length === 0) {
               return this.$message.error("费用信息不能为空")
             } else {