From de795b7249a8ce7c3d6b46f770700237ae8a15e4 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Tue, 5 Jan 2021 20:50:52 +0800
Subject: [PATCH] =?UTF-8?q?CRM=E5=AE=A2=E6=88=B7=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=88=B7=E4=BD=93=E5=BE=81=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/custom/SysCustomerMapper.xml | 2 +-
stdiet-ui/src/views/custom/customer/index.vue | 102 ++++++++++++------
.../custom/investigate/questionnaire.vue | 3 +-
3 files changed, 71 insertions(+), 36 deletions(-)
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
index aa37d3fce..c82853ec3 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
@@ -207,7 +207,7 @@
and sc.name like concat('%', #{name}, '%')
and sc.phone like concat('%', #{phone}, '%')
- order by id desc
+ order by sc.create_time desc
diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index db5dda54e..3b4e8d9e1 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -77,120 +77,134 @@
-
-
-
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
{{scope.row.sign.sex == 0 ? `男` : '女'}}
-
-
-
-
+
+
+
+
{{scope.row.sign.position == 0 ? `南方` : '北方'}}
-
+
- {{getSignString(scope.row.sign.signList)}}
+ 点击查看
+ {{getSignString(scope.row.sign.signList)}}
-
+
- {{scope.row.sign.dishesIngredientId}}
+ 点击查看
+ {{scope.row.sign.dishesIngredientId}}
-
+
{{scope.row.sign.constipation == 0 ? `是` : '否'}}
-
+
{{scope.row.sign.staylate == 0 ? `是` : '否'}}
-
+
{{scope.row.sign.motion == 0 ? `是` : '否'}}
-
+
{{scope.row.sign.makeFoodType == 0 ? `自己做` : '外面吃'}}
-
-
+
+
+ 点击查看
+ {{scope.row.sign.remarks}}
+
+
+
{{scope.row.sign.makeFoodTaste == 0 ? `清淡` : '重口味'}}
-
+
{{scope.row.sign.vocation}}
-
+
{{scope.row.sign.night == 0 ? `是` : '否'}}
-
+
{{scope.row.sign.walk == 0 ? `久坐多` : '走动多'}}
-
+
{{scope.row.sign.weakness == 0 ? `是` : '否'}}
-
+
{{scope.row.sign.rebound == 0 ? `是` : '否'}}
-
+
{{scope.row.sign.crux == 0 ? `是` : '否'}}
-
+
{{scope.row.sign.sleepTime}}点
-
+
{{scope.row.sign.getupTime}}点
-
+
{{scope.row.sign.connectTime}}点
-
+
{{scope.row.sign.bloodData}}
-
+
{{scope.row.sign.moistureDate}}
-
+
- {{scope.row.sign.experience}}
+ 点击查看
+ {{scope.row.sign.experience}}
-
+
- {{scope.row.sign.difficulty}}
+ 点击查看
+ {{scope.row.sign.difficulty}}
-
+
+
+ {{formDialog.content}}
+
+
+
@@ -302,7 +324,8 @@
-
+
+
@@ -498,6 +521,12 @@
moistureDate:[
{ required: true, trigger: "blur", message: "请测试湿气" }
]*/
+ },
+ //查看表单内容
+ formDialog:{
+ title: "",
+ show: false,
+ content: ""
}
};
},
@@ -709,6 +738,11 @@
return time > 9 ? (time + ":00") : ("0"+time+":00");
}
return null;
+ },
+ openFormDialog(title, content){
+ this.formDialog.title = title;
+ this.formDialog.content = content;
+ this.formDialog.show = true;
}
}
};
diff --git a/stdiet-ui/src/views/custom/investigate/questionnaire.vue b/stdiet-ui/src/views/custom/investigate/questionnaire.vue
index e2899aff7..7fe6b9d61 100644
--- a/stdiet-ui/src/views/custom/investigate/questionnaire.vue
+++ b/stdiet-ui/src/views/custom/investigate/questionnaire.vue
@@ -79,7 +79,8 @@
-
+
+