diff --git a/pages/operation/operationadd.js b/pages/operation/operationadd.js
index 9448e1d..b49702f 100644
--- a/pages/operation/operationadd.js
+++ b/pages/operation/operationadd.js
@@ -10,6 +10,18 @@ Page({
zyqy:'',
chosespr:false
},
+ bindspr1change: function (e) {
+ this.setData({
+ spr1index: e.detail.value,
+ })
+ this.data.spr1s = this.data.spr1Array[e.detail.value].value
+ },
+ bindspr2change: function (e) {
+ this.setData({
+ spr2index: e.detail.value,
+ })
+ this.data.spr2s = this.data.spr2Array[e.detail.value].value
+ },
checkboxChangefxcs: function (e) {
var x = this.data.fxcslist;
var values = e.detail.value;
@@ -258,13 +270,13 @@ Page({
'content-type': 'application/json', //
'Cookie': wx.getStorageSync("sessionid"),
},
- method: 'GET',
+ method: 'POST',
data: {'sdbm':this.data.sdbm},
success: res => {
if (res.statusCode === 200) {
this.setData({
- spr1Array:res.data.spr1Array,
- spr2Array:res.data.spr2Array
+ spr1Array:res.data.data.spr1Array,
+ spr2Array:res.data.data.spr2Array
})
}
}
@@ -287,6 +299,12 @@ Page({
that.Tap1('请输入作业内容!')
} else if (!that.data.fxcs) {
that.Tap1('请确认分析措施!')
+ } else if (that.data.chosespr==true) {
+ if(!that.data.spr1s||!that.data.spr2s){
+ that.Tap1('审批人未选择!')
+ }else{
+ this.upimg(0, this.data.zyimg.length);
+ }
}else {
this.upimg(0, this.data.zyimg.length);
}
@@ -350,6 +368,12 @@ Page({
zyimg: this.data.zyimg,
sdbm:this.data.sdbm,
fxcs: this.data.fxcs,
+ chosespr:this.data.chosespr,
+ }
+ if(this.data.chosespr){
+ zydata.spr1s = this.data.spr1s
+ zydata.spr2s = this.data.spr2s
+ zydata.chosespr = this.data.chosespr
}
//console.log(gcdata.unsafe)
wx.showLoading({
diff --git a/pages/operation/operationadd.wxml b/pages/operation/operationadd.wxml
index 4e63e52..907eae9 100644
--- a/pages/operation/operationadd.wxml
+++ b/pages/operation/operationadd.wxml
@@ -154,7 +154,7 @@
- {{spr1Array[spr1index].text}}
+ {{spr1Array[spr1index].text}}
@@ -164,7 +164,7 @@
- {{spr2Array[spr2index].text}}
+ {{spr2Array[spr2index].text}}
diff --git a/pages/parttree/index.js b/pages/parttree/index.js
index b449a50..cd95411 100644
--- a/pages/parttree/index.js
+++ b/pages/parttree/index.js
@@ -16,6 +16,9 @@ Page({
newbm__partname: e.detail.name,
newbm: e.detail.id,
})
+ if(prevPage.route.indexOf('operation')!=-1){
+ prevPage.getspr12array()
+ }
wx.request({
url: getApp().globalData.serverUrl + 'getuser?a=combobox&partid='+e.detail.id,
header: {