修改

components/Yl_nav/index.js

@@ -53,7 +53,7 @@ Component({
                     i = this.data.list.findIndex(v => v.id == 'sort');
                 this.setData({
                     [`list[${i}].label`]: sort.sortname,
-                    [`list[${i}].icon`]: sort.reversed == 1 ? 'icon-jiangxu1' : 'icon-shengxu',
+                    [`list[${i}].icon`]: sort.reversed == 0 ? 'icon-jiangxu1' : 'icon-shengxu',
                 })
                 let pages = getCurrentPages(),
                     page = pages[pages.length - 1];

packageA/activity/index.js

@@ -14,7 +14,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/contract/index.js

@@ -30,7 +30,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/contract/modules/discount/product/index.js

@@ -29,7 +29,7 @@ Component({
         getList(id, init) {
             let content = this.data.content;
             content.sa_contractid = id;
-            content.sys_enterpriseid = getCurrentPages()[getCurrentPages().length - 1].data.detail.sys_enterpriseid;
+            content.sys_enterpriseid = getCurrentPages().find(v => v.__route__ == 'packageA/contract/detail').data.detail.sys_enterpriseid;
             if (init) content.pageNumber = 1;
             _Http.basic({
                 "id": "20221122165302",

packageA/contract/modules/product/index.js

@@ -29,7 +29,7 @@ Component({
         getList(id, init) {
             let content = this.data.content;
             content.sa_contractid = id;
-            content.sys_enterpriseid = getCurrentPages()[getCurrentPages().length - 1].data.detail.sys_enterpriseid;
+            content.sys_enterpriseid = getCurrentPages().find(v => v.__route__ == 'packageA/contract/detail').data.detail.sys_enterpriseid;
             if (init) content.pageNumber = 1
             _Http.basic({
                 "id": "20221122165302",
@@ -64,7 +64,7 @@ Component({
         },
         /* 去选择产品 */
         addProduct() {
-            let page = getCurrentPages()[getCurrentPages().length - 1];
+            let page = getCurrentPages().find(v => v.__route__ == 'packageA/contract/detail');
             if (page.data.detail.typemx) {
                 wx.navigateTo({
                     url: '/packageA/select/offers/select?params=' + JSON.stringify({

packageA/offers/index.js

@@ -22,7 +22,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/opponent/index.js

@@ -7,7 +7,7 @@ Page({
     data: {
         navList: [{
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/project/index.js

@@ -12,7 +12,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/publicClue/detail.js

@@ -127,32 +127,42 @@ Page({
                     label: "分配人",
                     value: res.data.assignedBy
                 }, {
-                    label: "最近跟进人",
-                    value: res.data.followBy
-                }, {
-                    label: "转移人",
-                    value: res.data.changeBy
+                    label: "分配时间",
+                    value: res.data.assignedDate
                 }, {
                     label: "最近编辑人",
                     value: res.data.editBy
                 }, {
-                    label: "创建时间",
-                    value: res.data.createDate
+                    label: "最近编辑时间",
+                    value: res.data.editDate
                 }, {
-                    label: "分配时间",
-                    value: res.data.assignedDate
+                    label: "最近跟进人",
+                    value: res.data.followBy
                 }, {
                     label: "最近跟进时间",
                     value: res.data.followDate
                 }, {
-                    label: "最近转移时间",
-                    value: res.data.changeDate
+                    label: "转手次数",
+                    value: res.data.leader[0].leadernum
                 }, {
-                    label: "最近编辑时间",
-                    value: res.data.editDate
+                    label: "转化次数",
+                    value: res.data.iscustomer + res.data.isproject
+                }, {
+                    label: "无效原因",
+                    value: res.data.invalidreason
+                }, {
+                    label: "作废原因",
+                    value: res.data.deletereason
                 }],
                 tabsList: this.data.tabsList,
             });
+            /* {
+                label: "转移人",
+                value: res.data.changeBy
+            }, {
+                label: "最近转移时间",
+                value: res.data.changeDate
+            } */
             var arr = this.data.tabbarList
             if (res.data.status != '待跟进') {
                 arr = arr.filter(item => {

packageA/publicClue/index.js

@@ -15,7 +15,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/publicCustomer/addAndEditor.js

@@ -159,7 +159,7 @@ Page({
             placeholder: "选择上级企业",
             valueName: "parentid",
             checking: "base",
-            required: true
+            required: false
         }],
         content: {
             "sa_customersid": 0, //新增是传0

packageA/publicCustomer/index.js

@@ -10,7 +10,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/saleClue/index.js

@@ -14,7 +14,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/salesForecasting/detail.js

@@ -67,7 +67,7 @@ Page({
                     value: res.data.periodstart
                 }, {
                     label: "提报截止时间",
-                    value: res.data.reportingtaskdays
+                    value: res.data.periodend
                 }, {
                     label: "预测金额",
                     value: res.data.sumamount
@@ -89,7 +89,7 @@ Page({
                     value: res.data.periodstart
                 }, {
                     label: "提报截止时间",
-                    value: res.data.reportingtaskdays
+                    value: res.data.periodend
                 }, {
                     label: "预测金额(元)",
                     value: res.data.sumamount

packageA/salesForecasting/index.js

@@ -1,13 +1,7 @@
 const _Http = getApp().globalData.http,
     getHeight = require("../../utils/getRheRemainingHeight");
 Page({
-    /* , {
-            label: "筛选",
-            icon: "icon-shaixuan",
-            color: "",
-            width: "",
-            id: "2"
-        } */
+
     /**
      * 页面的初始数据
      */
@@ -21,38 +15,18 @@ Page({
         }],
         typeShow: false,
         navList: [{
-            label: "全部",
-            icon: "icon-webxialaxuanxiangjiantou",
+            label: "筛选",
+            icon: "icon-shaixuan",
             color: "",
             width: "",
-            id: "1"
+            id: "2"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"
         }],
-        classShow: false,
-        classActions: [{
-                name: '全部',
-                index: 0
-            }, {
-                name: '我负责的',
-                index: 1
-            },
-            {
-                name: '我参与的',
-                index: 2
-            },
-            {
-                name: "我下属负责的",
-                index: 3
-            }, {
-                name: "我下属参与的",
-                index: 4
-            }
-        ],
         content: {
             "nocache": true,
             "type": 0,
@@ -69,12 +43,9 @@ Page({
         },
         filter: {
             show: false,
-            type: ['客户报价', '项目报价'], //状态项
             typeActive: "",
-            status: ['新建', '提交', '审核'], //状态项
+            status: ['待提报', '提报中', '已提报'], //状态项
             statusActive: "",
-            startdate: "",
-            enddate: ""
         }
     },
     onLoad(options) {
@@ -174,11 +145,6 @@ Page({
         detail
     }) {
         switch (detail.id) {
-            case '1':
-                this.setData({
-                    classShow: true
-                })
-                break;
             case '2':
                 this.setData({
                     'filter.show': true
@@ -186,22 +152,6 @@ Page({
                 break;
         }
     },
-    classClose() {
-        this.setData({
-            classShow: false
-        })
-    },
-    classSelect({
-        detail
-    }) {
-        if (this.data.content.type == detail.index) return this.classClose();
-        this.setData({
-            "content.type": detail.index,
-            'navList[0].label': detail.name
-        })
-        this.classClose();
-        this.getList(true)
-    },
     /* 筛选状态选择 */
     selectStatus(e) {
         const {

packageA/salesForecasting/index.wxml

@@ -1,6 +1,4 @@
 <Yl_nav search list='{{navList}}' sort='{{content.sort}}' bind:onClick='navClick' bindonSearch="onSearch" />
-<!-- 显示类型 -->
-<van-action-sheet show="{{ classShow }}" actions="{{ classActions }}" cancel-text="取消" bind:cancel="classClose" bind:click-overlay='classClose' bind:select="classSelect" />
 <view class="total">共{{content.total}}个</view>
 <My_listBox id='ListBox' height="{{listHeight}}" bind:getlist='getList'>
     <List list='{{list}}' />
@@ -8,14 +6,6 @@
 </My_listBox>
 <!-- 筛选条件 -->
 <Yl_filtrate show="{{filter.show}}" bind:handle="handleFilter">
-    <view class="groud">
-        <view class="label">
-            预测类型
-        </view>
-        <view class="content">
-            <van-button custom-class='but {{filter.typeActive==item?"active":""}}' wx:for="{{filter.type}}" wx:key="item" bindtap="typeStatus" data-item="{{item}}">{{item}}</van-button>
-        </view>
-    </view>
     <view class="groud">
         <view class="label">
             预测状态
@@ -24,20 +14,6 @@
             <van-button custom-class='but {{filter.statusActive==item?"active":""}}' wx:for="{{filter.status}}" wx:key="item" bindtap="selectStatus" data-item="{{item}}">{{item}}</van-button>
         </view>
     </view>
-    <view class="groud">
-        <view class="label">
-            时间范围
-        </view>
-        <view class="content time">
-            <picker mode="date" bindchange='changeDate' data-name="startdate">
-                <view class="tbox">{{filter.startdate||'开始时间'}}</view>
-            </picker>
-            <view class="partition">-</view>
-            <picker mode="date" bindchange='changeDate' data-name="enddate">
-                <view class="tbox">{{filter.enddate||"结束时间"}}</view>
-            </picker>
-        </view>
-    </view>
 </Yl_filtrate>
 
 <van-action-sheet show="{{ typeShow }}" actions="{{ typeList }}" cancel-text="取消" bind:cancel='typeCancel' bind:select='typeSelect' />

packageA/salesForecasting/modules/list/index.wxml

@@ -10,7 +10,7 @@
     </view>
     <view class="exp line-1">提报要求：<text>{{item.remarks}}</text></view>
     <view class="exp line-1">提报开始时间：<text>{{item.periodstart}}</text></view>
-    <view class="exp line-1">提报截止时间：<text>{{item.reportingtaskdays||' --'}}</text></view>
+    <view class="exp line-1">提报截止时间：<text>{{item.periodend||' --'}}</text></view>
     <view class="exp line-1">预测金额：<text>{{item.amount}}</text></view>
 </navigator>
 

packageA/setclient/addAndEditor.js

@@ -147,7 +147,7 @@ Page({
 			placeholder: "选择上级企业",
 			valueName: "parentid",
 			checking: "base",
-			required: true
+			required: false
 		}],
 		content: {
 			"sa_customersid": 0, //新增是传0

packageA/setclient/index.js

@@ -10,7 +10,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

packageA/work/add.js

@@ -25,7 +25,7 @@ Page({
             checking: "base",
             required: false
         }, {
-            label: "负责人",
+            label: "执行人",
             error: false,
             errMsg: "",
             type: "route",
@@ -45,12 +45,12 @@ Page({
                     }
                 }
             },
-            placeholder: "选择任务负责人",
+            placeholder: "选择任务执行人",
             valueName: "principal",
             checking: "base",
             required: true
         }, {
-            label: "参与人",
+            label: "协助人",
             error: false,
             errMsg: "",
             type: "route",
@@ -69,7 +69,7 @@ Page({
                     }
                 }
             },
-            placeholder: "选择任务参与人",
+            placeholder: "选择任务协助人",
             valueName: "member",
             checking: "base",
             required: false
@@ -113,7 +113,7 @@ Page({
                 if (leader != -1) {
                     data.principal = [group[leader].name, [group[leader].userid]]
                     group.splice(leader, 1)
-                    data.member = [group.map(s => s.name), group.map(s => s.userid-0)]
+                    data.member = [group.map(s => s.name), group.map(s => s.userid - 0)]
 
                 }
             }
@@ -222,6 +222,21 @@ Page({
             };
             let index = form.findIndex(v => v.label == '提醒时间');
             index == -1 ? form.push(obj) : form[index] = pbj;
+        } else if (data.label == '执行人') {
+            let index = form.findIndex(v => v.label == '协助人');
+            if (index != -1 && form[index].value[1]) {
+                let i = form[index].value[1].findIndex(v => v == data.value[1][0]);
+                if (i != -1) {
+                    form[index].value[0].splice(i, 1);
+                    form[index].value[1].splice(i, 1);
+                    if (form[index].value[0].length == 0) form[index].value = '';
+                }
+            }
+        } else if (data.label == '协助人') {
+            let index = form.findIndex(v => v.label == '执行人');
+            if (index != -1 && form[index].value[1]) {
+                if (data.value[1].findIndex(v => v == form[index].value[1][0]) != -1) form[index].value = ''
+            }
         }
         this.setData({
             form

packageA/work/index.js

@@ -18,7 +18,7 @@ Page({
             id: "1"
         }, {
             label: "排序",
-            icon: "icon-shengxu",
+            icon: "icon-jiangxu1",
             color: "",
             width: "",
             id: "sort"

utils/Http.js

@@ -1,6 +1,6 @@
 // const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-// const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
+const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
+// const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
 
 let count = null;
 class HTTP {