合同

packageA/contract/add/type4/index.js

@@ -99,8 +99,7 @@ Page({
         }],
         "content": {
             "sa_contractid": 0,
-            "type": "项目",
-            "typemx": '经销',
+            "type": "居间",
             sys_enterpriseid: 0
         },
         disabled: true

packageA/contract/detail.js

@@ -45,82 +45,100 @@ Page({
                     num: 132
                 })
             }
+            let data = res.data;
+            switch (data.type) {
+                case "框架":
+                    data.type = '经销商合作协议'
+                    break;
+                case "工具借用":
+                    data.type = '工具使用(借出)协议'
+                    break;
+                case "居间":
+                    data.type = '居间协议'
+                    break;
+                case "项目":
+                    data.type = data.typemx + '项目协议'
+                    break;
+                default:
+                    result = '--'
+                    break;
+            };
             this.setData({
                 detail: res.data,
                 briefs: [{
                     label: "合同编号",
-                    value: res.data.billno
+                    value: data.billno
                 }, {
                     label: "合同类型",
-                    value: res.data.type
+                    value: data.type
                 }, {
                     label: "有效期",
-                    value: res.data.begdate + ' 至 ' + res.data.enddate
+                    value: data.begdate + ' 至 ' + data.enddate
                 }, {
                     label: "签约时间",
-                    value: res.data.signdate
+                    value: data.signdate
                 }, {
                     label: "签约金额",
-                    value: res.data.signamount
+                    value: data.signamount
                 }, {
                     label: "整体折扣",
-                    value: res.data.discountrate * 100 + '%'
+                    value: data.discountrate * 100 + '%'
                 }, {
                     label: "佣金比例",
-                    value: res.data.kickback
+                    value: data.kickback
                 }, {
                     label: "单套价格",
-                    value: res.data.signamount
+                    value: data.signamount
                 }, {
                     label: "状态",
-                    value: res.data.status
+                    value: data.status
                 }],
                 list1: [{
                     label: "合同编号",
-                    value: res.data.billno
+                    value: data.billno
                 }, {
                     label: "合同类型",
-                    value: res.data.type
+                    value: data.type
                 }, {
                     label: "有效期",
-                    value: res.data.begdate + ' 至 ' + res.data.enddate
+                    value: data.begdate + ' 至 ' + data.enddate
                 }, {
                     label: "签约时间",
-                    value: res.data.specialoffer == 1 ? '是' : '否'
+                    value: data.specialoffer == 1 ? '是' : '否'
                 }, {
                     label: "签约金额",
-                    value: res.data.signamount
+                    value: data.signamount
                 }, {
                     label: "整体折扣",
-                    value: res.data.discountrate * 100 + '%'
+                    value: data.discountrate * 100 + '%'
                 }, {
                     label: "佣金比例",
-                    value: res.data.kickback
+                    value: data.kickback
                 }, {
                     label: "单套价格",
-                    value: res.data.signamount
+                    value: data.signamount
                 }, {
                     label: "状态",
-                    value: res.data.status
+                    value: data.status
                 }],
                 list2: [{
                     label: "创建人",
-                    value: res.data.createby
+                    value: data.createby
                 }, {
                     label: "创建时间",
-                    value: res.data.createdate
+                    value: data.createdate
                 }, {
                     label: "最近编辑人",
-                    value: res.data.changeby
+                    value: data.changeby
                 }, {
                     label: "最近编辑时间",
-                    value: res.data.changedate
+                    value: data.changedate
                 }, {
                     label: "最近跟进人",
-                    value: res.data.followby
+                    value: data.followby
                 }, {
                     label: "最近跟进时间",
-                    value: res.data.followdate
+                    value: data.followdate
                 }],
                 tabsList: this.data.tabsList
             });

packageA/contract/index.js

@@ -77,7 +77,7 @@ Page({
         },
         filter: {
             show: false,
-            type: ['项目', '框架', '居间', '工具借用'], //状态项
+            type: ['项目', '居间', '工具借用', '框架'], //状态项
             typeActive: "",
             status: ['新建', '已提交', '审核'], //状态项
             statusActive: "",

packageA/contract/index.wxml

@@ -14,7 +14,7 @@
             合同类型
         </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>
+            <van-button custom-class='but {{filter.typeActive==item?"active":""}}' wx:for="{{filter.type}}" style="white-space: pre-wrap;" wx:key="item" bindtap="typeStatus" data-item="{{item}}">{{item=='框架'?'经销商\n合作':item}}协议</van-button>
         </view>
     </view>
     <view class="groud">

packageA/contract/modules/list/index.wxml

@@ -9,46 +9,8 @@
         <view class="datatag" wx:for="{{item.tags.datatag}}" wx:key="item">{{item}}</view>
     </view>
     <view class="exp line-1">合同编号：<text>{{item.billno}}</text></view>
-    <view class="exp line-1">合同类型：<text>{{handle.getType(item.type)}}</text></view>
+    <view class="exp line-1">合同类型：<text>{{item.typemx?item.typemx+'项目协议':handle.getType(item.type)}}</text></view>
     <view class="exp line-1">有效期：<text>{{item.begdate}} 至 {{item.enddate}}</text></view>
 </navigator>
 
-<wxs module="handle">
-    module.exports = {
-        getColor: function (status) {
-            var color = null;
-            if (status == '新建') {
-                color = '#3874F6';
-            } else if (status == '已提交') {
-                color = '#52C41A';
-            } else {
-                color = '#FA8C16';
-            };
-            return color
-        },
-        getType: function (type) {
-            var result = "";
-            switch (type) {
-                case "框架":
-                    result = '经销商合作协议'
-                    break;
-                case "经销项目":
-                    result = '经销项目协议'
-                    break;
-                case "直销项目":
-                    result = '直销项目协议'
-                    break;
-                case "工具借用":
-                    result = '工具使用协议'
-                    break;
-                case "居间":
-                    result = '居间协议'
-                    break;
-                default:
-                    result = '--'
-                    break;
-            };
-            return result;
-        }
-    }
-</wxs>
+<wxs module="handle" src='../type.wxs' />

packageA/contract/modules/type.wxs

@@ -0,0 +1,31 @@
+module.exports = {
+    getColor: function (status) {
+        var color = null;
+        if (status == '新建') {
+            color = '#3874F6';
+        } else if (status == '已提交') {
+            color = '#52C41A';
+        } else {
+            color = '#FA8C16';
+        };
+        return color
+    },
+    getType: function (type) {
+        var result = "";
+        switch (type) {
+            case "框架":
+                result = '经销商合作协议'
+                break;
+            case "工具借用":
+                result = '工具使用(借出)协议'
+                break;
+            case "居间":
+                result = '居间协议'
+                break;
+            default:
+                result = '--'
+                break;
+        };
+        return result;
+    }
+}