From a6acbd8aa2546c7cb22d48cb8dde8c7e51e3e9b6 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 9 Oct 2019 00:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/operation/operationadd.wxml   |  6 ++--
 pages/operation/operationadd.wxss   |  6 +++-
 pages/operation/operationcheck.js   | 54 +++++++++++++++++++++++++++--
 pages/operation/operationcheck.wxml | 18 +++++++++-
 4 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/pages/operation/operationadd.wxml b/pages/operation/operationadd.wxml
index 105c31b..5db30bf 100644
--- a/pages/operation/operationadd.wxml
+++ b/pages/operation/operationadd.wxml
@@ -141,10 +141,8 @@
       </view>
       <view class="weui-cell weui-cell_access" style="height: 4.3em">
         {{spryname}}
-      </view> -->
-    <view class="btn-area">
-      <button class="weui-btn" type="primary" bindtap="submit">提交审批</button>
-    </view>
+    </view> -->
+      <button class="weui-btn" type="primary" bindtap="submit">分析完毕,发起作业</button>
   </view>
 </view>
 
diff --git a/pages/operation/operationadd.wxss b/pages/operation/operationadd.wxss
index 7e7bdf8..ff29dfb 100644
--- a/pages/operation/operationadd.wxss
+++ b/pages/operation/operationadd.wxss
@@ -1 +1,5 @@
-/* pages/operation/operationadd.wxss */
\ No newline at end of file
+/* pages/operation/operationadd.wxss */
+.weui-btn{
+  width:auto;
+  margin: 5px;
+}
\ No newline at end of file
diff --git a/pages/operation/operationcheck.js b/pages/operation/operationcheck.js
index 3bda6da..513859c 100644
--- a/pages/operation/operationcheck.js
+++ b/pages/operation/operationcheck.js
@@ -7,7 +7,8 @@ Page({
    */
   data: {
     serverUrl: getApp().globalData.serverUrl,
-    zyimg2: []
+    zyimg2: [],
+    zjsp:false
   },
   getZy: function (zyid) {
     wx.showLoading({
@@ -59,7 +60,19 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    let lst = getApp().globalData.selectPeopleList
+    let nst = []
+    let nst1 = []
+    if (lst) {
+      for (var i = 0; i < lst.length; i++) {
+        nst.push(lst[i]['name'])
+        nst1.push(lst[i]['id'])
+      }
+      this.setData({
+        zyspryname: nst.join(','),
+        spry: nst1,
+      })
+    }
   },
 
   /**
@@ -239,4 +252,41 @@ Page({
       }
     });
   },
+  openaction: function () {
+    var that = this
+    wx.showActionSheet({
+      itemList: ['确认无误,审批通过', '转交他人审批', '终止审批开始作业'],
+      success: function (res) {
+        if (!res.cancel) {
+          if (res.tapIndex == 0) {
+            that.submit2()
+          }
+          else if (res.tapIndex == 1) {
+            that.setData({
+              'zjsp': true,
+              'action':'转交他人审批'
+            })
+          } else if (res.tapIndex == 2) {
+            wx.request({
+              url: that.data.serverUrl + 'api/operation?a=spzy',
+              header: {
+                'content-type': 'application/x-www-form-urlencoded', // 
+                'Cookie': wx.getStorageSync("sessionid"),
+              },
+              method: 'POST',
+              data: { 'zyid': that.data.zyid ,'zzsp':true},
+              success: res => {
+                if (res.statusCode === 200) {
+                  wx.hideLoading();
+                  wx.navigateBack({
+                    delta: 1
+                  })
+                }
+              }
+            });
+          } 
+        }
+      }
+    });
+  }
 })
\ No newline at end of file
diff --git a/pages/operation/operationcheck.wxml b/pages/operation/operationcheck.wxml
index 7a002db..a066628 100644
--- a/pages/operation/operationcheck.wxml
+++ b/pages/operation/operationcheck.wxml
@@ -119,4 +119,20 @@
 <!-- <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>
\ No newline at end of file
+<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 class="weui-cell weui-cell_select">
+        <view class="weui-cell__hd weui-cell__hd_in-select-after">
+          <view class="weui-label">新审批人</view>
+        </view>
+        <view class="weui-cell__bd">
+          <navigator url="/pages/userSelect/userSelect">
+            <view class="weui-select">请选择</view>
+          </navigator>
+        </view>
+      </view>
+      <view class="weui-cell weui-cell_access" style="height: 5.3em">
+        {{zyspryname}}
+      </view>
+</view>
+<button type="primary" bindtap="zjsp" class="weui-btn" wx:if="{{zjsp}}">确认转交</button>