Эх сурвалжийг харах

项目合同保存值获取

duy 2 жил өмнө
parent
commit
944d708560

+ 9 - 5
src/views/project/contract/components/base.vue

@@ -132,11 +132,14 @@ const props = defineProps({
 const infoData = ref(props.datas)
 const isDisabled = ref(props.disabled)
 const saveLoaingVal=ref(props.saveLoaing)
+const formBaseModel = ref(props.datas)
 
 //深度监听
 watch(() => [
     props.datas,
-], ([datas]) => {
+    formBaseModel
+], ([datas,val]) => {
+    emit('update:datas', val)
     infoData.value = datas
     formBaseModel.value=datas
     betweenTime.value[0]=datas['startTime']
@@ -165,7 +168,7 @@ onActivated(()=>{
 })
 //基础表单
 const formBaseRef = ref(null)
-const formBaseModel = ref({})
+
 const formBaseRules = {
     key2: [
         {required: true, message: '请输入', trigger: 'blur'},
@@ -189,11 +192,12 @@ const formInvoiceRules = {}
 const goBackClick = () => {
     router.back()
 }
-const emit= defineEmits(['saveClick'])
+const emit= defineEmits(['saveClick',"update:datas"])
+
 //提交保存
 const saveClick = () => {
-    console.log(formBaseModel.value,'formBaseModel');
-    emit('saveClick',formBaseModel.value,'base')
+    // console.log(formBaseModel.value,'formBaseModel');
+    emit('saveClick')
  
 
 }

+ 6 - 3
src/views/project/contract/components/file.vue

@@ -64,8 +64,10 @@ const saveLoaingVal=ref(props.saveLoaing)
 //深度监听
 watch(() => [
     props.datas,
-], ([datas]) => {
+    infoData
+], ([datas,infoData]) => {
     infoData.value = datas
+    emit('update:datas', infoData)
 }, {deep: true})
 
 //监听
@@ -99,11 +101,12 @@ const reuploadClick = () => {
 const goBackClick = () => {
     router.back()
 }
-const emit= defineEmits(['saveClick'])
+
+const emit= defineEmits(['saveClick',"update:datas"])
 //提交保存
 const saveClick = () => {
     console.log(infoData.value,'infoData');
-    emit('saveClick',infoData.value,'file')
+    emit('saveClick')
     
 
 }

+ 6 - 4
src/views/project/contract/components/milestone.vue

@@ -57,7 +57,7 @@ import {ref, watch} from "vue";
 import {useRouter} from 'vue-router'
 
 const router = useRouter()
-
+const emit= defineEmits(['saveClick',"update:datas"])
 //参数
 const props = defineProps({
     datas: {
@@ -81,8 +81,10 @@ const saveLoaingVal=ref(props.saveLoaing)
 //深度监听
 watch(() => [
     props.datas,
-], ([datas]) => {
+    infoData
+], ([datas,infoData]) => {
     infoData.value = datas
+    emit('update:datas', infoData)
 
 }, {deep: true})
 
@@ -118,11 +120,11 @@ const goBackClick = () => {
 const reminderUserList=ref([])
 
 
-const emit= defineEmits(['saveClick'])
+
 //提交保存
 const saveClick = () => {
     console.log(infoData.value,'infoData');
-    emit('saveClick',infoData.value,'milestone')
+    emit('saveClick')
  
 
 }

+ 8 - 12
src/views/project/contract/form.vue

@@ -31,7 +31,7 @@ const router = useRouter()
 const useRoutes = useRoute()
 const dataId = ref(useRoutes?.query?.id ?? '')
 const dataType = ref(useRoutes?.query?.type ?? '')
-
+const infoData = ref({})
 //缓存页面被激活时
 onActivated(() => {
     dataId.value = useRoutes?.query?.id ?? ''
@@ -39,6 +39,7 @@ onActivated(() => {
     setTabsData()
     if(dataType.value!=='add'){
         getContractInfoById()
+        getListByContractId()
     }else if(dataType.value=='add'){
         infoData.value={}
         infoDataFile.value={}
@@ -86,15 +87,10 @@ const tabsData = ref([
 ])
 const tabsClick = (key) => {
     tabsKey.value = key
-    if(key=='milestone'&&dataType.value!=='add'){
-        getListByContractId()
-      
-    }else if(key=='base'&&dataType.value!=='add'){
-        getContractInfoById()
-    }
+
 }
 
-const infoData = ref({})
+
 const isNoDropShadow = ref(false)
 //合同里程碑
 const milestoneData=ref([{}])
@@ -111,10 +107,10 @@ const getListByContractId=async()=>{
 const saveLoaing=ref(false)
 //保存
 const saveClick=(info,type)=>{
-    console.log(info,'info');
-    console.log(type,'type');
-    console.log(infoData.value,'原始信息infoData.value');
- 
+  console.log(infoData.value,'indo11111');
+  console.log(infoDataFile.value,'infoDataFile');
+  console.log(milestoneData.value,'milestoneData');
+
 }
 
 </script>