Merge branch 'green'

bgj/workOrder/detail.js

@@ -549,7 +549,7 @@ Page({
     const userid = wx.getStorageSync('userMsg').userid;
     const team = this.data.detail.team || [];
     const options = wx.getStorageSync('auth').wWorkOrder.options || [];
-    const isInTeam = team.some(v => v.userid == userid);
+    const isLeader = team.some(v => v.userid == userid && v.isleader == 1);
 
     setTimeout(() => {
       const tabbarList = [];
@@ -557,12 +557,12 @@ Page({
       const canCancel = options.some(v => v == 'cancellation');
 
       if (status === '待开始') {
-        if (isInTeam) tabbarList.push({ icon: "icon-kaishigongdan", label: "开始工单" });
+        if (isLeader) tabbarList.push({ icon: "icon-kaishigongdan", label: "开始工单" });
         if (canCancel) tabbarList.push({ icon: "icon-zuofei", label: "作废" });
       }
 
       if (status === '进行中') {
-        if (isInTeam) tabbarList.push({ icon: "icon-wanjiegongdan", label: "完结工单" });
+        if (isLeader) tabbarList.push({ icon: "icon-wanjiegongdan", label: "完结工单" });
         if (canStartOrStop) tabbarList.push({ icon: "icon-zanting", label: "暂停" });
         if (canCancel) tabbarList.push({ icon: "icon-zuofei", label: "作废" });
       }

bgj/workOrder/nodes/update/update.js

@@ -43,8 +43,6 @@ Page({
       });
       return;
     }
-    //工单状态为进行中可以编辑，不管工序是进行中还是已完成
-    const isEditing = workDetail.status == '进行中' ;
     const workpresetjson = detail.workpresetjson || {};
     const attinfos = detail.attinfos || [];
     // 按usetype分组
@@ -58,6 +56,10 @@ Page({
       ...t,
       _active: false,
     }));
+    // 工单状态为进行中可以编辑，不管工序是进行中还是已完成；仅工单团队负责人可编辑和保存
+    const userid = wx.getStorageSync('userMsg')?.userid;
+    const isLeader = team.some(v => v.userid == userid && v.isleader == 1);
+    const isEditing = workDetail.status == '进行中' && isLeader;
 
     this.setData({
       detail,
@@ -276,7 +278,7 @@ Page({
   onClickAway() {
     if (!this.data.isEditing) {
       wx.showToast({
-        title: '仅限工单进行中状态下编辑',
+        title: '仅限工单为进行中状态且为团队负责人可编辑',
         icon: 'none'
       });
     }