修复出货和供应商的一些bug

src/views/ecw/box/indexSea.vue

@@ -119,7 +119,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <!-- <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item> -->
+              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit" v-hasPermi="['shipment:box:sea:edit']">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item  command="sea" v-hasPermi="['shipment:box:action:sea']">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error" v-hasPermi="['shipment:box:action:error']">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost" v-hasPermi="['shipment:box:action:cost']">{{$t('费用登记')}}</el-dropdown-item>

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

@@ -150,7 +150,7 @@ export default {
           this.$set(this.subMaterialObj,'notifyingName',response.data.externalBackVO?.notifyCompanyName||'/')
           this.$set(this.subMaterialObj,'packageNum',response.data.externalBackVO?.packNum)
           this.$set(this.subMaterialObj,'packageUnit',response.data.externalBackVO?.packUnit)
-          this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName+response.data.externalBackVO?.fromNo+response.data.externalBackVO?.baNo)
+          this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||'')
           if(this.subMaterialObj.goodsDesc == null){
             this.$set(this.subMaterialObj,'goodsDesc','/')
           }

src/views/ecw/supplier/detail.vue

@@ -89,7 +89,7 @@
           <el-table-column :label="$t('序号')" width="80px">
             <template slot-scope="scope">{{scope.$index + 1}}</template>
           </el-table-column>
-          <el-table-column :label="$t('部门')" prop="priceAdvantage">
+          <el-table-column :label="$t('部门')" prop="department">
           </el-table-column>
           <el-table-column :label="$t('职位')" prop="position">
           </el-table-column>
@@ -470,6 +470,7 @@ export default {
                 this.formData = response.data
                 
                 this.$set(this.formData, 'companyTypeArr', this.strToArray(response.data.companyType))
+                this.$set(this.formData, 'priceAdvantage', response.data.priceAdvantage==0?'':response.data.priceAdvantage)
                 this.$set(this.formData, 'settlementPeriod', response.data.settlementPeriod==0?null:response.data.settlementPeriod)
                 this.formData.bankList.forEach(item => {
                   item.currency = +item.currency

src/views/ecw/supplier/index.vue

@@ -20,7 +20,7 @@
         <el-input v-model="queryParams.keyword" :placeholder="$t('名称/代码')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
 
-      <el-form-item :label="$t('供应商区域')" prop="areaType">
+      <el-form-item :label="$t('境内外')" prop="areaType">
         <el-select v-model="queryParams.areaType" placeholder="请选择" clearable="true">
           <el-option
             v-for="item in areaTypes"
@@ -64,6 +64,11 @@
           </template>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('境内外')" align="center" prop="areaType">
+        <template slot-scope="scope">
+          <span>{{ areaData[scope.row.areaType] }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('合作类型')" align="center" prop="cooperationType">
         <template slot-scope="{row}">
           <dict-tag type="cooperation_type" :value="row.cooperationType" />
@@ -120,9 +125,10 @@ export default {
       dateRangeCreateTime: [],
 
       areaTypes:[
-        {value:0, label:"国内供应商"},
-        {value:1, label:"国外供应商"}
+        {value:0, label:"境内"},
+        {value:1, label:"境外"}
       ],
+      areaData: ["境内", "境外"],
 
       // 查询参数
       queryParams: {