| 
					
				 | 
			
			
				@@ -375,10 +375,10 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ></el-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </el-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-form-item label="巡检日期" prop="fInspectiondate"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-form-item label="巡检日期" prop="fUpdateTime"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <el-date-picker 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               style="width: 200px;" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              v-model="twarehousecheckdetailList.fInspectiondate" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              v-model="twarehousecheckdetailList.fUpdateTime" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               type="date" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               value-format="yyyy-MM-dd" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               placeholder="选择日期"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -387,16 +387,22 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <el-form-item label="巡检人" prop="fInspectorid"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <el-input 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              style="width: 200px;" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              disabled 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               v-model="twarehousecheckdetailList.fInspectorid" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              placeholder="请输入巡检人" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              clearable 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              size="small" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              filterable 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              placeholder="最新巡检人" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <el-option 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                v-for="(item, index) in patrolInspection" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                :key="index.userId" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                :label="item.userName" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                :value="item.userId" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ></el-option> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </el-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-form-item label="备注" prop="remark"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <el-input style="width: 200px;" v-model="twarehousecheckdetailList.remark" type="textarea" placeholder="请输入内容" autosize/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-form-item label="备注" prop="fRemark"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <el-input style="width: 200px;" v-model="twarehousecheckdetailList.fRemark" type="textarea" placeholder="请输入内容" autosize/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </el-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </el-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <div style="background-color: #1c84c6"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -423,7 +429,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import {listCorps,delLog,information,updateLog,newlyAdded,savePicture,selectUserByRole} from '@/api/warehouseCheck/index' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import {listCorps,delLog,information,newlyAdded,savePicture,selectUserByRole,addOrModifyPictureList} from '@/api/warehouseCheck/index' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import {listWarehousesss} from "@/api/basicdata/warehouse"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import {getToken} from "@/utils/auth"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -519,33 +525,14 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     preservationtwo(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      let list = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      for (let item in this.pictureEist){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        list.push({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          fWarehouseid:this.twarehousecheckdetailList.fWarehouseid, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          fInspectiondate:this.twarehousecheckdetailList.fInspectiondate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          fInspectorid:this.twarehousecheckdetailList.fInspectorid, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          remark:this.twarehousecheckdetailList.remark, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          fPhotosname:this.pictureEist[item].response.fileName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          fPhotosurl:this.pictureEist[item].response.thumbnailUrl 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      for (let item in this.formList){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (this.picturefId === this.formList[item].fId) this.formList[item].twarehousecheckdetailList = list 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.form.twarehousecheckitemsVOList = this.formList 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      console.log(this.form) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      addOrModifyPictureList(this.twarehousecheckdetailList).then(res=>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      // updateLog(this.form).then(res =>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      //   this.opentwo=false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      //   console.log(res) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      // }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      newlyAdded(this.form).then(res =>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.opentwo=false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        console.log(res) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     pictureList(scope){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      savePicture(scope.row.fId).then(res=>{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        console.log(res) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.picturefId = scope.row.fId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.opentwo = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 |