operation check 1

app.js

@@ -91,8 +91,8 @@ App({
   },
   globalData: {
     userInfo: null,
-    serverUrl: 'https://safeyun.ctcshe.com/',
+    //serverUrl: 'https://safeyun.ctcshe.com/',
-    //serverUrl: 'http://127.0.0.1:8000/',
+    serverUrl: 'http://127.0.0.1:8000/',
     //serverUrl: 'http://192.168.0.102:8000/',
     //serverUrl:'http://10.7.100.250:8000/',
     isaqy: 0,

pages/operation/operationadd.js

@@ -7,7 +7,8 @@ Page({
    */
   data: {
     zyimg:[],
-    zyqy:''
+    zyqy:'',
+    chosespr:false
   },
   checkboxChangefxcs: function (e) {
     var x = this.data.fxcslist;
@@ -32,6 +33,17 @@ Page({
   bindzynrInput: function (e) {
     this.data.zynr = e.detail.value
   },
+  chosesprChange: function (e) {
+    if (e.detail.value) {
+      this.setData({
+        chosespr:true
+      })
+    } else {
+      this.setData({
+        chosespr:false
+      })
+    }
+  },
   /**
    * 生命周期函数--监听页面加载
    */
@@ -239,6 +251,25 @@ Page({
       }
     })
   },
+  getspr12array:function(){
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/operation?a=getspr12',
+      header: {
+        'content-type': 'application/json', // 
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      method: 'GET',
+      data: {'sdbm':this.data.sdbm},
+      success: res => {
+        if (res.statusCode === 200) {
+          this.setData({
+            spr1Array:res.data.spr1Array,
+            spr2Array:res.data.spr2Array
+          })
+        }
+      }
+    });
+  },
   submit:function(){
     var that = this;
     if (!that.data.kssj) {
@@ -321,6 +352,9 @@ Page({
       fxcs: this.data.fxcs,
     }
     //console.log(gcdata.unsafe)
+    wx.showLoading({
+      title: '',
+    })
     wx.request({
       url: getApp().globalData.serverUrl + 'api/operation?a=add',
       header: {

pages/operation/operationadd.wxml

@@ -54,7 +54,7 @@
           <input class="weui-input" placeholder="请输入" bindinput="bindzyddInput" />
         </view>
       </view>
-            <view class="weui-cell weui-cell_select">
+      <view class="weui-cell weui-cell_select">
         <view class="weui-cell__hd weui-cell__hd_in-select-after">
           <view class="weui-label">属地部门</view>
         </view>
@@ -73,7 +73,7 @@
         </view>
         <view class="weui-cell__bd">
           <navigator url="/pages/userSelect/userSelect">
-        <view class="weui-select">请选择</view>
+            <view class="weui-select">请选择</view>
           </navigator>
         </view>
       </view>
@@ -85,8 +85,8 @@
     <view class="weui-cells weui-cells_after-title">
       <view class="weui-cell">
         <view class="weui-cell__bd">
-          <textarea  class="weui-textarea" placeholder="请输入描述" style="height: 3.3em" bindinput="bindzynrInput"/>
+          <textarea class="weui-textarea" placeholder="请输入描述" style="height: 3.3em" bindinput="bindzynrInput" />
-          
+
         </view>
       </view>
     </view>
@@ -112,7 +112,7 @@
       </view>
     </view>
     <view class="weui-cells__title">风险分析和安全措施</view>
-        <view class="weui-cells weui-cells_after-title">
+    <view class="weui-cells weui-cells_after-title">
       <checkbox-group bindchange="checkboxChangefxcs">
         <label class="weui-cell weui-check__label" wx:for="{{fxcslist}}" wx:key="value">
           <checkbox class="weui-check" value="{{item.id}}" />
@@ -121,14 +121,14 @@
             <icon class="weui-icon-checkbox_success" type="success" size="23" wx:if="{{item.checked}}"></icon>
           </view>
           <view>
-          <view style='color:red'>{{item.fxfx}}</view>
+            <view style='color:red'>{{item.fxfx}}</view>
-          <view style='color:green'>{{item.aqcs}}</view>
+            <view style='color:green'>{{item.aqcs}}</view>
-          <view class="weui-media-box__desc">{{item.cslx}}</view>
+            <view class="weui-media-box__desc">{{item.cslx}}</view>
           </view>
         </label>
       </checkbox-group>
-</view>
+    </view>
-<!-- <view class="weui-cells__title">审批人</view>
+    <!-- <view class="weui-cells__title">审批人</view>
           <view class="weui-cell weui-cell_select">
         <view class="weui-cell__hd weui-cell__hd_in-select-after">
           <view class="weui-label">审批人</view>
@@ -142,9 +142,32 @@
       <view class="weui-cell weui-cell_access" style="height: 4.3em">
         {{spryname}}
     </view> -->
-      <button class="weui-btn" type="primary" bindtap="submit">分析完毕,发起作业</button>
+    <view class="weui-cell weui-cell_switch">
+      <view class="weui-cell__bd">手动选择审批人</view>
+      <view class="weui-cell__ft">
+        <switch bindchange="chosesprChange" />
+      </view>
+    </view>
+    <view class="weui-cell weui-cell_select" wx:if="{{chosespr}}">
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view>作业部门审批人</view>
+      </view>
+      <view class="weui-cell__bd">
+        <picker bindchange="bindspr1change" value="{{spr1index}}" range="{{spr1Array}}" range-key="text">
+          <view class="weui-select">{{spr1Array[spr1index].text}}</view>
+        </picker>
+      </view>
+    </view>
+    <view class="weui-cell weui-cell_select" wx:if="{{chosespr}}">
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view>属地部门审批人</view>
+      </view>
+      <view class="weui-cell__bd">
+        <picker bindchange="bindspr2change" value="{{spr2index}}" range="{{spr2Array}}" range-key="text">
+          <view class="weui-select">{{spr2Array[spr2index].text}}</view>
+        </picker>
+      </view>
+    </view>
+    <button class="weui-btn" type="primary" bindtap="submit">分析完毕,发起作业</button>
   </view>
-</view>
+</view>
-
-
-

pages/operation/operationcheck.js

@@ -141,6 +141,9 @@ Page({
   },
   submit2: function () {
     var that = this;
+    wx.showLoading({
+      title: '',
+    })
     wx.request({
       url: that.data.serverUrl + 'api/operation?a=spzy',
       header: {
@@ -256,6 +259,9 @@ Page({
   },
   zjsp: function () {
     var that=this
+    wx.showLoading({
+      title: '',
+    })
     wx.request({
       url: getApp().globalData.serverUrl + 'api/operation?a=spzy',
       header: {
@@ -275,7 +281,7 @@ Page({
   openaction: function () {
     var that = this
     wx.showActionSheet({
-      itemList: ['确认无误,审批通过', '转交他人审批', '终止审批开始作业'],
+      itemList: ['确认无误,审批通过', '提交上级审批'],
       success: function (res) {
         if (!res.cancel) {
           if (res.tapIndex == 0) {
@@ -284,7 +290,7 @@ Page({
           else if (res.tapIndex == 1) {
             that.setData({
               'zjsp': true,
-              'action':'转交他人审批'
+              'action':'提交上级审批'
             })
           } else if (res.tapIndex == 2) {
             wx.request({

pages/operation/operationcheck.wxml

@@ -66,6 +66,14 @@
       </view>
     </view>
   </view>
+          <view class="weui-cell weui-cell_access">
+          <view class="weui-cell__bd weui-cell_primary">
+            <view>作业人员</view>
+            <view class="weui-cell__ft">
+              {{zyry}}
+            </view>
+          </view>
+        </view>
   <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
       <view>现场图片</view>
@@ -115,12 +123,12 @@
         </view>
       </view>
     </view>
-<button class="weui-btn" type="primary" bindtap="submit" wx:if="{{zyzt.zyzt == '确认中'}}">安全措施就绪,确认参与作业</button>
+<button class="weui-btn" type="primary" bindtap="submit" wx:if="{{zyzt.zyzt == '确认中'}}">我的安全措施就绪,确认参与作业</button>
 <!-- <button class="weui-btn" type="primary" bindtap="submit2" >安全措施就绪,可以开始作业</button> -->
 <button class="weui-btn" type="primary" bindtap="submit3" wx:if="{{zyzt.zyzt == '待关闭'}}">现场清理完毕,关闭作业</button>
 <button type="primary" bindtap="openaction" class="weui-btn" wx:if="{{zyzt.zyzt == '审批中'}}">选择操作</button>
 <view wx:if="{{zyzt.zyzt == '审批中'}}"><span>当前操作：</span><span style="color:blue">{{action}}</span></view>
-<view wx:if="{{zjsp}}" class="weui-cells weui-cells_after-title">
+<!-- <view wx:if="{{zjsp}}" class="weui-cells weui-cells_after-title">
       <view class="weui-cell weui-cell_select">
         <view class="weui-cell__hd weui-cell__hd_in-select-after">
           <view class="weui-label">新审批人</view>
@@ -134,5 +142,5 @@
       <view class="weui-cell weui-cell_access" style="height: 5.3em">
         {{zyspryname}}
       </view>
-</view>
+</view> -->
-<button type="primary" bindtap="zjsp" class="weui-btn" wx:if="{{zjsp}}">确认转交</button>
+<button type="primary" bindtap="zjsp" class="weui-btn" wx:if="{{zjsp}}">确认提交</button>

pages/operation/operationdetail.wxml

@@ -124,6 +124,7 @@
           <view class="weui-cell weui-cell_access">
             <view class="weui-cell__bd weui-cell_primary">
               <view>{{index+1}} {{item.jdmc}}</view>
+              <view class="weui-media-box__desc" wx:if="{{index>0}}">可审批人:{{item.sprs}}</view>
             </view>
             <view class="weui-cell__ft" wx:if="{{zyzt.index > index }}" style="color:green">
               已执行
@@ -177,7 +178,7 @@
               已通过
             </view>
             <view class="weui-cell__ft" wx:if="{{item.checked == 2}}" style="color:green">
-              转交审批
+              通过并提交上级
             </view>
           </view>
         </block>

pages/trouble/accesstrouble.wxml

@@ -98,7 +98,10 @@
   </view>
 </view>
 <button type="primary" bindtap="openaction" class="weui-btn" wx:if="{{yhzt ==1}}">选择操作</button>
-<view wx:if="{{yhzt ==1}}"><span>当前操作：</span><span style="color:blue">{{action}}</span></view>
+<view wx:if="{{yhzt ==1}}">
+  <span>当前操作：</span>
+  <span style="color:blue">{{action}}</span>
+</view>
 <view wx:if='{{yhzt!=0}}'>
   <view wx:if="{{zppg=='yes' && shresult !='reject' }}">
     <view class="weui-cells__title">新评估人</view>
@@ -225,10 +228,10 @@
         </view>
         <view class="weui-cell__bd">
           <picker mode="multiSelector" value="{{dateTime1}}" bindchange="changeDateTime1" bindcolumnchange="changeDateTimeColumn1" range="{{dateTimeArray1}}">
-                        <view class="weui-select" wx:if="{{dateshow==1}}">
+            <view class="weui-select" wx:if="{{dateshow==1}}">
               {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
             </view>
-          <view class="weui-select" wx:else>
+            <view class="weui-select" wx:else>
             </view>
           </picker>
         </view>
@@ -386,12 +389,12 @@
 
 
   </view>
-      <view class="weui-cell weui-cell_switch" wx:if="{{yhzt ==4||yhzt==5}}">
+  <view class="weui-cell weui-cell_switch" wx:if="{{yhzt ==4||yhzt==5}}">
-      <view class="weui-cell__bd">驳回</view>
+    <view class="weui-cell__bd">驳回</view>
-      <view class="weui-cell__ft">
+    <view class="weui-cell__ft">
-        <switch bindchange="shChange" />
+      <switch bindchange="shChange" />
-      </view>
     </view>
+  </view>
 </view>
 <view class="weui-cells weui-cells_after-title" wx:if="{{yhzt==0||shresult=='reject'}}">
   <view class="weui-cell weui-cell_access">