出差管理修改

src/views/attendance/business-trip/index.vue

@@ -69,7 +69,7 @@
 </template>
 
 <script setup>
-import {ref, watch,onMounted} from  'vue'
+import {ref, watch,onMounted,onActivated} from  'vue'
 import dayjs from "dayjs"
 import 'dayjs/locale/zh-cn'
 import {useRouter} from 'vue-router'
@@ -79,7 +79,7 @@ import {getArrValue} from "js-fast-way"
 import {getProjectList, getDictInfo} from "~api/other";
 import {delMessage} from "~uti/tools";
 const router = useRouter()
-onMounted(()=>{
+onActivated(()=>{
   getProjectData()
   getTableData()
   getdraftTableData()

src/views/attendance/business-trip/info.vue

@@ -1,7 +1,7 @@
 <template>
   <HcCard actionUi="text-center">
     <template #header>
-        <div class="hc-expense-total-title">出差天数:0.5</div>
+        <div class="hc-expense-total-title">出差天数:{{ formModel?.durationAll ||''}}</div>
     </template>
       <div class="hac-card-project-box">
           <div class="left-box">
@@ -31,7 +31,7 @@
                                             <el-form-item label="目的城市" prop="endCity">
                                                 <el-input v-model="item.endCity"  />
                                             </el-form-item>
-                                            <el-form-item label="开始时间">
+                                            <el-form-item label="开始时间" prop="startDate">
                                                 <el-date-picker
                                                     v-model="item.startDate"
                                                     type="date"
@@ -41,8 +41,9 @@
                                                     value-format="YYYY-MM-DD"  
                                                 />
                                             </el-form-item>
-                                            <el-form-item label="结束时间">
+                                            <el-form-item label="结束时间"  prop="endDate">
                                                 <el-date-picker
+                                                    :getwarin="getwarin(item)"
                                                     v-model="item.endDate"
                                                     type="date"
                                                     placeholder="请选择结束时间"
@@ -264,8 +265,15 @@ const getDetailsData = async () => {
 //获取间隔天数
 const getDiffDaydata=(item)=>{
    let time= getDiffDay(item.startDate,item.endDate)
+ 
    item.duration=time||0
 }
+const getwarin=(item)=>{
+    if(item.endDate<item.startDate){
+        window.$message.warning('结束时间不能小于开始时间')
+       
+    }
+}
 //行程表单
 const formItemRules = {
     isSingletonType: {
@@ -529,10 +537,7 @@ const fellowTravelerUserIds=ref([])
 const getFormData = (submitStatus = 1) => {
     const res = deepClone(formModel.value)
   
-    const ccUserList = [{userId: ''}]           //抄送人列表
-    const personnelUser = {userId: ''}  //人事
-    const financeUser = {userId: ''}            //财务人员
-    const responsibleUser = {userId: ''}        //部门负责人
+
     //----处理数据----
     let newFormData = [], newDetails = {}
     //基础数据
@@ -545,10 +550,7 @@ const getFormData = (submitStatus = 1) => {
         newFormData.push({
             ...newDetails,
             ...item,
-            ccUserList,
-            personnelUser,
-            financeUser,
-            responsibleUser,
+    
             submitStatus //提交状态 1=暂存 2=提交审批
         })
     })
@@ -568,7 +570,7 @@ const saveClick=async()=>{
             saveLoading.value = false
             return
         }else{
-            form.fellowTravelerUserIds=fellowTravelerUserIds.value.join(',')
+            form[0].fellowTravelerUserIds=fellowTravelerUserIds.value.join(',')
             console.log(form,'form');
             const {error, code, msg} = await businessApi.submit(form)
             //判断状态
@@ -605,6 +607,7 @@ const tempDraftData = async () => {
         window.$message?.error(msg)
     }
 }
+
 </script>
 
 <style lang="scss" scoped>