2024-05-13报关公司BUG处理

src/views/ecw/box/shippingAir/nodePage/common/supplierSelect.vue

@@ -25,9 +25,10 @@ export default {
     companyType: String,
     value: Number,
     allSupplier: Array,
+    //0-國内供應商，1-國外供應商 lanbm 2024-05-11 添加注释
     areaType: {
       type: Number,
-      default: 0
+      default: 0,
     },
   },
   model: {
@@ -39,13 +40,27 @@ export default {
   },
   computed: {
     getSuppliers() {
+      //alert(this.areaType);
+      //alert(this.companyType);
       let allSupplier = this.allSupplier.filter(
         (item) => item.areaType == this.areaType
       );
-      if(this.areaType == 1 || !this.companyType) return allSupplier;
-      return allSupplier.filter((item) =>
-        item.companyTypes.includes(this.companyType)
-      );
+      //0-國内供應商，1-國外供應商 lanbm 2024-05-11 添加注释
+      //if(this.areaType == 1 || !this.companyType) return allSupplier;
+      //lanbm 2024-05-11 把或改且，解决空运供应商获取是海运供应商问题
+      //
+      if (this.areaType == 1) return allSupplier;
+      if (
+        this.companyType == null ||
+        this.companyType == "" ||
+        this.companyType == undefined
+      ) {
+        return allSupplier;
+      } else {
+        return allSupplier.filter((item) =>
+          item.companyTypes.includes(this.companyType)
+        );
+      }
     },
   },
   methods: {

src/views/ecw/box/shippingAir/nodePage/cusDeclaration.vue

@@ -12,7 +12,7 @@
         </div>
       </el-form-item>
       <el-form-item :label="$t('报关公司名称')">
-        <supplierSelect v-model="cusDeclarationObj.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司名称')" :allSupplier="this.$attrs.allSupplier" />
+        <supplierSelect v-model="cusDeclarationObj.dcCompanyId" :companyType="'7'" :placeholder="$t('请选择报关公司名称')" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item :label="$t('截关时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcCutOffTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -213,6 +213,8 @@ import dayjs from 'dayjs'
 
 /**
  * 报关
+ * lanbm 2024-05-11 把 报关公司名称 下拉列表中的
+ * company_type 有2 改为7 解决下来框中的公司是海运公司类型的BUG
  */
 export default {
   name: 'cusDeclaration',