From d05710a997052cb89c6254f79283f8431c28fbf6 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 18 Aug 2023 12:03:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task_template/edit.vue | 61 +++++++++++++++++++++++++-------
 src/views/task_template/map.vue  | 23 ++++++++----
 2 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index 920b74a..57aabca 100644
--- a/src/views/task_template/edit.vue
+++ b/src/views/task_template/edit.vue
@@ -105,25 +105,37 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="formData.type == 32" label="起点">
+        <el-form-item
+          v-if="formData.type == 32"
+          label="起点"
+          @click="changeMap(0)"
+        >
           <el-input
             placeholder="请点击上方地图选择地点"
             readonly
-            :value="formData.extend[0]?.address"
+            :value="formData.extend?.origin?.address"
           />
         </el-form-item>
-        <el-form-item v-if="formData.type == 32" label="中转点">
+        <el-form-item
+          v-if="formData.type == 32"
+          label="中转点"
+          @click="changeMap(1)"
+        >
           <el-input
             placeholder="请点击上方地图选择地点"
             readonly
-            :value="formData.extend[1]?.address"
+            :value="formData.extend?.transfer?.address"
           />
         </el-form-item>
-        <el-form-item v-if="formData.type == 32" label="终点">
+        <el-form-item
+          v-if="formData.type == 32"
+          label="终点"
+          @click="changeMap(2)"
+        >
           <el-input
             placeholder="请点击上方地图选择地点"
             readonly
-            :value="formData.extend[2]?.address"
+            :value="formData.extend?.terminus?.address"
           />
         </el-form-item>
         <el-form-item label="状态" prop="status">
@@ -144,7 +156,7 @@
         v-if="mapShow"
         ref="mapRef"
         @success="setMap"
-        @close="mapShow = false"
+        @close=""
       ></taskMap>
     </popup>
   </div>
@@ -194,7 +206,11 @@ const formData = reactive({
   money_two: 0, // 二阶段金额
   money_three: 0, // 长期金额
   types: "", //阶段类型
-  extend: {},
+  extend: {
+    origin: {}, //起点
+    transfer: {}, //中转
+    terminus: {}, //终点
+  },
 });
 
 //任务类型接口
@@ -259,14 +275,35 @@ const mapRef = shallowRef<InstanceType<typeof taskMap>>();
 const changeTaskType = async (e: any) => {
   if (e == 32) {
     mapShow.value = true; //为三轮车时
-    await nextTick();
-    console.log(mapRef.value);
-    mapRef.value?.open();
+    // await nextTick();
+    // mapRef.value?.open();
   }
 };
 
+// 当前点击的地图类型(起,转,终)点
+const mapType = ref("");
+const changeMap = async (e: Number) => {
+  let map_title = "";
+  switch (e) {
+    case 0:
+      mapType.value = "origin";
+      map_title = "起点";
+      break;
+    case 1:
+      mapType.value = "transfer";
+      map_title = "中转点";
+      break;
+    case 2:
+      mapType.value = "terminus";
+      map_title = "终点";
+      break;
+  }
+  await nextTick();
+  mapRef.value?.open(map_title);
+};
+
 const setMap = (e: any) => {
-  formData.extend = e;
+  formData.extend[mapType.value] = e[0];
   console.log("选择了地区", formData.extend);
 };
 
diff --git a/src/views/task_template/map.vue b/src/views/task_template/map.vue
index c291855..edd26df 100644
--- a/src/views/task_template/map.vue
+++ b/src/views/task_template/map.vue
@@ -2,7 +2,7 @@
   <div class="edit-popup">
     <popup
       ref="popupRef"
-      title="选择地点"
+      :title="title"
       :async="true"
       width="550px"
       @confirm="handleSubmit"
@@ -13,14 +13,16 @@
           <el-input
             style="width: 300px; margin-right: 16px"
             placeholder="请输入要搜索的地址"
+            v-model="searchText"
+            clearable
           />
-          <el-button type="primary">搜索</el-button>
-          <el-button @click="resetMap()">重置</el-button>
+          <el-button type="primary" @click="serach()">搜索</el-button>
+          <!-- <el-button @click="resetMap()">重置</el-button> -->
         </el-form-item>
         <el-form-item label-width="80px" label="地图">
           <MapContainer ref="mapRef" @changeMaps="changeMaps"></MapContainer>
         </el-form-item>
-        <el-form-item label-width="80px" label="起点">
+        <!-- <el-form-item label-width="80px" label="起点">
           <el-input
             style="width: 350px; margin-right: 16px"
             placeholder="请点击上方地图选择地点"
@@ -43,7 +45,7 @@
             readonly
             :value="address[2]?.address"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </popup>
   </div>
@@ -72,6 +74,7 @@ const formRef = shallowRef<FormInstance>();
 const popupRef = shallowRef<InstanceType<typeof Popup>>();
 const mode = ref("add");
 const datalist = ref([]);
+const title = ref("");
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
@@ -98,6 +101,12 @@ const resetMap = () => {
   mapRef.value.resetMap();
 };
 
+// 搜索
+const searchText = ref("");
+const serach = () => {
+  mapRef.value.searchMap(searchText.value);
+};
+
 const address = ref([]);
 const changeMaps = (e: any) => {
   address.value = JSON.parse(JSON.stringify(e));
@@ -112,8 +121,8 @@ const handleSubmit = async () => {
 };
 
 //打开弹窗
-const open = (type = "add") => {
-  mode.value = type;
+const open = (type = "地点") => {
+  title.value = "选择" + type;
   popupRef.value?.open();
 };
 

From b21d4266d1893f7863adbe356ad698c841a2ba55 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 18 Aug 2023 12:04:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/MapContainer.vue           |  87 +-
 .../components/header/user-drop-down.vue      |  53 +-
 src/views/account/login.vue                   | 231 +++--
 src/views/company/index.vue                   | 959 +++++++++---------
 src/views/company/subordinate.vue             | 450 ++++----
 src/views/consumer/lists/index.vue            | 440 ++++----
 src/views/contract/contractDetil.vue          |   2 +-
 7 files changed, 1212 insertions(+), 1010 deletions(-)

diff --git a/src/components/map/MapContainer.vue b/src/components/map/MapContainer.vue
index 0275e13..4309fb8 100644
--- a/src/components/map/MapContainer.vue
+++ b/src/components/map/MapContainer.vue
@@ -10,6 +10,8 @@ const map = shallowRef(null);
 let AMap: any = null;
 let markerList: Array<any> = [];
 let m_index: Number = 0;
+let geocoder: any = null;
+let autocomplete: any = null;
 
 const emits = defineEmits("changeMaps");
 
@@ -20,10 +22,6 @@ const resetMap = () => {
   emits("changeMaps", markerList);
 };
 
-defineExpose({
-  resetMap,
-});
-
 const initMap = async () => {
   const loader = AMapLoader.load({
     key: "4f8f55618010007147aab96fc72bb408",
@@ -36,37 +34,23 @@ const initMap = async () => {
     zoom: 13,
   });
 
+  AMap.plugin("AMap.Geocoder", function () {
+    geocoder = new AMap.Geocoder({
+      radius: 10, // 逆地理编码范围，默认值：1000，单位：米
+      extensions: "all", // 返回地址描述结果时是否包含引擎内置的POI，默认值：base，可选值：base、all
+    }); // 经纬度数组
+  });
+
+  // // 创建 Autocomplete 实例
+  // autocomplete = new AMap.Autocomplete({
+  //   city: "全国", // 设置默认城市为全国
+  // });
+
   map.value.on("click", (e: any) => {
     // console.log("点击", e.lnglat);
     if (m_index >= 3) return;
     // 调用函数并传入经纬度
-    getDistrictName(e.lnglat.lng, e.lnglat.lat);
-
-    // 获取地区名称
-    function getDistrictName(lng, lat) {
-      AMap.plugin("AMap.Geocoder", function () {
-        var geocoder = new AMap.Geocoder({
-          radius: 10, // 逆地理编码范围，默认值：1000，单位：米
-          extensions: "all", // 返回地址描述结果时是否包含引擎内置的POI，默认值：base，可选值：base、all
-        }); // 经纬度数组
-
-        geocoder.getAddress([lng, lat], function (status, result) {
-          if (status === "complete" && result.info === "OK") {
-            // 解析成功，提取地区名称
-            var district = result.regeocode.addressComponent.district;
-            // console.log(district, result.regeocode); // 输出地区名字
-            markerList.push({
-              lnglat: e.lnglat,
-              address: result.regeocode.formattedAddress,
-            });
-            emits("changeMaps", markerList);
-          } else {
-            // 解析失败
-            console.log("逆地理编码失败");
-          }
-        });
-      });
-    }
+    getDistrictName(e.lnglat.lng, e.lnglat.lat, e);
 
     // 自定义 Marker 的图标
     var customIcon = new AMap.Icon({
@@ -107,6 +91,47 @@ const initMap = async () => {
   });
 };
 
+const searchMap = (address: any) => {
+  console.log(address);
+  ElMessage.error("搜索功能开发中");
+
+  // autocomplete.search(address, function (status: any, result: any) {
+  //   console.log(status, result);
+
+  //   if (status === "complete" && result.info === "OK") {
+  //     // 获取提示结果
+  //     var tips = result.tips;
+
+  //     // 更新搜索结果列表或下拉菜单等
+  //     // ...
+  //   }
+  // });
+};
+
+// 获取地区名称
+const getDistrictName = (lng: any, lat: any, e: any) => {
+  geocoder.getAddress([lng, lat], function (status: any, result: any) {
+    if (status === "complete" && result.info === "OK") {
+      // 解析成功，提取地区名称
+      var district = result.regeocode.addressComponent.district;
+      // console.log(district, result.regeocode); // 输出地区名字
+      markerList.push({
+        lnglat: e.lnglat,
+        address: result.regeocode.formattedAddress,
+      });
+      emits("changeMaps", markerList);
+    } else {
+      // 解析失败
+      console.log("逆地理编码失败");
+    }
+  });
+};
+
+defineExpose({
+  resetMap,
+  searchMap,
+});
+
 onMounted(() => {
   initMap();
 });
diff --git a/src/layout/default/components/header/user-drop-down.vue b/src/layout/default/components/header/user-drop-down.vue
index 0442bc1..b1325a2 100644
--- a/src/layout/default/components/header/user-drop-down.vue
+++ b/src/layout/default/components/header/user-drop-down.vue
@@ -1,34 +1,37 @@
 <template>
-    <el-dropdown class="px-2" @command="handleCommand">
-        <div class="flex items-center">
-            <el-avatar :size="34" :src="userInfo.avatar" />
-            <div class="ml-3 mr-1">{{ userInfo.name }}</div>
-            <icon name="el-icon-ArrowDown" />
-        </div>
+  <el-dropdown class="px-2" @command="handleCommand">
+    <div class="flex items-center">
+      <el-avatar :size="34" :src="userInfo.avatar" />
+      <div class="ml-3 mr-1">{{ userInfo.name }}</div>
+      <icon name="el-icon-ArrowDown" />
+    </div>
 
-        <template #dropdown>
-            <el-dropdown-menu>
-                <router-link to="/user/setting">
-                    <el-dropdown-item>个人设置</el-dropdown-item>
-                </router-link>
-                <el-dropdown-item command="logout">退出登录</el-dropdown-item>
-            </el-dropdown-menu>
-        </template>
-    </el-dropdown>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <router-link to="/user/setting">
+          <el-dropdown-item>个人设置</el-dropdown-item>
+        </router-link>
+        <el-dropdown-item command="logout">退出登录</el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
 </template>
 
 <script setup lang="ts">
-import useUserStore from '@/stores/modules/user'
-import feedback from '@/utils/feedback'
-const userStore = useUserStore()
+import useUserStore from "@/stores/modules/user";
+import feedback from "@/utils/feedback";
+import cache from "@/utils/cache";
+import { ACCOUNT_KEY } from "@/enums/cacheEnums";
+const userStore = useUserStore();
 
-const userInfo = computed(() => userStore.userInfo)
+const userInfo = computed(() => userStore.userInfo);
 
 const handleCommand = async (command: string) => {
-    switch (command) {
-        case 'logout':
-            await feedback.confirm('确定退出登录吗？')
-            userStore.logout()
-    }
-}
+  switch (command) {
+    case "logout":
+      await feedback.confirm("确定退出登录吗？");
+      cache.set("logout", cache.get(ACCOUNT_KEY).account);
+      userStore.logout();
+  }
+};
 </script>
diff --git a/src/views/account/login.vue b/src/views/account/login.vue
index 7def9b6..187fd3a 100644
--- a/src/views/account/login.vue
+++ b/src/views/account/login.vue
@@ -1,130 +1,141 @@
 <template>
-    <div class="login flex flex-col">
-        <div class="flex-1 flex items-center justify-center">
-            <div class="login-card flex rounded-md">
-                <div class="flex-1 h-full hidden md:inline-block">
-                    <image-contain :src="config.login_image" :width="400" height="100%" />
-                </div>
-                <div
-                    class="login-form bg-body flex flex-col justify-center px-10 py-10 md:w-[400px] w-[375px] flex-none mx-auto"
-                >
-                    <div class="text-center text-3xl font-medium mb-8">{{ config.web_name }}</div>
-                    <el-form ref="formRef" :model="formData" size="large" :rules="rules">
-                        <el-form-item prop="account">
-                            <el-input
-                                v-model="formData.account"
-                                placeholder="请输入账号"
-                                @keyup.enter="handleEnter"
-                            >
-                                <template #prepend>
-                                    <icon name="el-icon-User" />
-                                </template>
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item prop="password">
-                            <el-input
-                                ref="passwordRef"
-                                v-model="formData.password"
-                                show-password
-                                placeholder="请输入密码"
-                                @keyup.enter="handleLogin"
-                            >
-                                <template #prepend>
-                                    <icon name="el-icon-Lock" />
-                                </template>
-                            </el-input>
-                        </el-form-item>
-                    </el-form>
-                    <div class="mb-5">
-                        <el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
-                    </div>
-                    <el-button type="primary" size="large" :loading="isLock" @click="lockLogin">
-                        登录
-                    </el-button>
-                </div>
-            </div>
+  <div class="login flex flex-col">
+    <div class="flex-1 flex items-center justify-center">
+      <div class="login-card flex rounded-md">
+        <div class="flex-1 h-full hidden md:inline-block">
+          <image-contain :src="config.login_image" :width="400" height="100%" />
         </div>
-        <layout-footer />
+        <div
+          class="login-form bg-body flex flex-col justify-center px-10 py-10 md:w-[400px] w-[375px] flex-none mx-auto"
+        >
+          <div class="text-center text-3xl font-medium mb-8">
+            {{ config.web_name }}
+          </div>
+          <el-form ref="formRef" :model="formData" size="large" :rules="rules">
+            <el-form-item prop="account">
+              <el-input
+                v-model="formData.account"
+                placeholder="请输入账号"
+                @keyup.enter="handleEnter"
+              >
+                <template #prepend>
+                  <icon name="el-icon-User" />
+                </template>
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+              <el-input
+                ref="passwordRef"
+                v-model="formData.password"
+                show-password
+                placeholder="请输入密码"
+                @keyup.enter="handleLogin"
+              >
+                <template #prepend>
+                  <icon name="el-icon-Lock" />
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-form>
+          <div class="mb-5">
+            <el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
+          </div>
+          <el-button
+            type="primary"
+            size="large"
+            :loading="isLock"
+            @click="lockLogin"
+          >
+            登录
+          </el-button>
+        </div>
+      </div>
     </div>
+    <layout-footer />
+  </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, reactive, ref, shallowRef } from 'vue'
-import type { InputInstance, FormInstance } from 'element-plus'
-import LayoutFooter from '@/layout/components/footer.vue'
-import useAppStore from '@/stores/modules/app'
-import useUserStore from '@/stores/modules/user'
-import cache from '@/utils/cache'
-import { ACCOUNT_KEY } from '@/enums/cacheEnums'
-import { PageEnum } from '@/enums/pageEnum'
-import { useLockFn } from '@/hooks/useLockFn'
-const passwordRef = shallowRef<InputInstance>()
-const formRef = shallowRef<FormInstance>()
-const appStore = useAppStore()
-const userStore = useUserStore()
-const route = useRoute()
-const router = useRouter()
-const remAccount = ref(false)
-const config = computed(() => appStore.config)
+import { computed, onMounted, reactive, ref, shallowRef } from "vue";
+import type { InputInstance, FormInstance } from "element-plus";
+import LayoutFooter from "@/layout/components/footer.vue";
+import useAppStore from "@/stores/modules/app";
+import useUserStore from "@/stores/modules/user";
+import cache from "@/utils/cache";
+import { ACCOUNT_KEY } from "@/enums/cacheEnums";
+import { PageEnum } from "@/enums/pageEnum";
+import { useLockFn } from "@/hooks/useLockFn";
+const passwordRef = shallowRef<InputInstance>();
+const formRef = shallowRef<FormInstance>();
+const appStore = useAppStore();
+const userStore = useUserStore();
+const route = useRoute();
+const router = useRouter();
+const remAccount = ref(false);
+const config = computed(() => appStore.config);
 const formData = reactive({
-    account: '',
-    password: ''
-})
+  account: "",
+  password: "",
+});
 const rules = {
-    account: [
-        {
-            required: true,
-            message: '请输入账号',
-            trigger: ['blur']
-        }
-    ],
-    password: [
-        {
-            required: true,
-            message: '请输入密码',
-            trigger: ['blur']
-        }
-    ]
-}
+  account: [
+    {
+      required: true,
+      message: "请输入账号",
+      trigger: ["blur"],
+    },
+  ],
+  password: [
+    {
+      required: true,
+      message: "请输入密码",
+      trigger: ["blur"],
+    },
+  ],
+};
 // 回车按键监听
 const handleEnter = () => {
-    if (!formData.password) {
-        return passwordRef.value?.focus()
-    }
-    handleLogin()
-}
+  if (!formData.password) {
+    return passwordRef.value?.focus();
+  }
+  handleLogin();
+};
 // 登录处理
 const handleLogin = async () => {
-    await formRef.value?.validate()
-    // 记住账号，缓存
-    cache.set(ACCOUNT_KEY, {
-        remember: remAccount.value,
-        account: remAccount.value ? formData.account : ''
-    })
-    await userStore.login(formData)
-    const {
-        query: { redirect }
-    } = route
-    const path = typeof redirect === 'string' ? redirect : PageEnum.INDEX
-    router.push(path)
-}
-const { isLock, lockFn: lockLogin } = useLockFn(handleLogin)
+  await formRef.value?.validate();
+  // 记住账号，缓存
+  cache.set(ACCOUNT_KEY, {
+    remember: remAccount.value,
+    account: remAccount.value ? formData.account : "",
+  });
+  await userStore.login(formData);
+  const {
+    query: { redirect },
+  } = route;
+  const path = typeof redirect === "string" ? redirect : PageEnum.INDEX;
+  router.push(
+    cache.get("logout") == formData.account || typeof redirect === "string"
+      ? path
+      : PageEnum.INDEX
+  );
+};
+const { isLock, lockFn: lockLogin } = useLockFn(handleLogin);
 
 onMounted(() => {
-    const value = cache.get(ACCOUNT_KEY)
-    if (value?.remember) {
-        remAccount.value = value.remember
-        formData.account = value.account
-    }
-})
+  const value = cache.get(ACCOUNT_KEY);
+  if (value?.remember) {
+    remAccount.value = value.remember;
+    formData.account = value.account;
+  }
+});
 </script>
 
 <style lang="scss" scoped>
 .login {
-    background-image: url('./images/login_bg.png');
-    @apply min-h-screen bg-no-repeat bg-center bg-cover;
-    .login-card {
-        height: 400px;
-    }
+  background-image: url("./images/login_bg.png");
+  @apply min-h-screen bg-no-repeat bg-center bg-cover;
+  .login-card {
+    height: 400px;
+  }
 }
 </style>
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index baa69f5..9ce5186 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -1,89 +1,93 @@
 <template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px] formdata" :model="queryParams" inline>
-                <el-form-item label="公司名称" prop="company_name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.company_name"
-                        clearable
-                        placeholder="请输入公司名称"
-                    />
-                </el-form-item>
-                <el-form-item label="区" prop="area" v-show="company_type_show">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.area"
-                        clearable
-                        placeholder="请输入区"
-                    />
-                </el-form-item>
-                <el-form-item label="镇" prop="street" v-show="company_type_show">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.street"
-                        clearable
-                        placeholder="请输入镇"
-                    />
-                </el-form-item>
-                <el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
-                    <el-select
-                        v-model="queryParams.company_type"
-                        placeholder="请选择公司类型"
-                        clearable
-                        class="w-[280px]"
-                    >
-                        <el-option
-                            v-for="(item, index) in datas.dictTypeLists"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="片区经理" prop="area_manager">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.area_manager"
-                        clearable
-                        placeholder="请输入片区经理"
-                    />
-                </el-form-item>
-                <el-form-item label="是否签约" prop="is_contract">
-                    <el-select
-                        v-model="queryParams.is_contract"
-                        placeholder="是否签约"
-                        clearable
-                        class="w-[240px]"
-                    >
-                        <el-option label="已签约" value="1"></el-option>
-                        <el-option label="未签约" value="0"></el-option>
-                    </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">
-            <router-link
-                v-perms="['company/add:edit']"
-                :to="{
-                    path: getRoutePath('company/add:edit'),
-                    query: {
-                        flag: true
-                    }
-                }"
-            >
-                <el-button type="primary" class="mb-4">
-                    <template #icon>
-                        <icon name="el-icon-Plus" />
-                    </template>
-                    创建
-                </el-button>
-            </router-link>
-            <!-- <router-link
+  <div>
+    <el-card class="!border-none mb-4" shadow="never">
+      <el-form class="mb-[-16px] formdata" :model="queryParams" inline>
+        <el-form-item label="公司名称" prop="company_name">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.company_name"
+            clearable
+            placeholder="请输入公司名称"
+          />
+        </el-form-item>
+        <el-form-item label="区" prop="area" v-show="company_type_show">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.area"
+            clearable
+            placeholder="请输入区"
+          />
+        </el-form-item>
+        <el-form-item label="镇" prop="street" v-show="company_type_show">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.street"
+            clearable
+            placeholder="请输入镇"
+          />
+        </el-form-item>
+        <el-form-item
+          label="公司类型"
+          prop="company_type"
+          v-show="company_type_show"
+        >
+          <el-select
+            v-model="queryParams.company_type"
+            placeholder="请选择公司类型"
+            clearable
+            class="w-[280px]"
+          >
+            <el-option
+              v-for="(item, index) in datas.dictTypeLists"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="片区经理" prop="area_manager">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.area_manager"
+            clearable
+            placeholder="请输入片区经理"
+          />
+        </el-form-item>
+        <el-form-item label="是否签约" prop="is_contract">
+          <el-select
+            v-model="queryParams.is_contract"
+            placeholder="是否签约"
+            clearable
+            class="w-[240px]"
+          >
+            <el-option label="已签约" value="1"></el-option>
+            <el-option label="未签约" value="0"></el-option>
+          </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">
+      <router-link
+        v-perms="['company/add:edit']"
+        :to="{
+          path: getRoutePath('company/add:edit'),
+          query: {
+            flag: true,
+          },
+        }"
+      >
+        <el-button type="primary" class="mb-4">
+          <template #icon>
+            <icon name="el-icon-Plus" />
+          </template>
+          创建
+        </el-button>
+      </router-link>
+      <!-- <router-link
         :to="{
           path: getRoutePath('company/add:edit'),
           query: {
@@ -96,436 +100,487 @@
           我的公司
         </el-button></router-link -->
 
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
-                    <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
-                    <el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
-                    <el-table-column label="区县" prop="area" show-overflow-tooltip />
-                    <el-table-column label="乡镇" prop="street" show-overflow-tooltip />
-                    <el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
-                    <el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
-                    <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
-                    <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
-                            <span v-else style="color: #fe0000">未签约</span>
-                        </template></el-table-column
-                    >
-                    <el-table-column label="操作" align="center" width="510" fixed="right">
-                        <template #default="{ row }">
-                            <div style="display: flex">
-                                <el-button type="primary" link>
-                                    <router-link
-                                        :to="{
-                                            path: getRoutePath('user.user/lists'),
-                                            query: {
-                                                company_id: row.id,
-                                                read: true
-                                            }
-                                        }"
-                                        >查看成员</router-link
-                                    >
-                                </el-button>
-                                <el-button type="primary" link>
-                                    <router-link
-                                        :to="{
-                                            path: getRoutePath('company/subordinate/lists'),
-                                            query: {
-                                                company_id: row.id,
-                                                read: true
-                                            }
-                                        }"
-                                        >下属公司</router-link
-                                    >
-                                </el-button>
-                                <el-button v-perms="['company/add:edit']" type="primary" link>
-                                    <router-link
-                                        :to="{
-                                            path: getRoutePath('company/add:edit'),
-                                            query: {
-                                                id: row.id,
-                                                read: true,
-                                                isshow: true
-                                            }
-                                        }"
-                                        >详情</router-link
-                                    >
-                                </el-button>
-                                <el-button v-perms="['company/add:edit']" type="primary" link>
-                                    <router-link
-                                        :to="{
-                                            path: getRoutePath('company/add:edit'),
-                                            query: {
-                                                id: row.id,
-                                                edit: true
-                                            }
-                                        }"
-                                        >编辑</router-link
-                                    >
-                                </el-button>
-                                <el-button
-                                    v-perms="['company/delete']"
-                                    type="danger"
-                                    link
-                                    @click="handleDelete(row.id)"
-                                    >删除</el-button
-                                >
-                                <el-button
-                                    v-if="row.is_authentication == 0"
-                                    v-perms="['company/authentication']"
-                                    type="primary"
-                                    link
-                                    @click="handleAuthentication(row.id)"
-                                    >企业认证</el-button
-                                >
-                                <template v-if="row.is_authentication && row.is_contract == 0">
-                                    <el-button
-                                        v-if="
-                                            Array.isArray(row.contract) && row.contract.length == 0
-                                        "
-                                        v-perms="['company/initiate_contract']"
-                                        type="primary"
-                                        link
-                                        @click="showChangeCompany(row)"
-                                        >生成合同</el-button
-                                    >
-                                    <el-button
-                                        v-else-if="row.contract?.check_status == 1"
-                                        v-perms="['company/initiate_contract']"
-                                        type="warning"
-                                        link
-                                        @click="auditing"
-                                        >审核中</el-button
-                                    >
-                                    <el-button
-                                        v-else-if="row.contract?.check_status == 2"
-                                        v-perms="['company/Draftingcontracts']"
-                                        type="primary"
-                                        link
-                                        @click="showCreateConctPop(row)"
-                                        >发送合同</el-button
-                                    >
-                                    <el-button
-                                        v-else-if="row.contract?.check_status == 3"
-                                        v-perms="['company/postsms']"
-                                        type="primary"
-                                        link
-                                        @click=";(showPop = true), (contractId = row.id)"
-                                        >发送短信</el-button
-                                    >
-                                </template>
-                            </div>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <el-dialog v-model="showInitiateContractPop" @close="offInitiateContractPop">
-            <h1>重要提醒</h1>
-            <div>
-                <div class="content">请确认信息是否有误</div>
-                <el-card>
-                    <el-col :span="24" class="el-card pt-6">
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item label-width="100px" label="签约方" prop="field130">
-                                    <el-select
-                                        v-model="contractFormData.party_a"
-                                        placeholder="请选择签约方"
-                                        clearable
-                                        :style="{ width: '100%' }"
-                                    >
-                                        <el-option
-                                            v-for="(item, index) in company_list"
-                                            :key="index"
-                                            :label="item.company_name"
-                                            :value="item.id"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label-width="100px"
-                                    label="被签约公司"
-                                    prop="field131"
-                                >
-                                    <el-input
-                                        :disabled="true"
-                                        v-model="contractFormData.party_b_name"
-                                        placeholder="请输入被签约公司"
-                                        clearable
-                                        :style="{ width: '100%' }"
-                                    ></el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item
-                                    label-width="100px"
-                                    label="合同类型"
-                                    prop="contract_type"
-                                >
-                                    <el-select
-                                        v-model="contractFormData.contract_type"
-                                        placeholder="请选择合同类型"
-                                        clearable
-                                        :style="{ width: '100%' }"
-                                    >
-                                        <el-option
-                                            v-for="(item, index) in contract_type"
-                                            :key="index"
-                                            :label="item.name"
-                                            :value="item.id"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <el-table-column
+            label="id"
+            prop="id"
+            show-overflow-tooltip
+            width="60"
+          />
+          <el-table-column
+            label="公司名称"
+            prop="company_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="公司类型"
+            prop="company_type"
+            show-overflow-tooltip
+          />
+          <el-table-column label="区县" prop="area" show-overflow-tooltip />
+          <el-table-column label="乡镇" prop="street" show-overflow-tooltip />
+          <el-table-column
+            label="主联系人"
+            prop="master_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="联系方式"
+            prop="master_phone"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="片区经理"
+            prop="area_manager"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="是否签约"
+            prop="is_contract"
+            show-overflow-tooltip
+          >
+            <template #default="{ row }">
+              <span v-if="row.is_contract == 1" style="color: #67c23a"
+                >已签约</span
+              >
+              <span v-else style="color: #fe0000">未签约</span>
+            </template></el-table-column
+          >
+          <el-table-column
+            label="操作"
+            align="center"
+            width="510"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <div style="display: flex">
+                <el-button type="primary" link>
+                  <router-link
+                    :to="{
+                      path: getRoutePath('user.user/lists'),
+                      query: {
+                        company_id: row.id,
+                        read: true,
+                      },
+                    }"
+                    >查看成员</router-link
+                  >
+                </el-button>
+                <el-button type="primary" link>
+                  <router-link
+                    :to="{
+                      path: getRoutePath('company/subordinate/lists'),
+                      query: {
+                        company_id: row.id,
+                        read: true,
+                      },
+                    }"
+                    >下属公司</router-link
+                  >
+                </el-button>
+                <el-button v-perms="['company/add:edit']" type="primary" link>
+                  <router-link
+                    :to="{
+                      path: getRoutePath('company/add:edit'),
+                      query: {
+                        id: row.id,
+                        read: true,
+                        isshow: true,
+                      },
+                    }"
+                    >详情</router-link
+                  >
+                </el-button>
+                <el-button v-perms="['company/add:edit']" type="primary" link>
+                  <router-link
+                    :to="{
+                      path: getRoutePath('company/add:edit'),
+                      query: {
+                        id: row.id,
+                        edit: true,
+                      },
+                    }"
+                    >编辑</router-link
+                  >
+                </el-button>
+                <el-button
+                  v-perms="['company/delete']"
+                  type="danger"
+                  link
+                  @click="handleDelete(row.id)"
+                  >删除</el-button
+                >
+                <el-button
+                  v-if="row.is_authentication == 0"
+                  v-perms="['company/authentication']"
+                  type="primary"
+                  link
+                  @click="handleAuthentication(row.id)"
+                  >企业认证</el-button
+                >
+                <template v-if="row.is_authentication && row.is_contract == 0">
+                  <el-button
+                    v-if="
+                      Array.isArray(row.contract) && row.contract.length == 0
+                    "
+                    v-perms="['company/initiate_contract']"
+                    type="primary"
+                    link
+                    @click="showChangeCompany(row)"
+                    >生成合同</el-button
+                  >
+                  <el-button
+                    v-else-if="row.contract?.check_status == 1"
+                    v-perms="['company/initiate_contract']"
+                    type="warning"
+                    link
+                    @click="auditing"
+                    >审核中</el-button
+                  >
+                  <el-button
+                    v-else-if="row.contract?.check_status == 2"
+                    v-perms="['company/Draftingcontracts']"
+                    type="primary"
+                    link
+                    @click="showCreateConctPop(row)"
+                    >发送合同</el-button
+                  >
+                  <el-button
+                    v-else-if="row.contract?.check_status == 3"
+                    v-perms="['company/postsms']"
+                    type="primary"
+                    link
+                    @click="(showPop = true), (contractId = row.id)"
+                    >发送短信</el-button
+                  >
+                </template>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <el-dialog
+      v-model="showInitiateContractPop"
+      @close="offInitiateContractPop"
+    >
+      <h1>重要提醒</h1>
+      <div>
+        <div class="content">请确认信息是否有误</div>
+        <el-card>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label-width="100px" label="签约方" prop="field130">
+                <el-select
+                  v-model="contractFormData.party_a"
+                  placeholder="请选择签约方"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                  <el-option
+                    v-for="(item, index) in company_list"
+                    :key="index"
+                    :label="item.company_name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label-width="100px"
+                label="被签约公司"
+                prop="field131"
+              >
+                <el-input
+                  :disabled="true"
+                  v-model="contractFormData.party_b_name"
+                  placeholder="请输入被签约公司"
+                  clearable
+                  :style="{ width: '100%' }"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                label-width="100px"
+                label="合同类型"
+                prop="contract_type"
+              >
+                <el-select
+                  v-model="contractFormData.contract_type"
+                  placeholder="请选择合同类型"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                  <el-option
+                    v-for="(item, index) in contract_type"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
 
-                            <el-col :span="12">
-                                <el-form-item label-width="100px" label="合同编号" prop="field133">
-                                    <el-input
-                                        placeholder="系统自动生成"
-                                        v-model="contractFormData.contract_no"
-                                        clearable
-                                        :style="{ width: '100%' }"
-                                        :disabled="true"
-                                    ></el-input>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-col>
-                </el-card>
-            </div>
-            <p class="btn_menu">
-                <el-button type="primary" size="large" @click="InitiateContract"
-                    >确认创建</el-button
-                >
-                <el-button type="info" size="large" @click="offInitiateContractPop">返回</el-button>
-            </p>
-        </el-dialog>
-        <el-dialog v-model="showPop" @close="offPop">
-            <h1>重要提醒</h1>
-            <div class="content" v-if="showConctactPop">
-                请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
-            </div>
-            <div class="content" v-else>
-                确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
-            </div>
-            <p class="btn_menu">
-                <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
-                    >确认创建</el-button
-                >
-                <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
-                <el-button type="info" size="large" @click="offPop">返回</el-button>
-            </p>
-        </el-dialog>
-    </div>
+            <el-col :span="12">
+              <el-form-item
+                label-width="100px"
+                label="合同编号"
+                prop="field133"
+              >
+                <el-input
+                  placeholder="系统自动生成"
+                  v-model="contractFormData.contract_no"
+                  clearable
+                  :style="{ width: '100%' }"
+                  :disabled="true"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-card>
+      </div>
+      <p class="btn_menu">
+        <el-button type="primary" size="large" @click="InitiateContract"
+          >确认</el-button
+        >
+        <el-button type="info" size="large" @click="offInitiateContractPop"
+          >返回</el-button
+        >
+      </p>
+    </el-dialog>
+    <el-dialog v-model="showPop" @close="offPop">
+      <h1>重要提醒</h1>
+      <div class="content" v-if="showConctactPop">
+        请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+      </div>
+      <div class="content" v-else>
+        确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+      </div>
+      <p class="btn_menu">
+        <el-button
+          type="primary"
+          size="large"
+          v-if="showConctactPop"
+          @click="creContct"
+          >确认</el-button
+        >
+        <el-button type="primary" size="large" v-else @click="sendMsg"
+          >确认</el-button
+        >
+        <el-button type="info" size="large" @click="offPop">返回</el-button>
+      </p>
+    </el-dialog>
+  </div>
 </template>
 
 <script lang="ts" setup name="companyLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import useUserStore from '@/stores/modules/user'
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import useUserStore from "@/stores/modules/user";
 import {
-    apiCompanyLists,
-    companyListTwo,
-    apiCompanyDelete,
-    generateGontract,
-    sendMsgApi,
-    authentication,
-    apiCompanyDetail,
-    initiate_contract
-} from '@/api/company'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import { dictDataLists } from '@/api/setting/dict'
-import { getRoutePath } from '@/router'
-import DialogIndex from './dialog_index.vue'
+  apiCompanyLists,
+  companyListTwo,
+  apiCompanyDelete,
+  generateGontract,
+  sendMsgApi,
+  authentication,
+  apiCompanyDetail,
+  initiate_contract,
+} from "@/api/company";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+import { dictDataLists } from "@/api/setting/dict";
+import { getRoutePath } from "@/router";
+import DialogIndex from "./dialog_index.vue";
 
-const userStore = useUserStore()
-console.log(userStore.userInfo.company_id)
-const route = useRoute()
-const company_type_show = ref(true)
+const userStore = useUserStore();
+console.log(userStore.userInfo.company_id);
+const route = useRoute();
+const company_type_show = ref(true);
 // 创建合同与发送短信
 //弹窗
-const showPop = ref(false)
-const showConctactPop = ref(false)
+const showPop = ref(false);
+const showConctactPop = ref(false);
 const offPop = () => {
-    showPop.value = false
-    showConctactPop.value = false
-}
-const InitiateContractPop = ref(false)
-const showInitiateContractPop = ref(false)
+  showPop.value = false;
+  showConctactPop.value = false;
+};
+const InitiateContractPop = ref(false);
+const showInitiateContractPop = ref(false);
 const offInitiateContractPop = () => {
-    showInitiateContractPop.value = false
-    InitiateContractPop.value = false
-}
+  showInitiateContractPop.value = false;
+  InitiateContractPop.value = false;
+};
 // 创建合同的id
-const contractId = ref('')
+const contractId = ref("");
 
 // 合同
 const contractFormData = ref({
-    party_a: '',
-    party_a_name: '',
-    party_b: '',
-    party_b_name: '',
-    contract_type: '',
-    contract_no: ''
-})
+  party_a: "",
+  party_a_name: "",
+  party_b: "",
+  party_b_name: "",
+  contract_type: "",
+  contract_no: "",
+});
 
-const company_list = ref([])
-const contract_type = ref([])
+const company_list = ref([]);
+const contract_type = ref([]);
 
 const getDetails = async (id: any) => {
-    const data = await apiCompanyDetail({
-        id: id
-    })
-    companyListTwo().then((res) => {
-        company_list.value = res
-    })
-    dictDataLists({ type_id: 7 }).then((res) => {
-        contract_type.value = res.lists
-    })
-    contractFormData.value.party_b = data.id
-    contractFormData.value.party_b_name = data.company_name
-    if (userStore.userInfo.company.id) {
-        contractFormData.value.party_a = userStore.userInfo.company.id
-        contractFormData.value.party_a_name = userStore.userInfo.company.company_name
-    } else {
-        contractFormData.value.party_a = ''
-        contractFormData.value.party_a_name = ''
-    }
-}
+  const data = await apiCompanyDetail({
+    id: id,
+  });
+  companyListTwo().then((res) => {
+    company_list.value = res;
+  });
+  dictDataLists({ type_id: 7 }).then((res) => {
+    contract_type.value = res.lists;
+  });
+  contractFormData.value.party_b = data.id;
+  contractFormData.value.party_b_name = data.company_name;
+  if (userStore.userInfo.company.id) {
+    contractFormData.value.party_a = userStore.userInfo.company.id;
+    contractFormData.value.party_a_name =
+      userStore.userInfo.company.company_name;
+  } else {
+    contractFormData.value.party_a = "";
+    contractFormData.value.party_a_name = "";
+  }
+};
 
 const showChangeCompany = (row: any) => {
-    contractId.value = row.id
-    getDetails(row.id)
-    // showPop.value = true
-    ShowInitiateContractPop()
-}
+  contractId.value = row.id;
+  getDetails(row.id);
+  // showPop.value = true
+  ShowInitiateContractPop();
+};
 
 const ShowInitiateContractPop = () => {
-    ;(InitiateContractPop.value = true), (showInitiateContractPop.value = true)
-}
+  (InitiateContractPop.value = true), (showInitiateContractPop.value = true);
+};
 const showCreateConctPop = (row) => {
-    ;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
-}
-const InitiateContract = () => {
-    initiate_contract({
-        id: contractId.value,
-        ...contractFormData.value
-    }).catch((res) => {
-        console.log(res)
-    })
-    offInitiateContractPop()
-}
-const creContct = () => {
-    generateGontract({ id: contractId.value }).catch((res) => {
-        console.log(res)
-    })
-    offPop()
-}
-const sendMsg = () => {
-    sendMsgApi({ id: contractId.value })
-    offPop()
-}
+  (showPop.value = true),
+    (showConctactPop.value = true),
+    (contractId.value = row.id);
+};
+const InitiateContract = async () => {
+  await initiate_contract({
+    id: contractId.value,
+    ...contractFormData.value,
+  });
+  getLists();
+  offInitiateContractPop();
+};
+const creContct = async () => {
+  await generateGontract({ id: contractId.value });
+  getLists();
+  offPop();
+};
+const sendMsg = async () => {
+  await sendMsgApi({ id: contractId.value });
+  getLists();
+  offPop();
+};
 // 创建合同与发送短信结束
 // 查询条件
 const queryParams = reactive({
-    company_name: '',
-    area: '',
-    street: '',
-    company_type: '',
-    area_manager: '',
-    // 是否签约
-    is_contract: ''
-})
+  company_name: "",
+  area: "",
+  street: "",
+  company_type: "",
+  area_manager: "",
+  // 是否签约
+  is_contract: "",
+});
 
 if (route.query.company_type) {
-    company_type_show.value = false
-    queryParams['company_type'] = route.query.company_type?.toString() || ''
+  company_type_show.value = false;
+  queryParams["company_type"] = route.query.company_type?.toString() || "";
 }
 
 const datas = reactive({
-    dictTypeLists: []
-})
+  dictTypeLists: [],
+});
 const getdictTypeLists = async () => {
-    const data = await dictDataLists({ type_id: 6 })
-    datas['dictTypeLists'] = data['lists']
-}
-getdictTypeLists()
+  const data = await dictDataLists({ type_id: 6 });
+  datas["dictTypeLists"] = data["lists"];
+};
+getdictTypeLists();
 // 选中数据
-const selectData = ref<any[]>([])
+const selectData = ref<any[]>([]);
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
+  selectData.value = val.map(({ id }) => id);
+};
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData("");
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiCompanyLists,
-    params: queryParams
-})
+  fetchFun: apiCompanyLists,
+  params: queryParams,
+});
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiCompanyDelete({ id })
-    getLists()
-}
+  await feedback.confirm("确定要删除？");
+  await apiCompanyDelete({ id });
+  getLists();
+};
 const handleAuthentication = async (id: number | any[]) => {
-    await feedback.confirm('确定要认证？')
-    await authentication({ id })
-    getLists()
-}
+  await feedback.confirm("确定要认证？");
+  await authentication({ id });
+  getLists();
+};
 
 // 审核中
 const auditing = () => {
-    ElMessage.warning('请等待合同审核完成!')
-}
+  ElMessage.warning("请等待合同审核完成!");
+};
 
-getLists()
+getLists();
 </script>
 <style lang="scss">
 .btn {
-    position: absolute;
+  position: absolute;
 }
 h1 {
-    text-align: center;
-    font-weight: bold;
-    font-size: 30px;
-    color: red;
-    margin-bottom: 10px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 30px;
+  color: red;
+  margin-bottom: 10px;
 }
 
 .content {
-    font-size: 20px;
+  font-size: 20px;
 }
 
 .info {
-    color: red;
-    font-weight: bold;
-    font-size: 18px;
-    display: inline-block;
-    margin: 0 5px;
+  color: red;
+  font-weight: bold;
+  font-size: 18px;
+  display: inline-block;
+  margin: 0 5px;
 }
 
 .btn_menu {
-    margin-top: 10vh;
-    display: flex;
-    justify-content: space-around;
+  margin-top: 10vh;
+  display: flex;
+  justify-content: space-around;
 }
 .formdata {
-    .el-form-item {
-        width: 20%;
-    }
+  .el-form-item {
+    width: 20%;
+  }
 }
 </style>
diff --git a/src/views/company/subordinate.vue b/src/views/company/subordinate.vue
index 756e3f9..91464b5 100644
--- a/src/views/company/subordinate.vue
+++ b/src/views/company/subordinate.vue
@@ -1,238 +1,320 @@
 <template>
-    <div>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
-                    <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
-                    <el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
-                    <el-table-column label="区县" prop="area_name" show-overflow-tooltip />
-                    <el-table-column label="乡镇" prop="street_name" show-overflow-tooltip />
-                    <el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
-                    <el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
-                    <el-table-column
-                        label="片区经理"
-                        prop="area_manager_name"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
-                            <span v-else style="color: #fe0000">未签约</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" align="center" width="450" fixed="right">
-                        <template #default="{ row }">
-                            <div style="display: flex">
-                                <el-button type="primary" link>
-                                    <router-link
-                                        :to="{
-                                            path: getRoutePath('auth.admin/lists'),
-                                            query: {
-                                                company_id: row.id,
-                                                read: true
-                                            }
-                                        }"
-                                        >查看成员</router-link
-                                    >
-                                </el-button>
-                                <el-button
-                                    v-perms="['company/edit', 'company/add']"
-                                    type="primary"
-                                    link
-                                >
-                                    <router-link
-                                        :to="{
-                                            path: getRoutePath('company/add:edit'),
-                                            query: {
-                                                id: row.id,
-                                                read: true
-                                            }
-                                        }"
-                                        >详情</router-link
-                                    >
-                                </el-button>
-                                <el-button
-                                    v-perms="['company/edit', 'company/add']"
-                                    type="primary"
-                                    link
-                                >
-                                    <router-link
-                                        :to="{
-                                            path: getRoutePath('company/add:edit'),
-                                            query: {
-                                                id: row.id,
-                                                edit: true
-                                            }
-                                        }"
-                                        >编辑</router-link
-                                    >
-                                </el-button>
-                                <el-button
-                                    v-perms="['company/delete']"
-                                    type="danger"
-                                    link
-                                    @click="handleDelete(row.id)"
-                                    >删除</el-button
-                                >
-                                <el-button
-                                    v-perms="['company/edit', 'company/add']"
-                                    type="primary"
-                                    link
-                                    @click="showCreateConctPop(row)"
-                                    >生成合同</el-button
-                                >
-                                <el-button
-                                    v-perms="['company/edit', 'company/add']"
-                                    type="primary"
-                                    link
-                                    @click=";(showPop = true), (contractId = row.id)"
-                                    >发送短信</el-button
-                                >
-                            </div>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <el-dialog v-model="showPop" @close="offPop">
-            <h1>重要提醒</h1>
-            <div class="content" v-if="showConctactPop">
-                请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
-            </div>
-            <div class="content" v-else>
-                确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
-            </div>
-            <p class="btn_menu">
-                <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
-                    >确认创建</el-button
+  <div>
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <el-table-column
+            label="id"
+            prop="id"
+            show-overflow-tooltip
+            width="60"
+          />
+          <el-table-column
+            label="公司名称"
+            prop="company_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="公司类型"
+            prop="company_type"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="区县"
+            prop="area_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="乡镇"
+            prop="street_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="主联系人"
+            prop="master_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="联系方式"
+            prop="master_phone"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="片区经理"
+            prop="area_manager_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="是否签约"
+            prop="is_contract"
+            show-overflow-tooltip
+          >
+            <template #default="{ row }">
+              <span v-if="row.is_contract == 1" style="color: #67c23a"
+                >已签约</span
+              >
+              <span v-else style="color: #fe0000">未签约</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="300"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <div style="display: flex">
+                <el-button type="primary" link>
+                  <router-link
+                    :to="{
+                      path: getRoutePath('auth.admin/lists'),
+                      query: {
+                        company_id: row.id,
+                        read: true,
+                      },
+                    }"
+                    >查看成员</router-link
+                  >
+                </el-button>
+                <el-button
+                  v-perms="['company/edit', 'company/add']"
+                  type="primary"
+                  link
                 >
-                <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
-                <el-button type="info" size="large" @click="offPop">返回</el-button>
-            </p>
-        </el-dialog>
-    </div>
+                  <router-link
+                    :to="{
+                      path: getRoutePath('company/add:edit'),
+                      query: {
+                        id: row.id,
+                        read: true,
+                      },
+                    }"
+                    >详情</router-link
+                  >
+                </el-button>
+                <el-button
+                  v-perms="['company/edit', 'company/add']"
+                  type="primary"
+                  link
+                >
+                  <router-link
+                    :to="{
+                      path: getRoutePath('company/add:edit'),
+                      query: {
+                        id: row.id,
+                        edit: true,
+                      },
+                    }"
+                    >编辑</router-link
+                  >
+                </el-button>
+                <el-button
+                  v-perms="['company/delete']"
+                  type="danger"
+                  link
+                  @click="handleDelete(row.id)"
+                  >删除</el-button
+                >
+                <el-button
+                  v-if="row.is_authentication == 0"
+                  v-perms="['company/authentication']"
+                  type="primary"
+                  link
+                  @click="handleAuthentication(row.id)"
+                  >企业认证</el-button
+                >
+                <template v-if="row.is_authentication && row.is_contract == 0">
+                  <el-button
+                    v-if="
+                      Array.isArray(row.contract) && row.contract.length == 0
+                    "
+                    v-perms="['company/initiate_contract']"
+                    type="primary"
+                    link
+                    @click="showChangeCompany(row)"
+                    >生成合同</el-button
+                  >
+                  <el-button
+                    v-else-if="row.contract?.check_status == 1"
+                    v-perms="['company/initiate_contract']"
+                    type="warning"
+                    link
+                    @click="auditing"
+                    >审核中</el-button
+                  >
+                  <el-button
+                    v-else-if="row.contract?.check_status == 2"
+                    v-perms="['company/Draftingcontracts']"
+                    type="primary"
+                    link
+                    @click="showCreateConctPop(row)"
+                    >发送合同</el-button
+                  >
+                  <el-button
+                    v-else-if="row.contract?.check_status == 3"
+                    v-perms="['company/postsms']"
+                    type="primary"
+                    link
+                    @click="(showPop = true), (contractId = row.id)"
+                    >发送短信</el-button
+                  >
+                </template>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <el-dialog v-model="showPop" @close="offPop">
+      <h1>重要提醒</h1>
+      <div class="content" v-if="showConctactPop">
+        请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+      </div>
+      <div class="content" v-else>
+        确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+      </div>
+      <p class="btn_menu">
+        <el-button
+          type="primary"
+          size="large"
+          v-if="showConctactPop"
+          @click="creContct"
+          >确认创建</el-button
+        >
+        <el-button type="primary" size="large" v-else @click="sendMsg"
+          >确认</el-button
+        >
+        <el-button type="info" size="large" @click="offPop">返回</el-button>
+      </p>
+    </el-dialog>
+  </div>
 </template>
 
 <script lang="ts" setup name="companyLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiCompanyLists, apiCompanyDelete, apiSubordinateList } from '@/api/company'
-import { generateGontract, sendMsgApi } from '@/api/perms/admin'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import { dictDataLists } from '@/api/setting/dict'
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import {
+  apiCompanyLists,
+  apiCompanyDelete,
+  apiSubordinateList,
+} from "@/api/company";
+import { generateGontract, sendMsgApi } from "@/api/perms/admin";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+import { dictDataLists } from "@/api/setting/dict";
 // import EditPopup from './edit.vue'
-import { getRoutePath } from '@/router'
+import { getRoutePath } from "@/router";
 
-const route = useRoute()
-const company_type_show = ref(true)
+const route = useRoute();
+const company_type_show = ref(true);
 // 创建合同与发送短信
 //弹窗
-const showPop = ref(false)
-const showConctactPop = ref(false)
+const showPop = ref(false);
+const showConctactPop = ref(false);
 const offPop = () => {
-    showPop.value = false
-    showConctactPop.value = false
-}
+  showPop.value = false;
+  showConctactPop.value = false;
+};
 // 创建合同的id
-const contractId = ref('')
+const contractId = ref("");
 const showCreateConctPop = (row) => {
-    ;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
-}
+  (showPop.value = true),
+    (showConctactPop.value = true),
+    (contractId.value = row.id);
+};
 const creContct = () => {
-    generateGontract({ id: contractId.value })
-    offPop()
-}
+  generateGontract({ id: contractId.value });
+  offPop();
+};
 const sendMsg = () => {
-    sendMsgApi({ id: contractId.value })
-    offPop()
-}
+  sendMsgApi({ id: contractId.value });
+  offPop();
+};
 // 创建合同与发送短信结束
 // 查询条件
 const queryParams = reactive({
-    company_name: '',
-    area: '',
-    street: '',
-    company_type: '',
-    area_manager: '',
-    // 是否签约
-    is_contract: '',
-    company_id: ''
-})
+  company_name: "",
+  area: "",
+  street: "",
+  company_type: "",
+  area_manager: "",
+  // 是否签约
+  is_contract: "",
+  company_id: "",
+});
 
 if (route.query.company_type) {
-    company_type_show.value = false
-    queryParams['company_type'] = route.query.company_type?.toString() || ''
+  company_type_show.value = false;
+  queryParams["company_type"] = route.query.company_type?.toString() || "";
 }
 if (route.query.company_id) {
-    queryParams.company_id = route.query.company_id?.toString() || ''
+  queryParams.company_id = route.query.company_id?.toString() || "";
 }
 
 const datas = reactive({
-    dictTypeLists: []
-})
+  dictTypeLists: [],
+});
 const getdictTypeLists = async () => {
-    const data = await dictDataLists({ type_id: 6 })
-    datas['dictTypeLists'] = data['lists']
-}
-getdictTypeLists()
+  const data = await dictDataLists({ type_id: 6 });
+  datas["dictTypeLists"] = data["lists"];
+};
+getdictTypeLists();
 // 选中数据
-const selectData = ref<any[]>([])
+const selectData = ref<any[]>([]);
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
+  selectData.value = val.map(({ id }) => id);
+};
 
 // 获取字典数据
-const { dictData } = useDictData('')
+const { dictData } = useDictData("");
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiSubordinateList,
-    params: queryParams
-})
+  fetchFun: apiSubordinateList,
+  params: queryParams,
+});
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiCompanyDelete({ id })
-    getLists()
-}
+  await feedback.confirm("确定要删除？");
+  await apiCompanyDelete({ id });
+  getLists();
+};
 
-getLists()
+getLists();
 </script>
 <style lang="scss">
 .btn {
-    position: absolute;
+  position: absolute;
 }
 h1 {
-    text-align: center;
-    font-weight: bold;
-    font-size: 30px;
-    color: red;
-    margin-bottom: 10px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 30px;
+  color: red;
+  margin-bottom: 10px;
 }
 
 .content {
-    font-size: 20px;
+  font-size: 20px;
 }
 
 .info {
-    color: red;
-    font-weight: bold;
-    font-size: 18px;
-    display: inline-block;
-    margin: 0 5px;
+  color: red;
+  font-weight: bold;
+  font-size: 18px;
+  display: inline-block;
+  margin: 0 5px;
 }
 
 .btn_menu {
-    margin-top: 10vh;
-    display: flex;
-    justify-content: space-around;
+  margin-top: 10vh;
+  display: flex;
+  justify-content: space-around;
 }
 </style>
diff --git a/src/views/consumer/lists/index.vue b/src/views/consumer/lists/index.vue
index 729d9a8..758ea53 100644
--- a/src/views/consumer/lists/index.vue
+++ b/src/views/consumer/lists/index.vue
@@ -1,203 +1,229 @@
 <template>
-    <div>
-        <el-card class="!border-none" shadow="never">
-            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
-                <el-form-item label="用户信息">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.keyword"
-                        placeholder="用户编号/昵称/手机号码"
-                        clearable
-                        @keyup.enter="resetPage"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="getUserList"
-                        :params="queryParams"
-                        :page-size="pager.size"
-                    />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none mt-4" shadow="never">
-            <el-table size="large" v-loading="pager.loading" :data="pager.lists">
-                <el-table-column label="用户编号" prop="sn" min-width="120" />
-                <el-table-column label="头像" min-width="100">
-                    <template #default="{ row }">
-                        <el-avatar :src="row.avatar" :size="50" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="账号" prop="account" min-width="120" />
-                <el-table-column label="姓名" prop="nickname" min-width="100" />
-                <el-table-column label="联系方式" prop="mobile" min-width="100" />
-                <el-table-column
-                    label="隶属公司"
-                    prop="company_name"
-                    min-width="180"
-                    align="center"
+  <div>
+    <el-card class="!border-none" shadow="never">
+      <el-form
+        ref="formRef"
+        class="mb-[-16px]"
+        :model="queryParams"
+        :inline="true"
+      >
+        <el-form-item label="用户信息">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.keyword"
+            placeholder="用户编号/昵称/手机号码"
+            clearable
+            @keyup.enter="resetPage"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="resetPage">查询</el-button>
+          <el-button @click="resetParams">重置</el-button>
+          <export-data
+            class="ml-2.5"
+            :fetch-fun="getUserList"
+            :params="queryParams"
+            :page-size="pager.size"
+          />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="!border-none mt-4" shadow="never">
+      <el-table size="large" v-loading="pager.loading" :data="pager.lists">
+        <el-table-column label="ID" prop="id" min-width="100" />
+        <el-table-column label="用户编号" prop="sn" min-width="120" />
+        <el-table-column label="头像" min-width="100">
+          <template #default="{ row }">
+            <el-avatar :src="row.avatar" :size="50" />
+          </template>
+        </el-table-column>
+        <el-table-column label="账号" prop="account" min-width="120" />
+        <el-table-column label="姓名" prop="nickname" min-width="100" />
+        <el-table-column label="联系方式" prop="mobile" min-width="120" />
+        <el-table-column
+          label="隶属公司"
+          prop="company_name"
+          min-width="180"
+          align="center"
+        >
+          <template #default="{ row }">
+            {{ row.company?.company_name || "/" }}
+          </template>
+        </el-table-column>
+        <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
+        <el-table-column label="授权身份" prop="role_name" min-width="120">
+          <template #default="{ row }">
+            <span
+              v-if="row.admin_id == row.company?.admin_id"
+              style="color: #67c23a"
+              >公司后台管理人员</span
+            >
+            <span v-else style="color: #fe0000">无</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="是否签约"
+          prop="is_contract"
+          align="center"
+          min-width="120"
+        >
+          <template #default="{ row }">
+            <span v-if="row.is_contract == 1" style="color: #67c23a"
+              >已签约</span
+            >
+            <span v-else style="color: #fe0000">未签约</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          min-width="300"
+          align="center"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <el-button v-perms="['user.user/detail']" type="primary" link>
+              <router-link
+                :to="{
+                  path: getRoutePath('user.user/detail'),
+                  query: {
+                    id: row.id,
+                  },
+                }"
+              >
+                详情
+              </router-link>
+            </el-button>
+            <template v-if="row.is_contract == 0">
+              <el-button
+                v-perms="['user.user/launch']"
+                type="primary"
+                link
+                v-if="!row.contract"
+              >
+                <router-link
+                  :to="{
+                    path: getRoutePath('user.user/detail'),
+                    query: {
+                      id: row.id,
+                      mode: 'initiate',
+                    },
+                  }"
                 >
-                    <template #default="{ row }">
-                        {{ row.company?.company_name || '/' }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
-                <el-table-column label="授权身份" prop="role_name" min-width="120">
-                    <template #default="{ row }">
-                        <span v-if="row.admin_id == row.company?.admin_id" style="color: #67c23a"
-                            >公司后台管理人员</span
-                        >
-                        <span v-else style="color: #fe0000">无</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="是否签约" prop="is_contract" align="center" min-width="120">
-                    <template #default="{ row }">
-                        <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
-                        <span v-else style="color: #fe0000">未签约</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="400" align="center" fixed="right">
-                    <template #default="{ row }">
-                        <el-button v-perms="['user.user/detail']" type="primary" link>
-                            <router-link
-                                :to="{
-                                    path: getRoutePath('user.user/detail'),
-                                    query: {
-                                        id: row.id
-                                    }
-                                }"
-                            >
-                                详情
-                            </router-link>
-                        </el-button>
-                        <template v-if="row.is_contract == 0">
-                            <el-button
-                                v-perms="['user.user/launch']"
-                                type="primary"
-                                link
-                                v-if="!row.contract"
-                            >
-                                <router-link
-                                    :to="{
-                                        path: getRoutePath('user.user/detail'),
-                                        query: {
-                                            id: row.id,
-                                            mode: 'initiate'
-                                        }
-                                    }"
-                                >
-                                    发起合同
-                                </router-link>
-                            </el-button>
+                  发起合同
+                </router-link>
+              </el-button>
 
-                            <el-button
-                                v-perms="['user.user/uplode']"
-                                type="primary"
-                                link
-                                v-if="row.contract?.check_status == 1"
-                            >
-                                <router-link
-                                    :to="{
-                                        path: getRoutePath('user.user/detail'),
-                                        query: {
-                                            id: row.id,
-                                            mode: 'uplode',
-                                            mdoeid: row.contract.id
-                                        }
-                                    }"
-                                >
-                                    上传合同
-                                </router-link>
-                            </el-button>
-                            <el-button
-                                v-perms="['user.user/launch']"
-                                type="primary"
-                                v-if="row.contract?.check_status == 2"
-                                link
-                                @click="
-                                    ;(showPop = true),
-                                        (showConctactPop = true),
-                                        (contractId = row.id)
-                                "
-                                >生成个人合同</el-button
-                            >
-                            <el-button
-                                v-if="row.is_contract == 0 && row.contract?.check_status == 3"
-                                v-perms="['user.user/launch']"
-                                type="primary"
-                                link
-                                @click=";(showPop = true), (contractId = row.id)"
-                                >重新短信</el-button
-                            >
-                        </template>
-                    </template>
-                </el-table-column>
-            </el-table>
+              <el-button
+                v-perms="['user.user/uplode']"
+                type="primary"
+                link
+                v-if="row.contract?.check_status == 1"
+              >
+                <router-link
+                  :to="{
+                    path: getRoutePath('user.user/detail'),
+                    query: {
+                      id: row.id,
+                      mode: 'uplode',
+                      mdoeid: row.contract.id,
+                    },
+                  }"
+                >
+                  上传合同
+                </router-link>
+              </el-button>
+              <el-button
+                v-perms="['user.user/launch']"
+                type="primary"
+                v-if="row.contract?.check_status == 2"
+                link
+                @click="
+                  (showPop = true),
+                    (showConctactPop = true),
+                    (contractId = row.id)
+                "
+                >生成个人合同</el-button
+              >
+              <el-button
+                v-if="row.is_contract == 0 && row.contract?.check_status == 3"
+                v-perms="['user.user/launch']"
+                type="primary"
+                link
+                @click="(showPop = true), (contractId = row.id)"
+                >重新短信</el-button
+              >
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
 
-            <el-dialog v-model="showPop" @close="offPop">
-                <h1>重要提醒</h1>
-                <div class="content" v-if="showConctactPop">
-                    请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
-                </div>
-                <div class="content" v-else>
-                    确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
-                </div>
-                <p class="btn_menu">
-                    <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
-                        >确认创建</el-button
-                    >
-                    <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
-                    <el-button type="info" size="large" @click="offPop">返回</el-button>
-                </p>
-            </el-dialog>
-            <div class="flex justify-end mt-4">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
+      <el-dialog v-model="showPop" @close="offPop">
+        <h1>重要提醒</h1>
+        <div class="content" v-if="showConctactPop">
+          请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+        </div>
+        <div class="content" v-else>
+          确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+        </div>
+        <p class="btn_menu">
+          <el-button
+            type="primary"
+            size="large"
+            v-if="showConctactPop"
+            @click="creContct"
+            >确认创建</el-button
+          >
+          <el-button type="primary" size="large" v-else @click="sendMsg"
+            >确认</el-button
+          >
+          <el-button type="info" size="large" @click="offPop">返回</el-button>
+        </p>
+      </el-dialog>
+      <div class="flex justify-end mt-4">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+  </div>
 </template>
 <script lang="ts" setup name="consumerLists">
-import { usePaging } from '@/hooks/usePaging'
-import { getRoutePath } from '@/router'
-import { getUserList, creatContact, sendMsgApi } from '@/api/consumer'
-import { ClientMap } from '@/enums/appEnums'
-import feedback from '@/utils/feedback'
-const route = useRoute()
+import { usePaging } from "@/hooks/usePaging";
+import { getRoutePath } from "@/router";
+import { getUserList, creatContact, sendMsgApi } from "@/api/consumer";
+import { ClientMap } from "@/enums/appEnums";
+import feedback from "@/utils/feedback";
+const route = useRoute();
 
 const queryParams = reactive({
-    keyword: '',
-    channel: '',
-    create_time_start: '',
-    create_time_end: '',
-    company_id: ''
-})
+  keyword: "",
+  channel: "",
+  create_time_start: "",
+  create_time_end: "",
+  company_id: "",
+});
 if (route.query.company_id) {
-    queryParams.company_id = route.query.company_id
+  queryParams.company_id = route.query.company_id;
 }
-const contractId = ref(0)
-const showPop = ref(false)
-const showConctactPop = ref(false)
+const contractId = ref(0);
+const showPop = ref(false);
+const showConctactPop = ref(false);
 const offPop = () => {
-    showPop.value = false
-    showConctactPop.value = false
-}
+  showPop.value = false;
+  showConctactPop.value = false;
+};
 const creContct = () => {
-    console.log(contractId.value)
-    //   feedback.msgSuccess("复制成功");
-    creatContact({ id: contractId.value }).then(() => {
-        feedback.msgSuccess('发送成功')
-    })
-    offPop()
-}
+  console.log(contractId.value);
+  //   feedback.msgSuccess("复制成功");
+  creatContact({ id: contractId.value }).then(() => {
+    feedback.msgSuccess("发送成功");
+  });
+  offPop();
+};
 const sendMsg = () => {
-    sendMsgApi({ id: contractId.value }).then((res) => {
-        feedback.msgSuccess('发送成功')
-    })
-    offPop()
-}
+  sendMsgApi({ id: contractId.value }).then((res) => {
+    feedback.msgSuccess("发送成功");
+  });
+  offPop();
+};
 // const handleDelete = async (id: number) => {
 //     await feedback.confirm('确定要删除？')
 //     await adminDelete({ id })
@@ -209,39 +235,39 @@ const sendMsg = () => {
 //     getLists()
 // }
 const { pager, getLists, resetPage, resetParams } = usePaging({
-    fetchFun: getUserList,
-    params: queryParams
-})
+  fetchFun: getUserList,
+  params: queryParams,
+});
 onActivated(() => {
-    getLists()
-})
+  getLists();
+});
 
-getLists()
+getLists();
 </script>
 <style scoped>
 h1 {
-    text-align: center;
-    font-weight: bold;
-    font-size: 30px;
-    color: red;
-    margin-bottom: 10px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 30px;
+  color: red;
+  margin-bottom: 10px;
 }
 
 .content {
-    font-size: 20px;
+  font-size: 20px;
 }
 
 .info {
-    color: red;
-    font-weight: bold;
-    font-size: 18px;
-    display: inline-block;
-    margin: 0 5px;
+  color: red;
+  font-weight: bold;
+  font-size: 18px;
+  display: inline-block;
+  margin: 0 5px;
 }
 
 .btn_menu {
-    margin-top: 10vh;
-    display: flex;
-    justify-content: space-around;
+  margin-top: 10vh;
+  display: flex;
+  justify-content: space-around;
 }
 </style>
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index 8677155..cfae423 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -465,7 +465,7 @@ async function render() {
   });
   compeny.value = res.party_a_info;
   basicdata.value = res;
-  if (basicdata.value.status == 1) {
+  if (basicdata.value.status == 1 || res.check_status == 3 || res.status == 1) {
     isshow.value = false;
   }
   try {

From 6f4cbcc24aa286f1e7f731a06abb2aaa9f984c21 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 18 Aug 2023 12:10:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/MapContainer.vue | 26 +++++++++++++-------------
 src/views/task/editTow.vue          |  4 ++--
 src/views/task/taskCalendar.vue     |  8 ++------
 src/views/task_template/map.vue     | 11 ++++++++++-
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/components/map/MapContainer.vue b/src/components/map/MapContainer.vue
index 4309fb8..7973e98 100644
--- a/src/components/map/MapContainer.vue
+++ b/src/components/map/MapContainer.vue
@@ -48,7 +48,7 @@ const initMap = async () => {
 
   map.value.on("click", (e: any) => {
     // console.log("点击", e.lnglat);
-    if (m_index >= 3) return;
+    if (m_index >= 1) return;
     // 调用函数并传入经纬度
     getDistrictName(e.lnglat.lng, e.lnglat.lat, e);
 
@@ -76,18 +76,18 @@ const initMap = async () => {
     m_index++;
 
     // 添加标记点击事件监听器
-    // marker.on("click", (event: any) => {
-    //   console.log("删除", event);
-    //   markerList = markerList.filter((item: any) => {
-    //     item[0] == marker._position.pos[0] &&
-    //       item[0] == marker._position.pos[0];
-    //   });
-    //   emits("changeMaps", markerList);
-    //   // 在这里可以进行其他自定义逻辑操作
-    //   map.value.remove(marker);
-    //   m_index--;
-    //   marker = null;
-    // });
+    marker.on("click", (event: any) => {
+      console.log("删除", event);
+      markerList = markerList.filter((item: any) => {
+        item[0] == marker._position.pos[0] &&
+          item[0] == marker._position.pos[0];
+      });
+      emits("changeMaps", markerList);
+      // 在这里可以进行其他自定义逻辑操作
+      map.value.remove(marker);
+      m_index--;
+      marker = null;
+    });
   });
 };
 
diff --git a/src/views/task/editTow.vue b/src/views/task/editTow.vue
index b602c80..4faa146 100644
--- a/src/views/task/editTow.vue
+++ b/src/views/task/editTow.vue
@@ -54,10 +54,10 @@
             placeholder="没有任务描述"
           />
         </el-form-item>
-        <el-form-item v-if="mode == 'show'" label="">
+        <!-- <el-form-item v-if="mode == 'show'" label="">
           <el-button type="primary" @click="clickUpdate"> 修改 </el-button>
           <el-button type="danger" @click="clickDelete"> 删除 </el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </popup>
     <el-dialog v-model="isShow" title="选择任务模板" width="60%">
diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue
index 41fc9f6..e618f3e 100644
--- a/src/views/task/taskCalendar.vue
+++ b/src/views/task/taskCalendar.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="!border-none" v-loading="loading" shadow="never">
-      <div style="display: flex; justify-content: space-between">
+      <!-- <div style="display: flex; justify-content: space-between">
         <el-button
           v-perms="['task.taskCalendar/add']"
           type="primary"
@@ -12,11 +12,7 @@
           </template>
           新增
         </el-button>
-        <!-- <div class="btn">
-          <div :class="{ active: nowType == 0 }" @click="nowType = 0">日历</div>
-          <div :class="{ active: nowType == 1 }" @click="nowType = 1">列表</div>
-        </div> -->
-      </div>
+      </div> -->
       <calendar
         :list="taskList"
         @clickItem="clickTask"
diff --git a/src/views/task_template/map.vue b/src/views/task_template/map.vue
index edd26df..ee6db7c 100644
--- a/src/views/task_template/map.vue
+++ b/src/views/task_template/map.vue
@@ -22,6 +22,14 @@
         <el-form-item label-width="80px" label="地图">
           <MapContainer ref="mapRef" @changeMaps="changeMaps"></MapContainer>
         </el-form-item>
+        <el-form-item label-width="80px" label="已选地点">
+          <el-input
+            style="width: 350px; margin-right: 16px"
+            placeholder="请点击上方地图选择地点"
+            readonly
+            :value="address[0]?.address"
+          />
+        </el-form-item>
         <!-- <el-form-item label-width="80px" label="起点">
           <el-input
             style="width: 350px; margin-right: 16px"
@@ -115,7 +123,7 @@ const changeMaps = (e: any) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-  if (address.value.length < 3) return ElMessage.error("请先选择三个地点");
+  // if (address.value.length < 3) return ElMessage.error("请先选择三个地点");
   popupRef.value?.close();
   emit("success", address.value);
 };
@@ -124,6 +132,7 @@ const handleSubmit = async () => {
 const open = (type = "地点") => {
   title.value = "选择" + type;
   popupRef.value?.open();
+  resetMap();
 };
 
 // 关闭回调