From 9c49f1bd055122b63c04bdd42c6262dba1ea3eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B1=E5=B1=8B?= <3180483789@qq.com>
Date: Tue, 11 Jul 2023 15:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/RequirementItemForm.vue           | 51 ++++++++++++++-----
 .../entity/RequirementItem.java               | 10 ++--
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue
index 3e06c82..7264ed3 100644
--- a/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue
+++ b/ant-design-vue-jeecg/src/views/requirementitem/modules/RequirementItemForm.vue
@@ -8,10 +8,23 @@
               <j-dict-select-tag type="list" v-model="model.projectId" dictCode="projectx,project_name,id" placeholder="请选择项目" :disabled="disablecol" @change="getxqbm"/>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
               <j-dict-select-tag type="list" v-model="model.typeId" dictCode="requirement_type,type_name,id" placeholder="请选择类型" />
             </a-form-model-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeName">
+              <j-popup
+                v-model="model.typeName"
+                field="typeName"
+                org-fields="id,type_name"
+                dest-fields="typeId,typeName"
+                code="typename"
+                :multi="true"
+                @input="popupCallback"
+                />
+            </a-form-model-item>
           </a-col>
           <a-col :span="24" v-if="num===0">
             <a-form-model-item label="上级需求" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperId">
@@ -28,14 +41,19 @@
               <a-input v-model="model.requirementName" placeholder="请输入中文名称"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="需求文件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requirementFile">
+              <j-upload v-model="model.requirementFile"   ></j-upload>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="需求等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requirementLevel">
-              <j-dict-select-tag type="list" v-model="model.requirementLevel" dictCode="requirement_level" placeholder="请选择需求等级" />
+              <j-dict-select-tag type="radio" v-model="model.requirementLevel" dictCode="requirement_level" placeholder="请选择需求等级" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="需求状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requirementStatus">
-              <j-dict-select-tag type="list" v-model="model.requirementStatus" dictCode="requirement_status" placeholder="请选择需求状态" />
+              <j-dict-select-tag type="radio" v-model="model.requirementStatus" dictCode="requirement_status" placeholder="请选择需求状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -43,13 +61,11 @@
               <j-image-upload isMultiple  v-model="model.requirementPic" ></j-image-upload>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="需求文件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requirementFile">
-              <j-upload v-model="model.requirementFile"   ></j-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="需求描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requirementDescribe">
+          
+        </a-row>
+        <a-row>
+          <a-col>
+            <a-form-model-item label="需求描述" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="requirementDescribe">
               <j-editor v-model="model.requirementDescribe" />
             </a-form-model-item>
           </a-col>
@@ -83,13 +99,21 @@
         model:{
          },
         labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
+          xs: { span: 23 },
+          sm: { span: 6 },
         },
         wrapperCol: {
           xs: { span: 24 },
           sm: { span: 16 },
         },
+        labelCol1: {
+          xs: { span: 24 },
+          sm: { span: 3 },
+        },
+        wrapperCol1: {
+          xs: { span: 24 },
+          sm: { span: 20 },
+        },
         confirmLoading: false,
         validatorRules: {
            projectId: [
@@ -127,6 +151,9 @@
        //备份model原始值
     },
     methods: {
+      popupCallback(value,row){
+         this.model = Object.assign(this.model, row);
+      },
       getxqbm(){
         if(this.model.upperId===undefined||this.model.upperId===null){
           this.model.upperId = "";
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java
index 75522d7..53b0968 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/requirementitem/entity/RequirementItem.java
@@ -62,11 +62,15 @@ public class RequirementItem implements Serializable {
 	@Dict(dictTable = "projectx", dicText = "project_name", dicCode = "id")
     @ApiModelProperty(value = "项目id")
     private java.lang.String projectId;
-	/**类型id*/
-	@Excel(name = "类型id", width = 15, dictTable = "requirement_type", dicText = "type_name", dicCode = "id")
-	@Dict(dictTable = "requirement_type", dicText = "type_name", dicCode = "id")
+    /**类型id*/
+    @Excel(name = "类型id", width = 15, dictTable = "requirement_type", dicText = "type_name", dicCode = "id")
+    @Dict(dictTable = "requirement_type", dicText = "type_name", dicCode = "id")
     @ApiModelProperty(value = "类型id")
     private java.lang.String typeId;
+    /**类型*/
+    @Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private java.lang.String typeName;
 	/**上级需求id*/
 	@Excel(name = "上级需求id", width = 15)
     @ApiModelProperty(value = "上级需求id")