inint

ruoyi-ui/src/views/project/module/index.vue

@@ -54,6 +54,7 @@
         </template>
       </el-table-column>
       <el-table-column label="所属项目" align="center" prop="projectName" />
+      <el-table-column label="模块描述" align="center" prop="remark" />
       <el-table-column label="接取状态" align="center" prop="status">
         <template slot-scope="scope">
           <el-tag
@@ -143,8 +144,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="模块描述" prop="description">
+        <el-form-item label="模块描述" prop="remark">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         
       </el-form>

ruoyi-ui/src/views/project/module/myModules.vue

@@ -156,6 +156,7 @@
             </template>
           </el-table-column>
           <el-table-column label="描述" prop="description" />
+          <el-table-column label="描述" prop="description" />
           <el-table-column label="操作" align="center" width="260">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEditSub(scope.row)" v-if="canOperateSub()">修改</el-button>

ruoyi-ui/src/views/project/project/index.vue

@@ -101,6 +101,7 @@
               @row-click="handleRowClick">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="项目名称" align="center" prop="projectName"/>
+      <el-table-column label="项目描述" align="center" prop="remark"/>
       <el-table-column label="当前状态" align="center" prop="status">
         <template slot-scope="scope">
           <el-tag
@@ -186,12 +187,14 @@
         <!-- 多选列 -->
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="模块名称" prop="moduleName"/>
+        <el-table-column label="模块描述" prop="remark"/>
         <el-table-column label="状态">
           <template #default="{ row }">
             <el-tag :type="row.status === '0' ? 'info' : row.status === '1' ? 'warning' : 'success'">
               {{ {0: '待接取', 1: '进行中', 2: '已完成'}[row.status] }}
             </el-tag>
           </template>
+
         </el-table-column>
         <el-table-column label="接取人" prop="assignee"/>
         <el-table-column label="操作">
@@ -228,6 +231,9 @@
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入项目名称"/>
         </el-form-item>
+        <el-form-item label="模块描述" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入项目描述" />
+        </el-form-item>
         <el-form-item label="截止日期" prop="deadline">
           <el-date-picker clearable
                           v-model="form.deadline"
@@ -274,6 +280,9 @@
         <el-form-item label="模块名称" prop="ModelName">
           <el-input v-model="modelsForm.moduleName" placeholder="请输入模块名称"/>
         </el-form-item>
+        <el-form-item label="项目描述" prop="remark">
+          <el-input v-model="modelsForm.remark" type="textarea" placeholder="请输入项目描述" />
+        </el-form-item>
         <el-form-item label="截止日期" prop="deadline">
           <el-date-picker clearable
                           v-model="modelsForm.deadline"
@@ -369,6 +378,7 @@ export default {
       form: {
         status:0,
         finishTime: null,
+        remark: null,
       },
       // 统一上传配置
       upload: {
@@ -388,7 +398,8 @@ export default {
         assignTime: null,
         del_flag: null,
         create_by: null,
-        finishTime: null
+        finishTime: null,
+        remark: null
       },
 
       // 表单校验
@@ -703,7 +714,8 @@ export default {
         updateTime: null,
         finishTime: null,
         deadline: null,
-        projectLabel: null
+        projectLabel: null,
+        remark: null
       }
       this.resetForm("projectForm")
     },
@@ -748,7 +760,8 @@ export default {
       this.drawer = false;
       const projectId = row.projectId || this.ids
       getProject(projectId).then(response => {
-        this.form = response.data
+        this.form = Object.assign({}, response.data) || {}
+        if (typeof this.form.remark === 'undefined') this.form.remark = null
         this.title = "修改项目"
         this.projectTitle = this.title;
       })