diff --git a/src/api/shop_contract.ts b/src/api/shop_contract.ts
index c507c78..4b7c024 100644
--- a/src/api/shop_contract.ts
+++ b/src/api/shop_contract.ts
@@ -23,4 +23,9 @@ export function apiShopContractDelete(params: any) {
 // 商户合同详情
 export function apiShopContractDetail(params: any) {
     return request.get({ url: '/shop_contract/detail', params })
-}
\ No newline at end of file
+}
+
+// 合同上传
+export function apiShopWindControl(params: any) {
+    return request.post({ url: '/shop_contract/wind_control', params })
+}
diff --git a/src/views/shop_contract/details.vue b/src/views/shop_contract/details.vue
new file mode 100644
index 0000000..93ce94b
--- /dev/null
+++ b/src/views/shop_contract/details.vue
@@ -0,0 +1,645 @@
+<template>
+  <el-card class="box-card">
+    <template #header>
+      <span>甲方基本信息</span>
+    </template>
+    <el-form
+      :inline="true"
+      ref="formRef"
+      :model="compeny"
+      label-width="91.5px"
+      :rules="formRules"
+      class="select"
+    >
+      <el-form-item label="公司名称" prop="company_name" required>
+        <el-input
+          disabled
+          v-model="compeny.company_name"
+          placeholder="请输入公司名称"
+        />
+      </el-form-item>
+      <el-form-item label="社会代码" prop="organization_code" required>
+        <el-input
+          disabled
+          v-model="compeny.organization_code"
+          placeholder="请输入社会代码"
+        />
+      </el-form-item>
+      <el-form-item label="主要联系人" prop="company_name" required>
+        <el-input
+          disabled
+          v-model="compeny.master_name"
+          placeholder="请输入主要联系人"
+        />
+      </el-form-item>
+      <el-form-item label="公司类型" prop="compeny">
+        <el-select
+          disabled
+          v-model="compeny.company_type_name"
+          placeholder="请输入公司类型"
+        >
+        </el-select>
+      </el-form-item>
+      <el-form-item label="省" prop="province">
+        <el-select
+          disabled
+          v-model="compeny.province_name"
+          placeholder="请选择省"
+        >
+        </el-select>
+      </el-form-item>
+      <el-form-item label="市" prop="city">
+        <el-select disabled v-model="compeny.city_name" placeholder="请选择市">
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区" prop="area">
+        <el-select disabled v-model="compeny.area_name" placeholder="请选择区">
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="镇"
+        v-if="compeny.company_type != 30"
+        prop="company_type_name"
+      >
+        <el-select
+          disabled
+          v-model="compeny.street_name"
+          placeholder="请选择镇"
+        >
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="compeny.company_type != 30"
+        label="地址"
+        prop="address"
+      >
+        <el-input
+          disabled
+          v-model="compeny.address"
+          placeholder="请输入公司地址"
+          :style="{ width: '32rem' }"
+        />
+      </el-form-item>
+    </el-form>
+  </el-card>
+  <el-card v-if="false">
+    <template #header>
+      <span>甲方资质信息</span>
+    </template>
+    <el-form
+      :inline="true"
+      ref="formRef"
+      :model="compeny"
+      label-width="90px"
+      :rules="formRules"
+      class="company_z"
+    >
+      <el-form-item label="公司资质" prop="contract_type" required>
+        <div class="company">
+          <img :src="compenyimg.business_license" />
+        </div>
+      </el-form-item>
+      <el-form-item
+        label-width="120px"
+        label="开户许可证"
+        prop="contract_no"
+        required
+      >
+        <div class="company">
+          <img :src="compenyimg.business_licenseB" />
+        </div>
+      </el-form-item>
+      <el-form-item
+        v-if="compenyimg.other_qualifications?.length > 0"
+        class="other"
+        label="其他资质"
+        prop="contract_no"
+        required
+      >
+        <div
+          class="company"
+          v-for="(v, i) in compenyimg.other_qualifications"
+          :key="i"
+        >
+          <img :src="v" />
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-card>
+  <el-card v-if="show">
+    <template #header>
+      <span>乙方基本信息</span>
+    </template>
+    <el-form
+      :inline="true"
+      ref="formRef"
+      :model="compenyB"
+      label-width="91.5px"
+      :rules="formRules"
+      class="select"
+    >
+      <el-form-item label="公司名称" prop="company_name" required>
+        <el-input
+          disabled
+          v-model="compenyB.company_name"
+          placeholder="请输入公司名称"
+        />
+      </el-form-item>
+      <el-form-item label="社会代码" prop="organization_code" required>
+        <el-input
+          disabled
+          v-model="compenyB.organization_code"
+          placeholder="请输入社会代码"
+        />
+      </el-form-item>
+      <el-form-item label="公司类型" prop="company_type">
+        <el-select
+          disabled
+          v-model="compenyB.company_type_name"
+          placeholder="请输入社会类型"
+        >
+          <el-option></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="主要联系人" prop="master_name" required>
+        <el-input
+          disabled
+          v-model="compenyB.master_name"
+          placeholder="请输入主要联系人"
+        />
+      </el-form-item>
+      <el-form-item label="省" prop="province">
+        <el-select
+          disabled
+          v-model="compenyB.province_name"
+          placeholder="请选择省"
+        >
+        </el-select>
+      </el-form-item>
+      <el-form-item label="市" prop="city">
+        <el-select disabled v-model="compenyB.city_name" placeholder="请选择市">
+        </el-select>
+      </el-form-item>
+      <el-form-item label="区" prop="area">
+        <el-select disabled v-model="compenyB.area_name" placeholder="请选择区">
+        </el-select>
+      </el-form-item>
+      <el-form-item label="镇" prop="street">
+        <el-select
+          disabled
+          v-model="compenyB.street_name"
+          placeholder="请选择镇"
+        >
+          <el-option></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="地址" prop="street">
+        <el-input
+          disabled
+          v-model="compenyB.address"
+          placeholder="请输入公司地址"
+          :style="{ width: '31.5rem' }"
+        />
+      </el-form-item>
+    </el-form>
+  </el-card>
+  <el-card v-if="show && false">
+    <template #header>
+      <span>乙方资质信息</span>
+    </template>
+    <el-form
+      :inline="true"
+      ref="formRef"
+      :model="formData"
+      label-width="90px"
+      :rules="formRules"
+      class="company_z"
+    >
+      <el-form-item label="公司资质" prop="contract_type" required>
+        <div class="company">
+          <img :src="compenyBimg.business_license" />
+        </div>
+      </el-form-item>
+      <el-form-item
+        label-width="120px"
+        label="开户许可证"
+        prop="contract_no"
+        required
+      >
+        <div class="company">
+          <img :src="compenyBimg.business_licenseB" />
+        </div>
+      </el-form-item>
+      <el-form-item
+        v-if="compenyBimg.other_qualifications?.length > 0"
+        class="other"
+        label="其他资质"
+        prop="contract_no"
+        required
+      >
+        <div
+          class="company"
+          v-for="(v, i) in compenyBimg.other_qualifications"
+          :key="i"
+        >
+          <img :src="v" />
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-card>
+  <el-card v-if="flag">
+    <template #header>
+      <span>个人基本信息</span>
+    </template>
+    <div class="persenal">
+      <img :src="persen.avatar" />
+      <el-form
+        :inline="true"
+        ref="formRef"
+        :model="persen"
+        label-width="90px"
+        :rules="formRules"
+        class="person_select"
+      >
+        <el-form-item label="姓名">
+          <el-input
+            disabled
+            v-model="persen.nickname"
+            placeholder="请输入姓名"
+          />
+        </el-form-item>
+        <el-form-item label="性别">
+          <el-input disabled v-model="persen.sex" placeholder="请输入性别" />
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input
+            disabled
+            v-model="persen.mobile"
+            placeholder="请输入联系电话"
+          />
+        </el-form-item>
+        <el-form-item label="身份证号">
+          <el-input
+            v-model="persen.id_card"
+            placeholder="请输入身份证号"
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="省" prop="province">
+          <el-select
+            disabled
+            v-model="persen.province_name"
+            placeholder="请选择省"
+          >
+          </el-select>
+        </el-form-item>
+        <el-form-item label="市" prop="city">
+          <el-select disabled v-model="persen.city_name" placeholder="请选择市">
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区" prop="area">
+          <el-select disabled v-model="persen.area_name" placeholder="请选择区">
+            <el-option></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="镇" prop="street">
+          <el-select
+            disabled
+            v-model="persen.street_name"
+            placeholder="请选择镇"
+          >
+            <el-option></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+  </el-card>
+  <el-card v-if="flag">
+    <template #header>
+      <span>个人资质信息</span>
+    </template>
+    <el-form class="idcard" :model="persenimg" :inline="true">
+      <el-form-item label="身份证">
+        <img :src="persenimg.id_card" />
+        <img :src="persenimg.id_card_b" />
+      </el-form-item>
+      <el-form-item label="银行卡">
+        <img :src="persenimg.bank_account" />
+        <img :src="persenimg.bank_account_b" />
+      </el-form-item>
+      <el-form-item
+        v-if="persenimg.car_card || persenimg.car_card_b"
+        label="行驶证"
+      >
+        <img v-if="persenimg.car_card" :src="persenimg.car_card" />
+        <img v-if="persenimg.car_card_b" :src="persenimg.car_card_b" />
+      </el-form-item>
+    </el-form>
+  </el-card>
+  <el-card>
+    <template #header>
+      <span>电子合同</span>
+    </template>
+    <el-form
+      :inline="true"
+      class="frame"
+      ref="formRef"
+      :model="formData"
+      label-width="90px"
+      :rules="formRules"
+    >
+      <el-form-item label="甲方" prop="contract_type">
+        <el-input
+          v-model="compeny.company_name"
+          :disabled="true"
+          placeholder="暂无甲方方"
+        />
+      </el-form-item>
+      <el-form-item label="乙方" prop="contract_no">
+        <el-input
+          v-model="compenyB.company_name"
+          :disabled="true"
+          placeholder="暂无乙方"
+        />
+      </el-form-item>
+      <el-form-item label="合同类型" prop="contract_no">
+        <el-input
+          v-model="basicdata.contract_type_name"
+          :disabled="true"
+          placeholder="暂无合同"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="合同编号" prop="contract_no">
+                  <el-input
+                      v-model="formData.party_b_name"
+                      :disabled="true"
+                      placeholder="暂无签约方"
+                  />
+              </el-form-item> -->
+    </el-form>
+  </el-card>
+  <el-card>
+    <el-form label-width="100px">
+      <el-form-item
+        v-if="isshow || formData?.status == 0"
+        label="合同上传"
+        prop="field127"
+      >
+        <el-upload
+          :headers="{ Token: userStore.token }"
+          class="upload-demo"
+          :action="base_url + '/upload/file'"
+          :on-success="handleAvatarSuccess_four"
+          :before-upload="handleBeforeUpload"
+          :limit="1"
+          v-if="formData?.status == 0"
+          :on-exceed="handleExceed"
+          ref="upload"
+          v-perms="['contract.contract/wind_control']"
+        >
+          <el-button type="primary">{{
+            formData.file ? "重新上传" : "上传"
+          }}</el-button>
+        </el-upload>
+        <a
+          v-if="formData.file"
+          style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
+          :href="formData.file"
+          target="_blank"
+          >合同已上传,点击查看</a
+        >
+      </el-form-item>
+      <el-form-item v-if="isshow || formData.status == 0">
+        <el-button
+          v-perms="['contract.contract/wind_control']"
+          type="primary"
+          @click="submitContract"
+          >确定</el-button
+        >
+      </el-form-item>
+      <el-form-item v-else-if="formData.file && formData.status">
+        <a
+          v-if="formData.file"
+          style="margin-left: 10px; color: #4a5dff"
+          :href="
+            formData.signed_contract_url
+              ? formData.signed_contract_url
+              : formData.file
+          "
+          target="_blank"
+          >查看合同</a
+        >
+      </el-form-item>
+    </el-form>
+  </el-card>
+</template>
+  
+  <script lang="ts" setup>
+import {
+  type FormInstance,
+  type UploadProps,
+  ElMessage,
+  type UploadUserFile,
+} from "element-plus";
+import { apiShopContractDetail, apiShopWindControl } from "@/api/shop_contract";
+import { ref, reactive, defineExpose, computed, inject } from "vue";
+import { useRoute } from "vue-router";
+import { dictDataLists } from "@/api/setting/dict";
+// import { upContact } from "@/api/consumer";
+import { genFileId } from "element-plus";
+const { query } = useRoute();
+import useUserStore from "@/stores/modules/user";
+import useMultipleTabs from "@/hooks/useMultipleTabs";
+const { removeTab } = useMultipleTabs();
+const base_url: any = inject("base_url");
+
+const formData = reactive({
+  id: "",
+  company_id: "",
+  contract_type: "",
+  contract_type_name: "",
+  contract_no: "",
+  file: "",
+  status: "",
+  check_status: "",
+  party_a: "",
+  party_a_name: "",
+  party_b: "",
+  party_b_name: "",
+  area_manager: "",
+  area_manager_name: "",
+  type_name: "",
+  url: "",
+  status_name: "",
+  signed_contract_url: "",
+});
+const fileList = ref<UploadUserFile[]>([]);
+const basicdata = ref({});
+const compeny = ref({});
+const compenyimg = ref([]);
+const compenyB = ref([]);
+const compenyBimg = ref([]);
+const persen = ref([]);
+const persenimg = ref([]);
+const show = ref(true);
+const flag = ref(false);
+const isshow = ref(true);
+const route = useRoute();
+const userStore = useUserStore();
+
+async function render() {
+  // 传值赋值
+  const res = await apiShopContractDetail({ id: query.id });
+  Object.keys(formData).forEach((key: any) => {
+    if (res[key] != null && res[key] != undefined) formData[key] = res[key];
+  });
+  compeny.value = res.party_a_info;
+  basicdata.value = res;
+  if (basicdata.value.status == 1 || res.check_status == 3 || res.status == 1) {
+    isshow.value = false;
+  }
+  try {
+    if (res.party_a_info.qualification.bank_account) {
+      res.party_a_info.qualification.bank_account = JSON.parse(
+        res.party_a_info.qualification.bank_account
+      );
+      compenyimg.value = res.party_a_info.qualification;
+    }
+    if (res.party_b_info.qualification.other_qualifications) {
+      res.party_b_info.qualification.other_qualifications = JSON.parse(
+        res.party_b_info.qualification.other_qualifications
+      );
+      compenyBimg.value = res.party_b_info.qualification;
+    }
+  } catch (error) {}
+  compenyimg.value = res.party_a_info.qualification;
+  compenyB.value = res.party_b_info;
+  compenyBimg.value = res.party_b_info.qualification;
+  flag.value = false;
+  // if (res.type == 2) {
+  //   show.value = false;
+  //   res.party_b_info.sex == 1
+  //     ? (res.party_b_info.sex = "男")
+  //     : (res.party_b_info.sex = "女");
+  //   persen.value = res.party_b_info;
+  //   persenimg.value = res.party_b_info.qualification;
+  // }
+  // if (res.type == 1) {
+  //   compenyB.value = res.party_b_info;
+  //   compenyBimg.value = res.party_b_info.qualification;
+  //   flag.value = false;
+  // } else {
+  //   compenyB.value.company_name = res.party_b_info.nickname;
+  // }
+}
+
+const handleBeforeUpload = (e: any) => {
+  if (e?.name?.substring(e.name.length - 4, e.name.length) != ".pdf") {
+    ElMessage.error("仅支持上传.pdf文件");
+    return false;
+  }
+  return true;
+};
+
+const upload = ref(null);
+const handleExceed = (files: any) => {
+  upload.value!.clearFiles();
+  const file = files[0] as UploadRawFile;
+  file.uid = genFileId();
+  upload.value!.handleStart(file);
+  upload.value!.submit();
+};
+
+const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
+  response,
+  uploadFile
+) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
+  formData.file = response.data.uri;
+};
+
+const router = useRouter();
+const submitContract = () => {
+  if (!formData.file) ElMessage.error("请先上传合同!");
+  apiShopWindControl({ file: formData.file, id: route.query.id });
+  removeTab();
+  router.back();
+};
+
+onMounted(async () => {
+  await render();
+});
+</script>
+  
+  <style lang="scss" scoped>
+.frame {
+  .el-form-item {
+    width: 40%;
+    .el-input {
+      width: 100%;
+    }
+  }
+}
+.select {
+  .el-form-item {
+    .el-select {
+      width: 12rem;
+    }
+  }
+}
+.person_select {
+  .el-form-item {
+    width: 30%;
+    .el-select {
+      width: 100%;
+    }
+  }
+}
+.company {
+  display: flex;
+  justify-content: space-between;
+  img {
+    width: 10vw;
+    height: 6.3vw;
+    margin-right: 10px;
+  }
+}
+.persenal {
+  display: flex;
+  align-items: center;
+  img {
+    width: 10vw;
+    height: 6.3vw;
+  }
+}
+.idcard {
+  img {
+    width: 10vw;
+    height: 6.3vw;
+    margin-right: 12px;
+  }
+}
+.company_z {
+  .el-form-item {
+    width: 40%;
+  }
+  .other {
+    width: 100% !important;
+  }
+}
+.el-card {
+  margin-top: 10px;
+}
+
+.el-upload-list .el-upload-list__item-thumbnail {
+  width: 500px; /* 设置文件缩略图的宽度 */
+}
+
+.el-upload-list .el-upload-list__item-name {
+  max-width: 450px; /* 设置文件名的最大宽度 */
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/shop_contract/index.vue b/src/views/shop_contract/index.vue
index 0e34f77..71a1cbe 100644
--- a/src/views/shop_contract/index.vue
+++ b/src/views/shop_contract/index.vue
@@ -1,143 +1,283 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="合同编号" prop="contract_no">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
-                </el-form-item>
-                <el-form-item label="甲方" prop="party_a">
-                    <el-input class="w-[280px]" v-model="queryParams.party_a" clearable placeholder="请输入甲方" />
-                </el-form-item>
-                <el-form-item label="乙方" prop="party_b">
-                    <el-input class="w-[280px]" v-model="queryParams.party_b" clearable placeholder="请输入乙方" />
-                </el-form-item>
-                <el-form-item label="1 发起合同，2合同上传完成 ,3发送合同" prop="check_status">
-                    <el-input class="w-[280px]" v-model="queryParams.check_status" clearable placeholder="请输入1 发起合同，2合同上传完成 ,3发送合同" />
-                </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">
-            <el-button v-perms="['shop_contract/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['shop_contract/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
-                    <el-table-column label="甲方" prop="party_a" show-overflow-tooltip />
-                    <el-table-column label="乙方" prop="party_b" show-overflow-tooltip />
-                    <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
-                    <el-table-column label="1公司2个人" prop="type" show-overflow-tooltip />
-                    <el-table-column label="证据包" prop="evidence_url" show-overflow-tooltip />
-                    <el-table-column label="1 发起合同，2合同上传完成 ,3发送合同" prop="check_status" show-overflow-tooltip />

-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['shop_contract/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['shop_contract/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="shopContractLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiShopContractLists, apiShopContractDelete } from '@/api/shop_contract'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    contract_no: '',
-    party_a: '',
-    party_b: '',
-    check_status: '',
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiShopContractLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiShopContractDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
+<template>
+  <div>
+    <el-card class="!border-none mb-4" shadow="never">
+      <el-form class="mb-[-16px]" :model="queryParams" inline>
+        <el-form-item label="合同编号" prop="contract_no">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.contract_no"
+            clearable
+            placeholder="请输入合同编号"
+          />
+        </el-form-item>
+        <el-form-item label="甲方" prop="party_a">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.party_a"
+            clearable
+            placeholder="请输入甲方"
+          />
+        </el-form-item>
+        <el-form-item label="乙方" prop="party_b">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.party_b"
+            clearable
+            placeholder="请输入乙方"
+          />
+        </el-form-item>
+        <el-form-item label="签约状态" prop="status">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.check_status"
+            clearable
+            placeholder=""
+          />
+        </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">
+      <el-button
+        v-perms="['shop_contract/add']"
+        type="primary"
+        @click="handleAdd"
+      >
+        <template #icon>
+          <icon name="el-icon-Plus" />
+        </template>
+        新增
+      </el-button>
+      <el-button
+        v-perms="['shop_contract/delete']"
+        :disabled="!selectData.length"
+        @click="handleDelete(selectData)"
+      >
+        删除
+      </el-button>
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" />
+          <el-table-column
+            label="合同编号"
+            prop="contract_no"
+            show-overflow-tooltip
+          />
+          <el-table-column label="甲方" prop="party_a" show-overflow-tooltip />
+          <el-table-column label="乙方" prop="party_b" show-overflow-tooltip />
+          <el-table-column
+            label="片区经理"
+            prop="area_manager"
+            show-overflow-tooltip
+          />
+          <el-table-column label="合同类型" prop="type" show-overflow-tooltip />
+          <el-table-column
+            label="证据包"
+            prop="evidence_url"
+            show-overflow-tooltip
+          />
+          <el-table-column label="签约状态" prop="status" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.status" style="color: #67c23a">已签约</span>
+              <span v-else style="color: #fe0000">未签约</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" width="120" fixed="right">
+            <template #default="{ row }">
+              <el-button type="primary" link>
+                <router-link
+                  :to="{
+                    path: '/contract/shop_contract_detail',
+                    query: { id: row.id },
+                  }"
+                  >{{ row.status ? "详情" : "审核" }}</router-link
+                >
+              </el-button>
+              <template v-if="row.status == 0">
+                <el-button v-if="row.check_status == 1" type="warning" link>
+                  <router-link
+                    :to="{
+                      path: '/contract/shop_contract_detail',
+                      query: { id: row.id },
+                    }"
+                    >待审核</router-link
+                  >
+                </el-button>
+                <el-button
+                  v-else-if="row.check_status == 2"
+                  v-perms="['contract.contract/contract_send']"
+                  type="primary"
+                  link
+                  @click="showCreateConctPop(row)"
+                  >发送合同</el-button
+                >
+                <el-button
+                  v-else-if="row.check_status == 3"
+                  v-perms="['contract.contract/contract_send_again']"
+                  type="primary"
+                  link
+                  @click="(showPop = true), (contractId = row.party_b)"
+                  >发送短信</el-button
+                >
+              </template>
+              <el-button
+                v-else
+                type="primary"
+                link
+                @click="loadContractZip(row)"
+              >
+                下载证据包
+              </el-button>
+              <!-- <el-button
+                v-perms="['shop_contract/edit']"
+                type="primary"
+                link
+                @click="handleEdit(row)"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-perms="['shop_contract/delete']"
+                type="danger"
+                link
+                @click="handleDelete(row.id)"
+              >
+                删除
+              </el-button> -->
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+    <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="shopContractLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import {
+  apiShopContractLists,
+  apiShopContractDelete,
+} from "@/api/shop_contract";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+import EditPopup from "./edit.vue";
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+// 是否显示编辑框
+const showEdit = ref(false);
+
+// 查询条件
+const queryParams = reactive({
+  contract_no: "",
+  party_a: "",
+  party_b: "",
+  check_status: "",
+  status: "",
+});
+
+// 选中数据
+const selectData = ref<any[]>([]);
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+  selectData.value = val.map(({ id }) => id);
+};
+
+// 获取字典数据
+const { dictData } = useDictData("");
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: apiShopContractLists,
+  params: queryParams,
+});
+
+// 添加
+const handleAdd = async () => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("add");
+};
+
+// 编辑
+const handleEdit = async (data: any) => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("edit");
+  editRef.value?.setFormData(data);
+};
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+  await feedback.confirm("确定要删除？");
+  await apiShopContractDelete({ id });
+  getLists();
+};
+
+//弹窗
+const showPop = ref(false);
+const showConctactPop = ref(false);
+// 发送合同的id
+const contractId = ref("");
+// 发送合同
+const showCreateConctPop = (row) => {
+  (showPop.value = true),
+    (showConctactPop.value = true),
+    (contractId.value = row.party_b);
+};
+const offPop = () => {
+  showPop.value = false;
+  showConctactPop.value = false;
+};
+const creContct = async () => {
+  //   await generateGontract({ id: contractId.value });
+  getLists();
+  offPop();
+};
+const sendMsg = async () => {
+  //   await sendMsgApi({ id: contractId.value });
+  getLists();
+  offPop();
+};
+
+getLists();
+</script>
+
diff --git a/src/views/shop_merchant/index.vue b/src/views/shop_merchant/index.vue
index e9fa9a3..df4fd65 100644
--- a/src/views/shop_merchant/index.vue
+++ b/src/views/shop_merchant/index.vue
@@ -1,136 +1,177 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :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="master_name">
-                    <el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入主联系人姓名" />
-                </el-form-item>
-                <el-form-item label="主联系人手机" prop="master_phone">
-                    <el-input class="w-[280px]" v-model="queryParams.master_phone" clearable placeholder="请输入主联系人手机" />
-                </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">
-            <el-button v-perms="['shop_merchant/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['shop_merchant/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
-                    <el-table-column label="组织机构代码" prop="organization_code" 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="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['shop_merchant/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['shop_merchant/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="shopMerchantLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiShopMerchantLists, apiShopMerchantDelete } from '@/api/shop_merchant'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    company_name: '',
-    master_name: '',
-    master_phone: '',
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiShopMerchantLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiShopMerchantDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
+<template>
+  <div>
+    <el-card class="!border-none mb-4" shadow="never">
+      <el-form class="mb-[-16px]" :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="master_name">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.master_name"
+            clearable
+            placeholder="请输入主联系人姓名"
+          />
+        </el-form-item>
+        <el-form-item label="主联系人手机" prop="master_phone">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.master_phone"
+            clearable
+            placeholder="请输入主联系人手机"
+          />
+        </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">
+      <!-- <el-button
+        v-perms="['shop_merchant/add']"
+        type="primary"
+        @click="handleAdd"
+      >
+        <template #icon>
+          <icon name="el-icon-Plus" />
+        </template>
+        新增
+      </el-button>
+      <el-button
+        v-perms="['shop_merchant/delete']"
+        :disabled="!selectData.length"
+        @click="handleDelete(selectData)"
+      >
+        删除
+      </el-button> -->
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <!-- <el-table-column type="selection" width="55" /> -->
+          <el-table-column
+            label="公司名称"
+            prop="company_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="组织机构代码"
+            prop="organization_code"
+            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="操作" width="120" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-perms="['shop_merchant/edit']"
+                type="primary"
+                link
+                @click="handleEdit(row)"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-perms="['shop_merchant/delete']"
+                type="danger"
+                link
+                @click="handleDelete(row.id)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column> -->
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup name="shopMerchantLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import {
+  apiShopMerchantLists,
+  apiShopMerchantDelete,
+} from "@/api/shop_merchant";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+import EditPopup from "./edit.vue";
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+// 是否显示编辑框
+const showEdit = ref(false);
+
+// 查询条件
+const queryParams = reactive({
+  company_name: "",
+  master_name: "",
+  master_phone: "",
+});
+
+// 选中数据
+const selectData = ref<any[]>([]);
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+  selectData.value = val.map(({ id }) => id);
+};
+
+// 获取字典数据
+const { dictData } = useDictData("");
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: apiShopMerchantLists,
+  params: queryParams,
+});
+
+// 添加
+const handleAdd = async () => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("add");
+};
+
+// 编辑
+const handleEdit = async (data: any) => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("edit");
+  editRef.value?.setFormData(data);
+};
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+  await feedback.confirm("确定要删除？");
+  await apiShopMerchantDelete({ id });
+  getLists();
+};
+
+getLists();
+</script>
+