From da96300363966aaed7c33fda06adefd948ea7031 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 7 Aug 2023 18:56:49 +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/api/company.ts           |   4 +
 src/views/company/index.vue  | 684 +++++++++++++++++------------------
 src/views/contract/index.vue |  13 +-
 3 files changed, 344 insertions(+), 357 deletions(-)

diff --git a/src/api/company.ts b/src/api/company.ts
index a3c7786..ca99e62 100644
--- a/src/api/company.ts
+++ b/src/api/company.ts
@@ -33,6 +33,10 @@ export function sendMsgApi(params: any) {
     return request.get({ url: '/company/postsms', params })
 }
 // 生成合同
+export function initiate_contract(params: any) {
+    return request.get({ url: '/company/initiate_contract', params })
+}
+// 发送合同
 export function generateGontract(params: any) {
     return request.get({ url: '/company/Draftingcontracts', params })
 }
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index 371f811..745ba34 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -1,404 +1,390 @@
 <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="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>
-      &nbsp; &nbsp;
-      <router-link
-        :to="{
-          path: getRoutePath('company/add:edit'),
-          query: {
-            id: userStore.userInfo.company_id,
-            read: true,
-          },
-        }"
-      >
-        <el-button type="primary" class="mb-4">
-          我的公司
-        </el-button></router-link
-      >
+    <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="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>
+            &nbsp; &nbsp;
+            <router-link
+                :to="{
+                    path: getRoutePath('company/add:edit'),
+                    query: {
+                        id: userStore.userInfo.company_id,
+                        read: true
+                    }
+                }"
+            >
+                <el-button type="primary" class="mb-4"> 我的公司 </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="500"
-            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 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
+            <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="500" 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 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_contract == 0">
+                                    <el-button
+                                        v-perms="['company/initiate_contract']"
+                                        type="primary"
+                                        link
+                                        @click="ShowInitiateContractPop(row)"
+                                        >生成合同</el-button
+                                    >
+                                    <el-button
+                                        v-perms="['company/Draftingcontracts']"
+                                        type="primary"
+                                        link
+                                        @click="showCreateConctPop(row)"
+                                        >发送合同</el-button
+                                    >
+                                    <el-button
+                                        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 class="content">请确认信息是否有误</div>
+            <p class="btn_menu">
+                <el-button type="primary" size="large" @click="InitiateContract"
+                    >确认创建</el-button
                 >
-                <el-button
-                  v-if="row.is_authentication == 0"
-                  v-perms="['company/authentication']"
-                  type="primary"
-                  link
-                  @click="handleAuthentication(row.id)"
-                  >企业认证</el-button
+                <el-button type="info" size="large" @click="offPop">返回</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
                 >
-                <template v-if="row.is_contract == 0">
-                  <el-button
-                    v-perms="['company/Draftingcontracts']"
-                    type="primary"
-                    link
-                    @click="showCreateConctPop(row)"
-                    >生成合同</el-button
-                  >
-                  <el-button
-                    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>
+                <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,
-  apiCompanyDelete,
-  generateGontract,
-  sendMsgApi,
-  authentication,
-} from "@/api/company";
-import { timeFormat } from "@/utils/util";
-import feedback from "@/utils/feedback";
-import { dictDataLists } from "@/api/setting/dict";
-import { getRoutePath } from "@/router";
+    apiCompanyLists,
+    apiCompanyDelete,
+    generateGontract,
+    sendMsgApi,
+    authentication,
+    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'
 
-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;
-};
+    showPop.value = false
+    showConctactPop.value = false
+}
+const InitiateContractPop = ref(false)
+const showInitiateContractPop = ref(false)
+const offInitiateContractPop = () => {
+    showPop.value = false
+    showConctactPop.value = false
+}
 // 创建合同的id
-const contractId = ref("");
+const contractId = ref('')
+
+const ShowInitiateContractPop = (row) => {
+    ;(InitiateContractPop.value = true),
+        (showInitiateContractPop.value = true),
+        (contractId.value = row.id)
+}
 const showCreateConctPop = (row) => {
-  (showPop.value = true),
-    (showConctactPop.value = true),
-    (contractId.value = row.id);
-};
+    ;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
+}
+const InitiateContract = () => {
+    initiate_contract({ id: contractId.value }).catch((res) => {
+        console.log(res)
+    })
+    offInitiateContractPop()
+}
 const creContct = () => {
- generateGontract({ id: contractId.value }).catch((res)=>{
-    console.log(res);
- })
-  offPop();
-};
+    generateGontract({ id: contractId.value }).catch((res) => {
+        console.log(res)
+    })
+    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_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()
+}
 
-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/contract/index.vue b/src/views/contract/index.vue
index 4240b11..673e6cc 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -98,12 +98,11 @@
                     </el-table-column>
                     <el-table-column label="操作" width="180" fixed="right" align="center">
                         <template #default="{ row }">
-                            <el-button
-                                v-perms="['contract.contract/delete']"
-                                type="primary"
-                                link
-                            >                               
-                             <router-link :to="{path:'/contract/detail', query: {id: row.id}}">详情</router-link>
+                            <el-button type="primary" link>
+                                <router-link
+                                    :to="{ path: '/contract/detail', query: { id: row.id } }"
+                                    >详情</router-link
+                                >
                             </el-button>
 
                             <!-- <el-button v-perms="['contract.contract/delete']" type="danger" link
@@ -128,8 +127,6 @@ import { apiContractLists, apiContractDelete, apiContractDetail } from '@/api/co
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 
-
-
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)

From 33857ccc3d7618a0c5d72628264d69a5d2bd51b3 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Mon, 7 Aug 2023 22:36:05 +0800
Subject: [PATCH 2/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/company/edit.vue           | 47 +++++++-------
 src/views/contract/contractDetil.vue | 91 +++++++++++++++-------------
 src/views/contract/index.vue         | 40 +++++-------
 src/views/permission/admin/index.vue |  6 +-
 4 files changed, 88 insertions(+), 96 deletions(-)

diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 22ffce3..fa27a7b 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -237,6 +237,7 @@
                     <el-col :span="12">
                         <el-form-item label="性别" prop="sex">
                             <el-select
+                                :disabled="isDisabled"
                                 v-model="formData.sex"
                                 placeholder="请选择性别"
                                 :style="{ width: '100%' }"
@@ -249,6 +250,7 @@
                     <el-col :span="12">
                         <el-form-item label="身份证">
                             <el-input
+                                :disabled="isDisabled"
                                 v-model="formData.id_card"
                                 placeholder="请输入生份证"
                                 clearable
@@ -419,8 +421,7 @@
                                 placeholder="请选择签约方"
                                 clearable
                                 :style="{ width: '100%' }"
-                                @click="openCompany"
-                                :disabled="userStore.userInfo.root == 0 ? true : false"
+                                :disabled="true"
                             ></el-input>
                         </el-form-item>
                     </el-col>
@@ -467,7 +468,7 @@
                     </el-col>
                 </el-row>
             </el-col>
-            <el-col v-if="isshow" :span="24" class="el-card pt-6">
+            <!-- <el-col v-if="isshow" :span="24" class="el-card pt-6">
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="合同上传" required>
@@ -486,7 +487,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="24" class="el-card pt-6">
                 <el-form-item label prop="field139">
@@ -494,7 +495,7 @@
                         >修改</el-button
                     >
                     <el-button
-                        v-else
+                        v-if="isDisabled == false"
                         type="primary"
                         :disabled="isDisabled"
                         size="medium"
@@ -589,20 +590,7 @@ const formData = reactive({
     master_position: '',
     master_phone: '',
     master_email: '',
-    other_contacts: [
-        // {
-        //   name: "",
-        //   position: "",
-        //   phone: "",
-        //   email: "",
-        // },
-    ],
-    // area_manager: '',
-    // is_contract: '',
-    // account: '',
-    // password: '',
-    // deposit: '',
-    // deposit_time: '',
+    other_contacts: [],
     qualification: {
         business_license: '',
         business_licenseB: '',
@@ -888,7 +876,7 @@ const getDetails = async () => {
         id: route.query.id
     })
     Object.keys(formData).forEach((key) => {
-        const stringArr = ['province', 'city', 'area', 'street']
+        const stringArr = ['province', 'city', 'area', 'street', 'village', 'brigade']
         if (data[key] != null && data[key] != undefined) {
             formData[key] = data[key]
             if (key == 'qualification' && formData.qualification.bank_account) {
@@ -916,12 +904,13 @@ const getDetails = async () => {
     await getStreetList()
     await getVillageList()
     await getBrigadeList()
-    formData['party_a_name'] = data.contract?.party_a_name
-    formData['file_image'] = data.contract?.file
-    if (data.contract?.file) {
-        fileList.value[0].url = data.contract?.file
-        fileList.value[0].name = '合同文件'
-    }
+    formData['party_a_name'] = data.contract?.party_a_info.company_name
+    // formData['file_image'] = data.contract?.file
+    // if (data.contract?.file) {
+    //     fileList.value[0].url = data.contract?.file
+    //     fileList.value[0].name = '合同文件'
+    // }
+    console.log(formData)
     company_type_change(formData.company_type)
 }
 
@@ -1020,4 +1009,10 @@ defineExpose({
         margin-left: 12px;
     }
 }
+.el-card {
+    margin-bottom: 10px;
+}
+.tit {
+    margin-top: 15px;
+}
 </style>
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index 0b8f851..6fc8900 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -22,7 +22,11 @@
                 />
             </el-form-item>
             <el-form-item label="公司类型" prop="compeny">
-                <el-select disabled v-model="compeny.company_type_name" placeholder="请输入公司类型">
+                <el-select
+                    disabled
+                    v-model="compeny.company_type_name"
+                    placeholder="请输入公司类型"
+                >
                 </el-select>
             </el-form-item>
             <el-form-item label="省" prop="province">
@@ -30,12 +34,10 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="市" prop="city">
-                <el-select disabled v-model="compeny.city_name" placeholder="请选择市">
-                </el-select>
+                <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-select disabled v-model="compeny.area_name" placeholder="请选择区"> </el-select>
             </el-form-item>
             <el-form-item label="镇" prop="company_type_name">
                 <el-select disabled v-model="compeny.street_name" placeholder="请选择镇">
@@ -73,9 +75,9 @@
                     <img :src="compenyimg.business_licenseB" />
                 </div>
             </el-form-item>
-               <el-form-item label="其他资质" prop="contract_no" >
+            <el-form-item label="其他资质" prop="contract_no">
                 <div class="company">
-                    <img  :src="compenyimg.bank_account" /> 
+                    <img :src="compenyimg.bank_account" />
                 </div>
             </el-form-item>
         </el-form>
@@ -96,10 +98,18 @@
                 <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-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-select
+                    disabled
+                    v-model="compenyB.company_type_name"
+                    placeholder="请输入社会类型"
+                >
                     <el-option></el-option>
                 </el-select>
             </el-form-item>
@@ -179,11 +189,7 @@
                     <el-input disabled v-model="persen.mobile" placeholder="请输入联系电话" />
                 </el-form-item>
                 <el-form-item label="身份证号">
-                    <el-input
-                        v-model="persen.id"
-                        placeholder="请输入身份证号"
-                        disabled
-                    />
+                    <el-input v-model="persen.id" placeholder="请输入身份证号" disabled />
                 </el-form-item>
                 <el-form-item label="省" prop="province">
                     <el-select disabled v-model="persen.province_name" placeholder="请选择省">
@@ -267,7 +273,7 @@
             </el-form-item> -->
         </el-form>
     </el-card>
-    <el-card>
+    <el-card v-if="basicdata.check_status == 1">
         <el-form>
             <el-form-item label="合同上传" prop="field127">
                 <el-upload
@@ -289,7 +295,7 @@
 <script lang="ts" setup>
 import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
 import { apiContractDetail } from '@/api/contract'
-import { ref, reactive, defineExpose ,computed} from 'vue'
+import { ref, reactive, defineExpose, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { dictDataLists } from '@/api/setting/dict'
 import { upContact } from '@/api/consumer'
@@ -315,7 +321,7 @@ const formData = reactive({
     status_name: ''
 })
 const fileList = ref<UploadUserFile[]>([])
-const basicdata=ref({})
+const basicdata = ref({})
 const compeny = ref({})
 const compenyimg = ref([])
 const compenyB = ref([])
@@ -330,23 +336,27 @@ const userStore = useUserStore()
 async function render() {
     // 传值赋值
     const res = await apiContractDetail({ id: query.id })
-    compeny.value = res.party_a_info;
-    basicdata.value=res
+    compeny.value = res.party_a_info
+    basicdata.value = res
     try {
-        res.party_a_info.qualification.bank_account=JSON.parse(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
-       } catch (error) {}
+    } catch (error) {}
     compenyimg.value = res.party_a_info.qualification
     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 
-    } 
+        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
     }
 }
 
@@ -356,7 +366,7 @@ const handleAvatarSuccess_four: UploadProps['onSuccess'] = (response, uploadFile
         return
     }
     formData.file = response.data.uri
-    upContact({ file: formData.file, id: route.query.id })   
+    upContact({ file: formData.file, id: route.query.id })
 }
 onMounted(async () => {
     await render()
@@ -364,9 +374,6 @@ onMounted(async () => {
 </script>
 
 <style lang="scss" scoped>
-.btn_men {
-    text-align: right;
-}
 .frame {
     .el-form-item {
         width: 40%;
@@ -382,7 +389,7 @@ onMounted(async () => {
         }
     }
 }
-.person_select{
+.person_select {
     .el-form-item {
         width: 30%;
         .el-select {
@@ -394,30 +401,30 @@ onMounted(async () => {
     display: flex;
     justify-content: space-between;
     img {
-        width: 10rem;
-        height: 8rem;
+        width: 10vw;
+        height: 6.3vw;
     }
 }
 .persenal {
     display: flex;
     align-items: center;
     img {
-        width: 8rem;
-        height: 10rem;
+        width: 10vw;
+        height: 6.3vw;
     }
 }
 .idcard {
     img {
-        width: 10rem;
-        height: 10rem;
+        width: 10vw;
+        height: 6.3vw;
     }
 }
-.company_z{
-   .el-form-item{
-       width: 40%;
-   } 
+.company_z {
+    .el-form-item {
+        width: 40%;
+    }
 }
-.el-card{
-    margin-top: 1px;
+.el-card {
+    margin-top: 10px;
 }
 </style>
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index 673e6cc..8f41f46 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -56,24 +56,28 @@
                 </template>
                 新增
       </el-button>-->
-            <el-button
+            <!-- <el-button
                 v-perms="['contract.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 type="selection" width="55" /> -->
                     <el-table-column label="id" prop="id" show-overflow-tooltip />
-                    <el-table-column label="公司" prop="company_name" show-overflow-tooltip />
+                    <!-- <el-table-column label="公司" prop="company_name" show-overflow-tooltip /> -->
                     <el-table-column
                         label="合同类型"
                         prop="contract_type_name"
                         show-overflow-tooltip
                     />
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
-                    <el-table-column label="甲方" prop="party_a_name" show-overflow-tooltip />
+                    <el-table-column label="甲方" prop="party_a_name" show-overflow-tooltip>
+                        <template #default="scope">
+                            <span>{{ scope.row.party_a_info.company_name }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="乙方" prop="party_b_name" show-overflow-tooltip />
 
                     <el-table-column
@@ -126,6 +130,7 @@ import { useDictData } from '@/hooks/useDictOptions'
 import { apiContractLists, apiContractDelete, apiContractDetail } from '@/api/contract'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
+const route = useRoute()
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
@@ -139,9 +144,12 @@ const queryParams = reactive({
     status: '',
     party_a: '',
     party_b: '',
-    area_manager: ''
+    area_manager: '',
+    type: ''
 })
-
+if (route.query.type) {
+    queryParams.type = route.query.type?.toString()
+}
 // 选中数据
 const selectData = ref<any[]>([])
 
@@ -171,25 +179,7 @@ const checkContcat = (id: number) => {
     apiContractDetail({ id }).then((res) => {
         res.file ? window.open(res.file) : feedback.msgError('暂无合同可以查看')
     })
-
-    // window.open('https://www.zhihu.com/signin?next=%2F')
 }
-
-// 添加
-// 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('确定要删除？')
diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue
index 3a2e3c0..367d2c9 100644
--- a/src/views/permission/admin/index.vue
+++ b/src/views/permission/admin/index.vue
@@ -118,14 +118,14 @@
                                     @click="handleDelete(row.id)"
                                     >删除</el-button
                                 >
-                                <el-button
+                                <!-- <el-button
                                     v-if="row.is_contract == 1"
                                     v-perms="['auth.admin/abolition']"
                                     type="danger"
                                     link
                                     @click="handleAbolition(row.id)"
                                     >废除合同</el-button
-                                >
+                                > -->
                                 <template v-if="row.company_id != 0 && row.is_contract == 0">
                                     <el-button
                                         v-perms="['auth.admin/Draftingcontracts']"
@@ -136,7 +136,7 @@
                                                 (showConctactPop = true),
                                                 (contractId = row.id)
                                         "
-                                        >生成个人合同</el-button
+                                        >生成合同</el-button
                                     >
                                     <el-button
                                         v-perms="['auth.admin/postsms']"

From 6b9b26d2e3a896312375a877d559365e09c82334 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Mon, 7 Aug 2023 23:41:43 +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/views/company/edit.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index fa27a7b..3987378 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -562,8 +562,12 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref()
-isDisabled = route.query.read
-isEdit = route.query.edit
+if (route.query.read) {
+    isDisabled = route.query.read
+}
+if (route.query.edit) {
+    isEdit = route.query.edit
+}
 // 表单数据
 const formData = reactive({
     admin_id: '',