diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue
index 0024eda..0388b32 100644
--- a/src/components/tools/UserPassword.vue
+++ b/src/components/tools/UserPassword.vue
@@ -73,20 +73,22 @@ export default {
{ required: true, message: '请输入新密码!' },
{
pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '密码由8位数字、大小写字母和特殊符号组成!'
+ message: '密码由8位及以上数字、大小写字母和特殊符号组成!'
},
{ validator: this.validateToNextPassword }
- ]
+ ],
+ validateTrigger: 'blur'
},
confirmpassword: {
rules: [
{ required: true, message: '请确认新密码!' },
{
pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
- message: '密码由8位数字、大小写字母和特殊符号组成!'
+ message: '密码由8位及以上数字、大小写字母和特殊符号组成!'
},
{ validator: this.compareToFirstPassword }
- ]
+ ],
+ validateTrigger: 'blur'
}
},
confirmDirty: false,
diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue
index 1334202..3f15248 100644
--- a/src/views/MessagePage/ProjectDetailModal.vue
+++ b/src/views/MessagePage/ProjectDetailModal.vue
@@ -152,7 +152,7 @@ const columns = [
{
title: '开票人',
align: 'center',
- dataIndex: 'createBy'
+ dataIndex: 'realName'
},
{
title: '日期',
@@ -177,7 +177,7 @@ const columns = [
{
title: '邮寄人',
align: 'center',
- dataIndex: 'contactName'
+ dataIndex: 'updateBy'
},
{
title: '快递',
diff --git a/src/views/mineContract/MineContract.vue b/src/views/mineContract/MineContract.vue
index 57d61ba..ac2c1b3 100644
--- a/src/views/mineContract/MineContract.vue
+++ b/src/views/mineContract/MineContract.vue
@@ -50,6 +50,15 @@
{{ text }}
+
+
+
+
+ {{ text }}元
+
+ {{ text }}元
+
+
@@ -88,7 +97,7 @@ export default {
}, {
title: '合同金额',
dataIndex: 'contractAmount',
- scopedSlots: 'text',
+ scopedSlots: 'money',
col: 5
}, {
title: '负责人',
diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue
index 2326407..edaf320 100644
--- a/src/views/mineContract/modules/MineContractModule.vue
+++ b/src/views/mineContract/modules/MineContractModule.vue
@@ -40,7 +40,7 @@
合同金额:
-
+