Merge branch 'wyz' into 'test'

修改薪资发放字段

See merge request !166

src/views/financialCenter/financialSalary.vue

@@ -46,14 +46,19 @@
           <!-- <el-table-column prop="fortuneAccountBizId" label="业务ID" min-width="120" sortable /> -->
           <!-- <el-table-column prop="fortuneAccountBizId" label="业务ID" min-width="120" sortable /> -->
           <el-table-column prop="broker" label="转介人" min-width="120" sortable />
           <el-table-column prop="broker" label="转介人" min-width="120" sortable />
           <el-table-column prop="team" label="所属团队" min-width="120" sortable />
           <el-table-column prop="team" label="所属团队" min-width="120" sortable />
-          <el-table-column prop="hkdAmount" label="出账金额" width="120" sortable>
+          <el-table-column prop="hkdAmount" label="港币金额" width="120" sortable>
             <template #default="scope">
             <template #default="scope">
               {{ formatCurrency(scope.row.hkdAmount, '', 4) }}
               {{ formatCurrency(scope.row.hkdAmount, '', 4) }}
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column prop="currency" label="出账币种" width="120" sortable>
+          <el-table-column prop="payoutCurrency" label="发放币种" width="120" sortable>
             <template #default="scope">
             <template #default="scope">
-              <dict-tag :options="currencyTypeOptions" :value="scope.row.currency" />
+              <dict-tag :options="currencyTypeOptions" :value="scope.row.payoutCurrency" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="payoutAmount" label="发放金额" width="120" sortable>
+            <template #default="scope">
+              {{ formatCurrency(scope.row.payoutAmount, '', 4) }}
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column prop="status" label="出账状态" width="150" sortable>
           <el-table-column prop="status" label="出账状态" width="150" sortable>
@@ -255,7 +260,6 @@
               v-model="scope.row.toAmount"
               v-model="scope.row.toAmount"
               placeholder="请输入"
               placeholder="请输入"
               clearable
               clearable
-              :disabled="true"
               @input="val => (scope.row.toAmount = amountInput.filterInput(val, 4))"
               @input="val => (scope.row.toAmount = amountInput.filterInput(val, 4))"
               :formatter="value => inputThousands(value)"
               :formatter="value => inputThousands(value)"
               :parser="value => value.replace(/\$\s?|(,*)/g, '')"
               :parser="value => value.replace(/\$\s?|(,*)/g, '')"