diff --git a/client_mp/pages/inspectrecord/index.vue b/client_mp/pages/inspectrecord/index.vue index 3ce39c1..db4f01b 100644 --- a/client_mp/pages/inspectrecord/index.vue +++ b/client_mp/pages/inspectrecord/index.vue @@ -46,8 +46,9 @@ --> - - + + 多选 指派给 @@ -65,7 +66,7 @@ {{item.item_.sortnum}}.{{item.item_.name}} - {{item.checker_.name}} + {{item.checker_.name}} {{item.result}} {{item.result}} {{item.result}} @@ -156,11 +157,23 @@ this.members = res.data.members }) } - + this.getRecords(); }, onShow() { this.getSubtaskDept(); - this.getRecords(); + let rd = uni.getStorageSync('inspectrecord') + if(rd){ + for(var i=0;i { + uni.hideLoading() this.records_ = res.data this.records = res.data // for(var i=0;i{uni.hideLoading()}) }, selfChange(val) { if (val.value) { diff --git a/client_mp/pages/inspectrecord/recorddo.vue b/client_mp/pages/inspectrecord/recorddo.vue index 0d640ae..44ed9e0 100644 --- a/client_mp/pages/inspectrecord/recorddo.vue +++ b/client_mp/pages/inspectrecord/recorddo.vue @@ -81,7 +81,6 @@ }) } this.fileList = fileList - console.log(this.fileList) }) }, submit() { @@ -116,7 +115,12 @@ // console.log(sData.imgs) this.$u.api.checkInspectRecord(sData.id, sData).then(res => { + uni.setStorageSync('inspectrecord', res.data) this.$u.toast('提交成功'); + + + + uni.navigateBack({ }) diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py index 13711f8..484e209 100644 --- a/server/apps/quality/views.py +++ b/server/apps/quality/views.py @@ -322,7 +322,7 @@ class InspectRecordViewSet(OptimizationMixin, PageOrNot, ModelViewSet): """ instance = self.get_object() leader = InspectTeam.objects.get(subtask=instance.subtask, type='组长').member - if request.user == instance.checker or request.user == None or request.user == leader: + if request.user == instance.checker or instance.checker == None or request.user == leader: pass else: raise PermissionDenied @@ -330,5 +330,5 @@ class InspectRecordViewSet(OptimizationMixin, PageOrNot, ModelViewSet): serializer = InspectRecordCheckSerializer(instance, data=request.data) serializer.is_valid(raise_exception=True) serializer.save(checker=request.user, checked=True, check_time=timezone.now()) - return Response(status=status.HTTP_200_OK) + return Response(InspectRecordListSerializer(instance=instance).data, status=status.HTTP_200_OK) return Response('任务状态错误', status=status.HTTP_400_BAD_REQUEST) \ No newline at end of file