工单代码暂存

E-service/serviceImprovement/detail.js

@@ -37,7 +37,6 @@ Page({
       this.setData({
         detail: res.data
       })
-      this.setPreview(res);
       this.setTabbar()
       this.partialRenewal();
     })
@@ -78,25 +77,57 @@ Page({
           abortreasonShow: true
         })
         break;
-      case '退回':
-        this.setData({
-          backreasonShow: true
+      case '编辑':
+        wx.navigateTo({
+          url: `/E-service/serviceImprovement/edit`
         })
         break;
-      case '转工单':
-        wx.navigateTo({
-          url: "/E-service/serviceBillList/transferWorkOrder/transfer?id=" + detail.sa_service_improvementid + '&historicalservicesqty=' + detail.historicalservicesqty
+      case '撤回分析':
+        wx.showModal({
+          title: getApp().globalData.Language.getMapText('提示'),
+          content: getApp().globalData.Language.getMapText(`确认撤回分析吗`) + '?',
+          confirmBtn: getApp().globalData.Language.getMapText('确定'),
+          cancelBtn: getApp().globalData.Language.getMapText('取消'),
+          complete: ({
+            confirm
+          }) => {
+            if (confirm) _Http.basic({
+              "content": {
+                "sa_service_improvementid": detail.sa_service_improvementid
+              },
+              "id": "2026013111242402",
+            }).then(res => {
+              getApp().globalData.Language.showToast(res.code == '1' ? "撤回成功" : res.msg)
+              if (res.code == 1) that.getDetail();
+            })
+          }
         })
         break;
-      case '编辑':
-        wx.navigateTo({
-          url: `/E-service/serviceBillList/insert?type=${this.data.type}&edit=true`
+      case '撤回方案':
+        wx.showModal({
+          title: getApp().globalData.Language.getMapText('提示'),
+          content: getApp().globalData.Language.getMapText(`确认撤回方案吗`) + '?',
+          confirmBtn: getApp().globalData.Language.getMapText('确定'),
+          cancelBtn: getApp().globalData.Language.getMapText('取消'),
+          complete: ({
+            confirm
+          }) => {
+            if (confirm) _Http.basic({
+              "content": {
+                "sa_service_improvementid": detail.sa_service_improvementid
+              },
+              "id": "2026013111253202",
+            }).then(res => {
+              getApp().globalData.Language.showToast(res.code == '1' ? "撤回成功" : res.msg)
+              if (res.code == 1) that.getDetail();
+            })
+          }
         })
         break;
-      case '提交':
+      case '提交分析':
         wx.showModal({
           title: getApp().globalData.Language.getMapText('提示'),
-          content: getApp().globalData.Language.getMapText(`确认提交当前服务改善单吗`) + '?',
+          content: getApp().globalData.Language.getMapText(`确认提交分析吗`) + '?',
           confirmBtn: getApp().globalData.Language.getMapText('确定'),
           cancelBtn: getApp().globalData.Language.getMapText('取消'),
           complete: ({
@@ -104,11 +135,9 @@ Page({
           }) => {
             if (confirm) _Http.basic({
               "content": {
-                "sa_service_improvementid": detail.sa_service_improvementid,
-                "issumbit": 1,
-                backreason: ""
+                "sa_service_improvementid": detail.sa_service_improvementid
               },
-              "id": "20230206101403",
+              "id": "2026013111240602",
             }).then(res => {
               getApp().globalData.Language.showToast(res.code == '1' ? "提交成功" : res.msg)
               if (res.code == 1) that.getDetail();
@@ -116,10 +145,10 @@ Page({
           }
         })
         break;
-      case "删除":
+      case "发布方案":
         wx.showModal({
           title: getApp().globalData.Language.getMapText('提示'),
-          content: getApp().globalData.Language.getMapText(`确认删除当前改善单吗`) + '?',
+          content: getApp().globalData.Language.getMapText(`确认发布方案吗`) + '?',
           confirmBtn: getApp().globalData.Language.getMapText('确定'),
           cancelBtn: getApp().globalData.Language.getMapText('取消'),
           complete: ({
@@ -127,14 +156,12 @@ Page({
           }) => {
             if (confirm) _Http.basic({
               "content": {
-                "sa_service_improvementids": [detail.sa_service_improvementid],
+                "sa_service_improvementid": detail.sa_service_improvementid,
               },
-              "id": "20230206091803",
+              "id": "2026013111251602",
             }).then(res => {
-              getApp().globalData.Language.showToast(res.code == '1' ? "删除成功" : res.msg)
-              if (res.code == '1') setTimeout(() => {
-                wx.navigateBack()
-              }, 500);
+              getApp().globalData.Language.showToast(res.code == '1' ? "提交成功" : res.msg)
+              if (res.code == 1) that.getDetail();
             })
           }
         })
@@ -143,8 +170,10 @@ Page({
   },
   /* 底部功能 */
   async setTabbar() {
-    let status = this.data.detail.status,
+    let detail = this.data.detail;
+    let status = detail.status,
       tabbarList = [];
+    let userid = wx.getStorageSync('userMsg').userid;
     let options = {
       编辑: {
         icon: "icon-bianji2",
@@ -171,6 +200,22 @@ Page({
         label: "撤回方案"
       }
     };
+
+    let statusOptions = {
+      新建: ['编辑', '中止'],
+      分析已提交: ['中止'],
+      方案已发布: ['中止'],
+    }
+    if (detail.userid_analysis == userid) {
+      //真因分析负责人
+      statusOptions.新建.splice(1, 0, '提交分析')
+      statusOptions.分析已提交.unshift('撤回分析')
+    } else if (detail.userid_charge == userid) {
+      //改善方案责任人
+      statusOptions.分析已提交.unshift('发布方案')
+      statusOptions.方案已发布.unshift('撤回方案')
+    }
+
     if (statusOptions[status]) {
       tabbarList = statusOptions[status].map(v => options[v]);
     }
@@ -178,130 +223,6 @@ Page({
       tabbarList
     })
   },
-  setPreview(res) {
-    /* 基本信息 */
-    let list1 = [{
-      label: "改善单号",
-      value: res.data.billno
-    }, {
-      label: "单据日期",
-      value: res.data.billdate
-    }, {
-      label: "状态",
-      value: getApp().globalData.Language.getMapText(res.data.status),
-      style: `color:${this.data.sColors[res.data.status]}`
-    }, {
-      label: "企业名称",
-      value: res.data.enterprisename
-    }, {
-      label: "企业编号",
-      value: res.data.agentnum
-    }, {
-      label: "省市县",
-      value: res.data.province + res.data.city + res.data.county
-    }, {
-      label: "详细地址",
-      value: res.data.address
-    }, {
-      label: "关联订单",
-      value: res.data.sonum
-    }, {
-      label: "现场联系人",
-      value: res.data.scenecontact,
-    }, {
-      label: "身份备注",
-      value: res.data.scenecontactrole
-    }, {
-      label: "现场联系人电话",
-      value: res.data.scenecontactphonenumber
-    }, {
-      label: "应用系统",
-      value: res.data.class1
-    }, {
-      label: "服务开始日期",
-      value: res.data.begdate
-    }, {
-      label: "服务结束日期",
-      value: res.data.enddate
-    }, {
-      label: "问题描述",
-      value: res.data.reason
-    }, {
-      label: "业务员",
-      value: res.data.saler_name
-    }, {
-      label: "业务员电话",
-      value: res.data.saler_phonenumber
-    }, {
-      label: "项目名称",
-      value: res.data.projectnote
-    }, {
-      label: "异常类型",
-      value: res.data.exception_type
-    }, {
-      label: "服务等级",
-      value: res.data.service_level,
-      style: `color:${this.data.sColors[res.data.service_level]}`
-    }, {
-      label: "评估意见",
-      value: res.data.evaluation_comment
-    }, {
-      label: "备注",
-      value: res.data.remarks
-    }];
-    /* 系统信息 */
-    let list2 = [{
-      label: "创建人",
-      value: res.data.createby
-    }, {
-      label: "创建时间",
-      value: res.data.createdate
-    }, {
-      label: "最近编辑人",
-      value: res.data.changeby
-    }, {
-      label: "最近编辑时间",
-      value: res.data.changedate
-    }, {
-      label: "最近提交人",
-      value: res.data.submitby
-    }, {
-      label: "最近提交时间",
-      value: res.data.submitdate
-    }];
-    let list3 = [{
-      label: "供应方",
-      value: res.data.supplier
-    }];
-    let list4 = [{
-      label: "最近编辑人",
-      value: res.data.changeby
-    }, {
-      label: "最近编辑时间",
-      value: res.data.changedate
-    }, {
-      label: "转单人",
-      value: res.data.transformer
-    }, {
-      label: "转单时间",
-      value: res.data.transdate
-    }, {
-      label: "退回原因",
-      value: res.data.backreason
-    }, {
-      label: "中止原因",
-      value: res.data.abortreason
-    }, {
-      label: "中止时间",
-      value: res.data.abortdate
-    }];
-    this.setData({
-      list1,
-      list2,
-      list3,
-      list4
-    });
-  },
   //tabs 切换
   tabsChange({
     detail

E-service/serviceImprovement/detail.wxml

@@ -3,7 +3,7 @@
 		{{detail.billno}}
 	</view>
 	<view class="tabs">
-		<view class="tab">
+		<view class="tab" wx:if="{{detail.type}}">
 			{{language[detail.type]||detail.type}}
 		</view>
 		<view class="tab" style="background-color: {{tabColorS[detail.result].bgColor}};color:{{tabColorS[detail.result].color}};">

E-service/serviceImprovement/edit.js

@@ -0,0 +1,119 @@
+const _Http = getApp().globalData.http,
+  getTime = require("../../utils/getTime");
+
+Page({
+  data: {
+    loading: false,
+    showAll: false,
+    disabled: false,
+    form: [],
+    sa_service_improvementid: 0
+  },
+  onLoad(options) {
+    getApp().globalData.Language.getLanguagePackage(this, '编辑');
+    let form = [{
+        label: "类别",
+        error: false,
+        errMsg: "",
+        hint: "",
+        type: "radio",
+        value: "",
+        interrupt: false,
+        radioList: [],
+        valueName: "type", //绑定的字段名称
+        required: true, //必填
+        checking: `base`,
+      }, {
+        label: "备注",
+        error: false,
+        errMsg: "",
+        type: "textarea",
+        value: "",
+        placeholder: "请填写",
+        valueName: "remarks",
+        required: false,
+        checking: "base"
+      }],
+      data = getCurrentPages().find(v => v.__route__ == 'E-service/serviceImprovement/detail').data.detail;
+
+    _Http.basic({
+      "classname": "sysmanage.develop.optiontype.optiontype",
+      "method": "optiontypeselect",
+      "content": {
+        "pageNumber": 1,
+        "pageSize": 1000,
+        "typename": "improvementtype",
+      },
+    }).then(res => {
+      console.log("应用系统", res)
+      if (res.code == 1) {
+        let item = form.find(v => v.valueName == 'type');
+        item.radioList = res.data.map(v => {
+          return {
+            id: v.value,
+            name: v.value,
+          }
+        });;
+        item.value = data.type;
+        this.setData({
+          form
+        })
+      }
+    })
+    this.setData({
+      sa_service_improvementid: data.sa_service_improvementid
+    })
+  },
+  submit() {
+    this.setData({
+      loading: true
+    })
+    let content = {
+      sa_service_improvementid: this.data.sa_service_improvementid,
+      ...this.selectComponent("#Form").submit()
+    };
+    _Http.basic({
+      "id": 2026013111232202,
+      content
+    }).then(res => {
+      this.setData({
+        loading: false
+      })
+      console.log("编辑", res)
+      if (res.code == 1) {
+        getCurrentPages().find(v => v.__route__ == 'E-service/serviceImprovement/detail').getDetail();
+        wx.navigateBack({
+          success() {
+            wx.showToast({
+              title: getApp().globalData.Language.getMapText('保存成功'),
+              icon: "none",
+              mask: true
+            })
+          }
+        });
+      } else {
+        wx.showToast({
+          title: res.code != '1' ? res.msg : getApp().globalData.Language.getMapText('保存成功'),
+          icon: "none",
+          mask: true
+        })
+      }
+    })
+  },
+  // 是否显示全部
+  onChange({
+    detail
+  }) {
+    this.setData({
+      showAll: detail
+    })
+  },
+  /* 表单必填项是否完成 */
+  onConfirm({
+    detail
+  }) {
+    this.setData({
+      disabled: detail
+    })
+  }
+})

E-service/serviceImprovement/edit.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

E-service/serviceImprovement/edit.scss

@@ -0,0 +1,24 @@
+.new-footer {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	position: fixed;
+	width: 100vw;
+	height: 130rpx;
+	background: #FFFFFF;
+	box-shadow: 0px -4rpx 16rpx 2rpx rgba(150, 157, 165, 0.16);
+	bottom: 0;
+	z-index: 9999;
+
+	.new-submit {
+			width: 156rpx;
+			height: 90rpx;
+			background: #3874F6;
+			border-radius: 8rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC-Bold, PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			margin-right: 30rpx;
+	}
+}

E-service/serviceImprovement/edit.wxml

@@ -0,0 +1,6 @@
+<Yl_Headline title='基本信息' type='switch' switchLabel='仅显示必填信息' switch='{{showAll}}' bind:callBack='onChange' />
+<Yl_Field id='Form'bind:interrupt='interrupt' form='{{form}}' showAll='{{!showAll}}' bind:onConfirm='onConfirm' bind:interrupt="interrupt" />
+<view style="height: 150rpx;" />
+<view class="new-footer">
+    <van-button custom-class='new-submit' disabled='{{disabled || loading}}' loading='{{loading}}' bindclick='submit'>{{language['确定']||'确定'}}</van-button>
+</view>

E-service/serviceImprovement/index.wxml

@@ -1,9 +1,9 @@
-<Yl_Head2 tabs="{{[{title:'真因分析'},{title:'改善方案'},{title:'方案执行'},{title:'完成'},{title:'中止'}]}}" bind:onSearch='onSearch' bind:onChangeTab='onChangeTab' />
+<Yl_Head2 threshold='3' tabs="{{[{title:'真因分析'},{title:'改善方案'},{title:'方案执行'},{title:'完成'},{title:'中止'}]}}" bind:onSearch='onSearch' bind:onChangeTab='onChangeTab' />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
 	<navigator class="item" url="/E-service/serviceImprovement/detail?id={{item.sa_service_improvementid}}" wx:for="{{list}}" wx:key="sa_serviceorderid">
 		<view class="head">
 			<view class="tabs">
-				<view class="tab">
+				<view class="tab" wx:if="{{item.type}}">
 					{{language[item.type]||item.type}}
 				</view>
 				<view class="tab" style="background-color: {{tabColorS[item.result].bgColor}};color:{{tabColorS[item.result].color}};">

E-service/workOrder/detail.js

@@ -28,12 +28,15 @@ Page({
       label: "服务商品",
       model: "#Product"
     }, {
-      label: "申请信息"
+      label: "工序详情",
+      model: "#Nodes"
     }, {
       label: "工单物料",
       model: "#Material"
     }, {
-      label: "工单信息"
+      label: "服务确认单"
+    }, {
+      label: "服务团队"
     }],
     tabsActive: 0,
     reason: {
@@ -51,6 +54,8 @@ Page({
     this.getDetail()
   },
   getDetail() {
+    /* ①通用模板（服务商品、服务确认单、服务团队、工单信息）
+②工序模板（工序详情、工单物料、服务确认单、服务团队、工单信息） */
     _Http.basic({
       "id": 20230208140103,
       "content": {

E-service/workOrder/detail.json

@@ -2,6 +2,7 @@
   "usingComponents": {
     "Preview": "../components/preview/index",
     "Product": "./product/index",
-    "Material": "./material/index"
+    "Material": "./material/index",
+    "Nodes": "./nodes/index"
   }
 }

E-service/workOrder/detail.wxml

@@ -59,6 +59,7 @@
 <view style="height: 20rpx;" />
 <Yl_FunTabs list='{{tabsList}}' showIcon='{{false}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
 	<Preview slot='工单信息' list1='{{list1}}' list2='{{list2}}' />
+	<Nodes id='Nodes' slot='工序详情' nodes='{{detail.nodes}}' status="{{detail.status}}" />
 	<Product slot='服务商品' id='Product' disabled="{{detail.status != '进行中'}}" />
 	<Material slot='工单物料' id='Material' />
 	<view style="height: 180rpx;" />

E-service/workOrder/index.js

@@ -78,7 +78,7 @@ Page({
       index: null,
       showName: "value", //显示字段
       valueKey: "isout", //返回Key
-      selectKey: "value", //传参 代表选着字段 不传参返回整个选择对象
+      selectKey: "id", //传参 代表选着字段 不传参返回整个选择对象
       value: "", //选中值
       list: [{
         id: 1,

E-service/workOrder/nodes/index.js

@@ -0,0 +1,44 @@
+const _Http = getApp().globalData.http;
+
+Component({
+  properties: {
+    nodes: {
+      type: Object
+    },
+    prefix: {
+      type: Number,
+      value: 0
+    },
+    status: {
+      type: String
+    }
+  },
+  lifetimes: {
+    attached: function () {
+      getApp().globalData.Language.getLanguagePackage(this)
+      console.log(this.data.prefix, this.data.nodes)
+    }
+  },
+  data: {
+
+  },
+  methods: {
+    toWork(e) {
+      const {
+        item
+      } = e.currentTarget.dataset;
+      try {
+        if (item.child.length) return;
+      } catch (error) {
+        item.child = [];
+      }
+      if (item.child.length) return;
+      item.title = (this.data.prefix ? this.data.prefix + '-' : '') + item.rowindex + '. ' + item.workpresetjson.workname;
+      item.status1 = this.data.status;
+      _Http.data = item;
+      wx.navigateTo({
+        url: '/E-service/workOrder/nodes/work',
+      })
+    },
+  }
+})

E-service/workOrder/nodes/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "Nodes": "/E-service/workOrder/nodes/index"
+  }
+}

E-service/workOrder/nodes/index.scss

@@ -0,0 +1,52 @@
+
+.node {
+	display: flex;
+	padding: 10rpx;
+	font-family: Microsoft YaHei, Microsoft YaHei;
+	border-radius: 8rpx;
+	background-color: #fff;
+
+	.label,
+	.number {
+			font-size: 32rpx;
+	}
+
+	.number {
+			margin-right: 10rpx;
+	}
+
+	.stuta {
+			margin-top: 20rpx;
+			display: flex;
+
+			.tag {
+					border-radius: 8rpx;
+					padding: 8rpx 12rpx;
+					font-size: 24rpx;
+					color: #fff;
+			}
+	}
+
+	.images {
+			display: flex;
+			flex-wrap: wrap;
+
+			.image {
+					margin-top: 20rpx;
+					margin-right: 20rpx;
+			}
+	}
+}
+
+
+.child {
+	margin-left: -55rpx;
+	width: calc(100% + 65rpx);
+	transform: scale(0.9);
+
+	.label,
+	.number {
+			color: #333;
+	}
+
+}

E-service/workOrder/nodes/index.wxml

@@ -0,0 +1,19 @@
+<view class="{{prefix ? 'node child' : 'node'}}" hover-class="navigator-hover" wx:for="{{nodes}}" key="sa_workorder_nodeid" data-item="{{item}}" catch:tap="toWork">
+	<view class="number">
+		{{ (prefix ? prefix + '-' : '') + item.rowindex }}.
+	</view>
+	<view style="flex: 1;">
+		<view class="label">
+			{{ item.workpresetjson.workname }}
+		</view>
+		<Nodes wx:if="{{!prefix && item.child.length}}" status='{{status}}' nodes="{{item.child}}" prefix="{{(prefix ? prefix + '-' : '') + item.rowindex}}" />
+		<block wx:else>
+			<Yl_Files id="Yl_Files" attinfos='{{item.attinfos}}' />
+			<view class="stuta">
+				<view class="tag" style="background-color: #E64D55;" wx:if="{{item.status == '0'}}">未完成</view>
+				<view class="tag" style="background-color: #06A971;" wx:if="{{item.status == '1'}}">已完成</view>
+				<view class="tag" style="background-color: #70B603;" wx:if="{{item.status == '2'}}">进行中</view>
+			</view>
+		</block>
+	</view>
+</view>

E-service/workOrder/nodes/work.js

@@ -0,0 +1,9 @@
+const _Http = getApp().globalData.http;
+Page({
+  data: {
+
+  },
+  onLoad(options) {
+    console.log("_Http", _Http)
+  },
+})

E-service/workOrder/nodes/work.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

app.json

@@ -98,7 +98,9 @@
         "serviceBillList/transferWorkOrder/transfer",
         "workOrder/confirm",
         "workOrder/takeOrder",
-        "serviceBillList/transferWorkOrder/progress"
+        "serviceBillList/transferWorkOrder/progress",
+        "serviceImprovement/edit",
+        "workOrder/nodes/work"
       ]
     },
     {

components/Yl_Head2/index.js

@@ -26,6 +26,10 @@ Component({
     },
     onSearch: {
       type: Function
+    },
+    threshold: {
+      type: [String, Number],
+      value: 4
     }
   },
   data: {

components/Yl_Head2/index.wxml

@@ -1,6 +1,6 @@
 <view class="tabs">
 	<view style="flex: 1;width: 0;">
-		<van-tabs swipe-threshold='4' active="{{ active }}" tab-active-class='tab-active-class' color='#3874F6' bind:change="onChange">
+		<van-tabs swipe-threshold='{{threshold}}' active="{{ active }}" tab-active-class='tab-active-class' color='#3874F6' bind:change="onChange">
 			<van-tab wx:for="{{tabs}}" wx:key="title" title="{{language[item.title]||item.title}}" />
 		</van-tabs>
 	</view>

project.private.config.json

@@ -24,12 +24,26 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "老工单详情",
+          "pathName": "/Eservice/workerLeader/editworkOrderDetail/index",
+          "query": "id=1370",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "工序工单",
+          "pathName": "E-service/workOrder/detail",
+          "query": "id=1370",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "进度",
           "pathName": "E-service/serviceBillList/transferWorkOrder/progress",
           "query": "",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "改善单详情",
@@ -52,13 +66,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "老工单详情",
-          "pathName": "/Eservice/workerLeader/editworkOrderDetail/index",
-          "query": "id=1387",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "工单详情",
           "pathName": "E-service/workOrder/detail",