Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

client_mp/pages/inspectrecord/index.vue

@@ -46,8 +46,9 @@
 					</view>
 				</view>
 			</u-card> -->
-
+			<view v-show="currentIndex==0" style="text-align: right;position:sticky;top:0;z-index: 9999;background-color: white;
-			<view v-show="currentIndex==0" style="text-align: right;">
+			border-bottom:dotted #ff0000;">
+				<view style="height: 12rpx;"></view>
 				<u-checkbox v-model="mutiSelect" @change="mutiSelectChange" v-if="initData.leader==vuex_user.id">多选</u-checkbox>
 				<u-button type="primary" size="mini" style="margin-left:6rpx" @click="membersShow"
 					v-if="initData.leader==vuex_user.id && mutiSelect">指派给</u-button>
@@ -65,7 +66,7 @@
 						{{item.item_.sortnum}}.{{item.item_.name}}
 					</view>
 					<view class="u-body-item">
-						<span v-if="item.checker_">{{item.checker_.name}}</span>
+						<span v-if="item.checker_" style="color:gray">{{item.checker_.name}}</span>
 						<span v-if="item.result=='发现'" style="color:red;margin-left:8rpx">{{item.result}}</span>
 						<span v-else-if="item.result=='未发现'" style="color:green;margin-left:8rpx">{{item.result}}</span>
 						<span v-else-if="item.result=='不适用'" style="color:green;margin-left:8rpx">{{item.result}}</span>
@@ -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<this.records.length;i++){
+					if(this.records[i].id==rd.id){
+						this.records[i] = rd
+					}
+				}
+				for(var i=0;i<this.records_.length;i++){
+					if(this.records_[i].id==rd.id){
+						this.records_[i] = rd
+					}
+				}
+			}
 		},
 		methods: {
 			getSubtaskDept() {
@@ -172,11 +185,16 @@
 				})
 			},
 			getRecords() {
+				uni.showLoading({
+					title:'加载中...',
+					mask:true
+				})
 				this.$u.api.getInspectRecords({
 					subtask: this.initData.subtask,
 					dept: this.initData.dept,
 					pageoff: true
 				}).then(res => {
+					uni.hideLoading()
 					this.records_ = res.data
 					this.records = res.data
 					// for(var i=0;i<this.records.length;i++){
@@ -184,8 +202,9 @@
 					// }
 					this.mutiSelect = false
 					this.sectionChange(this.currentIndex)
+					this.selfChange({value:this.is_self})
 					// this.setCollapse(this.records_)
-				})
+				}).catch(e=>{uni.hideLoading()})
 			},
 			selfChange(val) {
 				if (val.value) {

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({
 
 							})

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)