hbchen hace 1 año
padre
commit
cbb34cb57a

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

+ 3 - 1
src/api/financialMana.js

@@ -368,7 +368,9 @@ export function preRegistrationAdd(data) {
  /**
   * 
   * @param {
- * invoice_id contract_register_id
+ * invoice_id
+ * contract_register_id 
+ * detail_type(1编辑 2预开票/到款)
  * } data 
  * @returns 
  */

+ 1 - 1
src/views/financialManagement/contractProgress.vue

@@ -15,7 +15,7 @@
   const store=useStore()
 
   const operationType=[{op_type:1,label:"合规登记"},{op_type:2,label:"开票登记"},{op_type:3,label:"到款登记"},
-  {op_type:4,label:"修改合同状态"},{op_type:5,label:"删除合同登记"},{op_type:6,label:"合规编辑"},{op_type:7,label:"预到款登记"}]
+  {op_type:4,label:"修改合同状态"},{op_type:5,label:"删除合同登记"},{op_type:6,label:"合规编辑"},{op_type:7,label:"预到款登记"},{op_type:8,label:"预开票登记"}]
 
   // 权限对象,判断是否有 合规登记、开票登记、到款登记权限
   const permissionItem={

+ 2 - 2
src/views/financialManagement/registrationPre.vue

@@ -277,7 +277,7 @@ const deleteRegistrationPreRow=(index,row)=>{
 const editRegistrationPre=(row)=>{
   dialog.hasServiceChange=false
   preRegistrationDetail({contract_register_id:row.contract_register_id,
-  invoice_type:row.invoice_type}).then(res=>{
+  invoice_type:row.invoice_type,detail_type:1}).then(res=>{
     if(!res.data) return
     dialog.registrationPreForm.contract_register_id = res.data.contract_register_id
     dialog.registrationPreForm.company_name = res.data.company_name
@@ -454,7 +454,7 @@ watch(()=>preDialog.validityDate,(newVal)=>{
 const preIorP=(row)=>{
   preRegistrationDetail({contract_register_id:row.contract_register_id,
   invoice_type:row.invoice_type==3?4:3,pre_register_id:row.pre_register_id,arrive_id:row.arrive_id,
-  invoice_id:row.invoice_id}).then(res=>{
+  invoice_id:row.invoice_id,detail_type:2}).then(res=>{
     if(!res.data) return
     preDialog.preForm.contract_register_id = res.data.contract_register_id
     preDialog.preForm.company_name = res.data.company_name