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

ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue

@@ -232,7 +232,7 @@
           <!--              <a-input-number v-model="model.verison" placeholder="请输入版本号" style="width: 100%" />-->
           <!--            </a-form-model-item>-->
           <!--          </a-col>-->
-          <a-col :span="24" style="height: 3rem">
+          <a-col :span="24" >
             <a-form-model-item
               label="任务状态"
               :labelCol="labelCol"

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

@@ -6,10 +6,10 @@
           <a-col :span="24">
             <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperName">
               <j-popup
-                v-model="model.upperName"
-                field="upperName"
+                v-model="model.upperTaskName"
+                field="upperTaskName"
                 org-fields="id,task_name"
-                dest-fields="upperId,upperName"
+                dest-fields="upperId,upperTaskName"
                 code="taskname"
                 :multi="true"
                 @input="popupCallback"