优化

E-service/serviceBillList/detail.wxml

@@ -70,7 +70,7 @@
 	<WorkOrderTeam slot='服务团队' list='{{workDetail.team}}' projectleader='{{workDetail.projectleader}}' sa_workorderid='{{workDetail.sa_workorderid}}' disabled="{{true}}" />
 	<WorkOrderProduct slot='工单服务商品' id='WorkOrderProduct' sa_serviceorderid='{{detail.sa_serviceorderid}}' disabled="{{true}}" />
 	<WorkOrderMaterial slot='工单物料' id='WorkOrderMaterial' />
-	<WorkOrderNotarizeBill slot='服务确认单' billData='{{workDetail}}' id='WorkOrderNotarizeBill' class2='&class=stopClick' disabled="{{true}}" />
+	<WorkOrderNotarizeBill slot='服务确认单' billData='{{workDetail}}' id='WorkOrderNotarizeBill' class1='&class=stopClick' disabled="{{true}}" />
 
 	<Record slot='操作记录' id="Record" ownertable='sa_serviceorder' ownerid='{{detail.sa_serviceorderid}}' />
 	<Files slot='附件' id="Files" ownertable='sa_serviceorder' ownerid='{{detail.sa_serviceorderid}}' />

E-service/serviceBillList/insert.js

@@ -198,7 +198,7 @@ Page({
             "pageNumber": 1,
             "where": {
               "condition": "",
-              "type": 23
+              "type": this.data.type == 'admin' ? '' : 23
             }
           },
         },

E-service/serviceImprovement/detail.js

@@ -280,7 +280,7 @@ Page({
       }, {
         label: "改善结果",
         value: res.data.result,
-        style: `color:${this.data.tabColorS[res.data.result].color}`
+        style: res.data.result ? `color:${this.data.tabColorS[res.data.result].color}` : ''
       }, {
         label: "备注",
         value: res.data.remarks

E-service/serviceImprovement/execute/index.js

@@ -36,9 +36,6 @@ Component({
       }
     },
     list: [],
-    record: "",
-    "sa_service_improvement_planid": 0,
-    "sa_service_improvement_recordid": 0,
     unfolds: []
   },
   methods: {
@@ -56,48 +53,15 @@ Component({
         unfolds
       })
     },
-    areaInput(e) {
-      this.setData({
-        record: e.detail.value
-      })
-    },
-    onRecord(e) {
-      let that = this;
-      setTimeout(() => {
-        let record = that.data.record;
-        if (record == '') return wx.showToast({
-          title: getApp().globalData.Language.getMapText("请填写改善记录"),
-          icon: "none"
-        })
-        _Http.basic({
-          "content": {
-            "sa_service_improvementid": that.data.sa_service_improvementid,
-            "sa_service_improvement_planid": that.data.sa_service_improvement_planid,
-            "sa_service_improvement_recordid": that.data.sa_service_improvement_recordid,
-            record
-          },
-          "id": 2026020210270102,
-        }).then(res => {
-          getApp().globalData.Language.showToast(res.code == '1' ? "保存成功" : res.msg)
-          if (res.code == 1) that.getList('', true);
-        })
-      });
-
-    },
-    onCancel() {
-      this.setData({
-        sa_service_improvement_planid: 0
-      })
-    },
     add(e) {
       const {
         item
       } = e.currentTarget.dataset;
-      this.setData({
-        sa_service_improvement_planid: item.sa_service_improvement_planid,
-        sa_service_improvement_recordid: 0,
-        record: ""
+      wx.navigateTo({
+        url: `/E-service/serviceImprovement/record?sa_service_improvementid=${this.data.sa_service_improvementid}&sa_service_improvement_planid=${item.sa_service_improvement_planid}&sa_service_improvement_recordid=0&record=`
       })
+      _Http.basic.updateExe = this.getList.bind(this)
+      _Http.basic.attinfos = []
     },
     getList(id, init = false) {
       console.log("getList", id)
@@ -152,7 +116,7 @@ Component({
               let page = getCurrentPages().find(v => v.__route__ == 'E-service/serviceImprovement/detail')
               page.getDetail()
             } catch (error) {
-              console.log("更新详情失败",error)
+              console.log("更新详情失败", error)
             }
           })
         }
@@ -188,12 +152,11 @@ Component({
       const {
         item
       } = e.currentTarget.dataset;
-      this.setData({
-        "sa_service_improvement_planid": item.sa_service_improvement_planid,
-        "sa_service_improvement_recordid": item.sa_service_improvement_recordid,
-        record: item.record
+      wx.navigateTo({
+        url: `/E-service/serviceImprovement/record?sa_service_improvementid=${this.data.sa_service_improvementid}&sa_service_improvement_planid=${item.sa_service_improvement_planid}&sa_service_improvement_recordid=${item.sa_service_improvement_recordid}&record=${item.record}&attachmentids=${item.attachmentids || ''}`
       })
-      console.log(item)
+      _Http.basic.attinfos = item.attinfos || [];
+      _Http.basic.updateExe = this.getList.bind(this)
     }
   }
 })

E-service/serviceImprovement/execute/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "van-transition": "@vant/weapp/transition/index"
+    "van-transition": "@vant/weapp/transition/index",
+    "Yl_Files": "/components/Yl_Files/index"
   }
 }

E-service/serviceImprovement/execute/index.wxml

@@ -24,19 +24,16 @@
       <view class="rows" wx:for="{{item.recordRows}}" wx:for-item="it" wx:for-index="i" wx:key="sa_service_improvement_recordid">
         <view class="changedate">{{it.changedate}}</view>
         <view class="record">{{it.record}}</view>
-
         <view class="right" wx:if="{{!disabled && item.status!='已完成' && (userid==item.userid_charge)}}">
           <navigator class="iconfont icon-bianji2" style="margin-right: 20rpx;" data-item="{{it}}" bind:tap="editItem" url="#"></navigator>
           <navigator class="iconfont icon-shanchu1" url="#" data-item="{{it}}" bind:tap="deteleItem"></navigator>
         </view>
+        <Yl_Files id="Yl_Files" attinfos='{{it.attinfos}}' />
       </view>
+
     </van-transition>
   </view>
 </view>
-<van-dialog show="{{ sa_service_improvement_planid!=0 }}" confirmButtonText="{{language['确定']||'确定'}}" cancelButtonText="{{language['取消']||'取消'}}" use-slot title="{{language['改善记录']||'改善记录'}}" show-cancel-button confirm-button-color='#3874F6' bind:confirm='onRecord' bind:cancel='onCancel'>
-  <textarea placeholder="{{language['改善记录']||'改善记录'}}" value="{{record}}" data-name="record" bindinput="areaInput" class="textarea" />
-</van-dialog>
-
 
 <Yl_Empty wx:if="{{list.length==0}}" />
 

E-service/serviceImprovement/record.js

@@ -0,0 +1,103 @@
+const _Http = getApp().globalData.http;
+
+Page({
+  data: {
+    loading: false,
+    record: "",
+    sa_service_improvementid: 0,
+    sa_service_improvement_planid: 0,
+    sa_service_improvement_recordid: 0
+  },
+  onLoad(options) {
+    getApp().globalData.Language.getLanguagePackage(this, '改善记录');
+    this.setData({
+      sa_service_improvementid: options.sa_service_improvementid || 0,
+      sa_service_improvement_planid: options.sa_service_improvement_planid || 0,
+      sa_service_improvement_recordid: options.sa_service_improvement_recordid || 0,
+      record: options.record || ""
+    })
+    if (_Http.basic.attinfos.length) this.selectComponent("#Yl_Files").handleFiles(_Http.basic.attinfos);
+  },
+  changeState({
+    detail
+  }) {
+    this.setData({
+      loading: detail
+    })
+  },
+  /* 绑定媒体 */
+  insertImgEdit({
+    detail
+  }) {
+    this.handleFileLink(detail)
+  },
+
+  handleFileLink(attachmentids = []) {
+    if (attachmentids.length) _Http.basic({
+      "classname": "system.attachment.Attachment",
+      "method": "createFileLink",
+      "content": {
+        ownertable: "sa_service_improvement_record",
+        ownerid: this.data.sa_service_improvement_recordid || 0,
+        usetype: 'default',
+        attachmentids
+      }
+    }).then(res => {
+      console.log('跟进记录绑定附件', res)
+      if (res.code != '1') return wx.showToast({
+        title: res.msg,
+        icon: "none"
+      })
+      this.selectComponent("#Yl_Files").handleFiles(res.data)
+    })
+  },
+  areaInput(e) {
+    this.setData({
+      record: e.detail.value
+    })
+  },
+  submit() {
+    let record = this.data.record;
+    if (record == '') return wx.showToast({
+      title: getApp().globalData.Language.getMapText("请填写改善记录"),
+      icon: "none"
+    })
+    this.setData({
+      loading: true
+    })
+    _Http.basic({
+      "content": {
+        "sa_service_improvementid": this.data.sa_service_improvementid,
+        "sa_service_improvement_planid": this.data.sa_service_improvement_planid,
+        "sa_service_improvement_recordid": this.data.sa_service_improvement_recordid,
+        record
+      },
+      "id": 2026020210270102,
+    }).then(res => {
+      this.setData({
+        loading: false
+      })
+      getApp().globalData.Language.showToast(res.code == '1' ? "保存成功" : res.msg)
+      if (res.code == 1) {
+        this.setData({
+          sa_service_improvement_recordid: res.data.sa_service_improvement_recordid
+        })
+        this.handleFileLink(this.selectComponent("#Yl_Files").getFiles().attachmentids)
+        setTimeout(() => {
+          _Http.basic.updateExe && _Http.basic.updateExe('', true)
+          wx.navigateBack()
+        }, 300);
+      }
+    })
+  },
+  onUnload() {
+    // 返回时刷新列表
+    let pages = getCurrentPages();
+    if (pages.length > 1) {
+      let page = pages[pages.length - 2];
+      if (page && page.getList) {
+        page.getList('', true);
+      }
+    }
+  }
+})

E-service/serviceImprovement/record.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "Yl_Upload": "/components/Yl_Upload/index",
+    "Yl_Files": "/components/Yl_Files/index"
+  }
+}

E-service/serviceImprovement/record.scss

@@ -0,0 +1,84 @@
+.page {
+	width: 100vw;
+	box-sizing: border-box;
+	margin-top: 20rpx;
+	background-color: #fff;
+
+	.content {
+			border-radius: 8rpx;
+			padding: 30rpx;
+			box-sizing: border-box;
+
+			.title {
+					font-size: 32rpx;
+					font-family: PingFang SC-Bold, PingFang SC;
+					color: #333333;
+					font-weight: bold;
+					margin-bottom: 30rpx;
+			}
+
+			.textarea {
+					width: 100%;
+					min-height: 200rpx;
+					padding: 20rpx;
+					box-sizing: border-box;
+					background-color: #F7F8FA;
+					border-radius: 8rpx;
+					font-size: 28rpx;
+					color: #333333;
+					margin-bottom: 30rpx;
+			}
+
+			.upload {
+					display: flex;
+					align-items: center;
+					width: 100%;
+					height: 88rpx;
+					box-sizing: border-box;
+					margin-bottom: 20rpx;
+
+					.upload-title {
+							flex: 1;
+							font-size: 28rpx;
+							font-family: PingFang SC-Regular, PingFang SC;
+							color: #333333;
+							font-weight: bold;
+					}
+
+					navigator {
+							width: 100rpx;
+							height: 80rpx;
+							line-height: 80rpx;
+							text-align: center;
+							padding: 0;
+					}
+			}
+
+	}
+}
+
+
+.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/record.wxml

@@ -0,0 +1,31 @@
+<view class="page">
+  <view class="content">
+  <view class="title">{{language['改善记录']||'改善记录'}}</view>
+    <textarea
+      placeholder="{{language['请填写改善记录']||'请填写改善记录'}}"
+      value="{{record}}"
+      bindinput="areaInput"
+      class="textarea"
+      maxlength="-1"
+      auto-height
+    />
+    <view class="upload">
+        <view class="upload-title">{{language['附件']||'附件'}}</view>
+        <Yl_Upload accept='media' binduploadCallback="insertImgEdit" bindchangeState='changeState'>
+            <navigator url="#">
+                <text class="iconfont icon-a-tonggaofujian" />
+            </navigator>
+        </Yl_Upload>
+        <Yl_Upload accept='file' binduploadCallback="insertImgEdit" bindchangeState='changeState'>
+            <navigator url="#">
+                <text class="iconfont icon-a-biaoqianlanzhiku" />
+            </navigator>
+        </Yl_Upload>
+    </view>
+    <Yl_Files delete id="Yl_Files" strict ownertable="sa_service_improvement_record" />
+  </view>
+</view>
+<view style="height: 150rpx;" />
+<view class="new-footer">
+    <van-button custom-class='new-submit' disabled='{{loading}}' loading='{{loading}}' bindclick='submit'>{{language['确定']||'确定'}}</van-button>
+</view>

E-service/workOrder/detail.js

@@ -196,7 +196,8 @@ Page({
       _Http.basic({
         "content": {
           "sa_workorderid": that.data.detail.sa_workorderid,
-          "isout": isout
+          "isout": isout,
+          userid: that.data.detail.team.find(v => v.isleader).userid
         },
         "id": 20230210101103,
       }).then(res => {

app.json

@@ -103,7 +103,8 @@
         "serviceImprovement/edit",
         "workOrder/nodes/work",
         "serviceImprovement/analysis/change",
-        "serviceImprovement/scheme/insert"
+        "serviceImprovement/scheme/insert",
+        "serviceImprovement/record"
       ]
     },
     {

components/Yl_Files/index.js

@@ -33,6 +33,7 @@ Component({
     },
     observers: {
         'attinfos': function (attinfos) {
+            console.log("attinfos",attinfos)
             this.initData();
             this.handleFiles(attinfos, true)
         }

components/Yl_FunTabs/index.wxss

@@ -91,8 +91,11 @@
     font-family: PingFang SC, PingFang SC;
     font-size: 24rpx;
     color: #333333;
-    padding: 6rpx 12rpx;
+    padding: 6rpx 0rpx;
     margin: 10rpx 10rpx 0 0;
+    width: 170rpx;
+    box-sizing: border-box;
+    text-align: center;
 }
 
 .flat-container  .active {

project.private.config.json

@@ -24,12 +24,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "E-service/serviceImprovement/detail",
+          "pathName": "E-service/serviceImprovement/detail",
+          "query": "id=35",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "Eservice/nodeDetail/index",
           "pathName": "Eservice/nodeDetail/index",
           "query": "id=6189&wid=1422",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "E-service/serviceImprovement/detail",