@@ -73,7 +87,7 @@ import UserSelect from '@/components/Business/User/UserSelect.vue';
export default {
name: "CustomerEditDialog",
components: { FormCol, UserSelect },
- dicts: ['customer_intent_level', 'customer_status'],
+ dicts: ['customer_intent_level', 'customer_status', 'customer_source', 'customer_intent'],
props: {
show: {
type: Boolean,
@@ -94,10 +108,10 @@ export default {
// 表单校验
rules: {
code: [
- { required: true, message: "客户编号不能为空", trigger: "blur" }
+ { required: true, message: "客户编号不能为空", trigger: "change" }
],
name: [
- { required: true, message: "客户姓名不能为空", trigger: "blur" }
+ { required: true, message: "客户姓名不能为空", trigger: "change" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "change" }
@@ -106,10 +120,10 @@ export default {
{ required: true, message: "意向强度不能为空", trigger: "change" }
],
source: [
- { required: true, message: "来源不能为空", trigger: "blur" }
+ { required: true, message: "来源不能为空", trigger: "change" }
],
followId: [
- { required: true, message: "跟进人不能为空", trigger: "blur" }
+ { required: true, message: "跟进人不能为空", trigger: "change" }
]
}
};
@@ -149,10 +163,8 @@ export default {
mobile: null,
wechat: null,
source: null,
- intent: null,
+ intents: [],
followId: this.userId,
- lastFollowTime: null,
- nextFollowTime: null,
remark: null
};
this.resetForm("form");
diff --git a/src/views/bst/customer/index.vue b/src/views/bst/customer/index.vue
index 34079e5..ac77b25 100644
--- a/src/views/bst/customer/index.vue
+++ b/src/views/bst/customer/index.vue
@@ -142,6 +142,9 @@
+
+ {{d.row[column.key].join(',')}}
+
{{d.row[column.key]}}
@@ -186,7 +189,7 @@
+
+
\ No newline at end of file
diff --git a/src/views/bst/project/components/ProjectStartDialog.vue b/src/views/bst/project/components/ProjectStartDialog.vue
new file mode 100644
index 0000000..e9e46dd
--- /dev/null
+++ b/src/views/bst/project/components/ProjectStartDialog.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/bst/project/edit/index.vue b/src/views/bst/project/edit/index.vue
index bedb64d..b98e27d 100644
--- a/src/views/bst/project/edit/index.vue
+++ b/src/views/bst/project/edit/index.vue
@@ -7,9 +7,6 @@
-
-
-
@@ -22,8 +19,8 @@
style="width: calc(100% - 2em)"
/> 元
-
-
+
+
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
@@ -71,11 +54,11 @@
import { getProject, addProject, updateProject } from "@/api/bst/project";
import FormCol from "@/components/FormCol/index.vue";
import EditHeader from "@/components/EditHeader/index.vue";
-import UserInput from "@/components/Business/User/UserInput.vue";
-import FileUpload from "@/components/FileUpload/index.vue";
+import CustomerInput from "@/components/Business/Customer/CustomerInput.vue";
+import UserSelect from "@/components/Business/User/UserSelect.vue";
export default {
name: "ProjectEdit",
- components: { FormCol, EditHeader, UserInput, FileUpload },
+ components: { FormCol, EditHeader, UserSelect, CustomerInput },
dicts: ['project_status'],
data() {
return {
@@ -86,9 +69,6 @@ export default {
form: {},
// 表单校验
rules: {
- no: [
- { required: true, message: "项目编号不能为空", trigger: "blur" }
- ],
name: [
{ required: true, message: "项目名称不能为空", trigger: "blur" }
],
diff --git a/src/views/bst/project/index.vue b/src/views/bst/project/index.vue
index f48d0fb..a650667 100644
--- a/src/views/bst/project/index.vue
+++ b/src/views/bst/project/index.vue
@@ -46,9 +46,8 @@
+ :label="dict.value"
+ >{{dict.label}}
@@ -124,6 +123,12 @@
+ 详情
删除
+ 开始开发
+ 开发完成
+ 项目验收
+ 运行维护
@@ -149,13 +186,30 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/bst/task/components/TaskEditDialog.vue b/src/views/bst/task/components/TaskEditDialog.vue
index d47656c..eea59f5 100644
--- a/src/views/bst/task/components/TaskEditDialog.vue
+++ b/src/views/bst/task/components/TaskEditDialog.vue
@@ -17,7 +17,7 @@