+
@@ -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/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() {
From 2cf95c4e5d31b17fa43859a791811aa080f316fa Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 12 Aug 2024 18:06:10 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Clue/Order/Comp/MallOrderList.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 5482072..3f82934 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -55,7 +55,7 @@
批量修改安装状态
@@ -103,6 +103,7 @@
:inactive-value="false"
active-text="已生产"
inactive-text="待生产"
+ :disabled="!checkPermi(['clue:order:update-produce'])"
size="small"
@change="handleChangeProdoce(scope.row)"
/>
@@ -256,6 +257,7 @@ import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
import { VueDraggable } from 'vue-draggable-plus'
+import { checkPermi } from '@/utils/permission'
const userOptions = ref([])
const allUserOptions = ref([])
From 004915e9566f643c54b3820d3cbd870b6f6b80dd Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 13 Aug 2024 15:21:57 +0800
Subject: [PATCH 3/4] sc
---
.../Clue/Order/Comp/DialogAfterSaleAudit.vue | 49 +++++++++++++++----
.../Clue/Order/Comp/DialogBatchAudit.vue | 49 +++++++++++++++----
src/views/Clue/Pool/Comp/DialogClue.vue | 6 +--
3 files changed, 81 insertions(+), 23 deletions(-)
diff --git a/src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue b/src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue
index 15272c7..38f0c24 100644
--- a/src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue
+++ b/src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue
@@ -1,16 +1,39 @@