提交代码

miniprogram/pageage/project_problemmodify/quality/add/index.js

@@ -27,11 +27,12 @@ Page({
         recheckSendUser:"",
         workParts:"",
         changeInfo:"",
-        dangerType:"",
+        dangerType:"1",
         dangerTypeList:[],
         selectValue:"",
         selectIndex:"",
         problemType:"1",
+        showHis:false,
         problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}]
     },
 
@@ -54,6 +55,7 @@ Page({
             }) 
             this.getAllProjectUserData();
             this.getDangerTypeList();
+            this.getHisInfo();
         }  
         }) 
     },
@@ -84,6 +86,37 @@ Page({
         })
     },
 
+    getHisInfo(){
+        //这里查询当前登录人上次提交隐患，自动填充整改人，复检人，抄送人
+        let that = this
+        wx.request({
+            url: app.globalData.reqUrl+'/wechat/projectProblemmodify/findLastDataByParams',
+            method:"get",
+            data:{
+                projectId:that.data.projectId,
+                createUser:that.data.loginName,
+                infoType:1
+            },
+            header:{
+            'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                res = res.data
+                if(res.code == 200 && res.data){
+                    that.setData({
+                        showHis:true,
+                        lordSent:res.data.lordSent,
+                        lordSentUser:res.data.lordSentUser,
+                        recheckSend:res.data.recheckSend,
+                        recheckSendUser:res.data.recheckSendUser,
+                        copySend:res.data.copySend,
+                        copySendUser:res.data.copySendUser
+                    })
+                }
+            }
+        })
+    },
+
     getDangerTypeList(){
         let that = this
         wx.request({
@@ -290,7 +323,7 @@ Page({
                     copySend,
                     copySendUser,
                     checkState:0,
-                    nickedTime:nickedTime+" 23:59",
+                    nickedTime:nickedTime+" 23:59:59",
                     smarkUrl:fileUrls.toString(),
                     createUser:loginName,
                     dangerType,

miniprogram/pageage/project_problemmodify/quality/add/index.wxml

@@ -57,7 +57,7 @@
     <view class="inspect_info_list">
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改人</view>
             <view class="inspect_info_content">
-                <select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人" >
+                <select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人" choose="{{lordSent}}">
                 </select-group-person>
              </view>
     </view>
@@ -71,10 +71,13 @@
     <view class="inspect_info_list">
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">抄送人</view>
             <view class="inspect_info_content">
-                <select-group-person rectifierData="{{rectifierData3}}" multiple="{{true}}" bindselected="onAddCopySend" index="3" title="请选择抄送人" >
+                <select-group-person rectifierData="{{rectifierData3}}" multiple="{{true}}" bindselected="onAddCopySend" index="3" title="请选择抄送人" choose="{{copySend}}">
                 </select-group-person>
              </view>
     </view>
+    <view class="safety_inspect_title module_title_flex" wx:if="{{showHis}}">
+        <text class="color_orange">已自动填充上次隐患的整改人，复检人，抄送人。</text>
+    </view>
 </view>
 <view class="problem_submit_to">
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>

miniprogram/pageage/project_problemmodify/security/add/index.js

@@ -27,11 +27,12 @@ Page({
         recheckSendUser:"",
         workParts:"",
         changeInfo:"",
-        dangerType:"",
+        dangerType:"1",
         dangerTypeList:[],
         selectValue:"",
         selectIndex:"",
         problemType:"1",
+        showHis:false,
         problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}]
     },
 
@@ -54,6 +55,7 @@ Page({
             }) 
             this.getAllProjectUserData();
             this.getDangerTypeList();
+            this.getHisInfo();
         }  
         }) 
     },
@@ -84,6 +86,37 @@ Page({
         })
     },
 
+    getHisInfo(){
+        //这里查询当前登录人上次提交隐患，自动填充整改人，复检人，抄送人
+        let that = this
+        wx.request({
+            url: app.globalData.reqUrl+'/wechat/projectProblemmodify/findLastDataByParams',
+            method:"get",
+            data:{
+                projectId:that.data.projectId,
+                createUser:that.data.loginName,
+                infoType:0
+            },
+            header:{
+            'content-type': 'application/x-www-form-urlencoded'  
+            },
+            success(res){
+                res = res.data
+                if(res.code == 200 && res.data){
+                    that.setData({
+                        showHis:true,
+                        lordSent:res.data.lordSent,
+                        lordSentUser:res.data.lordSentUser,
+                        recheckSend:res.data.recheckSend,
+                        recheckSendUser:res.data.recheckSendUser,
+                        copySend:res.data.copySend,
+                        copySendUser:res.data.copySendUser
+                    })
+                }
+            }
+        })
+    },
+
     getDangerTypeList(){
         let that = this
         wx.request({
@@ -297,7 +330,7 @@ Page({
                     copySend,
                     copySendUser,
                     checkState:0,
-                    nickedTime:nickedTime+" 23:59",
+                    nickedTime:nickedTime+" 23:59:59",
                     smarkUrl:fileUrls.toString(),
                     createUser:loginName,
                     dangerType,

miniprogram/pageage/project_problemmodify/security/add/index.wxml

@@ -57,7 +57,7 @@
     <view class="inspect_info_list">
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改人</view>
             <view class="inspect_info_content">
-                <select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人" >
+                <select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人" choose="{{lordSent}}">
                 </select-group-person>
              </view>
     </view>
@@ -71,10 +71,13 @@
     <view class="inspect_info_list">
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">抄送人</view>
             <view class="inspect_info_content">
-                <select-group-person rectifierData="{{rectifierData3}}" multiple="{{true}}" bindselected="onAddCopySend" index="3" title="请选择抄送人" >
+                <select-group-person rectifierData="{{rectifierData3}}" multiple="{{true}}" bindselected="onAddCopySend" index="3" title="请选择抄送人" choose="{{copySend}}">
                 </select-group-person>
              </view>
     </view>
+    <view class="safety_inspect_title module_title_flex" wx:if="{{showHis}}">
+        <text class="color_orange">已自动填充上次隐患的整改人，复检人，抄送人。</text>
+    </view>
 </view>
 <view class="problem_submit_to">
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>

miniprogram/pages/gengduogongneng/gengduogongneng.js

@@ -152,7 +152,7 @@ Page({
   //跳转到质量管理
   ZLGL:function(){
     wx.redirectTo({
-      url:'../quality_manage/index.js'
+      url:'../quality_manage/index'
     }) 
   },
    //跳转到进度管理