测试bug修复-3

.env.development

@@ -1,5 +1,5 @@
 # 接口地址
-# VITE_APP_API_URL="http://192.168.77.4:8619/api"
-VITE_APP_API_URL="http://8.136.199.33:8619/api"
+VITE_APP_API_URL="http://192.168.77.4:8619/api"
+# VITE_APP_API_URL="http://8.136.199.33:8619/api"
 # crm系统地址
 VITE_CRM_SYSTEM_URL="https://rddptest.hzinsights.com/login"

src/views/financialManagement/composition/serivceCascader.js

@@ -54,12 +54,14 @@ export default function serviceCascader() {
     let hasQYService = checkedNodes.some(Node => Node.data.product_id == 2)
     // 套餐类型
     let typeValue
-    if(hasFICCService&&hasQYService || !(hasFICCService||hasQYService)){
+    if(hasFICCService&&hasQYService){
       typeValue=3
     }else if(hasFICCService){
       typeValue=1
-    }else{
+    }else if(hasQYService){
       typeValue=2
+    }else{
+      typeValue=0
     }
     // console.log(checkedNodes);
     

src/views/financialManagement/registrationPre.vue

@@ -11,7 +11,7 @@ const serviceComposition = serviceCascader()
 
 const router = useRouter()
 
-  const adminId = localStorage.getItem('userInfo')?JSON.parse(localStorage.getItem('userInfo')).admin_id || 0:0
+  // const adminId = localStorage.getItem('userInfo')?JSON.parse(localStorage.getItem('userInfo')).admin_id || 0:0
   const placemenetPre=reactive({
     searchParams:{
       keyword:'',
@@ -70,10 +70,10 @@ const servicesList=ref([])
 const selectServicesRef=ref(null)
 
 // 套餐类型 1-FICC 2-权益 3-FICC&权益
-const serviceType=ref(3)
+const serviceType=ref(0)
 
 // 预开票/预到款套餐类型 1-FICC 2-权益 3-FICC&权益
-const serviceTypePre=ref(3)
+const serviceTypePre=ref(0)
 
 // 获取套餐列表
 const getServicesListFun=()=>{
@@ -144,6 +144,7 @@ const servicesChange=(value,type)=>{
 }
 
 watch(serviceType,(newVal)=>{
+  console.log(newVal);
   if(newVal==1 || newVal==2){
     dialog.registrationPreForm.IorPInfo.map(item =>{
       if(item.service_product_id!=newVal){
@@ -151,7 +152,7 @@ watch(serviceType,(newVal)=>{
       }
       item.service_product_id=newVal
     })
-  }else{
+  }else if(newVal==0){
     dialog.registrationPreForm.IorPInfo.map(item =>{
       productIdChange(item)
       item.service_product_id=''
@@ -165,7 +166,7 @@ watch(serviceTypePre,(newVal)=>{
       productIdChange(preDialog.preForm)
     }
     preDialog.preForm.service_product_id=newVal
-  }else{
+  }else if(newVal==0){
     productIdChange(preDialog.preForm)
     preDialog.preForm.service_product_id=''
   }
@@ -413,7 +414,7 @@ const preIorP=(row)=>{
         // 套餐类型
         let hasFICCService = checkedNodes.some(Node => Node.data.product_id == 1)
         let hasQYService = checkedNodes.some(Node => Node.data.product_id == 2)
-        if(hasFICCService&&hasQYService || !(hasFICCService||hasQYService)){
+        if(hasFICCService&&hasQYService){
           serviceTypePre.value=3
         }else if(hasFICCService){
           serviceTypePre.value=1
@@ -583,9 +584,9 @@ placementPreList()
       <!-- 按钮区域 -->
       <div class="placemenetPre-top-option-zone">
         <el-button type="primary" @click="addRegistrationPre('开票')" class="main-button-large" 
-        style="margin-left: 30px;" v-permission="'financial:registrationPre:AandEInvoice'">开票预登记</el-button>         
+        style="margin-left: 30px;" v-permission="'financial:registrationPre:AEDInvoice'">开票预登记</el-button>         
         <el-button type="primary" @click="addRegistrationPre('到款')" class="main-button-large" style="margin-left: 30px;"
-        v-permission="'financial:registrationPre:AandEPayment'">到款预登记</el-button>         
+        v-permission="'financial:registrationPre:AEDPayment'">到款预登记</el-button>         
       </div>
     </div>
     <div class="placemenetPre-table-zone">
@@ -624,16 +625,24 @@ placementPreList()
               @click="preIorP(row)"  v-if="row.invoice_type==3">
                 预到款
               </span>
-              <span class="table-option-buttons" v-permission="'financial:registrationPre:AandEInvoice'"
+              <!-- 开票预登记编辑 -->
+              <span class="table-option-buttons" v-permission="'financial:registrationPre:AEDInvoice'"
               @click="editRegistrationPre(row)" v-if="row.invoice_type==3" >
                 编辑
-              </span>              
-              <span class="table-option-buttons" v-permission="'financial:registrationPre:AandEPayment'"
+              </span>          
+              <!-- 到款预登记编辑 -->
+              <span class="table-option-buttons" v-permission="'financial:registrationPre:AEDPayment'"
               @click="editRegistrationPre(row)" v-if="row.invoice_type==4">
                 编辑
               </span>
-              <span class="table-option-buttons" v-permission="'financial:registrationPre:delete'"
-              @click="delteRecord(row)" style="color:var(--dangerColor);" v-if="adminId==row.admin_id">
+              <!-- 开票预登记删除 -->
+              <span class="table-option-buttons" v-permission="'financial:registrationPre:AEDInvoice'"
+              @click="delteRecord(row)" style="color:var(--dangerColor);" v-if="row.invoice_type==3">
+                删除
+              </span>
+              <!-- 到款预登记删除 -->
+              <span class="table-option-buttons" v-permission="'financial:registrationPre:AEDPayment'"
+              @click="delteRecord(row)" style="color:var(--dangerColor);" v-if="row.invoice_type==4">
                 删除
               </span>
               <el-dropdown popper-class="classifyFandQ" size="large"  @command="(type)=>remarkView(type,row)">
@@ -716,6 +725,7 @@ placementPreList()
             </el-form-item>
             <el-form-item label="开票销售" :prop="`IorPInfo.${index}.seller_id`" label-width="90" style="margin-right: 0;"
             :rules="{required:true,message:'销售不能为空',trigger:'change'}" v-if="dialog.registrationType=='开票'">
+            {{ item.service_product_id }}
               <el-select v-model="item.seller_id" style="width: 176px;"
               placeholder="请选择销售" filterable v-if="item.service_product_id==1">
                 <el-option :label="seller.seller_name" :value="seller.seller_id"