Merge remote-tracking branch 'origin/dev' into prod

src/views/merchandise/components/comeInfo.vue

@@ -53,7 +53,13 @@
       :close-on-click-modal="false"
     >
       <!-- 表格数据 -->
-      <el-table v-loading="settingLoading" :data="settingList" border ref="settingTableRef" height="75%">
+      <el-table
+        v-loading="settingLoading"
+        :data="settingList"
+        border
+        ref="settingTableRef"
+        height="75%"
+      >
         <el-table-column
           label="序号 "
           width="55"
@@ -244,6 +250,7 @@
           </template>
           <template #default="scope">
             <el-select
+              @change="selectChange(scope.row, 'reconciliationCompanyName')"
               v-model="scope.row.reconciliationCompanyName"
               filterable
               remote
@@ -424,6 +431,16 @@ const { bx_currency_type, commission_cost_type, sys_no_yes, sys_status } = proxy
   'sys_no_yes',
   'sys_status'
 )
+const selectChange = (row, key) => {
+  if (key == 'reconciliationCompanyName') {
+    row.reconciliationCompany = searchOptions.value['reconciliationCompanyName'].find(
+      item => item.value == row.reconciliationCompanyName
+    ).value
+    row.reconciliationCompanyName = searchOptions.value['reconciliationCompanyName'].find(
+      item => item.value == row.reconciliationCompanyName
+    ).label
+  }
+}
 const switchChange = row => {
   if (!row.expectedCommissionRatioBizId) {
     return
@@ -619,6 +636,9 @@ const handleAddCommission = row => {
   if (!row.unadd) {
     settingList.value.push(obj)
   }
+  console.log('====================================')
+  console.log('新增', settingList.value)
+  console.log('====================================')
 }
 const closeSetting = () => {
   showCommisionSetting.value = false