合同

packageA/contract/index.js

@@ -61,9 +61,9 @@ Page({
         },
         filter: {
             show: false,
-            type: ['普通报价', '项目报价'], //状态项
+            type: ['项目', '框架', '居间', '工具借用'], //状态项
             typeActive: "",
-            status: ['新建', '提交', '审核'], //状态项
+            status: ['新建', '已提交', '审核'], //状态项
             statusActive: "",
             startdate: "",
             enddate: ""
@@ -81,6 +81,7 @@ Page({
         if (data) {
             content.where.status = data.statusActive;
             content.where.begindate = data.startdate;
+            content.where.type = data.typeActive;
             content.where.enddate = data.enddate;
         }
         _Http.basic({
@@ -212,6 +213,7 @@ Page({
             case 'reset':
                 this.setData({
                     'filter.statusActive': "",
+                    'filter.typeActive': "",
                     'filter.startdate': "",
                     'filter.enddate': "",
                 });

packageA/contract/modules/list/index.wxml

@@ -1,14 +1,13 @@
 <My_empty wx:if="{{list.length==0}}" />
-<navigator class="offer-list" url="/packageA/offers/detail?sa_quotedpriceid={{item.sa_quotedpriceid}}" wx:for="{{list}}" wx:key="item.billno">
+<navigator class="offer-list" url="#" wx:for="{{list}}" wx:key="item.billno">
     <view class="title">
-        <text class="line-1">{{item.salername}}</text>
+        <text class="line-1">编号：{{item.billno}}</text>
         <view class="status" style="background-color: {{handle.getColor(item.status)}};">{{item.status}}</view>
     </view>
     <view class="tag-box">
         <view class="systemtag" wx:for="{{item.tags.systemtag}}" wx:key="item">{{item}}</view>
         <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.begdate}} 至 {{item.enddate}}</text></view>
 </navigator>
@@ -19,7 +18,7 @@
             var color = null;
             if (status == '新建') {
                 color = '#3874F6';
-            } else if (status == '提交') {
+            } else if (status == '已提交') {
                 color = '#52C41A';
             } else {
                 color = '#FA8C16';