冲突调整

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

@@ -5,6 +5,7 @@
   import permissionQyDia from '../components/permissionQyDia.vue'
   import {getContractSearchList,getServiceDetail} from '@/api/crm'
   import {registerAdd,registerEdit,contractRegisterCheck} from '@/api/financialMana'
+  import {intervalDataRequest} from '@/utils/common-methods'
 
   const contractSourceArray=['非CRM合同导入','CRM合同导入']
   // 合同状态数组
@@ -114,8 +115,6 @@
 
   // --------------套餐信息
   const serviceData=reactive({
-    // showServiceFicc:false,
-    // showServiceQy:false,
     // 选中的套餐 - ficc
     checkedService:[],
     // 选中的套餐 - 权益
@@ -216,16 +215,6 @@
   }
 
 // ------------------------------------------------监听
-  // watch(()=>compliance.form.contract_amount,(newVal)=>{
-  //   if(serviceData.showServiceFicc && serviceData.showServiceQy){
-  //     return 
-  //   }else if(!serviceData.showServiceFicc){
-  //     compliance.form.services_Qy_amount = newVal
-  //   }else{
-  //     compliance.form.services_amount = newVal
-  //   }
-  // })
-
   watch(()=>props.supplementaryInfo.supplement,(value)=>{
     if(value){
       setSupplementaryData()
@@ -293,28 +282,6 @@
       }
       cascaderSelectSeller.value=[ficcSeller,qySeller]
       compliance.form.seller_ids= cascaderSelectSeller.value.join(',')
-      // 根据销售选择是否显示套餐
-      // if(ficcSeller && qySeller){
-      //   // 都有
-      //   serviceData.showServiceFicc=true
-      //   serviceData.showServiceQy=true
-      //   if(!compliance.form.contract_register_id){
-      //     // 新增的情况才置空
-      //     compliance.form.services_amount = compliance.form.services_Qy_amount = ''
-      //   }
-      // }else if(!ficcSeller){
-      //   // 没有ficc销售
-      //   serviceData.showServiceFicc=false
-      //   serviceData.showServiceQy=true
-      //   compliance.form.services_Qy_amount = compliance.form.contract_amount
-      //   compliance.form.services_amount =''
-      // }else{
-      //   // 没有权益销售
-      //   serviceData.showServiceFicc=true
-      //   serviceData.showServiceQy=false
-      //   compliance.form.services_amount = compliance.form.contract_amount
-      //   compliance.form.services_Qy_amount =''
-      // }
     }else{
       if(compliance.form.contract_register_id){
         // 编辑的情况下
@@ -322,8 +289,6 @@
         cascaderSelectSeller.value = compliance.form.seller_ids.split(',').map(item => +item)
         return 
       }
-      // serviceData.showServiceFicc = serviceData.showServiceQy=true
-      // compliance.form.services_amount = compliance.form.services_Qy_amount = ''
       cascaderSelectSeller.value=[]
     }
   }
@@ -335,10 +300,10 @@
       let servivesTemp = res.data?res.data.Service||[]:[]
       if(selectItem.product_id==1){
         // 清空权益套餐
-        contractInfo.serviceVarietyShowQy = false
-        contractInfo.serviceTypeQy = 0
-        contractInfo.checkedServiceQy=[]
-        contractInfo.form.services_Qy_amount = ''
+        serviceData.serviceVarietyShowQy = false
+        serviceData.serviceTypeQy = 0
+        serviceData.checkedServiceQy=[]
+        compliance.form.services_Qy_amount = ''
         // FICC套餐
         // 小套餐
         let smallService = servivesTemp.find(item => item.ServiceTemplateId==2)
@@ -351,10 +316,10 @@
         compliance.form.services_Qy_amount = ''
       }else{
         // 清空FICC套餐
-        contractInfo.serviceVarietyShow = false
-        contractInfo.serviceType = 0
-        contractInfo.checkedService=[]
-        contractInfo.form.services_amount = ''
+        serviceData.serviceVarietyShow = false
+        serviceData.serviceType = 0
+        serviceData.checkedService=[]
+        compliance.form.services_amount = ''
         //权益
         // 权益大套餐
         let bigServiceQY = servivesTemp.find(item => item.FMSServiceTemplateId==11 || item.FMSServiceTemplateId==12)
@@ -402,14 +367,12 @@
       'contract_code','company_name','contract_type','seller_ids',
       'start_date','contract_amount','relate_contract_code','actual_pay_companies'
     ])
-    if(sellerArray.value.findIndex(item => item.seller_id == selectItem.seller_id)==-1){
+    let sellerArray = sellerListType.value==1?props.sellerData.ficc_list:props.sellerData.rai_list
+    if(sellerArray.findIndex(item => item.seller_id == selectItem.seller_id)==-1){
       // 为-1表示原本的销售已离职
-      contractInfo.form.seller_id = selectItem.seller_name
+      compliance.form.seller_id = selectItem.seller_name
       isLeave=true
     }
-    // serviceData.showServiceFicc = selectItem.product_id == 1
-    // serviceData.showServiceQy = selectItem.product_id == 2
-
   }
 
   // 合规登记-提交
@@ -427,13 +390,13 @@
               ElMessage.error('请选择权益销售')
               return 
             }
-            if(allSellerArray.ficc_list.findIndex(item => item.seller_id == cascaderSelectSeller.value[0])==-1||
-            allSellerArray.rai_list.findIndex(item => item.seller_id == cascaderSelectSeller.value[1])==-1){
+            if(props.sellerData.ficc_list.findIndex(item => item.seller_id == cascaderSelectSeller.value[0])==-1||
+            props.sellerData.rai_list.findIndex(item => item.seller_id == cascaderSelectSeller.value[1])==-1){
               ElMessage.error('选择的销售不存在或已离职')
               return 
             }
           }else{
-            if(!Number(contractInfo.form.seller_id)){
+            if(!Number(compliance.form.seller_id)){
               ElMessage.error('选择的销售不存在或已离职')
               return 
             }
@@ -441,18 +404,14 @@
         }
         compliance.form.services=[]
         compliance.form.service_amount=[]
-        if(contractInfo.checkedServiceQy.length==0 && contractInfo.checkedService.length==0){
+        if(serviceData.checkedServiceQy.length==0 && serviceData.checkedService.length==0){
           ElMessage.warning('请选择套餐')
           return 
         }
         let hasFICCservice=false
         let hasQYservice=false
         // FICC
-        if(contractInfo.checkedService.length>0){
-          // if(serviceData.checkedService.length==0){
-          //   ElMessage.warning('请选择FICC套餐')
-          //   return 
-          // }
+        if(serviceData.checkedService.length>0){
           hasFICCservice=true
           if((!serviceData.checkedPermission || serviceData.checkedPermission.length==0) 
           && serviceData.checkedService.some(serviceId =>serviceId==2)){
@@ -489,15 +448,11 @@
             return 
           }
           compliance.form.service_amount.push({product_id:1,service_amount:+compliance.form.services_amount})
-          contractInfo.form.services_amount = +parseFloat(contractInfo.form.services_amount).toFixed(2) || 0
+          compliance.form.services_amount = +parseFloat(compliance.form.services_amount).toFixed(2) || 0
         }
         
         // 权益
-        if(contractInfo.checkedServiceQy.length>0){
-          // if(serviceData.checkedServiceQy.length==0){
-          //   ElMessage.warning('请选择权益套餐')
-          //   return 
-          // }
+        if(serviceData.checkedServiceQy.length>0){
           hasQYservice=true
           // 权益大套餐
           if((!serviceData.checkedPermissionQyBig || serviceData.checkedPermissionQyBig.length==0) 
@@ -555,22 +510,19 @@
             return 
           }
           compliance.form.service_amount.push({product_id:2,service_amount:+compliance.form.services_Qy_amount})
-          contractInfo.form.services_Qy_amount = +parseFloat(contractInfo.form.services_Qy_amount).toFixed(2) || 0
+          compliance.form.services_Qy_amount = +parseFloat(compliance.form.services_Qy_amount).toFixed(2) || 0
         }
         let servicesAll=0
         if(hasFICCservice&&hasQYservice){
-          servicesAll = Math.round((contractInfo.form.services_Qy_amount+contractInfo.form.services_amount)*100)/100
+          servicesAll = Math.round((compliance.form.services_Qy_amount+compliance.form.services_amount)*100)/100
         }else if(hasFICCservice){
-          servicesAll = contractInfo.form.services_amount
-          contractInfo.form.services_Qy_amount=''
+          servicesAll = compliance.form.services_amount
+          compliance.form.services_Qy_amount=''
         }else{
-          servicesAll = contractInfo.form.services_Qy_amount
-          contractInfo.form.services_amount=''
+          servicesAll = compliance.form.services_Qy_amount
+          compliance.form.services_amount=''
         }
         compliance.form.contract_amount = +parseFloat(compliance.form.contract_amount).toFixed(2)
-        // compliance.form.services_amount = +parseFloat(compliance.form.services_amount).toFixed(2) || 0
-        // compliance.form.services_Qy_amount = +parseFloat(compliance.form.services_Qy_amount).toFixed(2) || 0
-        // let servicesAll = Math.round((compliance.form.services_Qy_amount+compliance.form.services_amount)*100)/100
         if(servicesAll!=compliance.form.contract_amount){
           ElMessage.error('套餐总金额不等于合同金额')
           return 
@@ -598,7 +550,7 @@
           }
           // 新增
           contractRegisterCheck({company_name:compliance.form.company_name,
-            start_date:compliance.form.start_date,end_date:compliance.form.end_date}).then(res=>{
+            start_date:compliance.form.start_date,end_date:compliance.form.end_date,seller_ids:compliance.form.seller_ids}).then(res=>{
             if(res.data?.exist){
               // 存在给提示
               ElMessageBox.confirm('已登记过相同的合同，是否继续操作？',
@@ -684,12 +636,11 @@
 
   // 对于销售的处理
   const sellerOperation=({seller_id,rai_seller_id,seller_ids,seller_name,rai_seller_name})=>{
+    console.log({seller_id,rai_seller_id,seller_ids,seller_name,rai_seller_name});
     if(seller_id && rai_seller_id){
-      // contractInfo.showServiceFicc = contractInfo.showServiceQy=true
-      sellerArray.value = allSellerArray.all_list
       cascaderSelectSeller.value = seller_ids.split(',').map(item => +item) 
-      if(allSellerArray.ficc_list.findIndex(item => item.seller_id == seller_id)==-1){
-        sellerArray.value.push({
+      if(props.sellerData.ficc_list.findIndex(item => item.seller_id == seller_id)==-1){
+        props.sellerData.all_list.push({
           seller_id:seller_id,
           seller_name:seller_name+'-已离职',
           disabled:true,
@@ -697,8 +648,8 @@
         })
         isLeave=true
       }
-      if(allSellerArray.rai_list.findIndex(item => item.seller_id == rai_seller_id)==-1){
-        sellerArray.value.push({
+      if(props.sellerData.rai_list.findIndex(item => item.seller_id == rai_seller_id)==-1){
+        props.sellerData.all_list.push({
           seller_id:rai_seller_id,
           seller_name:rai_seller_name+'-已离职',
           disabled:true,
@@ -707,21 +658,17 @@
         isLeave=true
       }
     }else if(!seller_id){
-      sellerArray.value=allSellerArray.rai_list
-      if(sellerArray.value.findIndex(item => item.seller_id == rai_seller_id)==-1){
+      if(props.sellerData.rai_list.findIndex(item => item.seller_id == rai_seller_id)==-1){
         // 为-1表示原本的销售已离职
-        contractInfo.form.seller_id = rai_seller_name
+        compliance.form.seller_id = rai_seller_name
         isLeave=true
       }
-      // contractInfo.showServiceQy=true
     }else{
-      sellerArray.value=allSellerArray.ficc_list
-      if(sellerArray.value.findIndex(item => item.seller_id == seller_id)==-1){
+      if(props.sellerData.ficc_list.findIndex(item => item.seller_id == seller_id)==-1){
         // 为-1表示原本的销售已离职
-        contractInfo.form.seller_id = seller_name
+        compliance.form.seller_id = seller_name
         isLeave=true
       }
-      // contractInfo.showServiceFicc=true
     }
   }
 
@@ -794,7 +741,7 @@
     compliance.form.currency_unit=props.detailInfo.currency_unit
     compliance.form.new_company=props.detailInfo.new_company
     compliance.form.seller_ids=props.detailInfo.seller_ids
-    compliance.form.seller_id=props.detailInfo.seller_id
+    compliance.form.seller_id=props.detailInfo.seller_id || props.detailInfo.rai_seller_id
     compliance.form.contract_status=props.detailInfo.contract_status
     compliance.form.start_date=props.detailInfo.start_date
     compliance.form.end_date=props.detailInfo.end_date
@@ -814,22 +761,18 @@
     // 合同类型回显
     compliance.contractTypeCheck = [compliance.form.has_payment,compliance.form.contract_type]
     // 销售
-    if(allSellerArray.all_list){
-      // 拿到销售列表后才去做处理
-      sellerOperation(res.data)
-    }else{
-      // 轮询等拿到销售列表后才去做处理，并清除轮询定时器
-      const timer = setInterval(()=>{
-        if(allSellerArray.all_list){
-          sellerOperation(res.data)
-          clearInterval(timer)
-        }
-      },10)
+    let para={
+      seller_id:props.detailInfo.seller_id,
+      rai_seller_id:props.detailInfo.rai_seller_id,
+      seller_ids:props.detailInfo.seller_ids,
+      seller_name:props.detailInfo.seller_name,
+      rai_seller_name:props.detailInfo.rai_seller_name
     }
+    // 拿到销售列表后才去做处理
+    intervalDataRequest(()=> props.sellerData.all_list>0 ,sellerOperation(para),1)
     // 销售显示
     sellerListType.value=props.detailInfo.sellerListType
     if(sellerListType.value == 3){
-      // serviceData.showServiceFicc = serviceData.showServiceQy=true
       cascaderSelectSeller.value = compliance.form.seller_ids.split(',').map(item => +item) 
     }
     // 套餐金额

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

@@ -65,7 +65,7 @@
         // dom的类型
         amountDomType:'text',
         remarkDomType:'text',
-        seller_id:0,
+        seller_id:'',
         seller_name:''
       }
     ]
@@ -79,8 +79,7 @@
   const rmbRate=ref(1)
 
   const sellerListType=ref(3)
-  // 开票到款类型 1-单Ficc 2-单权益 3-ficc和权益
-  const InvoiceAndPaymentType=ref(3)
+
   // -----------------------------监听
   // 金额-FICC
   watch(()=> IandP.moneyData.haveMoneyFICC ,(newValue)=>{
@@ -109,7 +108,7 @@
   }) 
 // ------------------------------------------方法
   // 切换套餐类型
-  const productIdChange=(value,type,row)=>{
+  const productIdChange=(value,row)=>{
     // 清空销售
     if(props.type=='开票'){
       row.seller_id=''
@@ -149,7 +148,7 @@
     if(!(row.amount && row.invoice_date && row.service_product_id)){
       return '请填写完整信息'
     }
-    if(type=='invoice' && !row.seller_id){
+    if(type=='开票' && !row.seller_id){
       return '请填写完整信息' 
     }
     return 1
@@ -157,7 +156,7 @@
 
   // 表格添加行
   const addRow=(row,index)=>{
-    const flag = canAddorEdit(type,row)
+    const flag = canAddorEdit(props.type,row)
     if(flag==1){
       amountForm.amountData.splice((index+1),0,
       {service_product_id:sellerListType.value == 3?'':sellerListType.value,origin_amount:'',
@@ -165,27 +164,16 @@
     }else{
       ElMessage.error(flag)
     }
-    // if(!(row.amount && row.invoice_date && row.service_product_id)){
-    //   ElMessage.error('请填写完整信息')
-    //   return
-    // }
-    // if(props.type=='开票'){
-    //   if(!row.seller_id){
-    //     ElMessage.error('请填写完整信息')
-    //     return
-    //   }
-    // }
-
   }
 
   // 表格编辑行
-  const editRow=(type,row)=>{
+  const editRow=(row)=>{
     if(!row.isEdit){
       // 编辑 -> 确定
       row.isEdit=true
       return
     }
-    const flag = canAddorEdit(type,row)
+    const flag = canAddorEdit(props.type,row)
     if(flag==1){
       // 确定 -> 编辑
       row.isEdit=false
@@ -307,6 +295,7 @@
         amountForm.amountData.forEach(element => {
           element.origin_amount = parseFloat(element.origin_amount)
           element.amount = parseFloat(element.amount.toFixed(2))
+          element.seller_id = element.seller_id || 0
         });
         let invoice_type = props.type=='开票'?1:2
         let registerprop = props.type=='开票'?registerInvoice:registerPayment
@@ -330,16 +319,7 @@
     sellerListType.value = props.IPDetailInfo.sellerListType
     rmbRate.value=props.IPDetailInfo.rmb_rate
     amountForm.amountData[0].service_product_id = sellerListType.value == 3?'':sellerListType.value
-    // 开票到款时的展示方式
-    let hasFICC = res.data.service_amount_list.some(item => item.product_id==1)
-    let hasQY = res.data.service_amount_list.some(item => item.product_id==2)
-    if(hasFICC && hasQY){
-      InvoiceAndPaymentType.value = 3
-    }else if(!hasFICC){
-      InvoiceAndPaymentType.value = 2
-    }else{
-      InvoiceAndPaymentType.value = 1
-    }
+
     // FICC套餐总金额 = FICC套餐剩余开篇金额
     IandP.moneyData.waitMoneyFICC= IandP.moneyData.allMoneyFICC =
     props.IPDetailInfo.service_amount_list.find(item => item.product_id==1)?props.IPDetailInfo.service_amount_list.find(item => item.product_id==1).service_amount:0
@@ -374,7 +354,7 @@
       })
       // 添加一行空的
       amountForm.amountData.push({
-        service_product_id:InvoiceAndPaymentType.value == 3?'':InvoiceAndPaymentType.value,              
+        service_product_id:sellerListType.value == 3?'':sellerListType.value,              
         origin_amount:'',
         amount:'',
         is_pre_pay:0,
@@ -511,7 +491,9 @@
                     v-show="row.amountDomType=='input'" @blur="iandPAmountBlur(row)"
                       placeholder="请输入金额" @input="(e)=>moneyChange(e,$index,row)"></el-input>
                   </el-form-item>
-                  <span  v-show="row.invoice_id && !row.isEdit">{{ row.origin_amount.toFixed(2)}}</span>
+                  <span  v-show="row.invoice_id && !row.isEdit">
+                    {{ row.origin_amount?parseFloat(row.origin_amount).toFixed(2):'--' }}
+                  </span>
                 </template>
               </el-table-column>
               <el-table-column label="换算金额（元）" show-overflow-tooltip width="160" align="center" prop="amount">
@@ -530,7 +512,7 @@
                     <el-date-picker v-model="row.invoice_date" style="width: 124px;"
                     placeholder="请选择日期" value-format="YYYY-MM-DD" :clearable="false" ></el-date-picker>
                   </el-form-item>
-                  <span v-show="row.invoice_id">{{ row.invoice_date || '--' }}</span>
+                  <span v-show="row.invoice_id && !row.isEdit">{{ row.invoice_date || '--' }}</span>
                 </template>
               </el-table-column >
               <el-table-column label="销售" width="120" align="center" prop="seller_id" v-if="type=='开票'">
@@ -541,13 +523,13 @@
                   <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'}">
                     <el-select v-model="row.seller_id" style="width: 124px;" :ref='`amountData-service_product_id${$index}`'
-                    placeholder="请选择销售" filterable v-if="row.service_product_id==1">
+                    placeholder="请选择销售" filterable v-if="row.service_product_id==1" @change="(value)=> invoiceSellerChange(row,value)">
                       <el-option :label="item.seller_name" :value="item.seller_id" 
                       v-for="item in sellerData?.ficc_list" :key="item.seller_id">
                       </el-option>
                     </el-select>
                     <el-select v-model="row.seller_id" style="width: 124px;" :ref='`amountData-service_product_id${$index}`'
-                    placeholder="请选择销售" filterable v-else-if="row.service_product_id==2">
+                    placeholder="请选择销售" filterable v-else-if="row.service_product_id==2" @change="(value)=> invoiceSellerChange(row,value)">
                       <el-option :label="item.seller_name" :value="item.seller_id" 
                       v-for="item in sellerData?.rai_list" :key="item.seller_id">
                       </el-option>
@@ -578,7 +560,7 @@
                   <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('invoice',row)">{{ row.isEdit?'确定':'编辑' }}</span>
+                  @click="editRow(row)">{{ row.isEdit?'确定':'编辑' }}</span>
                   <span class="table-operation-button" style="color: var(--dangerColor);" 
                   @click="deleteRow(row,$index)">删除</span>
                 </template>

src/views/financialManagement/contractProgress.vue

@@ -126,19 +126,16 @@
     // 无分组
     getSellerListNoG().then(res=>{
       if(!res.data) return 
-      allSeller.ficc_list = res.data.FiccSeller
-      allSeller.rai_list = res.data.RaiSeller
-      allSeller.all_list=[
-        {seller_id: 2,seller_name: "FICC销售",child:allSellerArray.ficc_list},
-        {seller_id: 5,seller_name: "权益销售",child:allSellerArray.rai_list}
+      allSeller.value.ficc_list = res.data.FiccSeller
+      allSeller.value.rai_list = res.data.RaiSeller
+      allSeller.value.all_list=[
+        {seller_id: 2,seller_name: "FICC销售",child:allSeller.value.ficc_list},
+        {seller_id: 5,seller_name: "权益销售",child:allSeller.value.rai_list}
       ]
-      sellerArray.value = allSellerArray.all_list || []
     })
     // 有分组
     // getSellerList().then(res=>{
-      // allSellerArray=res.data || {}
-      // contractInfo.sellerInvoiceListF = allSellerArray.ficc_list || []
-      // contractInfo.sellerInvoiceListQ = allSellerArray.rai_list || []
+        // console.log(res);
     // })
   }
   // 获取服务列表
@@ -200,11 +197,6 @@
       router.back()
     }
   }
-  // --------------------------------
-  onMounted(()=>{
-    // 缓存dom查询结果
-    contractInfo.infoBoxDomList = document.getElementsByClassName('info-row-item')
-  })
 
 // ----------------------created
   // 合规登记Id
@@ -268,7 +260,10 @@
         currency_unit:res.data.currency_unit,
         new_company:res.data.new_company,
         seller_ids:res.data.seller_ids,
-        seller_id:res.data.seller_id || res.data.rai_seller_id,
+        seller_id:res.data.seller_id,
+        seller_name:res.data.seller_name,
+        rai_seller_id:res.data.rai_seller_id,
+        rai_seller_name:res.data.rai_seller_name,
         sellerListType,
         contract_status:res.data.contract_status,
         start_date:res.data.start_date,
@@ -288,9 +283,21 @@
         service_amount_list:res.data.service_amount_list,
         services:res.data.service_list
       }
+      
+      let hasFICC = res.data.service_amount_list.some(item => item.product_id==1)
+      let hasQY = res.data.service_amount_list.some(item => item.product_id==2)
+      //开票到款套餐类型 1-单Ficc 2-单权益 3-ficc和权益
+      let InvoiceAndPaymentType=3
+      if(hasFICC && hasQY){
+        InvoiceAndPaymentType = 3
+      }else if(!hasFICC){
+        InvoiceAndPaymentType = 2
+      }else{
+        InvoiceAndPaymentType = 1
+      }
       IPDetailInfo.value={
         contract_register_id:res.data.contract_register_id,
-        sellerListType,
+        sellerListType:InvoiceAndPaymentType,
         rmb_rate:res.data.rmb_rate,
         currency_unit:res.data.currency_unit,
         service_amount_list:res.data.service_amount_list || [],
@@ -315,6 +322,11 @@
       }
     })
   }
+  // --------------------------------
+  onMounted(()=>{
+    // 缓存dom查询结果
+    contractInfo.infoBoxDomList = document.getElementsByClassName('info-row-item')
+  })
 </script>
 
 <template>
@@ -338,7 +350,7 @@
             </div>
           </div>
           <!-- 开票登记 -->
-          <div class="info-box" v-show="operationtype!='compliance' && detailInfo.has_payment!=1" 
+          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_payment!=1" 
           :style="{order:operationtype=='invoice'?2:0}"
           style="margin-top:20px ;" v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']">
             <div class="info-box-head" @click="unfoldOrFlod(1)"
@@ -354,7 +366,7 @@
             </div>
           </div>
           <!-- 到款登记 -->
-          <div class="info-box" v-show="operationtype!='compliance' && detailInfo.has_payment!=1" 
+          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_payment!=1" 
           v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']"
           style="margin-top:20px;order: 1;">
             <div class="info-box-head" @click="unfoldOrFlod(2)"