任务

packageA/work/add.js

@@ -18,7 +18,7 @@ Page({
             label: "任务要求",
             error: false,
             errMsg: "",
-            type: "textarea",
+            type: "sex",
             value: "",
             placeholder: "",
             valueName: "remarks",
@@ -39,22 +39,76 @@ Page({
         }],
         "content": {
             "sys_taskid": 0,
-            "ownertable": "sys_task",
-            "ownerid": 0,
         },
         disabled: true
     },
     onLoad(options) {
         if (options.data) {
             let data = JSON.parse(options.data);
+            console.log(data)
+            data.starttime1 = data.starttime.split(" ")[1]
+            data.starttime = data.starttime.split(" ")[0]
+            data.endtime1 = data.endtime.split(" ")[1]
+            data.endtime = data.endtime.split(" ")[0]
+
+            let form = this.data.form.concat([{
+                label: "开始时间",
+                error: false,
+                errMsg: "",
+                type: "time",
+                value: "00:00",
+                interrupt: true,
+                placeholder: "开始时间",
+                valueName: "starttime1",
+                checking: "base",
+                required: false
+            }, {
+                label: "截止日期",
+                error: false,
+                errMsg: "",
+                type: "date",
+                start: data.value,
+                value: "",
+                interrupt: true,
+                placeholder: "截止日期",
+                valueName: "endtime",
+                checking: "base",
+                required: false
+            }, {
+                label: "截止时间",
+                error: false,
+                errMsg: "",
+                type: "time",
+                value: "00:00",
+                interrupt: true,
+                placeholder: "截止时间",
+                valueName: "endtime1",
+                checking: "base",
+                required: false
+            }, {
+                label: "提醒时间",
+                error: false,
+                errMsg: "",
+                type: "namber",
+                value: "",
+                placeholder: "结束时间前几天提醒",
+                valueName: "remindday",
+                checking: "base",
+                required: false
+            }]);
             this.setData({
+                "content.sys_taskid": data.sys_taskid,
                 disabled: false,
-                form: this.data.form.map(v => {
+                form: form.map(v => {
                     if (data[v.valueName]) v.value = data[v.valueName];
                     return v
                 })
             })
         }
+        this.setData({
+            "content.ownertable": options.ownertable || "sys_task",
+            "content.ownerid": options.ownerid || 0
+        })
     },
     /* 打断处理form */
     interrupt(e) {
@@ -145,15 +199,17 @@ Page({
             if (res.msg == '成功') setTimeout(() => {
                 getCurrentPages().forEach(v => {
                     if (v.__route__ == 'packageA/work/index') {
+                        console.log(555)
                         let index = v.data.list.findIndex(v => v.sys_taskid == res.data.sys_taskid);
+                        console.log(555)
                         if (index == -1) {
                             v.data.list.unshift(res.data)
-                            this.setData({
+                            v.setData({
                                 list: v.data.list,
                                 "content.total": v.data.content.total + 1
                             })
                         } else {
-                            this.setData({
+                            v.setData({
                                 [`list[${index}]`]: res.data
                             })
                         }
@@ -161,12 +217,17 @@ Page({
                 });
                 let pages = getCurrentPages(),
                     page = pages[pages.length - 2];
-                if (page.__route__ == 'packageA/work/index') wx.redirectTo({
-                    url: '/packageA/work/detail?id=' + res.data.sys_taskid,
-                    fail(err) {
-                        console.log(err)
-                    }
-                })
+                if (page.__route__ == 'packageA/work/index') {
+                    wx.redirectTo({
+                        url: '/packageA/work/detail?id=' + res.data.sys_taskid,
+                        fail(err) {
+                            console.log(err)
+                        }
+                    })
+                } else if (page.__route__ == 'packageA/work/detail') {
+                    wx.navigateBack();
+                    page.getDetail();
+                }
             }, 300);
         })
     },

packageA/work/detail.js

@@ -21,12 +21,43 @@ Page({
             icon: "icon-genjin",
             label: "跟进"
         }, {
-            icon: "icon-genjin",
+            icon: "icon-guanlian-bianji",
             label: "编辑"
         }, {
-            icon: "icon-genjin",
+            icon: "icon-dibu-chengjiao",
             label: "完成"
         }],
+        confirmShow: false,
+        finishnotes: "", //完成说明
+    },
+    /* 完成情况说明输入 */
+    areaInput(e) {
+        this.setData({
+            finishnotes: e.detail.value
+        })
+    },
+    onConfirm(e) {
+        console.log(this.data.finishnotes)
+        _Http.basic({
+            "id": 20221211112501,
+            "content": {
+                "sys_taskid": this.data.sys_taskid,
+                "finishnotes": this.data.finishnotes
+            }
+        }).then(res => {
+            console.log("完成情况说明", res)
+            wx.showToast({
+                title: res.msg == '成功' ? "提交成功" : res.msg,
+                icon: "none"
+            })
+            if (res.msg == '成功') this.getDetail();
+        })
+    },
+    /* 取消提交说明 */
+    onCancel(e) {
+        this.setData({
+            confirmShow: false
+        })
     },
     onLoad(options) {
         this.setData({
@@ -134,6 +165,11 @@ Page({
     getGroup() {
         this.selectComponent("#Group").getList();
     },
+    onClose() {
+        this.setData({
+            show: false
+        });
+    },
     //局部数据更新 tabs
     partialRenewal(init = false) {
         let id = this.data.detail.sys_taskid;
@@ -178,7 +214,12 @@ Page({
         switch (detail.label) {
             case "编辑":
                 wx.navigateTo({
-                    url: `/packageA/saleClue/addClue?rowData=${JSON.stringify(this.data.detail)}`,
+                    url: `/packageA/work/add?data=${JSON.stringify(this.data.detail)}`,
+                })
+                break;
+            case "完成":
+                this.setData({
+                    confirmShow: true
                 })
                 break;
             case "跟进":

packageA/work/detail.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {
+        "van-dialog": "@vant/weapp/dialog/index",
         "Preview": "../setclient/modules/preview/index",
         "Trace": "../setclient/modules/trace/index",
         "Record": "/packageA/public/record/index",

packageA/work/detail.scss

@@ -12,4 +12,15 @@
         color: #333333;
         margin-bottom: 16rpx;
     }
+}
+
+.textarea {
+    width: 90%;
+    height: 200rpx;
+    box-sizing: border-box;
+    padding: 20rpx 30rpx;
+    background-color: #FDF9FC;
+    margin: 20rpx auto;
+    border: 1rpx solid #EEECEF;
+    border-radius: 8rpx;
 }

packageA/work/detail.wxml

@@ -15,4 +15,8 @@
     <view style="height: 140rpx;" />
 </Yl_FunTabs>
 <!-- 底部 -->
-<Yl_Tabbar list='{{tabbarList}}' bind:callback="tabbarOnClick" />
+<Yl_Tabbar list='{{tabbarList}}' bind:callback="tabbarOnClick" />
+
+<van-dialog use-slot title="完成情况说明" show="{{ confirmShow }}" show-cancel-button confirm-button-color='#3874F6' bind:confirm='onConfirm' bind:cancel='onCancel'>
+    <textarea placeholder="情况说明" bindinput="areaInput" class="textarea" />
+</van-dialog>

packageA/work/modules/work/index.js

@@ -0,0 +1,23 @@
+// packageA/work/modules/work/index.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

packageA/work/modules/work/index.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

packageA/work/modules/work/index.scss

@@ -0,0 +1 @@
+/* packageA/work/modules/work/index.wxss */

packageA/work/modules/work/index.wxml

@@ -0,0 +1,2 @@
+<!--packageA/work/modules/work/index.wxml-->
+<text>packageA/work/modules/work/index.wxml</text>