hbchen 2 年之前
父节点
当前提交
c69e3c6184

+ 2 - 2
.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"

+ 4 - 1
src/views/financialManagement/contractProgress-component/Compliance.vue

@@ -339,7 +339,10 @@
         compliance.form.services_amount = ''
       }
       serviceData.varietyDiaType='edit'
-
+      // 关联合同回显
+      if(res.data.RelationContractDetailList && res.data.RelationContractDetailList.length>0){
+        compliance.form.relate_contract_code = res.data.RelationContractDetailList.map(it => it.ContractCode).join('、')
+      }
     })
 
     compliance.form.product_ids = selectItem.product_id.toString()

+ 10 - 6
src/views/financialManagement/registrationPre.vue

@@ -52,7 +52,8 @@ const store = useStore()
     selectServices:[],
     validityDate:[]
   })
-
+  // 开票/到款预登记删除的id
+  let hasDeleteIds=[]
   // 监听
 
   watch(()=>dialog.validityDate,(newVal)=>{
@@ -245,7 +246,7 @@ const addRegistrationPreRow=()=>{
   })
 }
 //删除预登记的行
-const deleteRegistrationPreRow=(index)=>{
+const deleteRegistrationPreRow=(index,row)=>{
   ElMessageBox.confirm(`是否删除该条${dialog.registrationType}记录?`,
     '提示',    
     {
@@ -253,6 +254,7 @@ const deleteRegistrationPreRow=(index)=>{
       cancelButtonText: '取消',
       type: 'warning',
     }).then(res=>{
+      row.contract_invoice_id && hasDeleteIds.push(row.contract_invoice_id)
       dialog.registrationPreForm.IorPInfo.splice(index,1)
     }).catch(()=>{}) 
 }
@@ -284,6 +286,7 @@ const editRegistrationPre=(row)=>{
 
 //弹窗关闭动画 回调
 const dialogClosed=()=>{
+  hasDeleteIds=[]
   dialog.registrationPreForm.company_name=''
   dialog.registrationPreForm.contract_register_id=''
   dialog.registrationPreForm.pre_register_id=''
@@ -320,6 +323,7 @@ const submitForm=()=>{
           end_date:dialog.registrationPreForm.end_date,
           list:dialog.registrationPreForm.IorPInfo,
           services:serviceData,
+          del_invoice_ids:hasDeleteIds
         }
         // 化''为0
         params.list.forEach(item =>{
@@ -620,9 +624,9 @@ placementPreList()
           </template>
         </el-table-column>
         <el-table-column label="套餐" prop="services" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" fixed="right" >
+        <el-table-column label="操作" fixed="right" min-width="100">
           <template #default="{row}">
-            <div class="table-options" style="padding-right: 16px;">
+            <div class="table-options" style="padding-right: 20px;">
               <span class="table-option-buttons" v-permission="'financial:registrationPre:supplementary'"
               @click="supplementaryContract(row)">
                 补录合同
@@ -655,7 +659,7 @@ placementPreList()
               @click="delteRecord(row)" style="color:var(--dangerColor);" v-if="row.invoice_type==4">
                 删除
               </span>
-              <el-dropdown popper-class="classifyFandQ" size="large" style="position: absolute;right: 8px;top: calc(50% - 8px);"
+              <el-dropdown popper-class="classifyFandQ" size="large" style="position: absolute;right: 12px;top: calc(50% - 8px);"
               v-permission="['financial:registrationPre:invoiceRemark','financial:registrationPre:paymentRemark','or']"
                @command="(type)=>remarkView(type,row)">
                 <el-icon style="cursor: pointer;font-size: 16px;"><MoreFilled /></el-icon>
@@ -764,7 +768,7 @@ placementPreList()
             style="margin-right: 0;" :style="{marginLeft:serviceType==3 && dialog.registrationType=='开票'?'20px':'0'}"> 
               <el-input v-model="item.remark" placeholder="请输入备注" :style="{width:serviceType==3&&dialog.registrationType=='开票'?'486px':'772px'}" />
             </el-form-item>
-            <el-icon color="#D0D2D5" class="deleteIcon" size="16px" @click="deleteRegistrationPreRow(index)"
+            <el-icon color="#D0D2D5" class="deleteIcon" size="16px" @click="deleteRegistrationPreRow(index,item)"
             v-show="dialog.registrationPreForm.IorPInfo.length>1"><CircleCloseFilled /></el-icon>
           </div>
         </el-scrollbar>