合同优化

CRM/wmycontract/confirm.js

@@ -47,34 +47,34 @@ Page({
       required: true,
       checking: "base"
     }, {
-      label: "签署人",
+      label: "法人",
       error: false,
       errMsg: "",
       type: "text",
       value: "",
-      placeholder: "请输入签署人姓名",
+      placeholder: "请输入法人姓名",
       valueName: "legal_rep",
       required: true,
       checking: "base"
     }, {
-      label: "电话",
+      label: "法人手机号码",
       error: false,
       errMsg: "",
-      type: "text",
+      type: "number",
       value: "",
-      placeholder: "请输入电话",
-      valueName: "mobile",
-      required: true,
-      checking: "base"
+      placeholder: "请输入法人手机号码",
+      valueName: "phonenumber",
+      required: true
     }, {
-      label: "签署人手机号码",
+      label: "法人身份证号码",
       error: false,
       errMsg: "",
-      type: "number",
+      type: "text",
       value: "",
-      placeholder: "请输入签署人手机号码",
-      valueName: "phonenumber",
-      required: true
+      placeholder: "请输入身份证号码",
+      valueName: "idcard",
+      required: true,
+      checking: "base"
     }, {
       label: "售前电话",
       error: false,
@@ -105,16 +105,6 @@ Page({
       valueName: "paymans",
       required: true,
       checking: "base"
-    }, {
-      label: "签署人身份证号码",
-      error: false,
-      errMsg: "",
-      type: "text",
-      value: "",
-      placeholder: "请输入身份证号码",
-      valueName: "idcard",
-      required: true,
-      checking: "base"
     }]
   },
 
@@ -322,9 +312,9 @@ Page({
 
     // 二次弹窗确认
     wx.showModal({
-      title: '确认',
-      content: '合同基础信息确认后不可修改，是否开始签署？',
-      confirmText: '开始签署',
+      title: '请仔细核对',
+      content: '提交后信息将锁定不可修改，法人信息会用于腾讯电子签实名认证及企业认证，签署完成后数据自动同步至经销商档案。确认提交吗？',
+      confirmText: '确认提交',
       confirmColor: '#3874F6',
       success: (res) => {
         if (res.confirm) {
@@ -348,6 +338,7 @@ Page({
       id: 2026041315410702,
       content: {
         sa_esign_contract_taskmxid: this.data.mxid,
+        mobile: formData.phonenumber,
         ...formData
       }
     }).then(res => {

CRM/wmycontract/confirm.scss

@@ -11,6 +11,29 @@ page {
   max-width: 100vw;
 }
 
+.notice-card {
+  background-color: #fef0e6;
+  border-radius: 12rpx;
+  padding: 24rpx;
+  margin-bottom: 20rpx;
+  margin-top: 20rpx;
+  border-left: 6rpx solid #E6A23C;
+
+  .notice-title {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #E6A23C;
+    margin-bottom: 12rpx;
+  }
+
+  .notice-item {
+    font-size: 24rpx;
+    color: #8a6d3b;
+    line-height: 1.7;
+    margin-bottom: 6rpx;
+  }
+}
+
 .form-card {
   background-color: #fff;
   border-radius: 16rpx;

CRM/wmycontract/confirm.wxml

@@ -1,7 +1,14 @@
 <view class="container">
+
   <!-- 表单区域 -->
   <Yl_Headline title='基础信息' type='switch' switchLabel='仅显示必填信息' switch='{{showAll}}' bind:callBack='onChange' />
   <Yl_Field id='Form' form='{{form}}' showAll='{{!showAll}}' bind:onConfirm='onConfirm' bind:interrupt="interrupt" />
+  <!-- 提示信息 -->
+  <view class="notice-card">
+    <view class="notice-title">重要提示</view>
+    <view class="notice-item">1. 法人相关信息将用于腾讯电子签签署人的实名认证及企业认证，请确保信息准确一致。</view>
+    <view class="notice-item">2. 合同签署成功后，数据将自动保存至经销商档案。</view>
+  </view>
 
   <!-- 营业执照复印件 -->
   <view class="form-card">
@@ -18,6 +25,7 @@
     </view>
   </view>
 
+
   <!-- 身份证复印件 -->
   <view class="form-card">
     <view class="section-title">身份证</view>
@@ -36,7 +44,6 @@
   <!-- 底部按钮 -->
   <view style="height: 150rpx;" />
   <view class="new-footer">
-    <van-button wx:if="{{flowid}}" custom-class='new-submit' type="primary" bindtap='goToSign'>去签署</van-button>
-    <van-button wx:else custom-class='new-submit' disabled='{{disabled || submitting}}' loading='{{submitting}}' bindtap='onSubmit'>确认并开始签署</van-button>
+    <van-button custom-class='new-submit' disabled='{{disabled || submitting}}' loading='{{submitting}}' bindtap='onSubmit'>确认并开始签署</van-button>
   </view>
 </view>

CRM/wmycontract/index.js

@@ -44,9 +44,10 @@ Page({
     }).then(res => {
       console.log("我的合同列表", res);
       this.selectComponent('#ListBox').RefreshToComplete();
+      const statusMap = { '合同创建': '待签署' };
       const list = (res.data || []).map(item => ({
         ...item,
-        _status: (item.status || '').trim() || this.inferStatus(item)
+        _status: statusMap[(item.status || '').trim()] || (item.status || '').trim() || this.inferStatus(item)
       }));
       this.setData({
         'content.pageNumber': res.pageNumber + 1,
@@ -84,6 +85,25 @@ Page({
     this.getList(true);
   },
 
+  /* 重新变更确认信息 */
+  onReconfirm(e) {
+    const item = e.currentTarget.dataset.item;
+    wx.showModal({
+      title: '温馨提示',
+      content: '变更签署信息将作废当前合同并重新创建，之前的签署进度将会丢失，确定继续吗？',
+      confirmText: '前去变更',
+      cancelText: '取消',
+      confirmColor: '#3874F6',
+      success: (res) => {
+        if (res.confirm) {
+          wx.navigateTo({
+            url: `/CRM/wmycontract/confirm?id=${item.sa_esign_contract_taskmxid}`
+          });
+        }
+      }
+    });
+  },
+
   /* 点击列表项 - 根据状态跳转不同页面 */
   onItemClick(e) {
     const item = e.currentTarget.dataset.item;

CRM/wmycontract/index.scss

@@ -8,6 +8,7 @@
     padding: 24rpx;
     margin-bottom: 20rpx;
     display: block;
+    position: relative;
     box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 
     .top {
@@ -57,4 +58,19 @@
   .header {
     background-color: #f5f5f5;
   }
+
+  .reconfirm-btn {
+    position: absolute;
+    right: 24rpx;
+    bottom: 24rpx;
+    font-size: 26rpx;
+    font-weight: 500;
+    letter-spacing: 2rpx;
+    color: #fff;
+    background: linear-gradient(135deg, #f0a028, #E6A23C);
+    padding: 12rpx 28rpx;
+    border-radius: 32rpx;
+    box-shadow: 0 4rpx 12rpx rgba(230, 162, 60, 0.4);
+    z-index: 1;
+  }
 }

CRM/wmycontract/index.wxml

@@ -3,6 +3,7 @@
   <view class="header" style="height: 20rpx;"></view>
   <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <view class="item" wx:for="{{list}}" wx:key="sa_esign_contract_taskmxid" bindtap="onItemClick" data-item="{{item}}">
+      <view class="reconfirm-btn" wx:if="{{item._status === '待签署'}}" catchtap="onReconfirm" data-item="{{item}}">变更签署信息</view>
       <view class="top">
         <view class="name">{{item.taskname || '--'}}</view>
         <view class="statu" style="border-color: {{set.color(item._status)}}; color: {{set.color(item._status)}};">
@@ -37,14 +38,11 @@
         case "待开始":
           color = '#909399';
           break;
-        case "合同创建":
-          color = '#3874F6';
-          break;
         case "待签署":
-          color = '#E6A23C';
+          color = '#3874F6';
           break;
         case "部分签署":
-          color = '#409EFF';
+          color = '#E6A23C';
           break;
         case "合同签署完成":
         case "已签署":

pages/login/modules/account.js

@@ -88,17 +88,6 @@ Component({
 				const s = _Http.baseUrl == "https://crm.meida.com:16691" ? await _Http.OldLogin(`?username=${this.data.accountno}&password=${encodeURIComponent(this.data.password)}`) : {
 					success: false
 				};
-				if (s.success == false) {
-					wx.showModal({
-						title: '提示',
-						content: s.msg,
-						showCancel: false,
-					})
-					getCurrentPages()[0].setData({
-						loading: false
-					})
-				}
-				if (s.success == false) return;
 				let res = s.success == true ? await _Http.SSO({
 					"accountno": s.data.userinfo.username,
 					"password": s.data.cookie.split("=")[1],
@@ -110,25 +99,25 @@ Component({
 					"imagecaptcha": this.data.imagecaptcha || '',
 					"systemclient": "wechatsaletool"
 				});
-				// if (res.remindchangepassword) return wx.showModal({
-				// 	title: '提示',
-				// 	content: '当前密码为系统初始化密码，请修改后重新登录',
-				// 	showCancel: false,
-				// 	confirmText: "前去修改",
-				// 	complete: () => {
-				// 		wx.navigateTo({
-				// 			url: '/pages/index/userCenter/changePassword/index?token=' + res.account_list[0].token
-				// 		})
-				// 		_Http.claerPassword = function () {
-				// 			this.setData({
-				// 				password: ""
-				// 			})
-				// 		}.bind(this);
-				// 		getCurrentPages()[0].setData({
-				// 			loading: false
-				// 		})
-				// 	}
-				// })
+				if (res.remindchangepassword) return wx.showModal({
+					title: '提示',
+					content: '当前密码为系统初始化密码，请修改后重新登录',
+					showCancel: false,
+					confirmText: "前去修改",
+					complete: () => {
+						wx.navigateTo({
+							url: '/pages/index/userCenter/changePassword/index?token=' + res.account_list[0].token
+						})
+						_Http.claerPassword = function () {
+							this.setData({
+								password: ""
+							})
+						}.bind(this);
+						getCurrentPages()[0].setData({
+							loading: false
+						})
+					}
+				})
 				getCurrentPages()[0].setData({
 					loading: false
 				})