添加业务员字段

packageA/contract/add/submit.js

@@ -6,30 +6,21 @@ module.exports = {
             mask: true
         })
         if (res.msg == '成功') setTimeout(() => {
-            getCurrentPages().forEach(v => {
-                switch (v.__route__) {
-                    case 'packageA/contract/index':
-                        v.getList(true);
-                        wx.redirectTo({
-                            url: `/packageA/contract/detail?sa_contractid=${res.data.sa_contractid}`,
-                        });
-                        break;
-                    case 'packageA/project/detail':
-                        let p = v.selectComponent("#Contract");
-                        if (p) p.getList(p.data.sa_projectid, true);
-                        wx.redirectTo({
-                            url: `/packageA/contract/detail?sa_contractid=${res.data.sa_contractid}`,
-                        });
-                        break;
-                    case 'packageA/contract/detail':
-                        v.getDetail();
-                        wx.navigateBack();
-                        break;
-                    default:
-                        break;
-                }
-            })
+            let page = getCurrentPages()[getCurrentPages().length - 2];
+            if (page.__route__ == 'packageA/contract/detail') {
+                page.getDetail();
+                wx.navigateBack();
+            } else {
+                wx.redirectTo({
+                    url: `/packageA/contract/detail?id=${res.data.sa_contractid}`,
+                });
+            }
 
+            let page1 = getCurrentPages().find(v => v.__route__ == 'packageA/project/detail');
+            if (page1) {
+                let p = page1.selectComponent("#Contract");
+                if (p) p.getList(p.data.sa_projectid, true);
+            }
         }, 500)
     }
 }

packageA/contract/add/type1/index.js

@@ -36,6 +36,7 @@ Page({
                     }
                 }
             },
+            interrupt: true,
             query: "&radio=true&title=选择经销商&idname=sys_enterpriseid",
             placeholder: "选择经销商",
             valueName: "sys_enterpriseid",
@@ -124,17 +125,76 @@ Page({
     onLoad(options) {
         if (options.data) {
             let data = JSON.parse(options.data);
+            data.discountrate = data.discountrate == 1 ? 100 : (data.discountrate * 100).toFixed(2);
+            let form = this.data.form.map(v => {
+                if (v.valueName == "invaliddate") v.start = "";
+                v.value = data[v.valueName] || "";
+                return v
+            })
+            form.splice(2, 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: [data.leader[0].name, [data.saler_hrid]],
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "1",
+                        "sys_enterpriseid": data.sys_enterpriseid[1][0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
             this.setData({
                 disabled: false,
-                form: this.data.form.map(v => {
-                    if (v.valueName == "invaliddate") v.start = "";
-                    v.value = data[v.valueName];
-                    return v
-                }),
+                form,
                 "content.sa_contractid": data.sa_contractid
             })
         }
     },
+    /* 打断 */
+    interrupt(e) {
+        let {
+            data,
+            form,
+            temporary
+        } = e.detail;
+        form[temporary.index].value = data.value;
+        if (temporary.item.label == '经销商') {
+            form.splice(2, form[2].label == '业务员' ? 1 : 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: "",
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "1",
+                        "sys_enterpriseid": data.id[0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
+            wx.navigateBack()
+        }
+        this.setData({
+            form
+        })
+    },
     submit() {
         let content = {
             ...this.data.content,
@@ -142,8 +202,9 @@ Page({
         };
         content.begdate = content.invaliddate[0];
         content.enddate = content.invaliddate[1];
-        content.sys_enterpriseid = content.sys_enterpriseid[1][0] || 0;
-        content.sa_receivableruleid = content.sa_receivableruleid[1][0] || 0;
+        content.sys_enterpriseid = content.sys_enterpriseid[1] ? content.sys_enterpriseid[1][0] : 0;
+        content.sa_receivableruleid = content.sa_receivableruleid[1] ? content.sa_receivableruleid[1][0] : 0;
+        content.saler_hrid = content.saler_hrid[1] ? content.saler_hrid[1][0] : 0;
         content.discountrate = (content.discountrate / 100).toFixed(4);
         content.paytype = ""
         delete(content.invaliddate)

packageA/contract/add/type2/index.js

@@ -125,10 +125,22 @@ Page({
         disabled: true
     },
     onLoad(options) {
+        let form = this.data.form,
+            project = null;
+
+
         if (options.data) {
             let data = JSON.parse(options.data);
+            data.discountrate = data.discountrate == 1 ? 100 : (data.discountrate * 100).toFixed(2);
             console.log(data)
-            if (data.sa_projectid) this.data.form.splice(2, 0, {
+            project = data;
+
+            form = form.map(v => {
+                if (v.valueName == "invaliddate") v.start = "";
+                v.value = data[v.valueName] || "";
+                return v
+            });
+            this.data.form.splice(2, 0, {
                 label: "项目",
                 error: false,
                 errMsg: "",
@@ -152,20 +164,21 @@ Page({
                 checking: "base",
                 required: true
             })
+
+
             this.setData({
                 disabled: false,
-                form: this.data.form.map(v => {
-                    if (v.valueName == "invaliddate") v.start = "";
-                    v.value = data[v.valueName];
-                    return v
-                }),
                 "content.sa_contractid": data.sa_contractid
             })
         };
+
+
+
         //项目进入 修改经销商选择范围
+
         if (options.project) {
-            let form = this.data.form,
-                project = JSON.parse(options.project);
+            source = 1;
+            project = JSON.parse(options.project);
             form[1].params = {
                 "id": 20220920083901,
                 "content": {
@@ -179,22 +192,55 @@ Page({
                     }
                 }
             };
+        }
+        if (project) {
             form.splice(2, 0, {
                 label: "项目",
                 error: false,
                 errMsg: "",
                 type: "route",
                 url: "/packageA/select/project/select",
-                value: [project.projectname, [project.sa_projectid]],
-                params: {},
-                disabled: true,
+                value: source == 1 ? [project.projectname, [project.sa_projectid]] : project.sa_projectid,
+                params: {
+                    "id": 20221201090802,
+                    "content": {
+                        nocache: true,
+                        sys_enterpriseid: source == 1 ? 0 : project.sys_enterpriseid[1][0],
+                        "type": 2, //1直销 2经销 3居间
+                        "where": {
+                            "condition": "",
+                        }
+                    }
+                },
+                disabled: source == 1,
                 query: "&radio=true",
                 placeholder: "选择项目",
                 valueName: "sa_projectid",
                 checking: "base",
                 required: true
             });
-            source = 1;
+            form.splice(3, 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: source == 1 ? "" : [project.leader[0].name, [project.saler_hrid]],
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "2",
+                        "sa_projectid": source == 1 ? project.sa_projectid : project.sa_projectid[1][0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            });
+
             this.setData({
                 form
             });
@@ -209,30 +255,55 @@ Page({
         } = e.detail;
         console.log("处理", data, form, temporary)
         form[temporary.index].value = data.value;
-        if (temporary.item.label == '经销商' && source == 0) form.splice(2, form[2].label == '项目' ? 1 : 0, {
-            label: "项目",
-            error: false,
-            errMsg: "",
-            type: "route",
-            url: "/packageA/select/project/select",
-            value: "",
-            params: {
-                "id": 20221201090802,
-                "content": {
-                    nocache: true,
-                    sys_enterpriseid: data.value[1][0],
-                    "type": 2, //1直销 2经销 3居间
-                    "where": {
-                        "condition": "",
+        if (temporary.item.label == '经销商' && source == 0) {
+            form.splice(2, form[2].label == '项目' ? 1 : 0, {
+                label: "项目",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/project/select",
+                value: "",
+                params: {
+                    "id": 20221201090802,
+                    "content": {
+                        nocache: true,
+                        sys_enterpriseid: data.value[1][0],
+                        "type": 2, //1直销 2经销 3居间
+                        "where": {
+                            "condition": "",
+                        }
                     }
-                }
-            },
-            query: "&radio=true",
-            placeholder: "选择项目",
-            valueName: "sa_projectid",
-            checking: "base",
-            required: true
-        });
+                },
+                interrupt: true,
+                query: "&radio=true",
+                placeholder: "选择项目",
+                valueName: "sa_projectid",
+                checking: "base",
+                required: true
+            });
+        } else if (temporary.item.label == '项目') {
+            form.splice(3, form[3].label == '业务员' ? 1 : 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: "",
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "2",
+                        "sa_projectid": data.id[0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
+        }
         this.setData({
             form
         });
@@ -245,9 +316,12 @@ Page({
         };
         content.begdate = content.invaliddate[0];
         content.enddate = content.invaliddate[1];
-        content.sys_enterpriseid = content.sys_enterpriseid[1][0] || 0;
-        content.sa_projectid = content.sa_projectid[1][0] || '';
-        content.sa_receivableruleid = content.sa_receivableruleid[1][0] || 0;
+
+        content.sys_enterpriseid = content.sys_enterpriseid[1] ? content.sys_enterpriseid[1][0] : 0;
+        content.sa_projectid = content.sa_projectid[1] ? content.sa_projectid[1][0] : 0;
+        content.sa_receivableruleid = content.sa_receivableruleid[1] ? content.sa_receivableruleid[1][0] : 0;
+        content.saler_hrid = content.saler_hrid[1] ? content.saler_hrid[1][0] : 0;
+
         content.discountrate = (content.discountrate / 100).toFixed(4) || 1;
         content.paytype = "";
         content.source = source;

packageA/contract/add/type3/index.js

@@ -124,24 +124,66 @@ Page({
         disabled: true
     },
     onLoad(options) {
+        let form = this.data.form,
+            project = null;
         if (options.data) {
             let data = JSON.parse(options.data);
+            data.discountrate = data.discountrate == 1 ? 100 : (data.discountrate * 100).toFixed(2);
+            form = form.map(v => {
+                if (v.valueName == "invaliddate") v.start = "";
+                v.value = data[v.valueName] || "";
+                return v
+            });
+            form.splice(2, 0, {
+                label: "收货人",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: [data.name, [data.rec_contactsid]],
+                params: {
+                    "id": "20221022165503",
+                    "content": {
+                        nocache: true,
+                        sys_enterpriseid: data.sys_enterpriseid[1][0],
+                        "where": {
+                            "condition": "",
+                            "workaddress": 0
+                        }
+                    }
+                },
+                query: "&radio=true",
+                interrupt: true,
+                placeholder: "选择收货人",
+                valueName: "rec_contactsid",
+                checking: "base",
+                required: true
+            })
+            form.splice(3, 0, {
+                label: "收货人电话",
+                error: false,
+                errMsg: "",
+                type: "textare",
+                value: data.phonenumber,
+                placeholder: "收货人电话",
+                valueName: "phonenumber",
+                disabled: true,
+                required: false
+            })
+            project = data;
             this.setData({
                 disabled: false,
-                form: this.data.form.map(v => {
-                    if (v.valueName == "invaliddate") v.start = "";
-                    v.value = data[v.valueName];
-                    return v
-                }),
                 "content.sa_contractid": data.sa_contractid
             })
         }
         //项目进入 修改客户选择范围
         if (options.project) {
-            let form = this.data.form,
-                project = JSON.parse(options.project);
-            console.log(project)
-            form[1].params = {
+            project = JSON.parse(options.project);
+            source = 1;
+        }
+
+        if (project) {
+            if (source === 1) form[1].params = {
                 "id": 20220920083901,
                 "content": {
                     nocache: true,
@@ -154,17 +196,26 @@ Page({
                     }
                 }
             };
-
             form.splice(4, 0, {
                 label: "项目",
                 error: false,
                 errMsg: "",
                 type: "route",
                 url: "/packageA/select/project/select",
-                value: [project.projectname, [project.sa_projectid]],
-                params: {},
+                value: Array.isArray(project.sa_projectid) ? project.sa_projectid : [project.projectname, [project.sa_projectid]],
+                params: {
+                    "id": 20221201090802,
+                    "content": {
+                        nocache: true,
+                        sys_enterpriseid: source == 1 ? 0 : project.sys_enterpriseid[1][0],
+                        "type": 1, //1直销 2经销 3居间
+                        "where": {
+                            "condition": "",
+                        }
+                    }
+                },
                 query: "&radio=true",
-                disabled: true,
+                disabled: source === 1,
                 placeholder: "选择项目",
                 valueName: "sa_projectid",
                 checking: "base",
@@ -192,11 +243,33 @@ Page({
                 disabled: true,
                 required: false
             })
-            source = 1;
-            this.setData({
-                form
-            });
+            form.splice(7, 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: project.leader[0].name ? [project.leader[0].name, [project.saler_hrid]] : "",
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "2",
+                        "sa_projectid": project.sa_projectid
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
+
         }
+
+        this.setData({
+            form
+        });
     },
 
 
@@ -242,7 +315,7 @@ Page({
                 type: "textare",
                 value: "",
                 placeholder: "收货人电话",
-                valueName: "num",
+                valueName: "phonenumber",
                 disabled: true,
                 required: false
             })
@@ -295,6 +368,27 @@ Page({
                 disabled: true,
                 required: false
             })
+            form.splice(temporary.index - 0 + 3, form.some(v => v.label == '业务员') ? 1 : 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: "",
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "2",
+                        "sa_projectid": data.id[0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
         } else if (temporary.item.valueName == "rec_contactsid") {
             form.find(v => v.label == '收货人电话').value = data.item.phonenumber;
         }
@@ -311,10 +405,11 @@ Page({
         };
         content.begdate = content.invaliddate[0];
         content.enddate = content.invaliddate[1];
-        content.sa_projectid = content.sa_projectid[1][0] || 0;
-        content.sys_enterpriseid = content.sys_enterpriseid[1][0] || 0;
-        content.rec_contactsid = content.rec_contactsid[1][0] || 0;
-        content.sa_receivableruleid = content.sa_receivableruleid[1][0] || 0;
+        content.sa_projectid = content.sa_projectid[1] ? content.sa_projectid[1][0] : 0;
+        content.sys_enterpriseid = content.sys_enterpriseid[1] ? content.sys_enterpriseid[1][0] : 0;
+        content.rec_contactsid = content.rec_contactsid[1] ? content.rec_contactsid[1][0] : 0;
+        content.sa_receivableruleid = content.sa_receivableruleid[1] ? content.sa_receivableruleid[1][0] : 0;
+        content.saler_hrid = content.saler_hrid[1] ? content.saler_hrid[1][0] : 0;
         content.discountrate = (content.discountrate / 100).toFixed(4) || 1;
         content.paytype = ""
         if (this.data.source) content.source = 1;

packageA/contract/add/type3/index.scss

@@ -8,6 +8,7 @@
     background: #FFFFFF;
     box-shadow: 0px -4rpx 16rpx 2rpx rgba(150, 157, 165, 0.16);
     bottom: 0;
+    z-index: 999999999;
 
     .new-submit {
         width: 156rpx;

packageA/contract/add/type4/index.js

@@ -36,6 +36,7 @@ Page({
                     }
                 }
             },
+            interrupt: true,
             query: "&radio=true&idname=sys_enterpriseid&title=选择服务商",
             placeholder: "选择居间服务商",
             valueName: "sys_enterpriseid",
@@ -155,33 +156,50 @@ Page({
     },
     onLoad(options) {
         if (options.data) {
-            let data = JSON.parse(options.data),
-                form = this.data.form;
-            data.productdiscount = data.productdiscount * 100
-            data.orderratio = data.orderratio * 100
+            let data = JSON.parse(options.data);
+            let form = this.data.form.map(v => {
+                if (v.valueName == "invaliddate") v.start = "";
+                v.value = data[v.valueName];
+                return v
+            });
+            if (data.radios == 1) {
+                form[5].label = '订单金额比例'
+                form[5].placeholder = '请填写订单金额比例'
+                form[5].valueName = 'orderratio'
+                form[5].value = data.orderratio == 1 ? 100 : (data.orderratio * 100).toFixed(2)
+            } else {
+                form[5].label = '居间产品折扣'
+                form[5].placeholder = '请填写居间产品折扣'
+                form[5].valueName = 'productdiscount'
+                form[5].value = data.productdiscount == 1 ? 100 : (data.productdiscount * 100).toFixed(2)
+            }
+            form.splice(2, 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: [data.leader[0].name, [data.saler_hrid]],
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "1",
+                        "sys_enterpriseid": data.sys_enterpriseid[1][0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
             this.setData({
                 disabled: false,
-                form: form.map((v, index) => {
-                    if (v.valueName == "invaliddate") v.start = "";
-                    if (v.valueName == "radios") {
-                        let i = index + 1;
-                        if (data[v.valueName] == 1) {
-                            form[i].label = '订单金额比例'
-                            form[i].placeholder = '请填写订单金额比例'
-                            form[i].valueName = 'orderratio'
-                        } else {
-                            form[i].label = '居间产品折扣'
-                            form[i].placeholder = '请填写居间产品折扣'
-                            form[i].valueName = 'productdiscount'
-                        }
-                    }
-                    v.value = data[v.valueName];
-                    return v
-                }),
+                form,
                 "content.sa_contractid": data.sa_contractid
             })
         }
-
         //项目进入 修改经销商选择范围
         if (options.project) {
             let form = this.data.form,
@@ -204,11 +222,6 @@ Page({
                 form
             });
         }
-
-
-
-
-
     },
     /* 打断处理form */
     interrupt(e) {
@@ -218,8 +231,8 @@ Page({
             temporary
         } = e.detail;
         console.log(data, form, temporary)
+        form[temporary.index].value = data.value;
         if (temporary.item.label == '计算方式') {
-            form[temporary.index].value = data.value;
             let index = form.findIndex(item => item.valueName == 'radios')
             let i = index + 1
             if (data.value == 1) {
@@ -231,14 +244,39 @@ Page({
                 form[i].placeholder = '请填写居间产品折扣'
                 form[i].valueName = 'productdiscount'
             }
+
         } else if (temporary.item.label == '项目合同') {
             let index = form.findIndex(v => v.label == '项目名称');
             if (index != -1 && source == 0) form[index].value = [data.item.projectname, [data.item.sa_projectid]]
             form[temporary.index].value = data.value;
             wx.navigateBack()
+
+        } else if (temporary.item.label == '居间服务商') {
+            form.splice(2, form[2].label == '业务员' ? 1 : 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: "",
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "1",
+                        "sys_enterpriseid": data.id[0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
+            wx.navigateBack()
         }
         this.setData({
-            form: form
+            form
         })
     },
     submit() {
@@ -254,9 +292,11 @@ Page({
         }
         content.begdate = content.invaliddate[0];
         content.enddate = content.invaliddate[1];
-        content.ascription_contractid = content.ascription_contractid[1][0] || '';
-        content.sys_enterpriseid = content.sys_enterpriseid[1][0] || '';
-        content.sa_projectid = content.sa_projectid[1][0] || '';
+        content.ascription_contractid = content.ascription_contractid[1] ? content.ascription_contractid[1][0] : 0;
+        content.sys_enterpriseid = content.sys_enterpriseid[1] ? content.sys_enterpriseid[1][0] : 0;
+        content.sa_projectid = content.sa_projectid[1] ? content.sa_projectid[1][0] : 0;
+        content.saler_hrid = content.saler_hrid[1] ? content.saler_hrid[1][0] : 0;
+        content.paytype = ""
         if (this.data.source) content.source = 1;
         console.log(content)
         delete(content.invaliddate)

packageA/contract/add/type5/index.js

@@ -36,6 +36,7 @@ Page({
                     }
                 }
             },
+            interrupt: true,
             query: "&radio=true&idname=sys_enterpriseid",
             placeholder: "选择企业",
             valueName: "sys_enterpriseid",
@@ -82,13 +83,36 @@ Page({
     onLoad(options) {
         if (options.data) {
             let data = JSON.parse(options.data);
+            let form = this.data.form.map(v => {
+                if (v.valueName == "invaliddate") v.start = "";
+                v.value = data[v.valueName];
+                return v
+            });
+            form.splice(2, form[2].label == '业务员' ? 1 : 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: [data.leader[0].name, [data.saler_hrid]],
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "1",
+                        "sys_enterpriseid": data.sys_enterpriseid[1][0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
+
             this.setData({
                 disabled: false,
-                form: this.data.form.map(v => {
-                    if (v.valueName == "invaliddate") v.start = "";
-                    v.value = data[v.valueName];
-                    return v
-                }),
+                form,
                 "content.sa_contractid": data.sa_contractid
             })
         }
@@ -97,9 +121,37 @@ Page({
     interrupt(e) {
         let {
             data,
-            form
+            form,
+            temporary
         } = e.detail;
-        console.log("处理", data, form)
+        form[temporary.index].value = data.value;
+        if (temporary.item.label == '选择企业') {
+            form.splice(2, form[2].label == '业务员' ? 1 : 0, {
+                label: "业务员",
+                error: false,
+                errMsg: "",
+                type: "route",
+                url: "/packageA/select/contacts/select",
+                value: "",
+                params: {
+                    "id": 20230305201202,
+                    "content": {
+                        nocache: true,
+                        "type": "1",
+                        "sys_enterpriseid": data.id[0]
+                    },
+                },
+                query: "&radio=true&idname=hrid",
+                placeholder: "选择业务员",
+                valueName: "saler_hrid",
+                checking: "base",
+                required: true
+            })
+        }
+        wx.navigateBack()
+        this.setData({
+            form
+        })
     },
     submit() {
         let content = {
@@ -108,7 +160,9 @@ Page({
         };
         content.begdate = content.invaliddate[0];
         content.enddate = content.invaliddate[1];
-        content.sys_enterpriseid = content.sys_enterpriseid[1][0] || '';
+        content.sys_enterpriseid = content.sys_enterpriseid[1] ? content.sys_enterpriseid[1][0] : 0;
+        content.saler_hrid = content.saler_hrid[1] ? content.saler_hrid[1][0] : 0;
+        content.paytype = ""
         delete(content.invaliddate)
         _Http.basic({
             "id": 20221121185302,

packageA/contract/detail.js

@@ -12,7 +12,7 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_contractid: options.sa_contractid,
+            sa_contractid: options.id,
             isAdmin: wx.getStorageSync('auth').wcontract.options.some(v => v == "admin"), //是否具有管理权限
             options: wx.getStorageSync('auth').wcontract.options, //权限列表
         });
@@ -640,7 +640,7 @@ Page({
                 type = "type3"
                 break;
             case "居间协议":
-                data.ascription_contractid = [data.ascription_title || '未命名合同', [data.ascription_contractid]];
+                data.ascription_contractid = [data.ascription_title, [data.ascription_contractid]];
                 data.radios = data.calculatemodel + "";
                 type = "type4"
                 break;
@@ -687,5 +687,21 @@ Page({
             }
         })
     },
-    onShareAppMessage() {}
+    onUnload() {
+        let page = getCurrentPages().find(v => v.__route__ == 'packageA/contract/index');
+        if (!page) return;
+        let content = JSON.parse(JSON.stringify(page.data.content));
+        content.pageSize = (content.pageNumber - 1) * content.pageSize;
+        content.pageNumber = 1;
+        _Http.basic({
+            id: 20221121201502,
+            content
+        }).then(res => {
+            console.log("更新合同列表", res);
+            if (res.msg == '成功') page.setData({
+                list: res.data,
+                "content.total": res.total
+            })
+        })
+    }
 })

packageA/contract/modules/list/index.wxml

@@ -1,5 +1,5 @@
 <My_empty wx:if="{{list.length==0}}" />
-<navigator class="offer-list" url="/packageA/contract/detail?sa_contractid={{item.sa_contractid}}" wx:for="{{list}}" wx:key="billno">
+<navigator class="offer-list" url="/packageA/contract/detail?id={{item.sa_contractid}}" wx:for="{{list}}" wx:key="billno">
     <view class="title">
         <text class="line-1">{{item.title}}</text>
         <view class="status" style="background-color: {{handle.getColor(item.status)}};">{{item.status}}</view>

packageA/offers/addProjectOffer.js

@@ -137,7 +137,7 @@ Page({
                     placeholder: "选择业务员",
                     valueName: "saler_hrid",
                     checking: "base",
-                    required: false
+                    required: true
                 });
             };
             this.setData({
@@ -210,7 +210,7 @@ Page({
                     placeholder: "选择业务员",
                     valueName: "saler_hrid",
                     checking: "base",
-                    required: false
+                    required: true
                 };
                 form.splice(6, form[6].label == "业务员" ? 1 : 0, hr);
                 break;

packageA/offers/addSetclientOffer.js

@@ -186,7 +186,7 @@ Page({
                 placeholder: "选择业务员",
                 valueName: "saler_hrid",
                 checking: "base",
-                required: false
+                required: true
             };
             form.splice(6, form[6].label == "业务员" ? 1 : 0, hr);
         }