添加品牌授权类型

src/utils/dict.js

@@ -181,6 +181,7 @@ export const DICT_TYPE = {
   MANUAL_EXCEPTION_TYPE:'manual_exception_type',
   APPLY_STATUS:'apply_status',//特价申请审核状态
   WAREHOUSING_SPECIFICATION_TYPE: 'warehousing_specification_type',
+  ECW_AUTH_TYPE:'auth_type',//品牌授权
 
   ECASH_INIT:'ecash_init', //e-cash
   FEE_TYPE:'receivable_fee_type',

src/views/ecw/financial/creatPayment.vue

@@ -197,7 +197,7 @@
         </el-table-column>
         <el-table-column :label="$t('价税合计(RMB)')" align="center" prop="total" >
           <template slot-scope="scope">
-           <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(6) }}</span>
+           <span>{{ scope.row.total = ((scope.row.totalAmount * scope.row.exchangeRate) + (scope.row.totalAmount * scope.row.exchangeRate) * (scope.row.taxRate/100)).toFixed(2) }}</span>
            <!-- <span>{{scope.row.total}}</span> -->
           </template>
         </el-table-column>

src/views/ecw/productBrank/Empower/index.vue

@@ -93,12 +93,13 @@
                 </div>
               </template>
             </el-table-column>
+
             <el-table-column
               prop="startTime"
               width="200px"
               label="授权时间">
               <template v-slot="{row}">
-                <span>{{row.startTime?(parseTime(row.startTime, '{y}-{m}-{d}') + ' - ' + parseTime(row.endTime, '{y}-{m}-{d}')):'永久'}}</span>
+                <span >{{row.startTime?(parseTime(row.startTime, '{y}-{m}-{d}') + ' - ' + parseTime(row.endTime, '{y}-{m}-{d}')):'永久'}}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -130,9 +131,13 @@
       title="添加"
       :visible.sync="addDialog.dialogVisible"
       width="600px">
+
       <el-form ref="form" :model="addDialog.form" label-width="80px">
         <el-form-item label="客户名称">{{ addDialog.form.customerName }}</el-form-item>
-        <el-form-item label="授权时间">
+        <el-form-item label="收费模式">
+          <dict-selector v-model="addDialog.form.authType" :type="DICT_TYPE.ECW_AUTH_TYPE"></dict-selector>
+        </el-form-item>
+        <el-form-item label="授权时间" v-if="addDialog.form.authType==1">
  <!--         <el-date-picker
             v-model="addDialog.dateRange"
             @chang="handleDatePick"
@@ -256,7 +261,8 @@ export default {
           "fileUrl": "",
           "productBrandId": null,
           "startTime": "",
-          "status": 0
+          "status": 0,
+          "authType":'0'
         },
         dateRange: []
       },