From 859c5603519a901ad2562a82a518fee0e8ffabaf Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 20 Sep 2023 10:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company/dialog_index_man.vue        | 125 ++++++++++--------
 src/views/task/taskCalendar.vue               |   2 +-
 .../component/banquetBirthday.vue             |   2 -
 .../component/banquetFullMoon.vue             |   2 -
 .../component/banquetFuneral.vue              |   2 -
 .../component/banquetMarry.vue                |   2 -
 .../component/banquetOther.vue                |   2 -
 .../user_informationg/component/breeding.vue  |   2 -
 .../component/deepProcessing.vue              |  24 ++--
 .../component/houseDecoration.vue             |   2 -
 .../component/houseRenovate.vue               |   2 -
 .../component/houseRepair.vue                 |   2 -
 .../component/houseTransaction.vue            |   2 -
 .../user_informationg/component/plant.vue     |   2 -
 .../user_informationg/component/store.vue     |   2 -
 .../component/thickProcessing.vue             |  24 ++--
 16 files changed, 94 insertions(+), 105 deletions(-)

diff --git a/src/views/company/dialog_index_man.vue b/src/views/company/dialog_index_man.vue
index 4c101b2..7c33095 100644
--- a/src/views/company/dialog_index_man.vue
+++ b/src/views/company/dialog_index_man.vue
@@ -1,17 +1,17 @@
 <template>
-    <div>
-        <el-card class="!border-none" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="管理员名称" prop="name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.name"
-                        clearable
-                        placeholder="请输入管理员名称"
-                    />
-                </el-form-item>
-                <el-form-item label="请选择管理员角色" prop="role_id">
-                    <el-select class="w-[280px]" v-model="queryParams.role_id">
+  <div>
+    <el-card class="!border-none" shadow="never">
+      <el-form class="mb-[-16px]" :model="queryParams" inline>
+        <el-form-item label="管理员名称" prop="name">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.name"
+            clearable
+            placeholder="请输入管理员名称"
+          />
+        </el-form-item>
+        <el-form-item label="请选择管理员角色" prop="role_id">
+          <el-select class="w-[280px]" v-model="queryParams.role_id">
             <el-option label="全部" value />
             <el-option
               v-for="(item, index) in optionsData.role"
@@ -20,38 +20,55 @@
               :value="item.id"
             />
           </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-         <el-table :data="pager.lists" @cell-click="handleCurrentChange">
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="resetPage">查询</el-button>
+          <el-button @click="resetParams">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <div class="mt-4">
+        <el-table :data="pager.lists" @cell-click="handleCurrentChange">
           <el-table-column label="账号" prop="account" min-width="120" />
           <el-table-column label="名称" prop="name" min-width="100" />
-          <el-table-column label="角色" prop="role_name" min-width="100" show-tooltip-when-overflow />
-          <el-table-column label="部门" prop="dept_name" min-width="100" show-tooltip-when-overflow />
-          <el-table-column label="创建时间" prop="create_time" min-width="180" />
-          <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
+          <el-table-column
+            label="角色"
+            prop="role_name"
+            min-width="100"
+            show-tooltip-when-overflow
+          />
+          <el-table-column
+            label="部门"
+            prop="dept_name"
+            min-width="100"
+            show-tooltip-when-overflow
+          />
+          <el-table-column
+            label="创建时间"
+            prop="create_time"
+            min-width="180"
+          />
+          <el-table-column
+            label="最近登录时间"
+            prop="login_time"
+            min-width="180"
+          />
           <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
         </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+  </div>
 </template>
 
 <script lang="ts" setup name="companyLists">
-import { usePaging } from '@/hooks/usePaging'
+import { usePaging } from "@/hooks/usePaging";
 import { roleAll } from "@/api/perms/role";
-import { useDictData,useDictOptions } from '@/hooks/useDictOptions'
-import { adminLists} from "@/api/perms/admin";
-import { defineEmits, defineProps } from 'vue'
+import { useDictData, useDictOptions } from "@/hooks/useDictOptions";
+import { adminLists } from "@/api/perms/admin";
 const { optionsData } = useDictOptions<{
   role: any[];
 }>({
@@ -61,34 +78,34 @@ const { optionsData } = useDictOptions<{
 });
 // 查询条件
 const queryParams = reactive({
-    name: "",
-    role_id: "",
-})
+  name: "",
+  role_id: "",
+});
 
 const props = defineProps({
-    type: {
-        type: Number,
-        defualt: 0
-    }
-})
+  type: {
+    type: Number,
+    defualt: 0,
+  },
+});
 
-if(props.type==8){
-    queryParams.role_id = 8
+if (props.type == 8) {
+  queryParams.role_id = 8;
 }
 
 // 选中数据
-const emits = defineEmits(['customEvent'])
+const emits = defineEmits(["customEvent"]);
 
 // 选中数据子父传递
 const handleCurrentChange = (value: any) => {
-    emits('customEvent', value)
-}
+  emits("customEvent", value);
+};
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: adminLists,
-    params: queryParams
-})
+  fetchFun: adminLists,
+  params: queryParams,
+});
 
-getLists()
+getLists();
 </script>
diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue
index e618f3e..0cfd316 100644
--- a/src/views/task/taskCalendar.vue
+++ b/src/views/task/taskCalendar.vue
@@ -100,7 +100,7 @@ const queryParams = reactive({
   start_time: "",
   end_time: "",
   page_no: 1,
-  pageSize: 150,
+  page_size: 300,
 });
 if (route.query.id) {
   queryParams.scheduling_id = route.query.id.toString();
diff --git a/src/views/user_informationg/component/banquetBirthday.vue b/src/views/user_informationg/component/banquetBirthday.vue
index c09077b..5269149 100644
--- a/src/views/user_informationg/component/banquetBirthday.vue
+++ b/src/views/user_informationg/component/banquetBirthday.vue
@@ -89,8 +89,6 @@
 </template>
   
   <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/banquetFullMoon.vue b/src/views/user_informationg/component/banquetFullMoon.vue
index 1510565..f4c5ab9 100644
--- a/src/views/user_informationg/component/banquetFullMoon.vue
+++ b/src/views/user_informationg/component/banquetFullMoon.vue
@@ -89,8 +89,6 @@
 </template>
   
   <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/banquetFuneral.vue b/src/views/user_informationg/component/banquetFuneral.vue
index c20b20b..e4020f9 100644
--- a/src/views/user_informationg/component/banquetFuneral.vue
+++ b/src/views/user_informationg/component/banquetFuneral.vue
@@ -93,8 +93,6 @@
 </template>
   
   <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/banquetMarry.vue b/src/views/user_informationg/component/banquetMarry.vue
index 2c29667..01dbf31 100644
--- a/src/views/user_informationg/component/banquetMarry.vue
+++ b/src/views/user_informationg/component/banquetMarry.vue
@@ -97,8 +97,6 @@
 </template>
   
   <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/banquetOther.vue b/src/views/user_informationg/component/banquetOther.vue
index 9b5a6b3..193510b 100644
--- a/src/views/user_informationg/component/banquetOther.vue
+++ b/src/views/user_informationg/component/banquetOther.vue
@@ -101,8 +101,6 @@
 </template>
   
   <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/breeding.vue b/src/views/user_informationg/component/breeding.vue
index 9340a9a..2521ff5 100644
--- a/src/views/user_informationg/component/breeding.vue
+++ b/src/views/user_informationg/component/breeding.vue
@@ -217,8 +217,6 @@
 </template>
   
   <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/deepProcessing.vue b/src/views/user_informationg/component/deepProcessing.vue
index 712382f..21834ff 100644
--- a/src/views/user_informationg/component/deepProcessing.vue
+++ b/src/views/user_informationg/component/deepProcessing.vue
@@ -124,17 +124,17 @@
           <el-col :span="8">
             <el-form-item label="经营类型" prop="manage_type">
               <el-select
-              v-model="datas.manage_type"
-              clearable
-              :style="{ width: '100%' }"
-            >
-              <el-option
-                v-for="(item, index) in storeTypeList"
-                :key="index"
-                :label="item"
-                :value="index + ''"
-              ></el-option>
-            </el-select>
+                v-model="datas.manage_type"
+                clearable
+                :style="{ width: '100%' }"
+              >
+                <el-option
+                  v-for="(item, index) in storeTypeList"
+                  :key="index"
+                  :label="item"
+                  :value="index + ''"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -242,8 +242,6 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const storeTypeList = ref([
   "超市",
   "生鲜",
diff --git a/src/views/user_informationg/component/houseDecoration.vue b/src/views/user_informationg/component/houseDecoration.vue
index bab7468..4891699 100644
--- a/src/views/user_informationg/component/houseDecoration.vue
+++ b/src/views/user_informationg/component/houseDecoration.vue
@@ -72,8 +72,6 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/houseRenovate.vue b/src/views/user_informationg/component/houseRenovate.vue
index 7bc4510..414988a 100644
--- a/src/views/user_informationg/component/houseRenovate.vue
+++ b/src/views/user_informationg/component/houseRenovate.vue
@@ -40,8 +40,6 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/houseRepair.vue b/src/views/user_informationg/component/houseRepair.vue
index dece8ae..aed0808 100644
--- a/src/views/user_informationg/component/houseRepair.vue
+++ b/src/views/user_informationg/component/houseRepair.vue
@@ -106,8 +106,6 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const props = defineProps({
   datas: {
     type: Object,
diff --git a/src/views/user_informationg/component/houseTransaction.vue b/src/views/user_informationg/component/houseTransaction.vue
index ca59b00..040d6f5 100644
--- a/src/views/user_informationg/component/houseTransaction.vue
+++ b/src/views/user_informationg/component/houseTransaction.vue
@@ -113,8 +113,6 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const storeTypeList = ref([
   "超市",
   "生鲜",
diff --git a/src/views/user_informationg/component/plant.vue b/src/views/user_informationg/component/plant.vue
index 4975892..4525e1c 100644
--- a/src/views/user_informationg/component/plant.vue
+++ b/src/views/user_informationg/component/plant.vue
@@ -256,8 +256,6 @@
 </template>
     
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const landPlanList = ref(["自己种", "出租", "代种", "租更多地扩大种植"]);
 
 const props = defineProps({
diff --git a/src/views/user_informationg/component/store.vue b/src/views/user_informationg/component/store.vue
index f99bf29..92bb589 100644
--- a/src/views/user_informationg/component/store.vue
+++ b/src/views/user_informationg/component/store.vue
@@ -164,8 +164,6 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const storeTypeList = ref([
   "超市",
   "生鲜",
diff --git a/src/views/user_informationg/component/thickProcessing.vue b/src/views/user_informationg/component/thickProcessing.vue
index 92d078a..caa3cd0 100644
--- a/src/views/user_informationg/component/thickProcessing.vue
+++ b/src/views/user_informationg/component/thickProcessing.vue
@@ -124,17 +124,17 @@
           <el-col :span="8">
             <el-form-item label="经营类型" prop="manage_type">
               <el-select
-              v-model="datas.manage_type"
-              clearable
-              :style="{ width: '100%' }"
-            >
-              <el-option
-                v-for="(item, index) in storeTypeList"
-                :key="index"
-                :label="item"
-                :value="index + ''"
-              ></el-option>
-            </el-select>
+                v-model="datas.manage_type"
+                clearable
+                :style="{ width: '100%' }"
+              >
+                <el-option
+                  v-for="(item, index) in storeTypeList"
+                  :key="index"
+                  :label="item"
+                  :value="index + ''"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -242,8 +242,6 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, defineProps } from "vue";
-
 const storeTypeList = ref([
   "超市",
   "生鲜",