更改

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

@@ -26,14 +26,10 @@
                                                 </el-select>
                                             </el-form-item>
                                             <el-form-item label="出发城市" prop="startCity">
-                                                <el-select v-model="item.startCity" block clearable placeholder="请选择出发城市">
-                                                    <el-option v-for="item in cityType" :label="item.name" :value="item.key"/>
-                                                </el-select>
+                                                <el-input v-model="item.startCity"  />
                                             </el-form-item>
                                             <el-form-item label="目的城市" prop="endCity">
-                                                <el-select v-model="item.endCity" block clearable placeholder="请选择目的城市">
-                                                    <el-option v-for="item in cityType" :label="item.name" :value="item.key"/>
-                                                </el-select>
+                                                <el-input v-model="item.endCity"  />
                                             </el-form-item>
                                             <el-form-item label="开始时间">
                                                 <el-date-picker

src/views/home/task/components/trip-info.vue

@@ -17,14 +17,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="出发城市" prop="startCity">
-          <el-select v-model="otherInfo.startCity" block clearable>
-            <el-option v-for="item in cityType" :label="item.name" :value="item.key" />
-          </el-select>
+          <el-input v-model="otherInfo.startCity"  />
         </el-form-item>
         <el-form-item label="目的城市" prop="endCity">
-          <el-select v-model="otherInfo.endCity" block clearable >
-            <el-option v-for="item in cityType" :label="item.name" :value="item.key" />
-          </el-select>
+          <el-input v-model="otherInfo.endCity"  />
         </el-form-item>
         <el-form-item label="开始时间">
           <el-date-picker v-model="otherInfo.startDate" type="date"  style="width: 100%;"
@@ -66,7 +62,7 @@
 
 <script setup>
 import { ref, watch,onActivated } from 'vue'
-import {getProjectList} from "~api/other";
+import {getProjectList,getDictInfo} from "~api/other";
 import {getArrValue} from "js-fast-way";
 
 //参数
@@ -77,7 +73,22 @@ const props = defineProps({
   }
 })
 const trafficTypeData=ref([])
-const wayType=ref([])
+//交通类型字典
+const getTrafficType= async () => {
+    const {error, code, data} = await getDictInfo('traffic_type')
+    //判断状态
+    if (!error && code === 200) {
+        trafficTypeData.value = getArrValue(data)
+    } else {
+        trafficTypeData.value = []
+    }
+}
+//单程往返
+const wayType = ref([
+  {name: '单程', key: 1},
+  {name: '往返', key: 2},
+ 
+])
 const cityType=ref([])
 const projectType=ref([])
 const partneroptions=ref([])
@@ -87,6 +98,7 @@ watch(() => [
 ], ([otherInfo]) => {
   console.log(otherInfo, 'otherInfo');
   getProjectData()
+  getTrafficType()
 
 })
 const getProjectData = async () => {

src/views/program/annual/view.vue

@@ -136,10 +136,10 @@ const tableIncomeColumn = [
     {key: 'projectName', name: '项目名称'},
     {key: 'incomeTypeValue', name: '收入类别',  align: 'center'},
     {key: 'projectTypeValue', name: '项目类别', align: 'center'},
-    {key: 'predictContractMoney', name: '产品线', align: 'center'},
-    {key: 'predictSignDate', name: '预计签单时间', align: 'center'},
-    {key: 'predictAnnualReturned', name: '预计新签合同额', align: 'center'},
-    {key: 'predictAnnualReturned', name: '预计本年度回款总金额', align: 'center'},
+    {key: 'contractTypeValue', name: '产品线', align: 'center'},
+    {key: 'returnTime', name: '预计签单时间', align: 'center'},
+    {key: 'predictContractMoney', name: '预计新签合同额', align: 'center'},
+    {key: 'returnMoney', name: '预计本年度回款总金额', align: 'center'},
 ]
 const tableIncomeData = ref([
     {id: 1, key1: 'xxxx'},

src/views/program/section/index.vue

@@ -39,7 +39,7 @@
             <template #key2="{row}">
                 <span >{{row.planStartDate?row.planStartDate:''}}</span>
                 <span  v-if="row.planStartDate">~</span>
-                <span >{{row.planStartDate?row.planStartDate:''}}</span>
+                <span >{{row.planEndDate?row.planEndDate:''}}</span>
             </template>
             <template #planTotal="{row}">
                 <span>{{row.planTotal}}条</span>

src/views/project/cost/form.vue

@@ -288,10 +288,10 @@ const getBudgetStatsById=async()=>{
     const {error, code, data} = await costApi.getBudgetStatsById({id: dataId.value})
     if (!error && code === 200) {
         formBaseModel.value=getObjValue(data)
-        tableData.value= formBaseModel.value.constructUnit.length>0?formBaseModel.value.constructUnit:originTableData.value
-        constructUnitData.value=formBaseModel.value.constructUnit||[]
-        bulidUnitData.value=formBaseModel.value.buildUnit||[]
-        supervisorUnitData.value=formBaseModel.value.supervisorUnit||[]
+        tableData.value= formBaseModel.value?.constructUnit||[]
+        constructUnitData.value=formBaseModel.value?.constructUnit||[]
+        bulidUnitData.value=formBaseModel.value?.buildUnit||[]
+        supervisorUnitData.value=formBaseModel.value?.supervisorUnit||[]
 
     } else {
         formBaseModel.value={}
@@ -415,20 +415,26 @@ const isEmptyObj=(obj)=> {
 //保存submitForm
 const submitLoaing=ref(false)
 const submitForm=async()=>{
- 
+ console.log(formBaseModel.value.supervisorUnit,'formBaseModel.value.supervisorUnit');
     //取消空对象提交
-    if(formBaseModel.value.supervisorUnit.length>0||formBaseModel.value.constructUnit.length>0||formBaseModel.value.buildUnit.length>0){
-        let suisnullObj= isEmptyObj(formBaseModel.value.supervisorUnit[0]) 
-        let buisnullObj= isEmptyObj(formBaseModel.value.buildUnit[0]) 
-        let coisnullObj= isEmptyObj(formBaseModel.value.constructUnit[0]) 
+    if(formBaseModel.value?.supervisorUnit?.length>0){
+        let suisnullObj= isEmptyObj(formBaseModel.value?.supervisorUnit[0]) 
         if(suisnullObj===true){
             formBaseModel.value.supervisorUnit=[]
-        }if(buisnullObj){
-            formBaseModel.value.buildUnit=[]
-        }if(coisnullObj){
+        }
+    } 
+    if(formBaseModel.value?.constructUnit?.length>0){
+        let coisnullObj= isEmptyObj(formBaseModel.value?.constructUnit[0]) 
+        if(coisnullObj){
             formBaseModel.value.constructUnit=[]
         }
     }
+    if(formBaseModel.value?.buildUnit?.length>0){
+        let buisnullObj= isEmptyObj(formBaseModel.value?.buildUnit[0]) 
+        if(buisnullObj){
+            formBaseModel.value.buildUnit=[]
+        }
+    }
 
 
     const res = await formValidate(formBaseRef.value)
@@ -438,6 +444,7 @@ const submitForm=async()=>{
         submitLoaing.value=false
         if (!error && code === 200) {
         window.$message.success(msg)
+        getBudgetStatsById()
         } 
     }