Browse Source

Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

凉纪 2 years ago
parent
commit
c448636c3f

+ 1 - 1
src/views/check/distribute.vue

@@ -96,7 +96,7 @@ export default {
         orgTypes: ["3"],
       }).then((r) => {
         this.info.orgAndStatus = r.data.map((d) => {
-          return { orgId: d.id, orgName: d.name, status: "1" };
+          return { orgId: d.id, orgName: d.shortName, status: "1" };
         });
         this.tableData = this.info.orgAndStatus;
       });

+ 1 - 1
src/views/resumption/plan/distribute.vue

@@ -96,7 +96,7 @@ export default {
         orgTypes: ["3"],
       }).then((r) => {
         this.info.orgAndStatus = r.data.map((d) => {
-          return { orgId: d.id, orgName: d.name, status: "1" };
+          return { orgId: d.id, orgName: d.shortName, status: "1" };
         });
         this.tableData = this.info.orgAndStatus;
       });

+ 3 - 3
src/views/resumption/taskManager/index.vue

@@ -361,7 +361,7 @@
           </el-table-column>
           <el-table-column
             prop="abnormalDataNums"
-            label="异常个数"
+            label="隐患问题数"
             min-width="80"
             v-if="columns[9].visible"
           >
@@ -524,7 +524,7 @@ export default {
         { key: 6, label: `截止时间`, visible: true },
         { key: 7, label: `提交人`, visible: true },
         { key: 8, label: `提交时间`, visible: true },
-        { key: 9, label: `异常个数`, visible: true },
+        { key: 9, label: `隐患问题数`, visible: true },
         
       ],
     };
@@ -657,7 +657,7 @@ export default {
 
       this.download('/core/resumption/record/export', {
         ...this.queryParams
-      }, `【${this.selectedOrgName}】-履职记录${new Date().getTime()}.xlsx`)
+      }, `【${this.selectedOrgName}】-履职任务管理${dayjs(new Date()).format("YYYYMMDDHHmmss")}.xlsx`)
 
       // await api.exportResumptionRecord(this.queryParams);
     },