Merge remote-tracking branch 'origin/master'

src/views/program/project/form.vue

@@ -18,7 +18,7 @@
         <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 v-for="item in taskTypeList" :label="item.dictName" :value="item.dictValue"/>
+                    <el-option v-for="item in taskTypeList" :label="item.dictName" :value="item.id"/>
                 </el-select>
                 <span v-else>{{row?.planTaskTypeValue}}</span>
             </template>
@@ -76,12 +76,12 @@
                   @save="subplanSaveClick"
         >
         <template #extra>
-            <el-button size="large" type="primary"  @click="addplan()">新增</el-button>
+            <el-button size="large" type="primary"  @click="addplan">新增</el-button>
         </template>
             <HcTable :isIndex="false" :column="tableSubplanColumn" :datas="tableSubplanData">
                 <template #planTaskType="{row,index}">
                     <el-select v-model="row.planTaskType" :disabled="!row.isEdit">
-                        <el-option v-for="item in taskTypeList" :label="item.dictName" :value="item.dictValue"/>
+                        <el-option v-for="item in taskTypeList" :label="item.dictName" :value="item.id"/>
                     </el-select>
                 </template>
                 <template #planTaskDesc="{row,index}">
@@ -104,6 +104,7 @@
                 <template #action="{row,index}">
                 <el-button size="small" type="success" v-if="row.isEdit" @click="getWorkDays(row)">保存</el-button>
                 <el-button size="small" type="primary" v-else @click="row.isEdit = true">编辑</el-button>
+                <el-button size="small" type="primary" @click="delSubplan(row,index)">删除</el-button>
             </template>
             </HcTable>
         </HcDialog>
@@ -357,7 +358,9 @@ const addplan=()=>{
 
     })
 }
-
+const delSubplan=(row,index)=>{
+    tableSubplanData.value.splice(index,1)
+}
 
 const relatedModal = ref(false)
 const rePlanid=ref('')
@@ -370,6 +373,13 @@ const relatedModalShow = (row) => {
 //保存获取工作时长
 const getWorkDays=async(row)=>{
     row.isEdit = false
+    //获取任务类型
+    const {planTaskType}=row
+    taskTypeList.value.forEach((ele)=>{
+        if(ele.id===planTaskType){
+            row.planTaskTypeValue=ele.dictName
+        }
+    })
     if(row?.planStartTime&&row?.planEndTime){
         const {error, code, data,msg} = await projectApi.getWorkDays( {
             startDate:row.planStartTime,

src/views/system/components/tab-task-type.vue

@@ -8,7 +8,7 @@
         </template>
         <HcTable :column="tasktableColumn" :datas="tasktableData" :loading="tableLoaing">
             <template #dictValue="{row}">
-                        <div >{{row?.dictValue==='1'?'固定任务':'临时任务'}}</div>
+                        <div >{{row?.dictValue===1?'固定任务':'临时任务'}}</div>
             </template>
             <template #action="{row, index}">
                 <el-button size="small" type="primary" @click="openTypeEdit(2,row)">编辑</el-button>
@@ -25,7 +25,7 @@
                 </el-form-item>
                 <el-form-item label="类型">
                     <el-select v-model="formtaskType.dictValue" class="block" placeholder="请选择">
-                        <el-option v-for="item in typeoptions" :key="item.value" :label="item.label" :value="item.value"/>
+                        <el-option v-for="item in typeoptions"  :label="item.name" :value="item.value"/>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -127,12 +127,12 @@ const getParentListData=async()=>{
 const formtaskType = ref({})
 const typeoptions = ref([
     {
-        value: '1',
-        label: '固定任务',
+        value: 1,
+        name: '固定任务',
     },
     {
-        value: '2',
-        label: '临时任务',
+        value: 2,
+        name: '临时任务',
     },
 ])