Merge branch '黄色' into 更新(蓝黄)

packageA/invoiceforecast/modules/orderForm/index.js

@@ -34,6 +34,9 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                siteid: wx.getStorageSync('userMsg').siteid
+            })
         }
     },
     methods: {

packageA/invoiceforecast/modules/orderForm/item.js

@@ -16,6 +16,9 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                siteid: wx.getStorageSync('userMsg').siteid
+            })
         }
     },
     methods: {

packageA/invoiceforecast/modules/orderForm/item.wxml

@@ -20,11 +20,19 @@
         <view class="left line-1">
             {{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}
         </view>
-        <view class="right line-1">
+        <view class="right line-1" wx:if="{{siteid!='HY'}}">
             {{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}
         </view>
     </view>
-
+    
+    <view class="row" wx:if="{{siteid=='HY'}}">
+        <view class="left line-1">
+            {{language['公称通径']||'公称通径'}}：{{item.caliber||' --'}}
+        </view>
+        <view class="right line-1">
+            {{language['公称压力']||'公称压力'}}：{{item.nominalpressure||' --'}}
+        </view>
+    </view>
 
     <view class="row">
         <view class="left line-1">

packageA/offers/index.js

@@ -1,4 +1,9 @@
-const _Http = getApp().globalData.http;
+const _Http = getApp().globalData.http,
+    currency = require("../../utils/currency"),
+    CNY = (value, symbol = "￥", precision = 2) => currency(value, {
+        symbol,
+        precision
+    }).format();
 Page({
     data: {
         loading: true,
@@ -96,6 +101,7 @@ Page({
             })
             res.data = res.data.map(v => {
                 v.progress = v.stage / v.totalstage * 100;
+                v.quotedpriceamount = CNY(v.quotedpriceamount)
                 return v
             })
             this.setData({

packageA/offers/modules/list/index.wxml

@@ -12,5 +12,6 @@
     <!-- <view class="exp line-1">{{language['项目']||'项目'}}：<text>{{item.projectname||' --'}}</text></view> -->
     <view class="exp line-1">{{language['客户']||'客户'}}：<text>{{item.enterprisename||' --'}}</text></view>
     <view class="exp line-1">{{language['报价日期']||'报价日期'}}：<text>{{item.billdate}}</text></view>
+    <view class="exp line-1">{{language['报价金额']||'报价金额'}}：<text>{{item.quotedpriceamount}}</text></view>
     <view class="exp line-1">{{language['是否特价']||'是否特价'}}：<text>{{language[item.specialoffer==1?'是':'否']||item.specialoffer==1?'是':'否'}}</text></view>
 </navigator>

packageA/publicClue/index.js

@@ -79,6 +79,29 @@ Page({
                 })
             }
         })
+        _Http.basic({
+            "classname": "sysmanage.develop.optiontype.optiontype",
+            "method": "optiontypeselect",
+            "content": {
+                "typename": "cluesourcesift"
+            }
+        }).then(res => {
+            console.log("获取来源", res)
+            if (res.code == '1') {
+                filtratelist.push({
+                    label: "来源",
+                    index: null,
+                    showName: "value", //显示字段
+                    valueKey: "cluesource", //返回Key
+                    selectKey: "value", //传参 代表选着字段 不传参返回整个选择对象
+                    value: "", //选中值
+                    list: res.data
+                })
+                this.setData({
+                    filtratelist
+                })
+            }
+        })
     },
     onClick() {
         this.setData({

packageA/saleAdmin/index.js

@@ -57,6 +57,29 @@ Page({
         });
         this.getList()
         this.getClueArea()
+        _Http.basic({
+            "classname": "sysmanage.develop.optiontype.optiontype",
+            "method": "optiontypeselect",
+            "content": {
+                "typename": "cluesourcesift"
+            }
+        }).then(res => {
+            console.log("获取来源", res)
+            if (res.code == '1') {
+                this.data.filtratelist.push({
+                    label: "来源",
+                    index: null,
+                    showName: "value", //显示字段
+                    valueKey: "cluesource", //返回Key
+                    selectKey: "value", //传参 代表选着字段 不传参返回整个选择对象
+                    value: "", //选中值
+                    list: res.data
+                })
+                this.setData({
+                    filtratelist: this.data.filtratelist
+                })
+            }
+        })
     },
     /* 获取列表 */
     getList(init = false) {

packageA/saleClue/detail.js

@@ -281,14 +281,14 @@ Page({
             })
         }
         if (this.data.isAdmin || isLeader) {
-            if (detail.isproject == 0 && detail.istransformingtoproject == 0) tabbarList.push({
-                icon: "icon-dibu-zhuanhuan",
-                label: "转化项目"
-            })
             if (detail.iscustomer == 0 && detail.istransformingtocustomer == 0) tabbarList.push({
                 icon: "icon-dibu-zhuanhuan",
                 label: "转化客户"
             })
+            if (detail.isproject == 0 && detail.istransformingtoproject == 0) tabbarList.push({
+                icon: "icon-dibu-zhuanhuan",
+                label: "转化项目"
+            })
             if (editdataleader) tabbarList.push({
                 icon: "icon-zhuanyi",
                 label: "更换负责人"

packageA/saleClue/index.js

@@ -163,6 +163,29 @@ Page({
                 })
             }
         })
+        _Http.basic({
+            "classname": "sysmanage.develop.optiontype.optiontype",
+            "method": "optiontypeselect",
+            "content": {
+                "typename": "cluesourcesift"
+            }
+        }).then(res => {
+            console.log("获取来源", res)
+            if (res.code == '1') {
+                filtratelist.push({
+                    label: "来源",
+                    index: null,
+                    showName: "value", //显示字段
+                    valueKey: "cluesource", //返回Key
+                    selectKey: "value", //传参 代表选着字段 不传参返回整个选择对象
+                    value: "", //选中值
+                    list: res.data
+                })
+                this.setData({
+                    filtratelist
+                })
+            }
+        })
     },
 
     /* 处理搜索 */

packageA/select/orderForm/select.js

@@ -59,7 +59,8 @@ Page({
             radio: options.radio ? true : false,
             idname: options.idname || this.data.idname,
             showName: options.showName || this.data.showName,
-            aitText: options.aitText || ''
+            aitText: options.aitText || '',
+            siteid: wx.getStorageSync('userMsg').siteid
         });
         this.getList()
 

packageA/select/orderForm/select.wxml

@@ -24,6 +24,14 @@
                         {{language['业务员']||'业务员'}}：{{item.name||' --'}}
                     </view>
                 </view>
+                <!-- <view class="row" wx:if="{{siteid == 'HY'}}" style="margin-top: 16rpx;">
+                    <view class="left">
+                        {{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||' --'}}
+                    </view>
+                    <view class="right">
+                        {{language['公称压力']||'公称压力'}}：{{item.nominalpressure||' --'}}
+                    </view>
+                </view> -->
                 <view class="row" style="margin-top: 16rpx;">
                     <view class="left">
                         {{language['项目名称']||'项目名称'}}：{{item.projectname||' --'}}