Merge branch 'dev_2307' of http://182.92.169.222:3000/zhc077/projectManagement into dev_2307

ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue

@@ -44,7 +44,14 @@
         <a-row>
           <a-col >
             <a-form-model-item label="任务类型" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="typeId">
-              <j-dict-select-tag v-model="model.typeId" type="radio" style="width: 100%" dict-code="task_type,type_name,id"/>
+              <!-- <j-dict-select-tag v-model="model.typeId" type="radio" style="width: 100%" dict-code="task_type,type_name,id"/> -->
+              <div v-for="item in options" :key="item.id" style="margin-bottom: 10px">
+                <span style="margin-right: 10px">{{ item.type_Name }} :</span>
+                <a-radio-group v-model="model.typeId" :key="`children-${item.id}`">
+                  <a-radio v-for="child in item.children" :key="child.id" :value="child.id">{{ child.type_name
+                  }}</a-radio>
+                </a-radio-group>
+              </div>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -225,6 +232,7 @@ export default {
         expectedDuration: 1,
         // curryUserName: '',
       },
+      options: [],
       // labelCol: {
       //   xs: {span: 24},
       //   sm: {span: 5},
@@ -311,6 +319,7 @@ export default {
         // queryTaskTypeById: "/taskType/taskType/queryById",
         fillTaskName: "/task/task/fillTaskName",
         list: "/task/task/list",
+        listtasktype: '/taskType/taskType/getTypeMap'
 
       }
     }
@@ -324,8 +333,16 @@ export default {
   created() {
     //备份model原始值
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    this.tasktype()
   },
   methods: {
+    tasktype() {
+      getAction(this.url.listtasktype).then((res) => {
+        this.options = res.result
+        console.log(res.result, '1326454')
+        console.log(this.options, '1556666')
+      })
+    },
     popupCallback(value,row){
          this.model = Object.assign(this.model, row);
       },