Merge branch 'fsms_2.4' into debug

src/views/financialManagement/components/permissionQyDia.vue

@@ -84,6 +84,10 @@
  
   const submit=()=>{
     permissionDia.permissionChecked=[]
+    if(props.serviceType==1 && !permissionDia.qyBigService){
+      ElMessage.warning('请选择权益大套餐品种')
+      return 
+    }
     if(props.serviceType==2){
       props.permissionData.map(item =>{
         permissionDia.permissionChecked=[...permissionDia.permissionChecked,...item.check_list]

src/views/financialManagement/contractProgress.vue

@@ -360,18 +360,16 @@
       }
   }
 
-  const elMessageDom=ref(null)
+  let elMessageDom=null
 
-  const selectVisible=(value,that,selectRef)=>{
+  const selectVisible=(value)=>{
     if(value){
-      if(!elMessageDom.value){
-        elMessageDom.value=ElMessage.warning('请选择套餐类型')
+      if(!elMessageDom){
+        elMessageDom=ElMessage.warning('请选择套餐类型')
         setTimeout(()=>{
-          elMessageDom.value=null
+          elMessageDom=null
         },1000)
       }
-      // 加上下面这个，直接额外触发4次selectVisible，不知道为啥。
-      that.$refs[selectRef].blur()
     }
   }
 
@@ -1882,7 +1880,7 @@
                               </el-select>
                               <el-select v-model="row.seller_id" style="width: 124px;" :ref='`invoiceData-service_product_id${$index}`'
                               placeholder="请选择销售" v-else
-                                @visible-change="(value)=>selectVisible(value,this,`invoiceData-service_product_id${$index}`)">
+                                @visible-change="selectVisible">
                               </el-select>
                             </el-form-item>
                             <span v-else>{{ row.seller_name || '--' }}</span>