Merge branch '销售预测' into release/9.30.0

packageA/finishforecast/detail.js

@@ -76,10 +76,6 @@ Page({
             });
         }
         let tabsList = [{
-            label: "跟进动态",
-            icon: "icon-tabgenjinjilu",
-            model: "#Trace"
-        }, {
             label: "项目产品清单",
             icon: "icon-tabchanpin",
             model: "#Project"
@@ -100,6 +96,7 @@ Page({
             isdatateam
         } = wx.getStorageSync('auth')[options.admin == 'true' ? 'finishforecastadmin' : 'finishforecast'];
 
+        console.log(wx.getStorageSync('auth')[options.admin == 'true' ? 'finishforecastadmin' : 'finishforecast'])
         if (isdatafollowup) tabsList.push({
             label: "跟进动态",
             icon: "icon-tabgenjinjilu",

packageA/finishforecast/detail.json

@@ -5,7 +5,7 @@
         "Files": "/packageA/public/files/index",
         "List": "./modules/list",
         "Work": "/packageA/public/work/index",
-        "Trace": "/pages/trace/index"
+        "Trace": "/packageA/setclient/modules/trace/index"
     },
     "navigationBarTitleText": "预测填报"
 }

packageA/finishforecast/detail.wxml

@@ -14,7 +14,7 @@
         <view class="row">预测时间：{{detail.periodstart}} 至 {{detail.periodend}}</view>
         <view class="row">预测金额：<text style="color: #F60909;">{{detail.projectamount}}</text></view>
         <view class="row">状态：<text style="color:{{backColor.getColor(detail.status)}};">{{detail.status}}</text></view>
-        <Yl-group wx:if="{{isdatateam}}" id='Group' ownertable='sa_salesforecastbill' ownerid='{{sa_salesforecastbillid}}' />
+        <Yl-group wx:if="{{isdatateam}}" add id='Group' ownertable='sa_salesforecastbill' ownerid='{{sa_salesforecastbillid}}' />
     </view>
     <view style="height: 20rpx;" />
     <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">

packageA/finishforecast/index.js

@@ -156,7 +156,6 @@ Page({
     handleFilter({
         detail
     }) {
-        console.log(detail)
         if (detail.startdate) {
             this.setData({
                 'content.where.begindate': detail.startdate || "",

packageA/finishforecast/modules/project/index.js

@@ -140,6 +140,7 @@ Component({
                 "content": {
                     nocache: true,
                     "sa_salesforecastprojectid": this.data.project.sa_salesforecastprojectid,
+                    "sa_salesforecastbillid": this.data.project.sa_salesforecastbillid,
                     pageSize: 9999,
                     "where": {
                         "condition": ""

packageA/finishforecast/modules/project/index.wxml

@@ -1,6 +1,6 @@
 <block wx:if="{{list.length==0}}">
     <view class="head">
-        <view class="count">去添加项目</view>
+        <view class="count">请添加项目</view>
         <view class="expand">
             <navigator wx:if="{{disabled}}" url="#" class="but" bindtap="addProject">
                 <van-icon name="plus" />

packageA/finishforecast/modules/project/list/index.js

@@ -88,7 +88,6 @@ Component({
                 item
             } = e.currentTarget.dataset,
                 that = this;
-            console.log(item)
             wx.showModal({
                 title: '提示',
                 content: `是否确认删除“${item.itemname}”?`,

packageA/invoiceforecast/detail.json

@@ -7,7 +7,7 @@
         "Record": "/packageA/public/record/index",
         "Files": "/packageA/public/files/index",
         "Work": "/packageA/public/work/index",
-        "Trace": "/pages/trace/index"
+        "Trace": "/packageA/setclient/modules/trace/index"
     },
     "navigationBarTitleText": "预测填报"
 }

packageA/invoiceforecast/detail.wxml

@@ -15,7 +15,7 @@
         <view class="row">出货预测金额：<text style="color: #F60909;">{{detail.orderoutamount}}</text></view>
         <view class="row">开票预测金额：<text style="color: #F60909;">{{detail.orderinvoamount}}</text></view>
         <view class="row" style="margin-bottom: 10rpx;">状态：<text style="color:{{backColor.getColor(detail.status)}};">{{detail.status}}</text></view>
-        <Yl-group wx:if="{{isdatateam}}" id='Group' ownertable='sa_salesforecastbill' ownerid='{{sa_salesforecastbillid}}' />
+        <Yl-group wx:if="{{isdatateam}}" add id='Group' ownertable='sa_salesforecastbill' ownerid='{{sa_salesforecastbillid}}' />
     </view>
     <view style="height: 20rpx;" />
     <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">

packageA/invoiceforecast/modules/orderForm/index.js

@@ -169,8 +169,11 @@ Component({
                 res.data = res.data.map(v => {
                     v.defaultamount = CNY(v.defaultamount);
                     v.amount = CNY(v.amount);
+                    v.showunoutamount = CNY(v.unoutamount);
+                    v.showuninvoiceamount = CNY(v.uninvoiceamount);
                     return v
                 })
+
                 if (sonum) {
                     let index = this.data.list.findIndex(v => v.sonum == sonum);
                     if (index != -1) this.setData({
@@ -197,13 +200,15 @@ Component({
             if (item[name] == value) return;
             item[name] = Number((value - 0).toFixed(2))
             _Http.basic({
-                "id": 20230705145204,
+                "id": 20230705145104,
                 "content": {
                     "sa_salesforecastbillid": this.data.sa_salesforecastbillid,
-                    "sa_salesforecastprojectid": item.sa_salesforecastprojectid,
-                    "salesforecast": [{
-                        "sa_salesforecastid": item.sa_salesforecastid,
+                    "ownertable": "sa_order", // sa_order 订单  sa_project 项目 sa_customers  客户
+                    "salesforecastproject": [{
+                        "sa_salesforecastprojectid": item.sa_salesforecastprojectid || 0,
+                        "sa_salesforecastid": item.sa_salesforecastid || 0,
                         "outamount": item.outamount,
+                        "ownerid": item.sa_orderid,
                         "invoiceamount": item.invoiceamount
                     }]
                 }

packageA/invoiceforecast/modules/orderForm/row.js

@@ -166,7 +166,7 @@ Page({
         let value = e.detail.value,
             index = e.currentTarget.dataset.index;
         if (this.data.list[index].deliverydate == value) return;
-        this.data.list[index].deliverydate = value;
+        this.data.list[index].plandeliverydate = value;
         this.handleChange([this.data.list[index]]).then(res => {
             if (res.msg == '成功') {
                 wx.showToast({