修复bug

E-service/serviceBillList/detail.js

@@ -63,7 +63,7 @@ Page({
         title: res.msg,
         icon: "none"
       })
-      if (['售中', "售后"].includes(res.data.servicetype)) {
+      if (['售中', "售后"].includes(res.data.servicetype) && !this.data.tabsList.some(v => v.label == '服务商品')) {
         this.data.tabsList.unshift({
           label: "服务商品",
           model: "#ServiceProduct",
@@ -147,7 +147,7 @@ Page({
           tabsList = tabsList.filter(v => ['工序详情', '工单物料', '服务确认单', '服务团队', '工单信息'].includes(v.label))
         }
         this.setData({
-          tabsList: this.data.tabsList.concat(tabsList),
+          tabsList: this.data.tabsList.some(v => v.label == '工单信息') ? this.data.tabsList : this.data.tabsList.concat(tabsList),
           workDetail: res.data
         })
         this.selectComponent("#WorkOrderPview").setPreview(res);

E-service/serviceImprovement/detail.js

@@ -119,7 +119,7 @@ Page({
           })
         }
         this.setData({
-          tabsList: this.data.tabsList.concat(tabsList),
+          tabsList: this.data.tabsList.some(v => v.label == '申请信息') ? this.data.tabsList : this.data.tabsList.concat(tabsList),
           serviceDetail: res.data
         })
         this.selectComponent("#ServicePview1").setPreview(res);
@@ -178,7 +178,7 @@ Page({
           tabsList = tabsList.filter(v => ['工序详情', '工单物料', '服务确认单', '服务团队', '工单信息'].includes(v.label))
         }
         this.setData({
-          tabsList: this.data.tabsList.concat(tabsList),
+          tabsList: this.data.tabsList.some(v => v.label == '工单信息') ? this.data.tabsList : this.data.tabsList.concat(tabsList),
           workDetail: res.data
         })
         this.selectComponent("#WorkOrderPview").setPreview(res);

E-service/workOrder/detail.js

@@ -141,7 +141,7 @@ Page({
           })
         }
         this.setData({
-          tabsList: this.data.tabsList.concat(tabsList),
+          tabsList: this.data.tabsList.some(v => v.label == '申请信息') ? this.data.tabsList : this.data.tabsList.concat(tabsList),
           serviceDetail: res.data
         })
         this.selectComponent("#ServicePview1").setPreview(res);
@@ -154,7 +154,7 @@ Page({
     this.data.reason[e.currentTarget.dataset.name] = e.detail.value;
   },
   addConfirmBill() {
-    let page = this.selectComponent("#NotarizeBill");
+    let page = this.selectComponent("#WorkOrderNotarizeBill");
     page.setData({
       sa_workorderid: this.data.detail.sa_workorderid
     })

E-service/workOrder/detail.wxml

@@ -35,6 +35,10 @@
 		<view class="label">{{language['现场联系人']||'现场联系人'}}</view>
 		<view class="value">{{detail.scenecontact}}<text wx:if="{{detail.scenecontactrole}}" style="margin-left: 10rpx;">{{language[detail.scenecontactrole]||detail.scenecontactrole}}</text> <text wx:if="{{detail.scenecontactphonenumber}}" bind:tap="callPhone" data-number="{{detail.scenecontactphonenumber}}" style="color: #3874F6;margin-left: 10rpx;">{{detail.scenecontactphonenumber}}</text></view>
 	</view>
+	<view class="row">
+		<view class="label">{{language['客诉大类']||'客诉大类'}}</view>
+		<view class="value">{{language[detail.class2]||detail.class2 || '--'}}</view>
+	</view>
 	<view class="row">
 		<view class="label">{{language['业务员']||'业务员'}}</view>
 		<view class="value">{{detail.saler_name}}<text wx:if="{{detail.salerphonenumber}}" bind:tap="callPhone" data-number="{{detail.salerphonenumber}}" style="color: #3874F6;margin-left: 10rpx;">{{detail.salerphonenumber}}</text></view>
@@ -62,7 +66,7 @@
 	<view slot='工序详情' style="padding: 20rpx; background-color: #fff;">
 		<WorkOrderNodes id='WorkOrderNodes' wx:if="{{detail}}" nodes='{{detail.nodes}}' sa_workorderid='{{detail.sa_workorderid}}' status="{{detail.status}}" />
 	</view>
-	<WorkOrderTeam slot='服务团队' list='{{detail.team}}' projectleader='{{detail.projectleader}}' sa_workorderid='{{detail.sa_workorderid}}' disabled="{{detail.status != '进行中' && (!isLeader || !isworkleader)}}" />
+	<WorkOrderTeam slot='服务团队' list='{{detail.team}}' projectleader='{{detail.projectleader}}' sa_workorderid='{{detail.sa_workorderid}}' disabled="{{detail.status != '进行中' || (detail.status == '进行中' && !isLeader && !isworkleader)}}" />
 	<WorkOrderProduct slot='工单服务商品' id='WorkOrderProduct' disabled="{{detail.status != '进行中'}}" />
 	<WorkOrderMaterial slot='工单物料' id='WorkOrderMaterial' />
 	<WorkOrderNotarizeBill slot='服务确认单' billData='{{detail}}' id='WorkOrderNotarizeBill' disabled="{{detail.status != '进行中'}}" />

E-service/workOrder/insert.js

@@ -129,7 +129,6 @@ Page({
   },
   onLoad(options) {
     getApp().globalData.Language.getLanguagePackage(this, '编辑工单');
-    this.getOptions();
     let form = this.data.form,
       data = getCurrentPages().find(v => v.__route__ == 'E-service/workOrder/detail').data.detail;
     data.region = data.province ? [data.province, data.city, data.county] : [];
@@ -148,6 +147,7 @@ Page({
       form,
       sa_workorderid: data.sa_workorderid
     })
+    this.getOptions();
   },
   submit() {
     this.setData({
@@ -191,39 +191,6 @@ Page({
   },
   getOptions() {
     let form = this.data.form;
-    // 服务类型
-    let servicetypes = _Http.servicetypes || [];
-    if (!servicetypes.length) {
-      _Http.basic({
-        "id": 20230206112003,
-        "content": {},
-      }).then(res => {
-        console.log("服务类型", res)
-        if (res.code == 1) {
-          servicetypes = res.data.map(v => {
-            return {
-              id: v.value,
-              name: v.value,
-            }
-          });
-          let data = form.find(v => v.valueName == 'servicetype');
-          data.radioList = servicetypes;
-          data.value = data.value || servicetypes[0].id;
-          _Http.servicetypes = servicetypes;
-          this.setData({
-            form
-          })
-        }
-      })
-    } else {
-      let data = form.find(v => v.valueName == 'servicetype');
-      data.radioList = servicetypes;
-      data.value = data.value || servicetypes[0].id;
-      this.setData({
-        form
-      })
-    }
-
     // 应用系统
     let class1s = _Http.class1s || [];
     if (!class1s.length) {

E-service/workOrder/team/index.js

@@ -136,6 +136,7 @@ Component({
           }).then(res => {
             getApp().globalData.Language.showToast(res.code == '1' ? "操作成功" : res.msg)
             if (res.code == 1) getCurrentPages().find(v => v.__route__ == 'E-service/workOrder/detail').getDetail()
+            this.getList(true)
           })
         }
       })

E-service/workOrder/team/index.wxml

@@ -30,7 +30,7 @@
 		<view style="height: 40rpx;" />
 		<view>
 			<block wx:for="{{workers}}" wx:key="rowindex">
-				<t-tag wx:if="{{projectleader!=item.name}}" style="margin: 5px 5px 0 0;" variant="{{wqp.query(teams,item.userid)?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectTeams">{{ item.name }}</t-tag>
+				<t-tag wx:if="{{projectleader != item.name}}" style="margin: 5px 5px 0 0;" variant="{{wqp.query(teams,item.userid)?'dark':'outline'}}" theme="primary" data-item="{{item}}" bindtap="selectTeams">{{ item.name }}</t-tag>
 			</block>
 		</view>
 	</view>

Eservice/signName/index.js

@@ -578,6 +578,7 @@ Page({
     })
   },
   uploadFile(res, data) {
+    console.log(233232)
     var that = this;
     wx.request({
       url: res.uploadurl,
@@ -617,7 +618,7 @@ Page({
     })
     wx.hideLoading()
     wx.navigateBack()
-    if (pages.data.disabled) api._post({
+    api._post({
       "id": 2025032710574302,
       "content": {
         "sa_workorderid": pages.data.bindSignNameData.ownerid