互通

E-service/serviceBillList/detail.js

@@ -81,6 +81,61 @@ Page({
       this.selectComponent("#ServicePview2").setPreview(res);
       this.setTabbar()
       this.partialRenewal();
+      this.getWorkDetail(res.data.sa_workorderid)
+    })
+  },
+  getWorkDetail(id) {
+    _Http.basic({
+      "id": 20230208140103,
+      "content": {
+        "sa_workorderid": id
+      },
+    }).then(res => {
+      console.log("工单详情", res)
+      if (res.code != '1') return wx.showToast({
+        title: res.msg,
+        icon: "none"
+      })
+      let tabsList = [{
+        label: "工单服务商品",
+        model: "#WorkOrderProduct",
+        idname: "sa_workorderid",
+        color: "#2AA520"
+      }, {
+        label: "工序详情",
+        model: "#WorkOrderNodes",
+        idname: "sa_workorderid",
+        color: "#2AA520"
+      }, {
+        label: "工单物料",
+        model: "#WorkOrderMaterial",
+        idname: "sa_workorderid",
+        color: "#2AA520"
+      }, {
+        label: "服务确认单",
+        model: "#WorkOrderNotarizeBill",
+        idname: "sa_workorderid",
+        color: "#2AA520"
+      }, {
+        label: "服务团队",
+        idname: "sa_workorderid",
+        color: "#2AA520"
+      }, {
+        label: "工单信息",
+        idname: "sa_workorderid",
+        color: "#2AA520"
+      }];
+      if (res.data.actiontype == '非工序模板') {
+        tabsList = tabsList.filter(v => ['工单服务商品', '服务确认单', '服务团队', '工单信息'].includes(v.label))
+
+      } else {
+        tabsList = tabsList.filter(v => ['工序详情', '工单物料', '服务确认单', '服务团队', '工单信息'].includes(v.label))
+      }
+      this.setData({
+        tabsList:this.data.tabsList.concat(tabsList),
+        workDetail: res.data
+      })
+      this.selectComponent("#WorkOrderPview").setPreview(res);
     })
   },
   onCancel() {

E-service/serviceBillList/detail.json

@@ -2,6 +2,12 @@
   "usingComponents": {
     "ServiceProduct": "/E-service/serviceBillList/product/index",
     "ServicePview1": "/E-service/serviceBillList/Pview1/index",
-    "ServicePview2": "/E-service/serviceBillList/Pview2/index"
+    "ServicePview2": "/E-service/serviceBillList/Pview2/index",
+    "WorkOrderProduct": "/E-service/workOrder/product/index",
+    "WorkOrderMaterial": "/E-service/workOrder/material/index",
+    "WorkOrderNodes": "/E-service/workOrder/nodes/index",
+    "WorkOrderTeam": "/E-service/workOrder/team/index",
+    "WorkOrderPview": "/E-service/workOrder/Pview/index",
+    "WorkOrderNotarizeBill": "/E-service/workOrder/notarizeBill/index"
   }
 }

E-service/serviceBillList/detail.wxml

@@ -55,9 +55,21 @@
 </view>
 <view style="height: 20rpx;" />
 <Yl_FunTabs list='{{tabsList}}' showIcon='{{false}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-	<ServiceProduct slot='服务商品' id="Product" sa_orderid='{{detail.sa_orderid}}' disabled='{{detail.status!="新建"}}' />
+	<ServiceProduct slot='服务商品' id="ServiceProduct" sa_orderid='{{detail.sa_orderid}}' disabled='{{detail.status!="新建"}}' />
 	<ServicePview1 id='ServicePview1' slot='申请信息' />
 	<ServicePview2 id='ServicePview2' slot='受理信息' />
+
+	<!-- 工单 -->
+	<WorkOrderPview id='WorkOrderPview' slot='工单信息' tabColorS='{{tabColorS}}' />
+	<view slot='工序详情' wx:if="{{workDetail.nodes.length == 0}}" style="padding: 20rpx; background-color: #fff;">
+		<WorkOrderNodes id='WorkOrderNodes' wx:if="{{workDetail.nodes}}" nodes='{{workDetail.nodes}}' sa_workorderid='{{workDetail.sa_workorderid}}' status="已完结" />
+	</view>
+	<Yl_Empty wx:else slot='工序详情' />
+
+	<WorkOrderTeam slot='服务团队' list='{{workDetail.team}}' projectleader='{{workDetail.projectleader}}' sa_workorderid='{{workDetail.sa_workorderid}}' disabled="{{true}}" />
+	<WorkOrderProduct slot='工单服务商品' id='WorkOrderProduct' disabled="{{detail.status != '进行中'}}" />
+	<WorkOrderMaterial slot='工单物料' id='WorkOrderMaterial' />
+	<WorkOrderNotarizeBill slot='服务确认单' billData='{{workDetail}}' id='WorkOrderNotarizeBill' disabled="{{true}}" />
 	<view style="height: 180rpx;" />
 </Yl_FunTabs>
 

E-service/workOrder/detail.wxml

@@ -68,7 +68,7 @@
 	<WorkOrderNotarizeBill slot='服务确认单' billData='{{detail}}' id='WorkOrderNotarizeBill' disabled="{{detail.status != '进行中'}}" />
 	
 	<!-- 服务申请单 -->
-	<ServiceProduct slot='服务商品' id="Product" sa_orderid='{{detail.sa_orderid}}' disabled='{{detail.status!="新建"}}' />
+	<ServiceProduct slot='服务商品' id="ServiceProduct" sa_orderid='{{detail.sa_orderid}}' disabled='{{true}}' />
 	<ServicePview1 id='ServicePview1' slot='申请信息' />
 	<ServicePview2 id='ServicePview2' slot='受理信息' />