服务工单商品添加删除

E-service/serviceBillList/detail.wxml

@@ -68,7 +68,7 @@
 	<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 != '进行中'}}" />
+	<WorkOrderProduct slot='工单服务商品' id='WorkOrderProduct' disabled="{{true}}" />
 	<WorkOrderMaterial slot='工单物料' id='WorkOrderMaterial' />
 	<WorkOrderNotarizeBill slot='服务确认单' billData='{{workDetail}}' id='WorkOrderNotarizeBill' disabled="{{true}}" />
 

E-service/serviceImprovement/detail.wxml

@@ -66,7 +66,7 @@
 	<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 != '进行中'}}" />
+	<WorkOrderProduct slot='工单服务商品' id='WorkOrderProduct' disabled="{{true}}" />
 	<WorkOrderMaterial slot='工单物料' id='WorkOrderMaterial' />
 	<WorkOrderNotarizeBill slot='服务确认单' billData='{{workDetail}}' id='WorkOrderNotarizeBill' disabled="{{true}}" />
 

E-service/workOrder/detail.wxml

@@ -67,7 +67,7 @@
 		<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 != '进行中' || (detail.status == '进行中' && !isLeader && !isworkleader)}}" />
-	<WorkOrderProduct slot='工单服务商品' id='WorkOrderProduct' disabled="{{detail.status != '进行中'}}" />
+	<WorkOrderProduct slot='工单服务商品' id='WorkOrderProduct' disabled="{{detail.status != '进行中' || (detail.status == '进行中' && !isLeader && !isworkleader)}}" />
 	<WorkOrderMaterial slot='工单物料' id='WorkOrderMaterial' />
 	<WorkOrderNotarizeBill slot='服务确认单' billData='{{detail}}' id='WorkOrderNotarizeBill' disabled="{{detail.status != '进行中'}}" />
 	<Improvement slot='关联改善单' id='Improvement' idname='2026022709163402' />

E-service/workOrder/index.js

@@ -41,7 +41,7 @@ Page({
   },
   async onLoad(options) {
     this.getList()
-    getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+    getApp().globalData.Language.getLanguagePackage(this, '工单');
 
     let filtratelist = [{
       label: "工单类型",

E-service/workOrder/product/index.js

@@ -33,7 +33,15 @@ Component({
     list: [],
     showSearch: false,
     focus: false,
-    condition: ""
+    condition: "",
+    actionShow: false,
+    actions: [{
+      name: getApp().globalData.Language.getMapText('自服务申请单添加'),
+      value: "自服务申请单添加",
+    }, {
+      name: getApp().globalData.Language.getMapText('自产品档案添加'),
+      value: "自产品档案添加"
+    }]
   },
   methods: {
     getList(id, init = false) {
@@ -124,6 +132,115 @@ Component({
         })
       }, 300)
     },
+    deleteItem(e) {
+      const {
+        item
+      } = e.currentTarget.dataset,
+        that = this;
+      wx.showModal({
+        content: getApp().globalData.Language.getMapText(`是否确定删除该产品`),
+        complete: ({
+          confirm
+        }) => {
+          if (confirm) _Http.basic({
+            "id": "20230215202003",
+            "content": {
+              "sa_workorder_node_itemsids": [item.sa_workorder_node_itemsid]
+            },
+          }).then(res => {
+            wx.showToast({
+              title: res.code == 1 ? getApp().globalData.Language.getMapText(`删除成功`) : res.msg,
+              icon: "none"
+            })
+            if (res.code == 1) {
+              that.getList('', true)
+            }
+          })
+        }
+      })
+    },
+    selectorMode(e) {
+      let {
+        value
+      } = e.detail;
+      wx.navigateTo({
+        url: `/E-service/serviceBillList/product/select?params=${JSON.stringify({
+          "content": {
+          "sa_workorderid":this.data.sa_workorderid,
+          "type": value == '自产品档案添加'?1:2,//1档案,2：申请单
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+          "condition": ""
+          }},
+          "id": "2026022710102502",
+          })}`
+      });
+      getApp().globalData.handleSelect = this.handleSelect.bind(this)
+      this.cancelSelector()
+    },
+    /* 处理新增产品 */
+    handleSelect(detail) {
+      let that = this;
+      wx.showModal({
+        cancelText: getApp().globalData.Language.getMapText('取消'),
+        confirmText: getApp().globalData.Language.getMapText('确定'),
+        title: getApp().globalData.Language.getMapText('提示'),
+        content: getApp().globalData.Language.joint([{
+          v: '是否确认添加',
+          t: 1
+        }, {
+          v: detail.result.length,
+          t: 1,
+          r: ' ',
+          f: " "
+        }, {
+          v: '件商品',
+          t: 1,
+          r: '？',
+        }]),
+        complete: (res) => {
+          if (res.confirm) _Http.basic({
+            "id": "20230215201903",
+            "content": {
+              "sa_workorder_nodeid": 0,
+              sa_workorderid: this.data.sa_workorderid,
+              "iteminfos": detail.list.map(v => {
+                return {
+                  "sa_workorder_node_itemsid": 0,
+                  "problem_description": "",
+                  "processing": "",
+                  "result": "",
+                  "reason": "",
+                  "qty": 1,
+                  "itemid": v.itemid
+                }
+              })
+            },
+          }).then(s => {
+            console.log('新增产品', s)
+            wx.showToast({
+              title: s.code == '1' ? getApp().globalData.Language.getMapText('添加成功') : s.msg,
+              icon: "none"
+            });
+            if (s.code == '1') setTimeout(() => {
+              that.getList('', true);
+              wx.navigateBack();
+            }, 300)
+          })
+        }
+      });
+    },
+    addProduct() {
+      this.setData({
+        actionShow: true
+      })
+    },
+    cancelSelector() {
+      this.setData({
+        actionShow: false
+      })
+    },
     onChange({
       detail
     }) {

E-service/workOrder/product/index.wxml

@@ -7,6 +7,9 @@
     <navigator url="#" class="but" bindtap="toSearch">
       <van-icon name="search" />
     </navigator>
+    <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="addProduct">
+      <van-icon name="plus" />
+    </navigator>
   </view>
 </view>
 
@@ -64,7 +67,12 @@
           <textarea auto-height placeholder-style='line-height:58rpx;' placeholder="{{language['原因分析']||'原因分析'}}" value="{{item.reason}}" data-name='reason' disabled="{{disabled}}" data-index="{{index}}" data-item="{{item}}" bindblur='onBlur' />
         </view>
       </view>
+      <navigator wx:if="{{!disabled}}" url="#" class="iconfont-box" data-item="{{item}}" bind:tap="deleteItem">
+        <view class="iconfont icon-guanlian-shanchu" />
+      </navigator>
     </view>
   </view>
 </view>
-<Yl_Empty wx:if="{{list.length==0}}" />
+<Yl_Empty wx:if="{{list.length==0}}" />
+
+<van-action-sheet show="{{ actionShow }}" actions="{{ actions }}" bind:select='selectorMode' bind:cancel='cancelSelector' bind:click-overlay='cancelSelector' z-index='999999999' cancel-text="{{language['取消']||'取消'}}" />

project.private.config.json

@@ -31,6 +31,13 @@
           "scene": null,
           "launchMode": "default"
         },
+        {
+          "name": "E-service/workOrder/detail",
+          "pathName": "E-service/workOrder/detail",
+          "query": "id=1406",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "E-service/workOrder/detail",
           "pathName": "E-service/workOrder/detail",