页面修改

src/api/consumer.ts

@@ -34,3 +34,7 @@ export function upContact(params: any) {
 export function creatContact(params: any) {
   return request.post({ url: "/user.user/Draftingcontracts", params });
 }
+//发送短息
+export function sendMsgApi(params: any) {
+  return request.get({ url: "/contract.contract/postsms", params });
+}

src/router/routes.ts

@@ -47,21 +47,29 @@ export const constantRoutes: Array<RouteRecordRaw> = [
         },
       },
       {
-        path: "b",
+        path: "user_informationgdetil",
-        component: () => import("@/views/fileManagement/index.vue"),
+        component: () => import("@/views/user_informationg/detil.vue"),
         name: Symbol(),
         meta: {
-          title: "个人设置",
+          title: "档案详情",
-        },
-      },
-      {
-        path: "a",
-        component: () => import("@/views/fileManagement/detil.vue"),
-        name: Symbol(),
-        meta: {
-          title: "个人设置",
         },
       },
+      // {
+      //   path: "b",
+      //   component: () => import("@/views/fileManagement/index.vue"),
+      //   name: Symbol(),
+      //   meta: {
+      //     title: "个人设置",
+      //   },
+      // },
+      // {
+      //   path: "a",
+      //   component: () => import("@/views/fileManagement/detil.vue"),
+      //   name: Symbol(),
+      //   meta: {
+      //     title: "个人设置",
+      //   },
+      // },
     ],
   },
   // {

src/views/category_business/edit.vue

@@ -7,8 +7,9 @@
             width="550px"
             @confirm="handleSubmit"
             @close="handleClose"
+       
         >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+            <el-form ref="formRef" :model="formData" label-width="90px"      :disabled="mode=='check'" :rules="formRules">
                 <el-form-item label="名称" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入名称" />
                 </el-form-item>

src/views/category_business/index.vue

@@ -74,8 +74,25 @@
               <dict-value :options="dictData.show_status" :value="row.status" />
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="120" fixed="right">
+          <el-table-column
+            label="操作"
+            width="180"
+            align="center"
+            fixed="right"
+          >
             <template #default="{ row }">
+              <el-button
+                v-perms="[
+                  'category_business.category_business/edit',
+                  'category_business.category_business/delete',
+                  'category_business.category_business/edit',
+                ]"
+                type="primary"
+                link
+                @click="handleCheck(row)"
+              >
+                详情
+              </el-button>
               <el-button
                 v-perms="['category_business.category_business/edit']"
                 type="primary"
@@ -155,7 +172,13 @@ const handleAdd = async () => {
   await nextTick();
   editRef.value?.open("add");
 };
-
+// 查看
+const handleCheck = async (data: any) => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("check");
+  editRef.value?.setFormData(data);
+};
 // 编辑
 const handleEdit = async (data: any) => {
   showEdit.value = true;

src/views/company/index.vue

@@ -26,12 +26,16 @@
             placeholder="请输入镇"
           />
         </el-form-item>
-                <el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
+        <el-form-item
+          label="公司类型"
+          prop="company_type"
+          v-show="company_type_show"
+        >
           <el-select
             v-model="queryParams.company_type"
             placeholder="请选择公司类型"
             clearable
-                        :style="{ width: '100%' }"
+            class="w-[280px]"
           >
             <el-option
               v-for="(item, index) in datas.dictTypeLists"
@@ -54,7 +58,7 @@
             v-model="queryParams.is_contract"
             placeholder="是否签约"
             clearable
-                        :style="{ width: '100%' }"
+            class="w-[240px]"
           >
             <el-option label="已签约" value="1"></el-option>
             <el-option label="未签约" value="0"></el-option>
@@ -70,7 +74,7 @@
       <router-link
         v-perms="['company/add:edit']"
         :to="{
-                    path: getRoutePath('company/add:edit')
+          path: getRoutePath('company/add:edit'),
         }"
       >
         <el-button type="primary" class="mb-4">
@@ -80,23 +84,74 @@
           创建
         </el-button>
       </router-link>
+      &nbsp; &nbsp;
+      <router-link
+        :to="{
+          path: getRoutePath('company/add:edit'),
+          query: {
+            id: 71,
+            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
-                    <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
+            label="id"
-                    <el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
+            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
-                    <el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
+            label="主联系人"
-                    <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
+            prop="master_name"
-                    <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
+            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-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">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="500"
+            fixed="right"
+          >
             <template #default="{ row }">
               <div style="display: flex">
                 <el-button type="primary" link>
@@ -105,8 +160,8 @@
                       path: getRoutePath('auth.admin/lists'),
                       query: {
                         company_id: row.id,
-                                                read: true
+                        read: true,
-                                            }
+                      },
                     }"
                     >查看成员</router-link
                   >
@@ -117,8 +172,8 @@
                       path: getRoutePath('company/subordinate/lists'),
                       query: {
                         company_id: row.id,
-                                                read: true
+                        read: true,
-                                            }
+                      },
                     }"
                     >下属公司</router-link
                   >
@@ -129,8 +184,8 @@
                       path: getRoutePath('company/add:edit'),
                       query: {
                         id: row.id,
-                                                read: true
+                        read: true,
-                                            }
+                      },
                     }"
                     >详情</router-link
                   >
@@ -141,8 +196,8 @@
                       path: getRoutePath('company/add:edit'),
                       query: {
                         id: row.id,
-                                                edit: true
+                        edit: true,
-                                            }
+                      },
                     }"
                     >编辑</router-link
                   >
@@ -174,7 +229,7 @@
                     v-perms="['company/postsms']"
                     type="primary"
                     link
-                                        @click=";(showPop = true), (contractId = row.id)"
+                    @click="(showPop = true), (contractId = row.id)"
                     >发送短信</el-button
                   >
                 </template>
@@ -196,10 +251,16 @@
         确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
       </div>
       <p class="btn_menu">
-                <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
+        <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="primary" size="large" v-else @click="sendMsg"
+          >确认</el-button
+        >
         <el-button type="info" size="large" @click="offPop">返回</el-button>
       </p>
     </el-dialog>
@@ -207,100 +268,102 @@
 </template>
 
 <script lang="ts" setup name="companyLists">
-import { usePaging } from '@/hooks/usePaging'
+import { usePaging } from "@/hooks/usePaging";
-import { useDictData } from '@/hooks/useDictOptions'
+import { useDictData } from "@/hooks/useDictOptions";
-import useUserStore from '@/stores/modules/user'
+import useUserStore from "@/stores/modules/user";
 import {
   apiCompanyLists,
   apiCompanyDelete,
   generateGontract,
   sendMsgApi,
-    authentication
+  authentication,
-} from '@/api/company'
+} from "@/api/company";
-import { timeFormat } from '@/utils/util'
+import { timeFormat } from "@/utils/util";
-import feedback from '@/utils/feedback'
+import feedback from "@/utils/feedback";
-import { dictDataLists } from '@/api/setting/dict'
+import { dictDataLists } from "@/api/setting/dict";
-import { getRoutePath } from '@/router'
+import { getRoutePath } from "@/router";
 
-const userStore = useUserStore()
+const userStore = useUserStore();
-const route = useRoute()
+const route = useRoute();
-const company_type_show = ref(true)
+const company_type_show = ref(true);
 // 创建合同与发送短信
 //弹窗
-const showPop = ref(false)
+const showPop = ref(false);
-const showConctactPop = ref(false)
+const showConctactPop = ref(false);
 const offPop = () => {
-    showPop.value = false
+  showPop.value = false;
-    showConctactPop.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 })
+  generateGontract({ id: contractId.value });
-    offPop()
+  offPop();
-}
+};
 const sendMsg = () => {
-    sendMsgApi({ id: contractId.value })
+  sendMsgApi({ id: contractId.value });
-    offPop()
+  offPop();
-}
+};
 // 创建合同与发送短信结束
 // 查询条件
 const queryParams = reactive({
-    company_name: '',
+  company_name: "",
-    area: '',
+  area: "",
-    street: '',
+  street: "",
-    company_type: '',
+  company_type: "",
-    area_manager: '',
+  area_manager: "",
   // 是否签约
-    is_contract: ''
+  is_contract: "",
-})
+});
 
 if (route.query.company_type) {
-    company_type_show.value = false
+  company_type_show.value = false;
-    queryParams['company_type'] = route.query.company_type?.toString() || ''
+  queryParams["company_type"] = route.query.company_type?.toString() || "";
 }
 
 const datas = reactive({
-    dictTypeLists: []
+  dictTypeLists: [],
-})
+});
 const getdictTypeLists = async () => {
-    const data = await dictDataLists({ type_id: 6 })
+  const data = await dictDataLists({ type_id: 6 });
-    datas['dictTypeLists'] = data['lists']
+  datas["dictTypeLists"] = data["lists"];
-}
+};
-getdictTypeLists()
+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
+  params: queryParams,
-})
+});
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
+  await feedback.confirm("确定要删除？");
-    await apiCompanyDelete({ id })
+  await apiCompanyDelete({ id });
-    getLists()
+  getLists();
-}
+};
 const handleAuthentication = async (id: number | any[]) => {
-    await feedback.confirm('确定要认证？')
+  await feedback.confirm("确定要认证？");
-    await authentication({ id })
+  await authentication({ id });
-    getLists()
+  getLists();
-}
+};
 
-getLists()
+getLists();
 </script>
 <style lang="scss">
 .btn {

src/views/consumer/lists/detail copy.vue

@@ -4,7 +4,12 @@
       <el-page-header content="用户详情" @back="$router.back()" />
     </el-card>
     <el-card class="mt-4 !border-none" header="基本资料" shadow="never">
-            <el-form ref="formRef" class="ls-form" :model="formData" label-width="120px">
+      <el-form
+        ref="formRef"
+        class="ls-form"
+        :model="formData"
+        label-width="120px"
+      >
         <div class="bg-page flex py-5 mb-10 items-center">
           <div class="basis-40 flex flex-col justify-center items-center">
             <div class="mb-2 text-tx-regular">用户头像</div>
@@ -28,7 +33,9 @@
         <el-col :span="24" class="el-card pt-6">
           <el-row>
             <el-col :span="12">
-                            <el-form-item label="用户编号："> {{ formData.sn }} </el-form-item>
+              <el-form-item label="用户编号：">
+                {{ formData.sn }}
+              </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="用户昵称：">
@@ -52,7 +59,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="真实姓名：">
-                                {{ formData.real_name || '-' }}
+                {{ formData.real_name || "-" }}
                 <popover-input
                   class="ml-[10px]"
                   @confirm="handleEdit($event, 'real_name')"
@@ -74,16 +81,16 @@
                   :options="[
                     {
                       label: '未知',
-                                            value: 0
+                      value: 0,
                     },
                     {
                       label: '男',
-                                            value: 1
+                      value: 1,
                     },
                     {
                       label: '女',
-                                            value: 2
+                      value: 2,
-                                        }
+                    },
                   ]"
                   @confirm="handleEdit($event, 'sex')"
                   v-perms="['user.user/edit']"
@@ -96,7 +103,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="联系电话：">
-                                {{ formData.mobile || '-' }}
+                {{ formData.mobile || "-" }}
                 <popover-input
                   class="ml-[10px]"
                   type="number"
@@ -110,7 +117,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-                            <el-form-item label="注册来源："> {{ formData.channel }} </el-form-item>
+              <el-form-item label="注册来源：">
+                {{ formData.channel }}
+              </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="注册时间：">
@@ -136,59 +145,60 @@
 </template>
 
 <script lang="ts" setup name="consumerDetail">
-import type { FormInstance } from 'element-plus'
+import type { FormInstance } from "element-plus";
-import { adjustMoney, getUserDetail, userEdit } from '@/api/consumer'
+import { adjustMoney, getUserDetail, userEdit } from "@/api/consumer";
-import { isEmpty } from '@/utils/util'
+import { isEmpty } from "@/utils/util";
-import AccountAdjust from '../components/account-adjust.vue'
+import AccountAdjust from "../components/account-adjust.vue";
-const route = useRoute()
+const route = useRoute();
 const formData = reactive({
-    avatar: '',
+  avatar: "",
-    channel: '',
+  channel: "",
-    create_time: '',
+  create_time: "",
-    login_time: '',
+  login_time: "",
-    mobile: '',
+  mobile: "",
-    nickname: '',
+  nickname: "",
   real_name: 0,
   sex: 0,
-    sn: '',
+  sn: "",
-    account: '',
+  account: "",
-    user_money: ''
+  user_money: "",
-})
+});
 
 const adjustState = reactive({
   show: false,
-    value: ''
+  value: "",
-})
+});
-const formRef = shallowRef<FormInstance>()
+const formRef = shallowRef<FormInstance>();
 
 const getDetails = async () => {
   const data = await getUserDetail({
-        id: route.query.id
+    id: route.query.id,
-    })
+  });
   Object.keys(formData).forEach((key) => {
     //@ts-ignore
-        formData[key] = data[key]
+    formData[key] = data[key];
-    })
+    key == "sex" ? (formData[key] = Number(data[key])) : "";
-}
+  });
+};
 
 const handleEdit = async (value: string, field: string) => {
-    if (isEmpty(value)) return
+  if (isEmpty(value)) return;
   await userEdit({
     id: route.query.id,
     field,
-        value
+    value,
-    })
+  });
-    getDetails()
+  getDetails();
-}
+};
 
 const handleAdjust = (value: string) => {
-    adjustState.show = true
+  adjustState.show = true;
-    adjustState.value = value
+  adjustState.value = value;
-}
+};
 const handleConfirmAdjust = async (value: any) => {
-    await adjustMoney({ user_id: route.query.id, ...value })
+  await adjustMoney({ user_id: route.query.id, ...value });
-    adjustState.show = false
+  adjustState.show = false;
-    getDetails()
+  getDetails();
-}
+};
-getDetails()
+getDetails();
 </script>

src/views/consumer/lists/detail.vue

@@ -5,13 +5,12 @@
     </el-card>
     <el-card class="mt-4 !border-none" shadow="never">
       <el-form ref="formRef" :model="formData" label-width="84px">
-        <div style="font-size: 1.2rem; margin: 10px 0">
+        <div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
-          基本信息创建{{ mode }}
-        </div>
         <div class="headimg">
           <el-upload
             v-model="formData.avatar"
             class="avatar-uploader-head"
+            :disabled="flag"
             :data="{ cid: 1 }"
             action="https://worker-task.lihaink.cn/api/upload/image"
             :show-file-list="false"
@@ -29,6 +28,7 @@
               <el-form-item label="姓名" prop="nickname">
                 <el-input
                   v-model="formData.nickname"
+                  :disabled="flag"
                   placeholder="请输入姓名"
                   clearable
                   :style="{ width: '100%' }"
@@ -39,11 +39,12 @@
               <el-form-item label="性别" prop="sex">
                 <el-select
                   v-model="formData.sex"
+                  :disabled="flag"
                   placeholder="请选择性别"
                   :style="{ width: '100%' }"
                 >
-                  <el-option label="男" value="1" />
+                  <el-option label="男" :value="1" />
-                  <el-option label="女" value="2" />
+                  <el-option label="女" :value="2" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -53,6 +54,7 @@
               <el-form-item label="身份证号" prop="id_card">
                 <el-input
                   v-model="formData.id_card"
+                  :disabled="flag"
                   placeholder="请输入身份证号"
                   clearable
                   :style="{ width: '100%' }"
@@ -64,6 +66,7 @@
                 <el-input
                   v-model="formData.account"
                   placeholder="请输入联系电话"
+                  :disabled="flag"
                   clearable
                   :style="{ width: '100%' }"
                 ></el-input>
@@ -75,6 +78,7 @@
               <el-select
                 v-model="formData.province"
                 placeholder="请选择省"
+                :disabled="flag"
                 clearable
                 @change="province_change"
                 :style="{ width: '100%' }"
@@ -92,6 +96,7 @@
                 v-model="formData.city"
                 placeholder="请选择市"
                 clearable
+                :disabled="flag"
                 @change="city_change"
                 :style="{ width: '100%' }"
               >
@@ -107,6 +112,7 @@
               <el-select
                 v-model="formData.area"
                 placeholder="请选择区"
+                :disabled="flag"
                 clearable
                 @change="area_change"
                 :style="{ width: '100%' }"
@@ -124,6 +130,7 @@
               <el-select
                 v-model="formData.street"
                 placeholder="请选择镇"
+                :disabled="flag"
                 clearable
                 @change="street_change"
                 :style="{ width: '100%' }"
@@ -139,6 +146,7 @@
             <el-form-item label="村社小队" prop="address" style="flex: 1.5">
               <el-input
                 v-model="formData.address"
+                :disabled="flag"
                 placeholder="请输入村社小队"
                 clearable
                 :style="{ width: '100%' }"
@@ -148,7 +156,7 @@
         </el-col>
 
         <el-col :span="24" style="margin-top: 1vh">
-          <el-row>
+          <!-- <el-row>
             <el-col :span="12" v-if="mode == 'initiate' || formData.party_b">
               <el-form-item label="签约方" prop="field130">
                 <el-input
@@ -161,7 +169,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </el-col>
         <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
         <div style="display: flex; justify-content: space-between">
@@ -169,6 +177,7 @@
             <el-form-item label="身份证" prop="id_card">
               <el-upload
                 v-model="formData.qualification.id_card"
+                :disabled="flag"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
                 action="https://worker-task.lihaink.cn/api/upload/image"
@@ -186,6 +195,7 @@
               </el-upload>
               <el-upload
                 v-model="formData.qualification.id_card_b"
+                :disabled="flag"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
                 action="https://worker-task.lihaink.cn/api/upload/image"
@@ -207,6 +217,7 @@
             <el-form-item label="行驶证" prop="car_card">
               <el-upload
                 v-model="formData.qualification.car_card"
+                :disabled="flag"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
                 action="https://worker-task.lihaink.cn/api/upload/image"
@@ -224,6 +235,7 @@
               </el-upload>
               <el-upload
                 v-model="formData.qualification.car_card_b"
+                :disabled="flag"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
                 action="https://worker-task.lihaink.cn/api/upload/image"
@@ -246,6 +258,7 @@
             <el-form-item label="银行卡号" prop="bank_account">
               <el-upload
                 v-model="formData.qualification.bank_account"
+                :disabled="flag"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
                 action="https://worker-task.lihaink.cn/api/upload/image"
@@ -264,6 +277,7 @@
               </el-upload>
               <el-upload
                 v-model="formData.qualification.bank_account_b"
+                :disabled="flag"
                 class="avatar-uploader pl-3"
                 :data="{ cid: 1 }"
                 action="https://worker-task.lihaink.cn/api/upload/image"
@@ -350,25 +364,6 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
-                <el-form-item label="合同类型" prop="contract_type">
-                  <el-col :span="24">
-                    <el-select
-                      v-model="formData.contract_type"
-                      placeholder="请选择合同类型"
-                      clearable
-                      :style="{ width: '100%' }"
-                    >
-                      <el-option
-                        v-for="(item, index) in datas.contract_type"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-col>
-                </el-form-item>
-              </el-col>
             </el-row>
           </el-col>
         </template>
@@ -387,26 +382,40 @@
             </el-upload>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="24">
+        <!-- <el-col :span="24" v-if="formData.contract">
           <el-form-item label="合同地址">
             <el-link
               type="success"
-              :href="formData.contract.url"
+              :href="formData.contract.file"
               target="_blank"
               >在线查看</el-link
             >
           </el-form-item>
         </el-col> -->
 
-        <el-col :span="24" class="pt-6">
+        <el-col :span="24" v-if="mode == 'initiate'" class="pt-6">
-          <el-form-item label prop="field139">
+          <el-row>
-            <!-- <el-button
+            <el-col :span="8">
-              type="primary"
+              <el-form-item label="合同类型" prop="contract_type">
-              :disabled="isDisabled"
+                <el-col :span="24">
-              size="medium"
+                  <el-select
-              @click="create"
+                    v-model="formData.contract_type"
-              >创建</el-button
+                    placeholder="请选择合同类型"
-            > -->
+                    clearable
+                    :style="{ width: '100%' }"
+                  >
+                    <el-option
+                      v-for="(item, index) in datas.contract_type"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.id"
+                    ></el-option>
+                  </el-select>
+                </el-col>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="field139">
                 <el-button
                   type="primary"
                   v-if="mode == 'initiate'"
@@ -415,6 +424,8 @@
                 >
               </el-form-item>
             </el-col>
+          </el-row>
+        </el-col>
       </el-form>
     </el-card>
 
@@ -423,9 +434,9 @@
       :value="adjustState.value"
       @confirm="handleConfirmAdjust"
     />
-    <el-dialog v-model="isCompany" title="选择签约方" width="60%">
+    <!-- <el-dialog v-model="isCompany" title="选择签约方" width="60%">
       <DialogIndex @customEvent="customEvent" />
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -459,8 +470,8 @@ import useUserStore from "@/stores/modules/user";
 import feedback from "@/utils/feedback";
 const { removeTab } = useMultipleTabs();
 const router = useRouter();
-
 const route = useRoute();
+const flag = ref(true);
 const formData = reactive({
   id: "",
   sex: "",
@@ -650,12 +661,15 @@ const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
     return;
   }
   formData.file = response.data.uri;
-  fileList.value[0].url = response.data.uri;
+  // fileList.value[0].url = response.data.uri;
-  fileList.value[0].name = "合同文件";
+  // fileList.value[0].name = "合同文件";
-  console.log(formData.file.substring(8));
+
-  upContact({ file: formData.file.substring(8), id: route.query.id }).then(
+  // upContact({ file: formData.file.substring(8), id: route.query.id }).then(
-    (res) => [console.log(res)]
+  //   (res) => [console.log(res)]
-  );
+  // );
+  upContact({ file: formData.file, id: route.query.id }).then((res) => [
+    console.log(res),
+  ]);
 };
 const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
   return true;
@@ -701,27 +715,18 @@ const handleConfirmAdjust = async (value: any) => {
 };
 // 发起合同
 const initiateContactFn = () => {
-  const { party_b, contract_type } = formData;
+  const { contract_type } = formData;
   //   console.log(party_b, contract_type);
-  initiateContact({ party_b, contract_type, type: 2 }).then((res) => {
+  initiateContact({ party_b: route.query.id, contract_type, type: 2 }).then(
+    (res) => {
       console.log(res);
       feedback.msgSuccess("发起成功，等待平台风控部上传合同");
-  });
+    }
-};
+  );
-const create = async () => {
-  await formRef.value?.validate();
-  const data = { ...formData };
-  //   mode.value = route.query.mode;
-  // if (route.query.id) {
-  //     await apiCompanyEdit(data)
-  // } else {
-  //     await apiCompanyAdd(data)
-  // }
-  removeTab();
-  router.back();
 };
 getDetails();
 getProvinceList();
+console.log(formData);
 </script>
 
 <style lang="scss">

src/views/consumer/lists/index.vue

@@ -87,11 +87,12 @@
                 详情
               </router-link>
             </el-button>
-            <template v-if="row.company_id != 0 && row.is_contract == 0">
+            <template v-if="row.is_contract == 0">
               <el-button
-                v-perms="['auth.admin/Draftingcontracts']"
+                v-perms="['user.user/edit']"
                 type="primary"
                 link
+                v-if="!row.contract"
               >
                 <router-link
                   :to="{
@@ -110,6 +111,7 @@
                 v-perms="['auth.admin/Draftingcontracts']"
                 type="primary"
                 link
+                v-if="row.contract?.check_status == 1"
               >
                 <router-link
                   :to="{
@@ -126,6 +128,7 @@
               <el-button
                 v-perms="['auth.admin/Draftingcontracts']"
                 type="primary"
+                v-if="row.contract?.check_status == 2"
                 link
                 @click="
                   (showPop = true),
@@ -213,12 +216,7 @@
 <script lang="ts" setup name="consumerLists">
 import { usePaging } from "@/hooks/usePaging";
 import { getRoutePath } from "@/router";
-import {
+import { getUserList, creatContact, sendMsgApi } from "@/api/consumer";
-  getUserList,
-  creatContact,
-  initiateContact,
-  upContact,
-} from "@/api/consumer";
 import { ClientMap } from "@/enums/appEnums";
 import feedback from "@/utils/feedback";
 
@@ -243,9 +241,11 @@ const creContct = () => {
   offPop();
 };
 const sendMsg = () => {
-  //   sendMsgApi({ id: contractId.value }).then((res) => {
+  console.log(contractId.value);
-  //     feedback.msgSuccess("发送成功");
+  return;
-  //   });
+  sendMsgApi({ id: contractId.value }).then((res) => {
+    feedback.msgSuccess("发送成功");
+  });
   offPop();
 };
 // const handleDelete = async (id: number) => {

src/views/task/calendar.vue

@@ -10,7 +10,7 @@
       <div class="mt-4">
         <el-calendar v-model="dateValue">
           <template #dateCell="{ data }">
-            <div style="width: 100%; height: 100%" @click="test(data)">
+            <div style="width: 100%; height: 100%">
               <p :class="data.isSelected ? 'is-selected' : ''">
                 {{ data.day.split("-").slice(1).join("-") }}
                 <!-- {{ data.isSelected ? '✔️' : '' }} -->
@@ -23,6 +23,7 @@
                   the: item.priority == 3,
                 }"
                 v-if="taskList[data.day]"
+                @click="handleEdit(item)"
                 v-for="(item, index) in taskList[data.day]"
                 :key="index"
               >
@@ -140,11 +141,11 @@ const handleEdit = async (data: any) => {
 };
 
 // 删除
-const handleDelete = async (id: number | any[]) => {
+// const handleDelete = async (id: number | any[]) => {
-  await feedback.confirm("确定要删除？");
+//   await feedback.confirm("确定要删除？");
-  await apiFlowTypeDelete({ id });
+//   await apiFlowTypeDelete({ id });
-  getLists();
+//   getLists();
-};
+// };
 
 // getLists();
 </script>

src/views/task/edit.vue

@@ -1,18 +1,37 @@
 <template>
   <div class="edit-popup">
-    <popup ref="popupRef" :title="popupTitle" :async="true" width="1000px" @confirm="handleSubmit" @close="handleClose">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="1000px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
       <el-form ref="formRef" :model="formData" label-width="84px">
         <el-col class="pt-6 !border-none">
           <el-row>
             <el-col :span="16">
               <el-form-item label="任务主题" prop="title">
-                <el-input v-model="formData.title" placeholder="请输入任务主题" clearable></el-input>
+                <el-input
+                  v-model="formData.title"
+                  placeholder="请输入任务主题"
+                  clearable
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="优先级" prop="name">
-                <el-select v-model="formData.priority" placeholder="请输入优先级">
+                <el-select
-                  <el-option v-for="item in priorityList" :key="item.value" :value="item.value" :label="item.label"/>
+                  v-model="formData.priority"
+                  placeholder="请输入优先级"
+                >
+                  <el-option
+                    v-for="item in priorityList"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -21,12 +40,21 @@
             <el-col :span="8">
               <el-form-item label="工作类型" prop="icon">
                 <el-select v-model="formData.type" placeholder="请选择工作类型">
-                  <el-option v-for="item in taskTypeList" :key="item.label" :value="item.value" :label="item.label"/>
+                  <el-option
+                    v-for="item in taskTypeList"
+                    :key="item.label"
+                    :value="item.value"
+                    :label="item.label"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="是否为修复BUG" label-width="auto" prop="icon">
+              <el-form-item
+                label="是否为修复BUG"
+                label-width="auto"
+                prop="icon"
+              >
                 <el-radio-group v-model="formData.is_bug">
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="0">否</el-radio>
@@ -37,43 +65,75 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="负责人" prop="icon">
-                <el-input v-model="formData.director_name" placeholder="请选择负责人" clearable @click="isMan = true"></el-input>
+                <el-input
+                  v-model="formData.director_name"
+                  placeholder="请选择负责人"
+                  clearable
+                  @click="isMan = true"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="协作人" prop="icon">
-                <el-input v-model="formData.assist_admin_names" placeholder="请选择协作人" clearable
+                <el-input
-                  @click="isManTow = true"></el-input>
+                  v-model="formData.assist_admin_names"
+                  placeholder="请选择协作人"
+                  clearable
+                  @click="isManTow = true"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="审查人" prop="icon">
-                <el-input v-model="formData.assist_check_names" placeholder="请选择审查人" clearable @click="isManThe = true"></el-input>
+                <el-input
+                  v-model="formData.assist_check_names"
+                  placeholder="请选择审查人"
+                  clearable
+                  @click="isManThe = true"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item label="开始时间" prop="icon">
-                <el-date-picker type="date" placeholder="开始时间" value-format="YYYY-MM-DD" v-model="formData.start_time" />
+                <el-date-picker
+                  type="date"
+                  placeholder="开始时间"
+                  value-format="YYYY-MM-DD"
+                  v-model="formData.start_time"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="结束时间" prop="icon">
-                <el-date-picker type="date" placeholder="预计结束时间" value-format="YYYY-MM-DD" v-model="formData.end_time" />
+                <el-date-picker
+                  type="date"
+                  placeholder="预计结束时间"
+                  value-format="YYYY-MM-DD"
+                  v-model="formData.end_time"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="验收时间" prop="icon">
-                <el-date-picker type="date" placeholder="预计验收时间" value-format="YYYY-MM-DD" v-model="formData.check_time" />
+                <el-date-picker
+                  type="date"
+                  placeholder="预计验收时间"
+                  value-format="YYYY-MM-DD"
+                  v-model="formData.check_time"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="详细描述" prop="icon">
-                <editor v-model="formData.content" :height="500" />
+                <editor
-              </el-form-item></el-col>
+                  v-model="formData.content"
+                  :height="500"
+                /> </el-form-item
+            ></el-col>
           </el-row>
         </el-col>
       </el-form>
@@ -93,10 +153,10 @@
 <script lang="ts" setup name="taskEidt">
 import type { FormInstance } from "element-plus";
 import Popup from "@/components/popup/index.vue";
-import { apiTaskCreat } from "@/api/task";
+import { apiTaskCreat, apiTaskView } from "@/api/task";
 import { timeFormat } from "@/utils/util";
 import { reactive, onMounted, type PropType } from "vue";
-import DialogIndexMan from './dialog_index_man.vue'
+import DialogIndexMan from "./dialog_index_man.vue";
 const props = defineProps({
   dictData: {
     type: Object as PropType<Record<string, any[]>>,
@@ -104,8 +164,8 @@ const props = defineProps({
   },
   dateValue: {
     type: Date,
-    default: () => (null),
+    default: () => null,
-  }
+  },
 });
 const emit = defineEmits(["success", "close"]);
 const formRef = shallowRef<FormInstance>();
@@ -118,42 +178,44 @@ const popupTitle = computed(() => {
 });
 
 onMounted(() => {
-  props.dateValue?.toDateString()?formData.start_time = props.dateValue.toDateString():null;
+  props.dateValue?.toDateString()
-})
+    ? (formData.start_time = props.dateValue.toDateString())
+    : null;
+});
 
 const priorityList = reactive([
   {
     value: 1,
-    label: "低"
+    label: "低",
   },
   {
     value: 2,
-    label: "中"
+    label: "中",
   },
   {
     value: 3,
-    label: "高"
+    label: "高",
   },
   {
     value: 4,
-    label: "紧急"
+    label: "紧急",
-  }
+  },
-])
+]);
 
 const taskTypeList = reactive([
   {
     value: 0,
-    label: "测试"
+    label: "测试",
   },
   {
     value: 1,
-    label: "修复"
+    label: "修复",
   },
   {
     value: 2,
-    label: "新增"
+    label: "新增",
-  }
+  },
-])
+]);
 
 // const timeList = reactive([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24])
 
@@ -174,7 +236,7 @@ const formData = reactive({
   assist_check_names: "", //审查人
   assist_check_ids: "", //审查人id
   content: "", //任务描述
-  project_id: ""//项目id
+  project_id: "", //项目id
 });
 
 // 获取详情
@@ -187,11 +249,11 @@ const setFormData = async (data: Record<any, any>) => {
   }
 };
 
-const getDetail = async (row: Record<string, any>) => {
+const getDetail = async (id: number) => {
-  const data = await apiFlowTypeDetail({
+  const data = await apiTaskView({
-    id: row.id,
+    id,
   });
-  setFormData(data);
+  setFormData(data.detail);
 };
 
 // 选择负责人
@@ -201,17 +263,17 @@ const isManTow = ref(false);
 // 选择审查人
 const isManThe = ref(false);
 function customEvent(data: any) {
-  isMan.value = false
+  isMan.value = false;
   formData.director_name = data.name;
   formData.director_uid = data.id;
 }
 function customEventMan(data: any) {
-  isManTow.value = false
+  isManTow.value = false;
   formData.assist_admin_names = data.name;
   formData.assist_admin_ids = data.id;
 }
 function customEventManThe(data: any) {
-  isManThe.value = false
+  isManThe.value = false;
   formData.assist_check_names = data.name;
   formData.assist_check_ids = data.id;
 }

src/views/user_informationg/index.vue

@@ -13,21 +13,11 @@
           <el-button>重置</el-button>
         </el-form-item>
       </el-form>
-      <el-button v-perms="['flow_type/add']" type="primary" @click="">
-        <template #icon>
-          <icon name="el-icon-Plus" />
-        </template>
-        新增
-      </el-button>
       <div class="mt-4">
         <el-table :data="pager.lists" @selection-change="handleSelectionChange">
           <el-table-column label="用户编号" prop="id" show-overflow-tooltip />
           <el-table-column label="用户名" prop="name" show-overflow-tooltip />
-          <el-table-column
+          <el-table-column label="联系方式" prop="phone" show-overflow-tooltip />
-            label="联系方式"
-            prop="phone"
-            show-overflow-tooltip
-          />
           <el-table-column label="地址" show-overflow-tooltip>
             <template #default="{ row }">
               <!-- <dict-value :options="dictData.show_status" :value="row.status" /> -->
@@ -40,42 +30,19 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="所属生产队队长" prop="type_name" show-overflow-tooltip />
-            label="所属生产队队长"
+          <el-table-column label="所属镇管理" prop="type_name" show-overflow-tooltip />
-            prop="type_name"
+          <el-table-column label="所属区域经理" prop="type_name" show-overflow-tooltip />
-            show-overflow-tooltip
+          <el-table-column label="最近更新时间" prop="type_name" show-overflow-tooltip />
-          />
+          <el-table-column label="操作" align="center" width="auto" fixed="right">
-          <el-table-column
-            label="所属镇管理"
-            prop="type_name"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="所属区域经理"
-            prop="type_name"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="最近更新时间"
-            prop="type_name"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            width="auto"
-            fixed="right"
-          >
             <template #default="{ row }">
               <el-button v-perms="['flow/edit']" type="primary" link>
-                <router-link
+                <router-link :to="{
-                  :to="{
+                  path: 'user/user_informationgdetil',
-                    path: getRoutePath('user.user/detil'),
                   query: {
                     id: row.id,
                   },
-                  }"
+                }">
-                >
                   详情
                 </router-link>
               </el-button>
@@ -87,13 +54,7 @@
         <pagination v-model="pager" @change="getLists" />
       </div>
     </el-card>
-    <edit-popup
+    <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-      v-if="showEdit"
-      ref="editRef"
-      :dict-data="dictData"
-      @success="getLists"
-      @close="showEdit = false"
-    />
   </div>
 </template>
 
@@ -108,6 +69,7 @@ import { timeFormat } from "@/utils/util";
 import feedback from "@/utils/feedback";
 // import { getRoutePath } from "router";
 import EditPopup from "./editCate.vue";
+console.log(getRoutePath);
 const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 // 是否显示编辑框
 const showEdit = ref(false);