修改

src/views/backend/taskInfo/index.vue

@@ -112,8 +112,8 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                  ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                  ? scope.row.taskName
                   : ""
               }}</template
             >
@@ -123,9 +123,9 @@
               <dict-tag
                 :type="DICT_TYPE.TASK_TYPE"
                 :value="
-                  scope.row.taskInfoDO == null
+                  scope.row == null
                     ? 0
-                    : scope.row.taskInfoDO.taskType
+                    : scope.row.taskType
                 "
               />
             </template>
@@ -134,7 +134,7 @@
             <template slot-scope="scope">
               <div
                 v-html="
-                  scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+                  scope.row ? scope.row.taskContent : ''
                 "
               ></div>
             </template>
@@ -142,9 +142,9 @@
           <el-table-column label="接收者" align="center" prop="receiverName" />
           <el-table-column label="发布者" align="center" prop="senderName" />
           <el-table-column label="单位" align="center" prop="orgName" />
-          <!-- <el-table-column label="任务状态" align="center" prop="taskInfoDO.taskStatus">
+          <!-- <el-table-column label="任务状态" align="center" prop="taskStatus">
             <template v-slot="scope">
-              <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="scope.row.taskInfoDO.taskStatus" />
+              <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="scope.row.taskStatus" />
             </template>
           </el-table-column> -->
           <!-- <el-table-column label="任务积分" align="center" prop="taskScore" /> -->
@@ -252,8 +252,8 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                  ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                  ? scope.row.taskName
                   : ""
               }}
             </template>
@@ -263,7 +263,7 @@
               <dict-tag
                 :type="DICT_TYPE.TASK_TYPE"
                 :value="
-                  scope.row.taskInfoDO ? scope.row.taskInfoDO.taskType : ''
+                  scope.row ? scope.row.taskType : ''
                 "
               />
             </template>
@@ -272,7 +272,7 @@
             <template slot-scope="scope">
               <div
                 v-html="
-                  scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+                  scope.row ? scope.row.taskContent : ''
                 "
               ></div>
             </template>
@@ -377,8 +377,8 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                  ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                  ? scope.row.taskName
                   : ""
               }}
             </template>
@@ -388,9 +388,9 @@
               <dict-tag
                 :type="DICT_TYPE.TASK_TYPE"
                 :value="
-                  scope.row.taskInfoDO == null
+                  scope.row == null
                     ? 0
-                    : scope.row.taskInfoDO.taskType
+                    : scope.row.taskType
                 "
               />
             </template>
@@ -399,7 +399,7 @@
             <template slot-scope="scope">
               <div
                 v-html="
-                  scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+                  scope.row ? scope.row.taskContent : ''
                 "
               ></div>
             </template>
@@ -498,8 +498,8 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                  ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                  ? scope.row.taskName
                   : ""
               }}
             </template>
@@ -509,9 +509,9 @@
               <dict-tag
                 :type="DICT_TYPE.TASK_TYPE"
                 :value="
-                  scope.row.taskInfoDO == null
+                  scope.row == null
                     ? 0
-                    : scope.row.taskInfoDO.taskType
+                    : scope.row.taskType
                 "
               />
             </template>
@@ -520,7 +520,7 @@
             <template slot-scope="scope">
               <div
                 v-html="
-                  scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+                  scope.row ? scope.row.taskContent : ''
                 "
               ></div>
             </template>
@@ -967,7 +967,7 @@
             <el-form-item label="任务名称:">
               <div>
                 {{
-                  deatilData.taskInfoDO ? deatilData.taskInfoDO.taskName : ""
+                  deatilData ? deatilData.taskName : ""
                 }}
               </div>
             </el-form-item></el-col
@@ -977,7 +977,7 @@
               <dict-tag
                 :type="DICT_TYPE.TASK_STATUS"
                 :value="
-                  deatilData.taskInfoDO ? deatilData.taskInfoDO.taskType : ''
+                  deatilData ? deatilData.taskType : ''
                 "
               />
             </el-form-item>
@@ -988,7 +988,7 @@
             <el-form-item label="任务内容:">
               <div>
                 {{
-                  deatilData.taskInfoDO ? deatilData.taskInfoDO.taskContent : ""
+                  deatilData ? deatilData.taskContent : ""
                 }}
               </div>
             </el-form-item></el-col
@@ -1024,8 +1024,8 @@
           >
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="10" v-if="this.deatilData.taskInfoDO">
-            <el-form-item label="附件:" v-if="this.deatilData.taskInfoDO.attId">
+          <el-col :span="10" v-if="this.deatilData">
+            <el-form-item label="附件:" v-if="this.deatilData.attId">
               <div @click="fujian" style="color: #204f7f">点击下载</div>
             </el-form-item></el-col
           >
@@ -1197,8 +1197,8 @@ export default {
   methods: {
     fujian() {
       const link = document.createElement("a");
-      link.href = this.deatilData.taskInfoDO
-        ? this.deatilData.taskInfoDO.attId
+      link.href = this.deatilData
+        ? this.deatilData.attId
         : "";
       link.setAttribute("download", "exp_data.xlsx");
       document.body.appendChild(link);
@@ -1460,8 +1460,8 @@ export default {
       console.log("row", this.selectedTab);
       const tab = this.selectedTab;
       let name =
-        row.taskInfoDO != null
-          ? row.taskInfoDO.taskName
+        row != null
+          ? row.taskName
           : row.taskName
           ? row.taskName
           : "";