Signed-off-by: zhaobao <528046418@qq.com>

pages/app_views/danger/handle/handle.vue

@@ -313,7 +313,7 @@
 			position: fixed;
 			left: 0;
 			bottom: 0;
-			z-index: 99;
+			z-index: 2;
 			box-shadow: 0px 0px 12px 0px #0000000A;
 			border-radius: 8px 8px 0px 0px
 		}

pages/app_views/danger/submit/submit.vue

@@ -4,10 +4,10 @@
 			    <uni-forms-item label="隐患标题" name="dangerTitle" required>
 			      <uni-easyinput v-model="formData.dangerTitle" />
 			    </uni-forms-item>			
-			    <uni-forms-item label="隐患编码" name="dangerCode" required>
+<!-- 			    <uni-forms-item label="隐患编码" name="dangerCode" required>
 			      <uni-easyinput v-model="formData.dangerCode" />
-			    </uni-forms-item>			
-			    <uni-forms-item label="所属部门" name="groupId" required>
+			    </uni-forms-item>	 -->		
+			    <uni-forms-item label="所在部门" name="groupId" required>
 <!-- 					<uni-data-picker :localdata="groupList" 
 					v-model="formData.groupId" 
 					placeholder="请选择组织"
@@ -32,7 +32,7 @@
 			    <uni-forms-item label="整改截止时间" name="dangerDeadLine" required>
 					<uni-datetime-picker type="datetime" return-type="string" v-model="formData.dangerDeadLine"/>
 			    </uni-forms-item>	
-			    <uni-forms-item label="执行人" name="accountId" required>
+			    <uni-forms-item label="处理人员" name="accountId" required>
 				  <uni-data-select v-model="formData.accountId" :localdata="userList"></uni-data-select>
 			    </uni-forms-item>						
 			    <uni-forms-item label="描述" name="dangerDesc">
@@ -81,7 +81,7 @@
 				formData:{
 					formCode: 'submit',
 					dangerId: undefined,
-					dangerCode: '',
+					dangerCode: undefined,
 					dangerTitle: '',
 					dangerSource: 0,
 					dangerDesc: '',
@@ -98,7 +98,7 @@
 							{required: true,errorMessage: '请填写姓名',},
 						]
 					},
-					dangerCode: {rules:[{required: true,errorMessage: '请填写隐患编码'}]},
+					// dangerCode: {rules:[{required: true,errorMessage: '请填写隐患编码'}]},
 					dangerDeadLine: {rules:[{required: true,errorMessage: '请填写整改截止时间'}]}										
 				},
 				flowData:{}
@@ -232,7 +232,7 @@
 					targetGroupName:qrcode.groupName,
 				}
 				let data=await handleWorkflow({...workflowForm,attachList})
-				let resq=await handleDanger({...res,...qrcode_target,attachList,status:1})
+				let resq=await handleDanger({...res,...qrcode_target,attachList,status:1,riskPointId:qrcode.targetId})
 				uni.showToast({
 					icon:'none',
 					title:"提交成功！",
@@ -273,7 +273,7 @@
 		position: fixed;
 		left: 0;
 		bottom: 0;
-		z-index: 99;
+		z-index: 2;
 		box-shadow: 0px 0px 12px 0px #0000000A;
 		border-radius: 8px 8px 0px 0px
 	}

pages/history/detail/detail.vue

@@ -38,6 +38,14 @@
 						<view class="item-row-lable">整改期限</view>
 						<view class="item-row-cont">{{baseInfo.dangerDeadLine}}</view>	
 					</view>
+					<view class="attachList" v-if="flow.attachList&&flow.attachList.length>0">
+						<view class="flow-title">附件</view>
+						<view class="attachList-cont">
+							<view class="attachbox"  v-for="(attach,attachIdex) in flow.attachList" :key="attachIdex" @click="showImg(attachIdex,flow.attachList)">
+								<image class="attach" :src="attach.fileUrl"></image>
+							</view>									
+						</view>				
+					</view>
 				</view>
 				<view class="flow-item" v-else>
 					<view class="flow-head">{{flow.activityInsTitle}}</view>
@@ -83,6 +91,7 @@
 		onLoad() {
 			let info=uni.getStorageSync('detail-info')
 			let wxId=uni.getStorageSync('wxId')
+			let accountInfo=uni.getStorageSync('accountInfo')
 			this.baseInfo=info
 			this.getWorkflowRecord()			
 			this.user=accountInfo
@@ -236,30 +245,30 @@
 						color: #434343;
 					}
 				}
-				.attachList{
-					.attachList-cont{
-						display: flex;
-						flex-wrap: wrap;
-						.attachbox{
-							display: block;
-							width: 224rpx;
-							height: 224rpx;
-							border-radius: 8px;
-							overflow: hidden;
-							&:nth-child(2n){
-								margin: 0 8rpx;
-							}
-							&:nth-child(n+4){
-								margin-top: 24rpx;
-							}
-							.attach{
-								display: block;
-								width: 224rpx;
-								height: 224rpx;
-								border-radius: 8px;
-							}
-						}
-					}
+			}
+		}
+	}
+	.attachList{
+		.attachList-cont{
+			display: flex;
+			flex-wrap: wrap;
+			.attachbox{
+				display: block;
+				width: 224rpx;
+				height: 224rpx;
+				border-radius: 8px;
+				overflow: hidden;
+				&:nth-child(2n){
+					margin: 0 8rpx;
+				}
+				&:nth-child(n+4){
+					margin-top: 24rpx;
+				}
+				.attach{
+					display: block;
+					width: 224rpx;
+					height: 224rpx;
+					border-radius: 8px;
 				}
 			}
 		}
@@ -276,7 +285,7 @@
 		position: fixed;
 		left: 0;
 		bottom: 0;
-		z-index: 99;
+		z-index: 2;
 		box-shadow: 0px 0px 12px 0px #0000000A;
 		border-radius: 8px 8px 0px 0px
 	}

pages/history/history.vue

@@ -38,15 +38,20 @@
 				</view>				
 			</view>
 			<view class="item-list basics danger" v-if="tabIdx===2">
-				<view class="basics-item" v-for="(danger,dangerIdx) in items" :key="dangerIdx" @click="linkTo(danger)">
-					<view class="basics-title">{{danger.dangerTitle}}</view>
-					<view class="basics-body">
-						<view class="lf">
-							<text class="time">{{danger.dangerDeadLine}}</text>
-							<text class="user">{{danger.curAccountName}}</text>							
-						</view>
-						<view class="status">{{dangerStatus(danger.status)}}</view>
-					</view>						
+				<view class="basics-item" v-for="(danger,dangerIdx) in items" :key="dangerIdx">
+					<view class="basics-item-sceneIcon">
+						<img @click="showImg([danger.scenePhoto])" class="icon" :src="danger.sceneIcon" v-if="danger.sceneIcon" />
+					</view>
+					<view class="basics-item-info" @click="linkTo(danger)">
+						<view class="basics-title">{{danger.dangerTitle}}</view>
+						<view class="basics-body">
+							<view class="lf">
+								<view class="user">{{danger.curAccountName}}</view>							
+								<view class="time">{{danger.dangerDeadLine}}</view>						
+							</view>
+							<view class="status">{{dangerStatus(danger.status)}}</view>
+						</view>							
+					</view>
 				</view>				
 			</view>		
 			<view class="item-list satisfaction" v-if="tabIdx===3">
@@ -218,6 +223,11 @@
 					url:`${pageUrl}?type=history&id=${item.checklistId}&recordId=${item.recordId}`
 				})	
 			},
+			showImg(urls){
+				uni.previewImage({
+					urls
+				})
+			},
 			isEmpty(val){
 				if(val!=="undefined"&&val!==undefined&&val!==""&&val!==null){
 					return false
@@ -397,6 +407,35 @@
 				}
 			}
 		}
+		&.danger{
+			.basics-item{
+				display: flex;
+				align-items: flex-start;
+				.basics-item-sceneIcon{
+					width:100rpx ;
+					height: 100rpx;
+					background-color: #f5f5f5;
+					border-radius: 10rpx;
+					overflow: hidden;
+					.icon{
+						display: block;
+						width:100rpx ;
+						height: 100rpx;
+					}
+				}
+				.basics-item-info{
+					flex: 1;
+					padding-left: 16rpx;
+					.basics-body{
+						.lf{
+							.user{
+								margin-left: 0;
+							}
+						}
+					}
+				}				
+			}
+		}
 	}
 }
 .custom-item-footer{

unpackage/dist/dev/mp-weixin/pages/app_views/checkList/index/index.wxss

@@ -94,6 +94,7 @@
   box-sizing: border-box;
   border-right: 1rpx solid #eaeaea;
   font-size: 30rpx;
+  text-align: center;
 }
 .wrap .handle-container .handle.data-v-a25b0eb8:nth-child(4) {
   border: 0;

unpackage/dist/dev/mp-weixin/pages/app_views/danger/handle/handle.wxss

@@ -66,7 +66,7 @@
   position: fixed;
   left: 0;
   bottom: 0;
-  z-index: 99;
+  z-index: 2;
   box-shadow: 0px 0px 12px 0px #0000000A;
   border-radius: 8px 8px 0px 0px;
 }

unpackage/dist/dev/mp-weixin/pages/app_views/danger/submit/submit.js

@@ -228,7 +228,7 @@ var _default = {
       formData: {
         formCode: 'submit',
         dangerId: undefined,
-        dangerCode: '',
+        dangerCode: undefined,
         dangerTitle: '',
         dangerSource: 0,
         dangerDesc: '',
@@ -246,12 +246,7 @@ var _default = {
             errorMessage: '请填写姓名'
           }]
         },
-        dangerCode: {
-          rules: [{
-            required: true,
-            errorMessage: '请填写隐患编码'
-          }]
-        },
+        // dangerCode: {rules:[{required: true,errorMessage: '请填写隐患编码'}]},
         dangerDeadLine: {
           rules: [{
             required: true,
@@ -447,7 +442,8 @@ var _default = {
                 _context2.next = 20;
                 return (0, _dangerApi.handleDanger)(_objectSpread(_objectSpread(_objectSpread({}, res), qrcode_target), {}, {
                   attachList: attachList,
-                  status: 1
+                  status: 1,
+                  riskPointId: qrcode.targetId
                 }));
               case 20:
                 resq = _context2.sent;

unpackage/dist/dev/mp-weixin/pages/app_views/danger/submit/submit.wxss

@@ -39,7 +39,7 @@
   position: fixed;
   left: 0;
   bottom: 0;
-  z-index: 99;
+  z-index: 2;
   box-shadow: 0px 0px 12px 0px #0000000A;
   border-radius: 8px 8px 0px 0px;
 }

unpackage/dist/dev/mp-weixin/pages/history/detail/detail.js

@@ -104,12 +104,14 @@ var render = function () {
   var _c = _vm._self._c || _h
   var l0 = _vm.__map(_vm.flows, function (flow, index) {
     var $orig = _vm.__get_orig(flow)
-    var g0 = !(index === 0)
+    var g0 = index === 0 ? flow.attachList && flow.attachList.length > 0 : null
+    var g1 = !(index === 0)
       ? flow.attachList && flow.attachList.length > 0
       : null
     return {
       $orig: $orig,
       g0: g0,
+      g1: g1,
     }
   })
   _vm.$mp.data = Object.assign(
@@ -231,6 +233,14 @@ var _wfApi = __webpack_require__(/*! @/api/system/wfApi.js */ 70);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -243,6 +253,7 @@ var _default = {
   onLoad: function onLoad() {
     var info = uni.getStorageSync('detail-info');
     var wxId = uni.getStorageSync('wxId');
+    var accountInfo = uni.getStorageSync('accountInfo');
     this.baseInfo = info;
     this.getWorkflowRecord();
     this.user = accountInfo;

unpackage/dist/dev/mp-weixin/pages/history/detail/detail.wxss

@@ -131,24 +131,24 @@
   line-height: 42rpx;
   color: #434343;
 }
-.wrap .flowlist .flow-item-wrap .flow-item .attachList .attachList-cont.data-v-8c3a262a {
+.wrap .attachList .attachList-cont.data-v-8c3a262a {
   display: flex;
   flex-wrap: wrap;
 }
-.wrap .flowlist .flow-item-wrap .flow-item .attachList .attachList-cont .attachbox.data-v-8c3a262a {
+.wrap .attachList .attachList-cont .attachbox.data-v-8c3a262a {
   display: block;
   width: 224rpx;
   height: 224rpx;
   border-radius: 8px;
   overflow: hidden;
 }
-.wrap .flowlist .flow-item-wrap .flow-item .attachList .attachList-cont .attachbox.data-v-8c3a262a:nth-child(2n) {
+.wrap .attachList .attachList-cont .attachbox.data-v-8c3a262a:nth-child(2n) {
   margin: 0 8rpx;
 }
-.wrap .flowlist .flow-item-wrap .flow-item .attachList .attachList-cont .attachbox.data-v-8c3a262a:nth-child(n+4) {
+.wrap .attachList .attachList-cont .attachbox.data-v-8c3a262a:nth-child(n+4) {
   margin-top: 24rpx;
 }
-.wrap .flowlist .flow-item-wrap .flow-item .attachList .attachList-cont .attachbox .attach.data-v-8c3a262a {
+.wrap .attachList .attachList-cont .attachbox .attach.data-v-8c3a262a {
   display: block;
   width: 224rpx;
   height: 224rpx;
@@ -166,7 +166,7 @@
   position: fixed;
   left: 0;
   bottom: 0;
-  z-index: 99;
+  z-index: 2;
   box-shadow: 0px 0px 12px 0px #0000000A;
   border-radius: 8px 8px 0px 0px;
 }

unpackage/dist/dev/mp-weixin/pages/history/history.js

@@ -339,6 +339,11 @@ var _default = {
         url: "".concat(pageUrl, "?type=history&id=").concat(item.checklistId, "&recordId=").concat(item.recordId)
       });
     },
+    showImg: function showImg(urls) {
+      uni.previewImage({
+        urls: urls
+      });
+    },
     isEmpty: function isEmpty(val) {
       if (val !== "undefined" && val !== undefined && val !== "" && val !== null) {
         return false;

unpackage/dist/dev/mp-weixin/pages/history/history.wxss

@@ -172,6 +172,29 @@
 .item-list-wrap .item-list.satisfaction.data-v-24bfa630 .uni-table-td, .item-list-wrap .item-list.satisfaction.data-v-24bfa630 .uni-table-th {
   border: 0;
 }
+.item-list-wrap .item-list.danger .basics-item.data-v-24bfa630 {
+  display: flex;
+  align-items: flex-start;
+}
+.item-list-wrap .item-list.danger .basics-item .basics-item-sceneIcon.data-v-24bfa630 {
+  width: 100rpx;
+  height: 100rpx;
+  background-color: #f5f5f5;
+  border-radius: 10rpx;
+  overflow: hidden;
+}
+.item-list-wrap .item-list.danger .basics-item .basics-item-sceneIcon .icon.data-v-24bfa630 {
+  display: block;
+  width: 100rpx;
+  height: 100rpx;
+}
+.item-list-wrap .item-list.danger .basics-item .basics-item-info.data-v-24bfa630 {
+  flex: 1;
+  padding-left: 16rpx;
+}
+.item-list-wrap .item-list.danger .basics-item .basics-item-info .basics-body .lf .user.data-v-24bfa630 {
+  margin-left: 0;
+}
 .custom-item-footer .name.data-v-24bfa630 {
   font-size: 30rpx;
   color: #333;