diff --git a/app.js b/app.js
index 7a0efc4..b698d4a 100644
--- a/app.js
+++ b/app.js
@@ -91,8 +91,8 @@ App({
},
globalData: {
userInfo: null,
- serverUrl: 'https://safeyun.ctcshe.com/',
- //serverUrl: 'http://127.0.0.1:8000/',
+ //serverUrl: 'https://safeyun.ctcshe.com/',
+ serverUrl: 'http://127.0.0.1:8000/',
//serverUrl: 'http://192.168.0.102:8000/',
//serverUrl:'http://10.7.100.250:8000/',
isaqy: 0,
diff --git a/pages/operation/operationadd.js b/pages/operation/operationadd.js
index d4f6b5f..9448e1d 100644
--- a/pages/operation/operationadd.js
+++ b/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: {
diff --git a/pages/operation/operationadd.wxml b/pages/operation/operationadd.wxml
index a215cca..4e63e52 100644
--- a/pages/operation/operationadd.wxml
+++ b/pages/operation/operationadd.wxml
@@ -54,7 +54,7 @@
-
+
属地部门
@@ -73,7 +73,7 @@
- 请选择
+ 请选择
@@ -85,8 +85,8 @@
-
-
+
+
@@ -112,7 +112,7 @@
风险分析和安全措施
-
+
- {{item.fxfx}}
- {{item.aqcs}}
- {{item.cslx}}
+ {{item.fxfx}}
+ {{item.aqcs}}
+ {{item.cslx}}
-
-
-
+
+ 手动选择审批人
+
+
+
+
+
+
+ 作业部门审批人
+
+
+
+ {{spr1Array[spr1index].text}}
+
+
+
+
+
+ 属地部门审批人
+
+
+
+ {{spr2Array[spr2index].text}}
+
+
+
+
-
-
-
-
+
\ No newline at end of file
diff --git a/pages/operation/operationcheck.js b/pages/operation/operationcheck.js
index 79caa66..8eb1384 100644
--- a/pages/operation/operationcheck.js
+++ b/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({
diff --git a/pages/operation/operationcheck.wxml b/pages/operation/operationcheck.wxml
index e2b1ce5..3cee840 100644
--- a/pages/operation/operationcheck.wxml
+++ b/pages/operation/operationcheck.wxml
@@ -66,6 +66,14 @@
+
+
+ 作业人员
+
+ {{zyry}}
+
+
+
现场图片
@@ -115,12 +123,12 @@
-
+
当前操作：{{action}}
-
+
+
diff --git a/pages/operation/operationdetail.wxml b/pages/operation/operationdetail.wxml
index 2f61bf3..ae2aa56 100644
--- a/pages/operation/operationdetail.wxml
+++ b/pages/operation/operationdetail.wxml
@@ -124,6 +124,7 @@
{{index+1}} {{item.jdmc}}
+ 可审批人:{{item.sprs}}
已执行
@@ -177,7 +178,7 @@
已通过
- 转交审批
+ 通过并提交上级
diff --git a/pages/trouble/accesstrouble.wxml b/pages/trouble/accesstrouble.wxml
index e690532..26e0618 100644
--- a/pages/trouble/accesstrouble.wxml
+++ b/pages/trouble/accesstrouble.wxml
@@ -98,7 +98,10 @@
-当前操作：{{action}}
+
+ 当前操作：
+ {{action}}
+
新评估人
@@ -225,10 +228,10 @@
-
+
{{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
-
+
@@ -386,12 +389,12 @@
-
- 驳回
-
-
-
+
+ 驳回
+
+
+