2.7 bug修复

src/api/crm.js

@@ -16,7 +16,7 @@ export function getPermissionList(data) {
       params:data
   })
 }
-// 获取销售列表
+// 获取销售列表（包括禁用的销售）
  /**
   * @param {
   * } data 

src/views/financialManagement/contractProgress-component/InvoiceAndPayment.vue

@@ -73,6 +73,17 @@
     // 已经登记的开票/到款 开票登记的时候是到款，到款登记的时候是开票
     submittedAmountData:[]
   })
+  // 销售离职验证
+  const sellerValidator=(row,callback)=>{
+    // console.log(row);
+    if(row.seller_name.indexOf('已离职')!=-1){
+      ElMessage.error(row.seller_name)
+      return 
+    }else{
+      callback()
+    }
+  }
+
   //开票-到款展开和收起
   const isIandPExpand=reactive({
     haveInvoice:false,
@@ -129,10 +140,10 @@
     IandP.moneyData.haveMoneyQY = Math.round(IandP.moneyData.haveMoneyQY*100)/100
   }
 
-  // 权益更改
+  // 销售更改
   const sellerChange=(row,value)=>{
     if(row.service_product_id==1){
-      row.seller_name = props.sellerData.ficc_list.find(seller => seller.seller_id==value)?.seller_name
+      row.seller_name = [...props.sellerData.ficc_list,...props.sellerData.rai_list].find(seller => seller.seller_id==value)?.seller_name
     }else{
       row.seller_name = props.sellerData.rai_list.find(seller => seller.seller_id==value)?.seller_name
     }
@@ -180,6 +191,26 @@
         break
       }
     }
+    // 判断销售是否离职
+    if(sellerId){
+      if(serviceProductId==1){
+        // FICC销售和权益销售都要判断，并且页面呈现为级联选择器
+        if([...props.sellerData.ficc_list,...props.sellerData.rai_list]
+        .findIndex(seller => seller.seller_id==sellerId)==-1){
+          props.sellerData.all_list.push({
+            seller_id:sellerId,
+            seller_name:sellerName+'-已离职',
+            disabled:true,
+            child:null
+          })
+          sellerName=sellerName+'-已离职'
+        }
+        // console.log(sellerId);
+      }else{
+        sellerId = props.sellerData.rai_list.findIndex(seller => seller.seller_id==sellerId)==-1?sellerName+'-已离职':sellerId
+        sellerName=sellerName+'-已离职'
+      }
+    }
     amountForm.amountData.push({
       service_product_id:serviceProductId,              
       origin_amount:'',
@@ -571,7 +602,10 @@
                 <template #default="{row,$index}">
                   <el-form-item :prop="`amountData.${$index}.seller_id`" 
                   :show-message="false" v-show="!row.invoice_id || row.isEdit"
-                  :rules="{required:true,message:()=>{ ElMessage.error('销售不能为空')},trigger:'change'}">
+                  :rules="[{required:true,message:()=>{ ElMessage.error('销售不能为空')},trigger:'change'},
+                  {validator:(rule,value,callback)=>{
+                    sellerValidator(row,callback)
+                  },trigger:'change'}]">
                     <!-- <el-select v-model="row.seller_id" :disabled="type=='到款'&& row.hasRelativeSeller" 
                     style="width: 143px;" 
                      filterable  >
@@ -615,8 +649,8 @@
                 <template #default="{row,$index}">
                   <span class="table-operation-button" v-show="$index==amountForm.amountData.length-1" 
                   @click="addRow(row,$index)" style="margin-right: 10px;">添加</span>
-                  <!-- <span class="table-operation-button" style="margin-right: 6px;" v-show="row.invoice_id" 
-                  @click="editRow(row)">{{ row.isEdit?'确定':'编辑' }}</span> -->
+                  <span class="table-operation-button" style="margin-right: 6px;" v-show="row.invoice_id" 
+                  @click="editRow(row)">{{ row.isEdit?'确定':'编辑' }}</span>
                   <span class="table-operation-button" style="color: var(--dangerColor);" 
                   @click="deleteRow(row,$index)">删除</span>
                 </template>