【update】 起草组会议相关判断的增加

app.json

@@ -36,7 +36,9 @@
     "pages/council/council",
     "pages/councilDetail/councilDetail",
     "pages/guestEditSignUpinfo/guestEditSignUpInfo",
-    "pages/invoice/invoice"
+    "pages/invoice/invoice",
+    "pages/contacts/contacts"
+
   ],
   "window":{
     "backgroundTextStyle": "dark",

assets/js/http/userApi.js

@@ -65,6 +65,8 @@ const UserApi = {
   noticeList: (params) => http.get(`${URL_CONFIG}sysNotice/page`, params),
   // 工作组分页
   workList: (params) => http.get(`${URL_CONFIG}project/payWorkingGroupSubitem/queryCompanyPageList`, params),
+   // 起草组分页 todo 需要修改接口
+  draftList: (params) => http.get(`${URL_CONFIG}project/payWorkingGroupSubitem/queryCompanyPageList`, params),
   // 分标委列表
   committeeList: (params) => http.get(`${URL_CONFIG}payCaseCommitteeSubitem/payCaseCommitteeSubitem/findTwo`, params),
   // 分标委详情

pages/home/home.js

@@ -208,6 +208,8 @@ Page({
       url = '../mineContract/mineContract'
     } else if (this.data.selectArr[index].val === '7') { // 发票
       url = '../invoice/invoice'
+    } else if (this.data.selectArr[index].val === '8') { // 起草组
+      url = '../project/project?type=draft'
     }
     isLogin( () => {
       wx.navigateTo({
@@ -400,6 +402,11 @@ Page({
         path: '../../assets/images/invoice.png',
         text: '发票',
         val: '7',
+      },
+      {
+        path: '../../assets/images/gongzuozu-new.png',
+        text: '起草组',
+        val: '8',
       }
     ]
 
@@ -438,6 +445,11 @@ Page({
         path: '../../assets/images/invoice.png',
         text: '发票',
         val: '7',
+      },
+      {
+        path: '../../assets/images/gongzuozu-new.png',
+        text: '起草组',
+        val: '8',
       }
     ]
     let searchParams = {

pages/login/login.wxml

@@ -32,7 +32,7 @@
       <button type="primary" formType="submit">登录</button>
     </view>
     <view class="forget">
-      <text bindtap="phonePassword">手机密码登录</text>
+      <text bindtap="phonePassword">账户登录</text>
       <text bindtap="register">注册</text>
       <text bindtap="updateInfo">忘记密码？</text>
     </view>

pages/meeting/meeting.js

@@ -75,6 +75,8 @@ Page({
           return '分标委会议'
         case '6':
           return '理事会会议'
+        case '7':
+          return '起草组会议'
       }
     } else {
       return ''

pages/meetingDetailSigned/meetingDetailSigned.js

@@ -118,6 +118,8 @@ Page({
           return '分标委会议'
         case '6':
           return '理事会会议'
+        case '7':
+          return '起草组会议'
       }
     } else {
       return ''

pages/project/project.js

@@ -7,7 +7,7 @@ Page({
   data: {
     statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
     index: 0,
-    type: '', // project 是来款项目 work 是工作组 ziliao是资料网员
+    type: '', // project 是来款项目 work 是工作组 ziliao是资料网员 draft 是起草组
     list: [], // 项目列表
     searchParams: {
       pageNo: 1,
@@ -22,6 +22,14 @@ Page({
       pageTitle:'项目'
     }
   },
+  // 编辑联系人信息
+  editContactsInfo(e) {
+    // 跳转到联系人页面
+    wx.navigateTo({
+      url: `../contacts/contacts?id=${e.currentTarget.dataset.project.id}&type=${this.data.type}&workingGroupId=${e.currentTarget.dataset.project.workingGroupId}`,
+    })
+   
+  },
   goBack(){
     wx.navigateBack()
   },
@@ -156,6 +164,28 @@ Page({
           duration: 2000
         })
       })
+    } else if(this.data.type == 'draft'){
+      UserApi.draftList(this.data.searchParams).then(res=>{
+        if(res.success){
+          // 搜索时，把原数据清空，重新筛选
+          if(that.data.searchParams.pageNo === 1) {
+            that.setData({
+              list: []
+            })
+          }
+          if(res.result.records && res.result.records.length){
+            that.setData({
+              list: [...that.data.list, ...res.result.records]
+            })
+          }
+        }
+      }).catch(err=>{
+        wx.showToast({
+          title: '加载失败',
+          icon: 'none',
+          duration: 2000
+        })
+      })
     }
   },
   /**
@@ -180,20 +210,26 @@ Page({
    */
   onLoad: function (options) {
     this.data.type = options.type
+    let pageTitle = ''
     switch(options.type){
-      case 'ziliao': this.setData({
+      case 'ziliao': 
-        pageTitle:'资料网员'
+        pageTitle = '资料网员'
-      })
       break
-      case 'work': this.setData({
+      case 'work': 
-        pageTitle:'工作组'
+        pageTitle = '工作组'
-      })
       break
-      default :  this.setData({
+      case 'draft': 
-        pageTitle:'项目'
+        pageTitle = '起草组'
-      })
+      break
+      default :  
+        pageTitle = '项目'
       break
     }
+    this.setData({
+      pageTitle: pageTitle,
+      type: this.data.type
+    })
+    
     this.loadData()
   },
   /**

pages/project/project.wxml

@@ -46,6 +46,13 @@
 			<view class="item-content"><text>运行周期：</text>{{item.operationCycle || ''}}</view>
 			<view class="item-content">缴费凭证:{{item.paymentStatus_dictText || '无'}}</view>
 		</block>
+		<!-- 工作组和起草组有 联系人字段 -->
+		<view class="content-btn" wx:if="{{type === 'work' || type === 'draft'}}">
+			<view class="inner-btn-box" data-project="{{item}}" catchtap="editContactsInfo">
+				<image src="../../assets/images/icon_edit.png"></image>
+				<text>联系人</text>
+			</view>
+		</view>
 		<!-- 工作组项目展示end -->
 		<!-- 应该是不要了 -->
 		<!-- <view class="content-text">

pages/project/project.wxss

@@ -101,3 +101,35 @@ page {
 .all{
   color: #069F99;
 }
+
+/* 列表页的操作按钮==开始 */
+.content-btn {
+  margin-top: 10rpx;
+  padding-top: 10px;
+  border-top: 2rpx solid #f5f5f5;
+  border-top: 2rpx solid #f5f5f5;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex-direction: row;
+  width: 100%;
+}
+
+.content-btn .inner-btn-box {
+  display: flex;
+  align-items: center;
+  margin-left: 50rpx;
+}
+
+.content-btn .inner-btn-box image {
+  width: 23rpx;
+  height: 24rpx;
+  margin-right: 8rpx;
+}
+
+.content-btn .inner-btn-box text {
+  font-size: 24rpx;
+  font-weight: 300;
+  color: #069F99;
+}
+/*  列表页的操作按钮==结束 */

pages/scanSign/scanSign.js

@@ -52,6 +52,8 @@ Page({
           return '分标委会议'
         case '6':
           return '理事会会议'
+        case '7':
+          return '起草组会议'
       }
     } else {
       return ''

pages/signUpEntrance/signUpEntrance.js

@@ -44,7 +44,7 @@ Page({
         let topicArr = currentMeetingInfo[dictKey].split(',')
         let topicTextArr = currentMeetingInfo[dictKey + '_dictText'].split(',')
         let opeArr = JSON.parse(JSON.stringify(WasicTopicData))
-       
+
         opeArr.map(tt => {
           // 先查询子集中
           tt.allChildren = [...tt.children, ...(tt.radioChildren || [])]
@@ -180,6 +180,8 @@ Page({
         return "分标委会议"
       case "6":
         return "理事会会议"
+      case "7":
+        return "起草组会议"
     }
   },
   // 标协会议类型