xiaohaizhao 10 месяцев назад
Родитель
Сommit
4218de49c6

+ 19 - 4
Eservice/workOrder/index.js

@@ -25,12 +25,27 @@ Page({
     },
     /* 去详情 */
     toDetail(e) {
-        console.log(e)
         const {
             item
         } = e.currentTarget.dataset;
-        wx.navigateTo({
-            url: (item.team.some(v => v.userid == wx.getStorageSync('userMsg').userid) ? '/Eservice/workOrderDetail/index' : '/Eservice/workerLeader/editworkOrderDetail/index') + '?id=' + item.sa_workorderid,
+        console.log(item)
+        api._post({
+            "id": 2025062416033402,
+            "content": {
+                "userid": wx.getStorageSync('userMsg').userid,
+                "sa_workorderid": item.sa_workorderid,
+            },
+        }).then(res => {
+            console.log("查询权限", res)
+            if (res.code == 1) {
+                wx.navigateTo({
+                    url: (res.data.isteamleader || res.data.isworkleader ? '/Eservice/workerLeader/editworkOrderDetail/index' : '/Eservice/workOrderDetail/index') + '?id=' + item.sa_workorderid,
+                })
+            } else {
+                wx.navigateTo({
+                    url: (item.isleader ? '/Eservice/workerLeader/editworkOrderDetail/index' : '/Eservice/workOrderDetail/index') + '?id=' + item.sa_workorderid,
+                })
+            }
         })
     },
     async listData() {
@@ -65,7 +80,7 @@ Page({
         this.setData({
             loadingTexts: ['下拉刷新', '松手刷新', '正在刷新', '刷新完成'].map(v => getApp().globalData.Language.getMapText(v))
         })
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     onShow() {
         this.setData({

+ 1 - 1
Eservice/workOrderDetail/index.wxml

@@ -46,7 +46,7 @@
       </view>
     </view>
   </card>
-  <view style="margin-bottom: 5px;" class="small"><text class="label">{{language['项目成员']||'项目成员'}}</text></view>
+  <view style="margin-bottom: 5px;" class="small"><text class="label">{{language['服务团队']||'服务团队'}}</text></view>
   <card bindtap="checkTeam">
     <view slot="content">
       <t-tag class="mr-5 mt-5" wx:for="{{billData.team}}" wx:key="userid" variant="{{item.isleader === 1?'dark':'outline'}}" theme="{{item.isleader === 1?'primary':''}}">{{item.name}}</t-tag>

+ 21 - 15
Eservice/workerLeader/editworkOrderDetail/index.js

@@ -230,18 +230,7 @@ Page({
         if (!this.data.actLeader) {
             getApp().globalData.Language.showToast('未选择负责人')
         } else {
-            /* this.data.billData.projectlearders = [this.data.actLeader.userid]
-            const res = await api._post({
-              "id": "20230208140003",
-              "content": this.data.billData
-            }) */
             let teams = this.data.billData.team;
-            console.log(this.data.billData.team.filter(v => v.isleader != 1))
-            console.log(this.data.actLeader)
-            if (!teams.some(v => v.userid == this.data.actLeader.userid)) {
-
-            }
-
             const res = await api._post({
                 "id": "20220930103703",
                 "content": {
@@ -255,13 +244,12 @@ Page({
                 "content": {
                     ownertable: 'sa_workorder',
                     ownerid: this.data.billData.sa_workorderid,
-                    "userids": [this.data.actLeader.userid].concat(this.data.billData.team.filter(v => v.isleader != 1).map(v => v.userid)),
+                    "userids": [this.data.actLeader.userid].concat(this.data.billData.team.map(v => v.userid)),
                     "justuserids": 1
                 }
             }).then(res => {
                 console.log("添加成员", res)
             })
-
             this.setData({
                 workLeaderDialog: false
             })
@@ -269,8 +257,26 @@ Page({
                 title: res.msg,
                 icon: "none"
             });
-            this.mainData()
-            // this.confirmBillList()
+            api._post({
+                "id": 2025062416033402,
+                "content": {
+                    "userid": wx.getStorageSync('userMsg').userid,
+                    "sa_workorderid": this.data.billData.sa_workorderid,
+                },
+            }).then(res => {
+                console.log("查询权限", res)
+                if (res.code == 1) {
+                    if (res.data.isteamleader || res.data.isworkleader) {
+                        this.mainData()
+                    } else {
+                        wx.redirectTo({
+                            url: '/Eservice/workOrderDetail/index?id=' + this.data.billData.sa_workorderid
+                        })
+                    }
+                } else {
+                    this.mainData()
+                }
+            })
         }
     },
     onLoad(options) {

+ 1 - 1
Eservice/workerLeader/editworkOrderDetail/index.wxml

@@ -42,7 +42,7 @@
     </view>
   </card>
 
-  <view style="margin-bottom: 5px;display: flex;justify-content: space-between;" class="small"><text class="label">{{language['项目成员']||'项目成员'}}</text>
+  <view style="margin-bottom: 5px;display: flex;justify-content: space-between;" class="small"><text class="label">{{language['服务团队']||'服务团队'}}</text>
     <view wx:if="{{billData.status!='已完成'}}">
       <t-tag class="mt-5" style="margin-right: 8rpx;" variant="outline" theme="warning" variant="dark" bind:click="showTeamDialog">
         {{language['添加成员']||'添加成员'}}