工单

E-service/workOrder/detail.js

@@ -151,6 +151,11 @@ Page({
           url: `/E-service/workOrder/insert`
         })
         break;
+      case '确认信息':
+        wx.navigateTo({
+          url: '/E-service/workOrder/confirm?id=' + detail.sa_workorderid
+        })
+        break;
       case '接单':
         wx.navigateTo({
           url: `/E-service/workOrder/takeOrder`
@@ -284,7 +289,7 @@ Page({
   async setTabbar() {
     let status = this.data.detail.status,
       tabbarList = [],
-      isLeader = this.data.detail.team.find(v => v.isleader) == wx.getStorageSync("userMsg").userid,
+      isLeader = this.data.detail.team.find(v => v.isleader).userid == wx.getStorageSync("userMsg").userid,
       isqQuery = this.data.isqQuery,
       isworkleader = this.data.isworkleader || false;
     let options = {
@@ -296,6 +301,10 @@ Page({
         icon: "icon-dibu-biangengchengjiaozhuangtai",
         label: "转工单"
       },
+      确认信息: {
+        icon: "icon-jiaoqiqueren",
+        label: "确认信息"
+      },
       接单: {
         icon: "icon-a-tonggaoshujuxiazailiang",
         label: "接单"
@@ -331,6 +340,7 @@ Page({
       console.log("重新是否服务主管", res)
       if (res.code == 1) {
         isworkleader = res.data.isworkleader
+        isLeader = res.data.isteamleader
         this.setData({
           isworkleader: res.data.isworkleader,
           isqQuery: true,
@@ -348,8 +358,9 @@ Page({
       if (!isLeader) statusOptions[status] = [];
       if (isLeader || isworkleader) {
         if (status == '待接单') {
-          statusOptions[status] = ["编辑", '转工单'].concat(statusOptions[status])
+          statusOptions[status] = ["编辑", '确认信息', '转工单', '接单', '中止']
         } else {
+          if (status == '待开始') statusOptions[status].unshift("确认信息");
           statusOptions[status].unshift("编辑");
         }
       }

E-service/workOrder/detail.wxml

@@ -65,7 +65,7 @@
 	<Team slot='服务团队' list='{{detail.team}}' projectleader='{{detail.projectleader}}' sa_workorderid='{{detail.sa_workorderid}}' disabled="{{detail.status != '进行中' && (isLeader || isworkleader)}}" />
 	<Product slot='服务商品' id='Product' disabled="{{detail.status != '进行中'}}" />
 	<Material slot='工单物料' id='Material' />
-	<NotarizeBill slot='服务确认单' billData='{{detail}}' id='NotarizeBill' />
+	<NotarizeBill slot='服务确认单' billData='{{detail}}' id='NotarizeBill' disabled="{{detail.status != '进行中'}}" />
 	<view style="height: 180rpx;" />
 </Yl_FunTabs>
 

E-service/workOrder/notarizeBill/index.js

@@ -42,6 +42,7 @@ Component({
         ...this.data.content,
         sa_workorderid: id || this.data.sa_workorderid
       };
+      content.where.sa_workorderid = content.sa_workorderid
       if (init) {
         content.pageNumber = 1
         content.pageTotal = 1

E-service/workOrder/takeOrder.js

@@ -116,7 +116,7 @@ Page({
       }
     } else if (detail.data.valueName == "userid") {
       detail.form[detail.form.findIndex(v => v.valueName == 'userid')] = detail.data;
-      detail.form[detail.form.findIndex(v => v.valueName == 'phonenumber111')].value = detail.data.radioList.find(v => v.id == detail.data.value).phonenumber;
+      detail.form[detail.form.findIndex(v => v.valueName == 'phonenumber111')].value = detail.data.radioList.find(v => v.id == detail.data.value).phonenumber || detail.data.radioList.find(v => v.id == detail.data.value).userphonenumber;
       this.setData({
         form: detail.form,
         leader: detail.data.value

E-service/workOrder/team/index.wxml

@@ -20,7 +20,7 @@
 			设为负责人
 		</view>
 	</block>
-	<view data-item="{{item}}" bind:tap="deleteUser" class="iconfont icon-guanlian-shanchu" wx:if="{{!item.isleader}}"></view>
+	<view data-item="{{item}}" bind:tap="deleteUser" class="iconfont icon-guanlian-shanchu" wx:if="{{!item.isleader && !disabled }}"></view>
 </view>
 
 <Yl_Empty wx:if="{{list.length==0}}" />
@@ -36,4 +36,4 @@
 	</view>
 </t-dialog>
 
-<wxs src="../../../utils/wxmlQueryPer.wxs" module="wqp" />
+<wxs src="../../../utils/wxmlQueryPer.wxs" module="wqp" />

project.private.config.json

@@ -24,12 +24,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "E-service/workOrder/detail",
+          "pathName": "E-service/workOrder/detail",
+          "query": "id=1386",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "老工单详情",
           "pathName": "/Eservice/workerLeader/editworkOrderDetail/index",
           "query": "id=1370",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "工序工单",