v2

ruoyi-ui/src/views/ct/agentAccountGood/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="代理商" prop="agentId">
-        <el-select v-model="queryParams.agentId" clearable>
+        <el-select v-model="queryParams.agentAccountId" filterable clearable>
           <el-option
-            v-for="item in agentList" :key="item.id"
-            :label="item.name"
+            v-for="item in agentAccountList" :key="item.value"
+            :label="item.agentName+'('+item.personnelId+')'"
             :value="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -273,7 +273,6 @@ export default {
       this.agentAccountList.forEach(item=>{
         if (item.id == val) {
           this.form.agentId = item.agentId
-          this.form.personnelId = item.personnelId
         }
       })
     },
@@ -281,14 +280,15 @@ export default {
       this.goodsList.forEach(item=>{
         if (item.id == val) {
           this.form.saleId = item.saleId
+          this.form.personnelId = item.personnelId
         }
       })
     },
     getAgentName(row) {
       let name = ''
-      this.agentList.forEach(item=>{
-        if (row.agentId == item.id) {
-          name = item.name
+      this.agentAccountList.forEach(item=>{
+        if (row.agentAccountId == item.id) {
+          name = item.agentName+'('+item.personnelId+')'
         }
       })
       return name
@@ -416,7 +416,7 @@ export default {
       });
     },
     save() {
-      
+
       if (this.form.id != null) {
         updateAgentAccountGood(this.form).then(response => {
           this.$modal.msgSuccess("修改成功");