Merge branch '黄色' into bug

packageA/expenseBreakdown/index.js

@@ -26,7 +26,8 @@ Page({
         console.log("options.isAdmin", options.isAdmin)
         this.setData({
             isAdmin: options.isAdmin == 'true',
-            detail: JSON.parse(options.item)
+            detail: JSON.parse(options.item),
+            userid: wx.getStorageSync('userMsg').userid
         })
         this.getList(true);
         _Http.updateExpenseBreakdownList = function () {

packageA/expenseBreakdown/index.wxml

@@ -68,16 +68,16 @@
 			<view>
 				{{language['营销费用']||'营销费用'}}：<text class="price">{{item.showAmount}}</text>
 			</view>
-			<view wx:if="{{isAdmin}}">
+			<view wx:if="{{userid == detail.createuserid}}">
 				<text class="iconfont icon-dibu-bianji" data-item="{{item}}" bind:tap="editItem" />
 				<text class="iconfont icon-guanlian-shanchu" data-item="{{item}}" bind:tap="deleteItem" />
 			</view>
 		</view>
 	</view>
-	<view style="height: 60px;" wx:if="{{isAdmin}}" />
+	<view style="height: 60px;" wx:if="{{userid == detail.createuserid}}" />
 	<My_Empty wx:if="{{list.length === 0}}" />
 </Yl_ListBox>
 
-<view class="footer" wx:if="{{isAdmin}}">
+<view class="footer" wx:if="{{userid == detail.createuserid}}">
 	<van-button custom-class='button-class' bind:click='toInsertion'>{{language['新增营销费用']||'新增营销费用'}}</van-button>
 </view>

packageA/project/detail.js

@@ -705,7 +705,7 @@ Page({
                         }).then(res => {
                             console.log("更换负责人", res)
                             wx.showToast({
-                                title: res.code != '1' ? res.data : getApp().globalData.Language.getMapText('更换成功'),
+                                title: res.code != '1' ? res.msg : getApp().globalData.Language.getMapText('更换成功'),
                                 icon: "none",
                                 mask: true
                             });

packageA/work/add.js

@@ -90,7 +90,9 @@ Page({
             required: true
         }],
         synchronization: null, //同步任务内容参数
-        disabled: true
+        disabled: true,
+        uoloadDisabled: true,
+        accessory: true
     },
     onLoad(options) {
         getApp().globalData.Language.getLanguagePackage(this, '新建任务')
@@ -145,6 +147,7 @@ Page({
             this.setData({
                 content,
                 isReset: false,
+                accessory: false,
                 disabled: false,
                 form: form.map(v => {
                     if (data[v.valueName]) v.value = data[v.valueName];
@@ -413,59 +416,104 @@ Page({
             content
         }).then(res => {
             console.log("创建任务成功", res)
-            this.setData({
-                loading: false
-            })
             wx.showToast({
                 title: res.code == '1' ? this.data.language['成功的'] || '保存成功' : res.msg,
                 icon: "none"
             });
-            /* _Http.basic({
-                "id": 20220930103601,
-                "content": {
-                    "ownertable": "sys_task",
-                    "ownerid": res.data.sys_taskid,
+            if (res.code == '1') try {
+                let attachmentids = this.selectComponent("#Yl_files").getFiles().attachmentids;
+                if (attachmentids.length) {
+                    this.handleFileLink(attachmentids, 'sys_task', res.data.sys_taskid, res.data)
+                } else {
+                    setTimeout(() => {
+                        this.changeItem(res.data)
+                    }, 500)
                 }
-            }, false).then(e => {
-                console.log("设置团队", e)
-            }) */
-            if (res.code == '1') setTimeout(() => {
-                getCurrentPages().forEach(v => {
-                    if (v.__route__ == 'packageA/work/index') {
-                        let index = v.data.list.findIndex(v => v.sys_taskid == res.data.sys_taskid);
-                        if (index == -1) {
-                            v.data.list.unshift(res.data)
-                            v.setData({
-                                list: v.data.list,
-                                "content.total": v.data.content.total + 1
-                            })
-                        } else {
-                            v.setData({
-                                [`list[${index}]`]: res.data
-                            })
-                        }
-                    }
-                });
-                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)
-                        }
+            } catch (error) {
+                setTimeout(() => {
+                    this.changeItem(res.data)
+                }, 500)
+            }
+        })
+    },
+    changeState({
+        detail
+    }) {
+        this.setData({
+            uoloadDisabled: detail
+        })
+    },
+    /* 绑定媒体 */
+    insertImgEdit({
+        detail
+    }) {
+        this.handleFileLink(detail)
+    },
+    handleFileLink(attachmentids, ownertable = "temporary", ownerid = 1, data) {
+        _Http.basic({
+            "classname": "system.attachment.Attachment",
+            "method": "createFileLink",
+            "content": {
+                ownertable,
+                ownerid,
+                usetype: 'default',
+                attachmentids
+            }
+        }).then(res => {
+            console.log('跟进记录绑定附件', res)
+            if (res.code != '1') return wx.showToast({
+                title: res.msg,
+                icon: "none"
+            })
+            if (ownertable == 'temporary') {
+                this.selectComponent("#Yl_files").handleFiles(res.data)
+                this.setData({
+                    uoloadDisabled: false
+                })
+            } else {
+                if (res.data.length) data.attinfos = res.data;
+                this.changeItem(data)
+            }
+        })
+    },
+    changeItem(data) {
+        this.setData({
+            loading: false
+        })
+        getCurrentPages().forEach(v => {
+            if (v.__route__ == 'packageA/work/index') {
+                let index = v.data.list.findIndex(v => v.sys_taskid == data.sys_taskid);
+                if (index == -1) {
+                    v.data.list.unshift(data)
+                    v.setData({
+                        list: v.data.list,
+                        "content.total": v.data.content.total + 1
                     })
-                } else if (page.__route__ == 'packageA/work/detail') {
-                    wx.navigateBack();
-                    page.getDetail();
                 } else {
-                    page.getTags && page.getTags();
-                    let p = page.selectComponent("#Work");
-                    if (p) p.getList(0, true);
-                    wx.navigateBack();
+                    v.setData({
+                        [`list[${index}]`]: data
+                    })
                 }
-            }, 500);
-        })
+            }
+        });
+        let pages = getCurrentPages(),
+            page = pages[pages.length - 2];
+        if (page.__route__ == 'packageA/work/index') {
+            wx.redirectTo({
+                url: '/packageA/work/detail?id=' + data.sys_taskid,
+                fail(err) {
+                    console.log(err)
+                }
+            })
+        } else if (page.__route__ == 'packageA/work/detail') {
+            wx.navigateBack();
+            page.getDetail();
+        } else {
+            page.getTags && page.getTags();
+            let p = page.selectComponent("#Work");
+            if (p) p.getList(0, true);
+            wx.navigateBack();
+        }
     },
     reset() {
         let form = this.data.form;

packageA/work/add.json

@@ -1,4 +1,6 @@
 {
-    "usingComponents": {},
+    "usingComponents": {
+        "My_upload": "/components/My_upload/index"
+    },
     "navigationBarTitleText": "新建任务"
 }

packageA/work/add.scss

@@ -37,4 +37,43 @@
     font-weight: bold;
     background-color: #3874F6;
     padding: 0 10rpx;
+}
+
+
+.box {
+    width: 100vw;
+    box-sizing: border-box;
+    margin-top: 20rpx;
+    background-color: #fff;
+
+    .content {
+        border-radius: 8rpx;
+        padding: 0 30rpx;
+        box-sizing: border-box;
+
+        .upload {
+            display: flex;
+            align-items: center;
+            width: 100%;
+            height: 88rpx;
+            box-sizing: border-box;
+
+            .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;
+            }
+        }
+
+    }
 }

packageA/work/add.wxml

@@ -3,8 +3,28 @@
     <view slot='discountrate' style="margin-right: 36rpx;">%</view>
     <!-- <view slot='synchronization' class="info" wx:if="{{synchronization}}" bindtap="startSynchronization">同步</view> -->
 </Yl_field>
-<view style="height: 100rpx;" />
+<view class="box"  wx:if="{{accessory}}">
+    <view class="content">
+        <view class="upload">
+            <view class="title">{{language['附件上传']||'附件上传'}}</view>
+            <My_upload accept='media' bind:changeState="changeState" binduploadCallback="insertImgEdit">
+                <navigator url="#">
+                    <text class="iconfont icon-a-tonggaofujian" />
+                </navigator>
+            </My_upload>
+
+            <My_upload accept='file' bind:changeState="changeState" binduploadCallback="insertImgEdit">
+                <navigator url="#">
+                    <text class="iconfont icon-a-biaoqianlanzhiku" />
+                </navigator>
+            </My_upload>
+        </view>
+    </view>
+    <Yl_Files delete id="Yl_files" />
+</view>
+
+<view style="height: 160rpx;" />
 <view class="new-footer">
-    <van-button custom-class='new-submit sub' disabled='{{isReset}}' bindclick='reset'>{{language['重置日期']||'重置日期'}}</van-button>
-    <van-button custom-class='new-submit' disabled='{{disabled || loading}}' loading='{{loading}}' bindclick='submit'>{{language['提交']||'提交'}}</van-button>
+    <van-button custom-class='new-submit sub' disabled='{{isReset || uoloadDisabled }}' bindclick='reset'>{{language['重置日期']||'重置日期'}}</van-button>
+    <van-button custom-class='new-submit' disabled='{{disabled || loading || uoloadDisabled }}' loading='{{loading}}' bindclick='submit'>{{language['提交']||'提交'}}</van-button>
 </view>