Merge remote-tracking branch 'origin/master'

src/api/modules/other.js

@@ -57,6 +57,12 @@ export const getApprovesList = (form, msg = true) => httpApi({
     params: form
 }, msg);
 
+//获取任务类型
+export const getTaskType = (form, msg = true) => httpApi({
+    url: 'api/blade-control/dictinfo/parent-list?type=2',
+    method: 'get',
+    params: form
+}, msg);
 
 
 //获取更新信息

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

@@ -247,9 +247,7 @@ const rowCancel = async (row) => {
     if (!error && code === 200) {
         window.$message?.success(msg)
         getTableData().then()
-    } else {
-        window.$message?.error(msg)
-    }
+    } 
 }
 //删除
 const delRowClick = async(row) => {

src/views/expense/finReimburse/record.vue

@@ -29,7 +29,7 @@
                             </div>
                             <div class="hc-form-item">
                                 <el-form-item label="报销金额(元)：" prop="frMoney">
-                                    <el-input v-model="item.frMoney" placeholder="请输入报销金额" />
+                                    <el-input v-model="item.frMoney" placeholder="请输入报销金额" onkeyup="this.value=this.value.match(/\d+\.?\d{0,2}/)"/>
                                 </el-form-item>
                                 <el-form-item label="费用发生日期：" prop="frDate">
                                     <el-date-picker type="date" class="block" v-model="item.frDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>

src/views/program/project/form.vue

@@ -18,10 +18,9 @@
         <HcTable :isIndex="false" :column="tableColumn" :datas="tableData" :row-style="tableRowStyle" hasChildren="hasChildren1" children="childrenList">
             <template #planTaskType="{row,index}">
                 <el-select v-model="row.planTaskType" v-if="row.isEdit">
-                    <el-option label="选项1" value="选项1"/>
-                    <el-option label="选项2" value="选项2"/>
+                    <el-option v-for="item in taskTypeList" :label="item.dictName" :value="item.dictValue"/>
                 </el-select>
-                <span v-else>{{row.planTaskType}}</span>
+                <span v-else>{{row?.planTaskTypeValue}}</span>
             </template>
             <template #planTaskDesc="{row,index}">
                 <el-input v-model="row.planTaskDesc" v-if="row.isEdit"/>
@@ -82,8 +81,7 @@
             <HcTable :isIndex="false" :column="tableSubplanColumn" :datas="tableSubplanData">
                 <template #planTaskType="{row,index}">
                     <el-select v-model="row.planTaskType" :disabled="!row.isEdit">
-                        <el-option label="选项1" value="1"/>
-                        <el-option label="选项2" value="2"/>
+                        <el-option v-for="item in taskTypeList" :label="item.dictName" :value="item.dictValue"/>
                     </el-select>
                 </template>
                 <template #planTaskDesc="{row,index}">
@@ -130,7 +128,7 @@ import {onActivated, ref,watch} from "vue";
 import projectApi from '~api/program/project.js';
 import contractApi from '~api/project/project-contract.js';
 import {getArrValue,getObjValue} from "js-fast-way"
-import { getuserList} from "~api/other";
+import { getuserList,getTaskType} from "~api/other";
 import {useAppStore} from "~src/store";
 const useAppState = useAppStore();
 
@@ -145,6 +143,7 @@ onActivated(() => {
     dataId.value = useRoutes?.query?.id ?? ''
     dataType.value = useRoutes?.query?.type ?? ''
     getUserDict()
+    gettaskTypeList()
     if(dataType.value!=='add'){
         getPlanByProjectId()
     
@@ -191,7 +190,19 @@ const getUserDict=async()=>{
 
     }
 }
+//获取所有任务类型
+const taskTypeList=ref([])
+//获取部门人员列表
+const gettaskTypeList=async()=>{
+    const {error, code, data} = await getTaskType()
+    if (!error && code === 200) {
+        taskTypeList.value = getArrValue(data['records'])
+
+    } else {
+        taskTypeList.value = []
 
+    }
+}
 //类型tab数据和相关处理
 const tabKey = ref('')
 const tabTab = ref([