Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/api/safetycheck/plan.js

@@ -61,3 +61,4 @@ export function delelte(id) {
     method: 'delete'
   })
 }
+

src/api/safetycheck/task.js

@@ -48,13 +48,15 @@ export function one(id) {
   });
 }
 
+
+
 /**
  * 查询 扫描记录
  */
 export function findNfcScanRecord(args) {
   return request({
-    url: "/core/resumption/record/nfc",
+    url: "/core/safetyTask/nfc",
     method: "get",
     params: args,
   });
-}
+}

src/views/check/task/dialog.scanrecord.vue

@@ -66,7 +66,7 @@
   </div>
 </template>
 <script>
-import * as api from "@/api/resumption/taskManger.js";
+import * as api from "@/api/safetycheck/task.js";
 export default {
   data() {
     return {
@@ -79,7 +79,7 @@ export default {
       let detail = (
         await api.findNfcScanRecord({
           orgId: orgId,
-          resumptionId: id,
+          taskId: id,
         })
       ).data;
       // console.log(detail);

src/views/check/task/index.vue

@@ -390,10 +390,10 @@ export default {
     },
     getLabel,
     showDetail(row) {
-      this.$refs.detaildialog.show(row.resumptionId, row.name);
+      this.$refs.detaildialog.show(row.id, row.name);
     },
     showscanRecord(row) {
-      this.$refs.scanrecorddialog.show(row.resumptionId, row.orgId);
+      this.$refs.scanrecorddialog.show(row.id, row.orgId);
     },
     showRegister(row){
       let path="/core/safetycheck/register/1704797898023739393"