From 95441c75615bd30ff473b27c9f57c561fd37fff3 Mon Sep 17 00:00:00 2001
From: mahuan@syspetro.com <mahuan@syspetro.com>
Date: 星期四, 19 五月 2022 14:21:20 +0800
Subject: [PATCH] 最新代码存档
---
GoldC/pages/aditReport/adit.js | 2
GoldC/pages/paiDan/paiDan.wxml | 4 +-
GoldC/pages/problemList/problemList.wxml | 8 ++--
GoldC/pages/problemReport/proRep.js | 3 +
GoldC/pages/paiDan/paiDan.js | 11 ++++-
GoldC/pages/problemList/problemList.js | 42 +++++++++++++++++++++
6 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/GoldC/pages/aditReport/adit.js b/GoldC/pages/aditReport/adit.js
index 14486dc..25165b6 100644
--- a/GoldC/pages/aditReport/adit.js
+++ b/GoldC/pages/aditReport/adit.js
@@ -297,7 +297,7 @@
_Reported_Question: this.data.shangbao,
Dispost_Question: this.data.Dispost_Question,//娲惧崟瀹℃牳鎰忚
_Reported_Address: this.data.detailedaddress,
- Reported_Remark: this.data.Reported_Remark ? '瀹夊叏闂' : '',
+ _Reported_Remark: this.data.Reported_Remark ? '瀹夊叏闂' : '',
Tag: this.data.listid,
_Reported_lnglat: this.data.locmap.latitude + ',' + this.data.locmap.longitude,
_fk_Role_Type: this.data.youkecenter[this.data.youkeindex] ? this.data.youkecenter[this.data.youkeindex].pk_TypeId : '',
diff --git a/GoldC/pages/paiDan/paiDan.js b/GoldC/pages/paiDan/paiDan.js
index c697359..a430e89 100644
--- a/GoldC/pages/paiDan/paiDan.js
+++ b/GoldC/pages/paiDan/paiDan.js
@@ -22,7 +22,7 @@
//
dis: true,
//
- Reported_Remark: [],//瀹夊叏闂
+ Reported_Remark: ['瀹夊叏闂'],//瀹夊叏闂
Dispost_Question: '',//娲惧崟瀹℃牳鎰忚
shangbao: '',
beizhu: '',
@@ -60,7 +60,14 @@
FTimageUrl: JSON.parse(options.data).Reported_Img.replace('..', '').split(","),
listid: JSON.parse(options.data).id
})
+ // Reported_Remark: JSON.parse(options.data).Reported_Remark ? ['瀹夊叏闂'] : ['瀹夊叏闂'],
+ setTimeout(()=>{
+ this.setData({
+ Reported_Remark:["瀹夊叏闂"]
+ })
+ console.log('瀹夊叏闂鍒濆鍖�', this.data.Reported_Remark);
+ },1000)
// 鍙嶅～娓稿褰掑睘涓績
this.data.youkecenter.forEach((e) => {
if (e.pk_TypeId === JSON.parse(options.data).fk_Role_Type) {
@@ -297,7 +304,7 @@
_Reported_Question: this.data.shangbao,
Dispost_Question: this.data.Dispost_Question,//娲惧崟瀹℃牳鎰忚
_Reported_Address: this.data.detailedaddress,
- Reported_Remark: this.data.Reported_Remark.length > 0 ? '瀹夊叏闂' : '',
+ _Reported_Remark: this.data.Reported_Remark.length > 0 ? '瀹夊叏闂' : '',
beizhu: this.data.Reported_Remark.length > 0 ? this.data.beizhu : '',
Tag: this.data.listid,
_Reported_lnglat: this.data.locmap.latitude + ',' + this.data.locmap.longitude,
diff --git a/GoldC/pages/paiDan/paiDan.wxml b/GoldC/pages/paiDan/paiDan.wxml
index 7746490..622b03c 100644
--- a/GoldC/pages/paiDan/paiDan.wxml
+++ b/GoldC/pages/paiDan/paiDan.wxml
@@ -69,8 +69,8 @@
</view>
<!-- <checkbox value="{{ Reported_Remark }}" class="checkbox" bind:change="choseRemark" style="margin-left: 10px;">瀹夊叏闂</checkbox>-->
<!-- <van-checkbox value="{{ Reported_Remark }}" class="checkbox" bind:change="choseRemark" style="margin-left: 10px;">瀹夊叏闂</van-checkbox>-->
- <checkbox-group :value="{{Reported_Remark}}" bind:change="choseRemark">
- <checkbox value="瀹夊叏闂">瀹夊叏闂</checkbox>
+ <checkbox-group value="{{Reported_Remark}}" bind:change="choseRemark">
+ <checkbox name="瀹夊叏闂" value="瀹夊叏闂">瀹夊叏闂</checkbox>
</checkbox-group>
</view>
diff --git a/GoldC/pages/problemList/problemList.js b/GoldC/pages/problemList/problemList.js
index c5aeb7a..95820b7 100644
--- a/GoldC/pages/problemList/problemList.js
+++ b/GoldC/pages/problemList/problemList.js
@@ -267,6 +267,48 @@
wx.hideLoading()
})
},
+ // 杞彂涓灑
+ zhuanFa(e) {
+ wx.request({
+ url: 'http://101.133.134.71:9002/TOperation/Post',
+ method: "POST",
+ header: { "content-type": "application/x-www-form-urlencoded" },
+ data: {
+ _RoleValue: wx.getStorageSync('user').RoleValue,
+ _pk_User: wx.getStorageSync('user').pk_User,
+ _pk_Examine: e.currentTarget.dataset.id,
+ Tag: e.currentTarget.dataset.tag
+ },
+ success(res) {
+ console.log(res)
+ if (res.data.Check){
+
+ }else{
+
+ }
+ },
+ fail(err) {
+
+ }
+ })
+ },
+ // 涓灑閫�鍥�
+ tuiHui(e) {
+ console.log(e.currentTarget.dataset.id)
+ var id = e.currentTarget.dataset.id * 1
+ CheckEdit(id).then((res) => {
+ res.data.Data.id = id
+ console.log(res.data.Data)
+ wx.navigateTo({
+ url: '/pages/paiDan/paiDan?data=' + JSON.stringify(res.data.Data),
+ })
+ }).catch((err) => {
+ console.log(err)
+ })
+ // wx.navigateTo({
+ // url: '/pages/aditReport/adit?data='+e.currentTarget.dataset.id,
+ // })
+ },
// 娲惧崟
paiDan(e) {
console.log(e.currentTarget.dataset.id)
diff --git a/GoldC/pages/problemList/problemList.wxml b/GoldC/pages/problemList/problemList.wxml
index 95463e7..c46801e 100644
--- a/GoldC/pages/problemList/problemList.wxml
+++ b/GoldC/pages/problemList/problemList.wxml
@@ -78,16 +78,16 @@
<text>娲惧崟</text>
</view>
</view>
- <view wx:if="{{ role == 6 }}" class="libtn">
+ <view wx:if="{{ role == 3 }}" class="libtn">
<!-- 杞彂涓灑 -->
- <view class="btn btn-adit" bindtap="paiDan" data-id="{{item.pk_Examine}}" style="background-color: purple;">
+ <view class="btn btn-adit" bindtap="zhuanFa" data-id="{{item.pk_Examine}}" data-tag="3" style="background-color: purple;">
<van-icon name="edit" class="icon"/>
<text>杞彂涓灑</text>
</view>
</view>
<view wx:if="{{ role == 13 }}" class="libtn">
- <!-- 杞彂涓灑 -->
- <view class="btn btn-adit" bindtap="paiDan" data-id="{{item.pk_Examine}}" style="background-color: purple;">
+ <!-- 涓灑閫�鍥� -->
+ <view class="btn btn-adit" bindtap="zhuanFa" data-id="{{item.pk_Examine}}" data-tag="4" style="background-color: purple;">
<van-icon name="edit" class="icon"/>
<text>涓灑閫�鍥�</text>
</view>
diff --git a/GoldC/pages/problemReport/proRep.js b/GoldC/pages/problemReport/proRep.js
index 167b2fc..b0d521f 100644
--- a/GoldC/pages/problemReport/proRep.js
+++ b/GoldC/pages/problemReport/proRep.js
@@ -290,7 +290,8 @@
_Reported_Question: this.data.shangbao,
Dispost_Question: this.data.Dispost_Question,//瀹℃牳娲惧崟鎰忚
_Reported_Address: this.data.detailedaddress,
- Reported_Remark: this.data.Reported_Remark ? this.data.beizhu : '',
+ _Reported_Remark: this.data.Reported_Remark.length > 0 ? '瀹夊叏闂' : '',
+ beizhu: this.data.Reported_Remark ? this.data.beizhu : '',
Tag: 0,
_Reported_lnglat: this.data.locmap.longitude + ',' + this.data.locmap.latitude,
_fk_Role_Type: this.data.youkecenter[this.data.youkeindex] ? this.data.youkecenter[this.data.youkeindex].pk_TypeId : '',
--
Gitblit v1.8.0