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

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/financial/commission-Payment.vue

@@ -109,13 +109,13 @@
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:delete']" @click="deleteFn(row)" v-if="[0,2].includes(row.state)" > {{$t('删除')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:details']"  v-if="[7,3,1,5].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})"   >{{$t('审核详情')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn('取消审核',7, row, '取消审核' )"  >{{$t('取消审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn('付款单反审核', 1, row, '提交反审核',)" >{{$t('反审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn('付款单核销申请', 2, row, '提交核销')"  >{{$t('核销')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单反审核', 1, row, '提交反审核',)" >{{$t('反审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单核销申请', 2, row, '提交核销')"  >{{$t('核销')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:print']" v-if="[4,6].includes(row.state)" @click="$router.push({path:'/financial/printPaymentVoucherCommission',query:{id:row.id}})"  >{{$t('打印')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn('付款单反核销申请', 3, row, '提交方核销')" >{{$t('反核销')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn('取消反审核',4, row, '提交取消反审核' )" >{{$t('取消反审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)"  @click="bridgeFn('取消付款单核销',5, row, '取消付款单核销' )" > {{$t('取消核销')}} </el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']"  v-if="[7].includes(row.state)"  @click="bridgeFn('取消付款单反核销',6, row, '取消付款单反核销' )" > {{$t('取消反核销')}} </el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn('佣金付款单反核销申请', 3, row, '提交反核销')" >{{$t('反核销')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn('取消佣金付款单反审核',4, row, '提交取消反审核' )" >{{$t('取消反审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)"  @click="bridgeFn('取消佣金付款单核销',5, row, '取消付款单核销' )" > {{$t('取消核销')}} </el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']"  v-if="[7].includes(row.state)"  @click="bridgeFn('取消佣金付款单反核销',6, row, '取消付款单反核销' )" > {{$t('取消反核销')}} </el-button>
        </template>
       </el-table-column>
     </el-table>
@@ -130,7 +130,7 @@
     <el-dialog @close="paymentValue = ''"  width="30%" :title="paymentTitle" :visible.sync="paymentShow">
       <div class="cancel_content">
         <span>{{ $t('申请理由') }}</span>
-        <el-input type="textarea" :rows="6" v-model="paymentValue" :placeholder="$t('请输入取消理由')"></el-input>
+        <el-input type="textarea" :rows="6" v-model="paymentValue" :placeholder="[1,2,3].includes(paymentIndex) ? $t('请输入申请理由') : $t('请输入取消理由')"></el-input>
       </div>
       <span slot="footer" class="dialog-footers">
         <el-button type="primary" @click="cancelWriteOffClick()">{{ $t(butTitle) }}</el-button>

src/views/ecw/financial/commission-payable.vue

@@ -88,8 +88,12 @@
   </el-card>
   <el-table border :data="list" style="margin-top: 30px">
     <el-table-column align="center" :label="$t('订单编号')" prop="orderNo" ></el-table-column>
+    <el-table-column align="center" :label="$t('品名')">
+      <template v-slot="{row}">
+         {{row.titleZh}}/{{row.titleEn}}
+      </template>
+    </el-table-column>
     <el-table-column align="center" :label="$t('客户名称')" prop="customerName" ></el-table-column>
-    <el-table-column align="center" :label="$t('订单编号')" prop="payableNo" ></el-table-column>
     <el-table-column align="center" :label="$t('佣金类型')">
       <template v-slot="{row}">
         <dict-tag

src/views/ecw/financial/commission-requestFunds.vue

@@ -68,7 +68,7 @@
               :rules="{required:true,message:$t('业务员不能为空')}"
               :error="$t('业务员不能为空')"
             >
-              <el-select v-model="form.salesmanName" :placeholder="$t('请选择业务员')">
+              <el-select filterable  v-model="form.salesmanName" :placeholder="$t('请选择业务员')">
                 <el-option
                   v-for="item in creatorData"
                   :key="item.id"

src/views/ecw/financial/printPaymentVoucherCommission.vue

@@ -33,7 +33,7 @@
       <table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse;line-height: 2 ">
           <tr>
             <th style="width: 6%;">{{ $t('序号') }}</th>
-            <th style="width: 11%;">{{ $t('自编号') }}</th>
+            <th style="width: 11%;">{{ $t('订单编号') }}</th>
             <th style="width: 15%;">{{ $t('佣金类型') }}</th>
             <th style="width: 10%;">{{ $t('币种') }}</th>
             <th style="width: 10%;">{{ $t('汇率') }}</th>
@@ -44,7 +44,7 @@
           </tr>
           <tr v-for="(item, index) in list" :key="index">
             <td>{{ index + 1 }}</td>
-            <td>{{ item.payableNo }}</td>
+            <td>{{ item.orderNo }}</td>
             <td>
               <dict-tag
                 :type="DICT_TYPE.COMMISSION_TYPE"

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: {