+
@@ -199,6 +248,7 @@ const searchForm = ref({
phone: undefined,
signUser: undefined,
dealDate: [],
+ createDate: [],
signProduct: undefined,
signSpecs: undefined,
signId: undefined,
@@ -215,6 +265,7 @@ function handleReset() {
phone: undefined,
signUser: undefined,
dealDate: [],
+ createDate: [],
signProduct: undefined,
signSpecs: undefined,
signId: undefined,
diff --git a/src/views/Clue/Order/Comp/SchoolSettle.vue b/src/views/Clue/Order/Comp/SchoolSettle.vue
index 22ec5d9..08cd1f4 100644
--- a/src/views/Clue/Order/Comp/SchoolSettle.vue
+++ b/src/views/Clue/Order/Comp/SchoolSettle.vue
@@ -2,22 +2,44 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
@@ -44,6 +79,7 @@
filterable
clearable
@change="changeSchool"
+ style="width: 120px"
>
+
@@ -206,6 +250,7 @@ const searchForm = ref({
phone: undefined,
signUser: undefined,
dealDate: [],
+ createDate: [],
signSchool: undefined,
signPlace: undefined,
signClass: undefined,
@@ -222,6 +267,7 @@ function handleReset() {
phone: undefined,
signUser: undefined,
dealDate: [],
+ createDate: [],
signSchool: undefined,
signPlace: undefined,
signClass: undefined,
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 70f755a..a5bd51a 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -33,7 +33,7 @@
v-model="row.nextFollowTime"
type="date"
placeholder="选择日期时间"
- :disabled="!row.editable"
+ :disabled="row.userId != useUserStore().getUser.id"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
style="width: 100%"
@@ -47,7 +47,7 @@
type="textarea"
:autoSize="{ minRows: 2 }"
placeholder="输入跟进内容"
- :disabled="!row.editable"
+ :disabled="row.userId != useUserStore().getUser.id"
/>
@@ -364,8 +364,8 @@ async function handleSave() {
const data = await ClueApi.createClue(params)
message.success(data)
} else {
- const data = await ClueApi.updateClue(params)
- message.success(data)
+ await ClueApi.updateClue(params)
+ message.success('修改成功')
}
dialogVisible.value = false
// 发送操作成功的事件
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index f057e58..2ce06f5 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -118,18 +118,31 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
待跟进
diff --git a/src/views/SchoolManagement/Class/Comp/DialogClass.vue b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
index 77a86ec..5fcd467 100644
--- a/src/views/SchoolManagement/Class/Comp/DialogClass.vue
+++ b/src/views/SchoolManagement/Class/Comp/DialogClass.vue
@@ -474,12 +474,15 @@ const opts = ref({
})
/** 打开弹窗 */
-const open = async (type, id) => {
+const open = async (type, id, sp) => {
dialogVisible.value = true
dialogTitle.value = type == 'create' ? '新增班型' : '修改班型'
formType.value = type
currentTab.value = 'base'
resetForm()
+ if (type == 'create' && sp && sp.length) {
+ formData.value.schPlace = sp
+ }
if (!opts.value.length) {
const arr = await ClassApi.getCommissionParams()
arr.map((item) => {
diff --git a/src/views/SchoolManagement/Class/index.vue b/src/views/SchoolManagement/Class/index.vue
index 921f1bb..6b9ba3a 100644
--- a/src/views/SchoolManagement/Class/index.vue
+++ b/src/views/SchoolManagement/Class/index.vue
@@ -47,20 +47,23 @@
plain
@click="handleOpenDialog('create', null)"
v-hasPermi="['school:class:add']"
- >新增
+ 新增
+
批量删除
+ 批量删除
+
批量启/停用
+ 批量启/停用
+
@@ -235,7 +238,7 @@ async function getList() {
const ClassDialog = ref()
function handleOpenDialog(type, id = null) {
- ClassDialog.value.open(type, id)
+ ClassDialog.value.open(type, id, searchForm.value.schPlace)
}
function handleReset() {