diff --git a/src/views/contract/ContractProc/components/createForm.vue b/src/views/contract/ContractProc/components/createForm.vue
index e66b9b6..824f582 100644
--- a/src/views/contract/ContractProc/components/createForm.vue
+++ b/src/views/contract/ContractProc/components/createForm.vue
@@ -14,11 +14,6 @@
                 <a-input v-model:value="formState.kName" placeholder="请输入合同名称" :disabled="isDisable"/>
               </a-form-item>
             </a-col>
-            <a-col :span="8">
-              <a-form-item label="合同主体" name="comName">
-                <a-input v-model:value="formState.comName" disabled />
-              </a-form-item>
-            </a-col>
             <a-col :span="8">
               <a-form-item label="合同期限" name="kPeriod">
                 <a-select v-model:value="formState.kPeriod" :disabled="isDisable" placeholder="请选择合同期限" @change="kPeriodChange" style="width: 100%" allow-clear>
@@ -53,6 +48,11 @@
                 <a-input-search v-model:value="formState.bDeptName" disabled placeholder="请选择业务部门"  readonly @search="onSearch"/>
               </a-form-item>
             </a-col>
+            <a-col :span="8">
+              <a-form-item label="合同主体" name="comName">
+                <a-input v-model:value="formState.comName" disabled />
+              </a-form-item>
+            </a-col>
             <a-col :span="8">
               <a-form-item label="币种" name="curCode">
                 <a-select v-model:value="formState.curCode" :disabled="isDisable" placeholder="请选择币种" style="width: 100%" allow-clear>
@@ -82,7 +82,7 @@
           <a-row>
             <a-col :span="8">
               <a-form-item label="接收站" name="staName">
-                <a-input-search v-model:value="formState.lngContractProcList[0].staName" :disabled="isDisable" placeholder="请选择接收站"  readonly @search="onSearchDownLoad('up', index)"/>
+                <a-input-search v-model:value="formState.staName" :disabled="isDisable" placeholder="请选择接收站"  readonly @search="onSearchDownLoad('up', index)"/>
               </a-form-item>
              </a-col>
              <a-col :span="24">
@@ -221,6 +221,7 @@
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
     import { addLngContract,updateLngContract, getLngContract,getParameter } from '/@/api/contract/ContractProc';
+    import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
     import { h } from 'vue';
@@ -289,7 +290,8 @@
       empName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       bDeptName: [{ required: false, message: "该项为必填项", trigger: 'change' }],
       dateTo:[{ required: true, message: "该项为必填项", trigger: 'change' }],
-      dateFrom:[{ required: true, message: "该项为必填项", trigger: 'change' }]
+      dateFrom:[{ required: true, message: "该项为必填项", trigger: 'change' }],
+      staName:[{ required: true, message: "该项为必填项", trigger: 'change' }],
     });
     const layout = {
       labelCol: { span: 8 },
@@ -404,6 +406,7 @@
       Object.assign(dataListPrice.value, formState.lngPriceProcList || [])
       formState.dateFrom = formState.dateFrom ? dayjs(formState.dateFrom) : null
       formState.dateTo = formState.dateTo ? dayjs(formState.dateTo) : null
+      formState.staName = formState.lngContractProcList[0]?.staName
       dataListPrice.value.forEach(v =>{
         v.dateFromNew = v.dateFrom ?  dayjs(v.dateFrom) : null
         v.dateToF = v.dateToF ?  dayjs(v.dateToF) : null
@@ -423,7 +426,9 @@
       dataListAppro.value.forEach(v => {
         // v.approId = v.id
       })
-
+      dataListContractFact.value.forEach(v => {
+        v.kFactId = v.id
+      })
       } catch (error) {
         spinning.value = false
       }
@@ -538,11 +543,14 @@
       formState.cpName = val[0].suName
     }
     const handleSuccessContractFact = (val) => {
-        val.forEach(v => {
+      val.forEach((v, idx) => {
+        v.kFactId = v.id
+        v.sort = idx
         v.id = null
       })
       if (!dataListContractFact.value.length) {
         dataListContractFact.value = val
+        getContractFact()
         return
       }
       let arr = []
@@ -556,10 +564,31 @@
         })
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
+      getContractFact()
+    }
+    const getContractFact = async () => {
+      let a = []
+      dataListContractFact.value.forEach(v=>{
+        if (v.relTypeCode == 'M') {
+          a.push(v)
+        } 
+      })
+      if(a.length == 1) {
+        const res = await getLngContractFact(a[0].kFactId)
+        formState.kNo = formState.kNo ? formState.kNo : res?.kNo
+        formState.kName = formState.kName ? formState.kName : res?.kName
+        formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
+        formState.curCode = formState.curCode ? formState.curCode : res?.curCode
+        formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
+        formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
+        formState.cpName = formState.cpName ? formState.cpName : (res?.lngContractFactCpList || [])[0]?.cpName
+        formState.cpCode = formState.cpCode ? formState.cpCode : (res?.lngContractFactCpList || [])[0]?.cpCode
+      }
     }
     const handleSuccessDownLoad = (val) => {
       formState.lngContractProcList[0].staCode = val[0].code
       formState.lngContractProcList[0].staName = val[0].fullName
+      formState.staName = val[0].fullName
     }
     
     function unique(arr, u_key) {
@@ -591,7 +620,7 @@
           dataListPrice.value[k].dateToF = dataListPrice.value[k].dateToF ? dayjs(dataListPrice.value[k].dateToF).format('YYYY-MM-DD HH:mm:ss') : null
           dataListPrice.value[k].dateToY = dataListPrice.value[k].dateToY ? dayjs(dataListPrice.value[k].dateToY).format('MM-DD') : null
 
-          dataListPrice.value[k].comCode = formState.comId
+          dataListPrice.value[k].comId = formState.comId
           dataListPrice.value[k].suCode = formState.cpCode
           dataListPrice.value[k].staCode = formState.lngContractProcList[0].staCode
           let arr = dataListPrice.value[k].lngPriceProcDtlList || []
diff --git a/src/views/contract/ContractPurInt/components/createForm.vue b/src/views/contract/ContractPurInt/components/createForm.vue
index f0158ce..c44bc88 100644
--- a/src/views/contract/ContractPurInt/components/createForm.vue
+++ b/src/views/contract/ContractPurInt/components/createForm.vue
@@ -285,6 +285,7 @@
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
     import { addLngContract,updateLngContract, getLngContract, getAllPriceTerm} from '/@/api/contract/ContractPurInt';
+    import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getAllCurrency } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
@@ -603,6 +604,7 @@
       })
       if (!dataListContractFact.value.length) {
         dataListContractFact.value = val
+        getContractFact()
         return
       }
       let arr = []
@@ -616,6 +618,26 @@
         })
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
+      getContractFact()
+    }
+    const getContractFact = async () => {
+      let a = []
+      dataListContractFact.value.forEach(v=>{
+        if (v.relTypeCode == 'M') {
+          a.push(v)
+        } 
+      })
+      if(a.length == 1) {
+        const res = await getLngContractFact(a[0].kFactId)
+        formState.kNo = formState.kNo ? formState.kNo : res?.kNo
+        formState.kName = formState.kName ? formState.kName : res?.kName
+        formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
+        formState.curCode = formState.curCode ? formState.curCode : res?.curCode
+        formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
+        formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
+        formState.cpName = formState.cpName ? formState.cpName : (res?.lngContractFactCpList || [])[0]?.cpName
+        formState.cpCode = formState.cpCode ? formState.cpCode : (res?.lngContractFactCpList || [])[0]?.cpCode
+      }
     }
     function unique(arr, u_key) {
       const map = new Map()
diff --git a/src/views/contract/ContractPurPng/components/createForm.vue b/src/views/contract/ContractPurPng/components/createForm.vue
index 691cd1c..122d0eb 100644
--- a/src/views/contract/ContractPurPng/components/createForm.vue
+++ b/src/views/contract/ContractPurPng/components/createForm.vue
@@ -187,6 +187,7 @@
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
     import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractPurPng';
+    import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
     import { h } from 'vue';
@@ -492,11 +493,13 @@
       formState.cpName = val[0].suName
     }
     const handleSuccessContractFact = (val) => {
-        val.forEach(v => {
+      val.forEach(v => {
+        v.idNew = v.id
         v.id = null
       })
       if (!dataListContractFact.value.length) {
         dataListContractFact.value = val
+        getContractFact()
         return
       }
       let arr = []
@@ -510,6 +513,25 @@
         })
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
+      getContractFact()
+    }
+    const getContractFact = async () => {
+      let a = []
+      dataListContractFact.value.forEach(v=>{
+        if (v.relTypeCode == 'M') {
+          a.push(v)
+        } 
+      })
+      if(a.length == 1) {
+        const res = await getLngContractFact(a[0].id || a[0].idNew)
+        formState.kNo = formState.kNo ? formState.kNo : res?.kNo
+        formState.kName = formState.kName ? formState.kName : res?.kName
+        formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
+        formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
+        formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
+        formState.cpName = formState.cpName ? formState.cpName : (res?.lngContractFactCpList || [])[0]?.cpName
+        formState.cpCode = formState.cpCode ? formState.cpCode : (res?.lngContractFactCpList || [])[0]?.cpCode
+      }
     }
     const cancel = () => {
       isShow.value = false
diff --git a/src/views/contract/ContractSales/components/createForm.vue b/src/views/contract/ContractSales/components/createForm.vue
index 63aeeb6..72ce258 100644
--- a/src/views/contract/ContractSales/components/createForm.vue
+++ b/src/views/contract/ContractSales/components/createForm.vue
@@ -189,6 +189,7 @@
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
     import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSales';
+    import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
     import { getAppEnvConfig } from '/@/utils/env';
@@ -528,6 +529,7 @@
       })
       if (!dataListContractFact.value.length) {
         dataListContractFact.value = val
+        getContractFact()
         return
       }
       let arr = []
@@ -541,6 +543,26 @@
         })
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
+      getContractFact()
+      
+    }
+    const getContractFact = async () => {
+      let a = []
+      dataListContractFact.value.forEach(v=>{
+        if (v.relTypeCode == 'M') {
+          a.push(v)
+        } 
+      })
+      if(a.length == 1) {
+        const res = await getLngContractFact(a[0].kFactId)
+        formState.kNo = formState.kNo ? formState.kNo : res?.kNo
+        formState.kName = formState.kName ? formState.kName : res?.kName
+        formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
+        formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
+        formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
+        formState.cpName = formState.cpName ? formState.cpName : (res?.lngContractFactCpList || [])[0]?.cpName
+        formState.cpCode = formState.cpCode ? formState.cpCode : (res?.lngContractFactCpList || [])[0]?.cpCode
+      }
     }
     const handleSuccessDownLoad = async (val, type) => {
       if (type == 'trans') {
diff --git a/src/views/contract/ContractSalesInt/components/createForm.vue b/src/views/contract/ContractSalesInt/components/createForm.vue
index e25642f..0e68af5 100644
--- a/src/views/contract/ContractSalesInt/components/createForm.vue
+++ b/src/views/contract/ContractSalesInt/components/createForm.vue
@@ -286,6 +286,7 @@
     import { useModal } from '/@/components/Modal';
     import {getAllPriceTerm} from '/@/api/contract/ContractPurInt';
     import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractSalesInt';
+    import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getAllCurrency } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
@@ -605,6 +606,7 @@
       })
       if (!dataListContractFact.value.length) {
         dataListContractFact.value = val
+        getContractFact()
         return
       }
       let arr = []
@@ -618,6 +620,26 @@
         })
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
+      getContractFact()
+    }
+    const getContractFact = async () => {
+      let a = []
+      dataListContractFact.value.forEach(v=>{
+        if (v.relTypeCode == 'M') {
+          a.push(v)
+        } 
+      })
+      if(a.length == 1) {
+        const res = await getLngContractFact(a[0].kFactId)
+        formState.kNo = formState.kNo ? formState.kNo : res?.kNo
+        formState.kName = formState.kName ? formState.kName : res?.kName
+        formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
+        formState.curCode = formState.curCode ? formState.curCode : res?.curCode
+        formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
+        formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
+        formState.cpName = formState.cpName ? formState.cpName : (res?.lngContractFactCpList || [])[0]?.cpName
+        formState.cpCode = formState.cpCode ? formState.cpCode : (res?.lngContractFactCpList || [])[0]?.cpCode
+      }
     }
     function unique(arr, u_key) {
       const map = new Map()
diff --git a/src/views/contract/ContractSalesLng/components/createForm.vue b/src/views/contract/ContractSalesLng/components/createForm.vue
index d0d9963..7373b64 100644
--- a/src/views/contract/ContractSalesLng/components/createForm.vue
+++ b/src/views/contract/ContractSalesLng/components/createForm.vue
@@ -14,11 +14,6 @@
                 <a-input v-model:value="formState.kName" placeholder="请输入合同名称" :disabled="isDisable"/>
               </a-form-item>
             </a-col>
-            <a-col :span="8">
-              <a-form-item label="合同主体" name="comName">
-                <a-input v-model:value="formState.comName" disabled />
-              </a-form-item>
-            </a-col>
             <a-col :span="8">
               <a-form-item label="合同期限" name="kPeriod">
                 <a-select v-model:value="formState.kPeriod" :disabled="isDisable" placeholder="请选择合同期限" style="width: 100%" allow-clear @change="periodTypeCodeChange">
@@ -68,7 +63,11 @@
                 <a-input-search v-model:value="formState.bDeptName" disabled placeholder="请选择业务部门"  readonly @search="onSearch"/>
               </a-form-item>
             </a-col>
-            
+            <a-col :span="8">
+              <a-form-item label="合同主体" name="comName">
+                <a-input v-model:value="formState.comName" disabled />
+              </a-form-item>
+            </a-col>
             <a-col :span="8">
               <a-form-item label="定价机制" name="prcTypeCode">
                 <a-select v-model:value="formState.prcTypeCode" :disabled="isDisable" style="width: 100%" allow-clear>
@@ -165,6 +164,7 @@
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
     import { addLngContract,updateLngContract, getLngContract, getTransList, getPurList } from '/@/api/contract/ContractSalesLng';
+    import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
     import { getAppEnvConfig } from '/@/utils/env';
@@ -450,10 +450,12 @@
     }
     const handleSuccessContractFact = (val) => {
         val.forEach(v => {
+          v.idNew = v.id
           v.id = null
       })
       if (!dataListContractFact.value.length) {
         dataListContractFact.value = val
+        getContractFact()
         return
       }
       let arr = []
@@ -467,6 +469,25 @@
         })
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
+      getContractFact()
+    }
+    const getContractFact = async () => {
+      let a = []
+      dataListContractFact.value.forEach(v=>{
+        if (v.relTypeCode == 'M') {
+          a.push(v)
+        } 
+      })
+      if(a.length == 1) {
+        const res = await getLngContractFact(a[0].id || a[0].idNew)
+        formState.kNo = formState.kNo ? formState.kNo : res?.kNo
+        formState.kName = formState.kName ? formState.kName : res?.kName
+        formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
+        formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
+        formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
+        formState.cpName = formState.cpName ? formState.cpName : (res?.lngContractFactCpList || [])[0]?.cpName
+        formState.cpCode = formState.cpCode ? formState.cpCode : (res?.lngContractFactCpList || [])[0]?.cpCode
+      }
     }
     function unique(arr, u_key) {
       const map = new Map()
diff --git a/src/views/contract/ContractTransPng/components/createForm.vue b/src/views/contract/ContractTransPng/components/createForm.vue
index 5ab53ab..72e4e0e 100644
--- a/src/views/contract/ContractTransPng/components/createForm.vue
+++ b/src/views/contract/ContractTransPng/components/createForm.vue
@@ -225,6 +225,7 @@
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
     import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractTransPng';
+    import { getLngContractFact } from '/@/api/contract/ContractFact';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
     import { h } from 'vue';
@@ -432,7 +433,9 @@
       dataListAppro.value.forEach(v => {
         // v.approId = v.id
       })
-
+      dataListContractFact.value.forEach(v => {
+        v.kFactId = v.id
+      })
       } catch (error) {
         spinning.value = false
       }
@@ -558,11 +561,14 @@
       formState.cpName = val[0].suName
     }
     const handleSuccessContractFact = (val) => {
-        val.forEach(v => {
+      val.forEach((v, idx) => {
+        v.kFactId = v.id
+        v.sort = idx
         v.id = null
       })
       if (!dataListContractFact.value.length) {
         dataListContractFact.value = val
+        getContractFact()
         return
       }
       let arr = []
@@ -576,6 +582,26 @@
         })
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
+      getContractFact()
+    }
+    const getContractFact = async () => {
+      let a = []
+      dataListContractFact.value.forEach(v=>{
+        if (v.relTypeCode == 'M') {
+          a.push(v)
+        } 
+      })
+      if(a.length == 1) {
+        const res = await getLngContractFact(a[0].kFactId)
+        formState.kNo = formState.kNo ? formState.kNo : res?.kNo
+        formState.kName = formState.kName ? formState.kName : res?.kName
+        formState.kPeriod = formState.kPeriod ? formState.kPeriod : res?.periodTypeCode
+        formState.curCode = formState.curCode ? formState.curCode : res?.curCode
+        formState.dateFrom = formState.dateFrom ? formState.dateFrom : (res?.dateFrom ? dayjs(res?.dateFrom) : null)
+        formState.dateTo = formState.dateTo ? formState.dateTo : (res?.dateTo ? dayjs(res?.dateTo) : null)
+        formState.cpName = formState.cpName ? formState.cpName : (res?.lngContractFactCpList || [])[0]?.cpName
+        formState.cpCode = formState.cpCode ? formState.cpCode : (res?.lngContractFactCpList || [])[0]?.cpCode
+      }
     }
     const handleSuccessDownLoad = (val, type) => {
       if (type == 'up') {
@@ -616,7 +642,7 @@
             let a = dataListPrice.value[i].lngPriceTransPngList[k]
             let flag = !a.dateFrom || !a.dateToCode || (a.dateToCode=='F'&&!a.dateToF) || (a.dateToCode=='Y'&&!a.dateToY)
             if (flag) {
-              message.warn('请完善管输价格必选项8')
+              message.warn('请完善管输价格必选项')
               return
             }
             dataListPrice.value[i].lngPriceTransPngList[k].dateFrom = dataListPrice.value[i].lngPriceTransPngList[k].dateFrom ? dayjs(dataListPrice.value[i].lngPriceTransPngList[k].dateFrom).format('YYYY-MM-DD HH:mm:ss'):null