Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

src/views/company/edit.vue

@@ -179,6 +179,8 @@
       </el-col>
       <el-col :span="24" class="el-card pt-6">
         <div class="tit">主要联系人</div>
+        <el-row>
+          <el-col :span="2">
             <div class="headimg">
               <el-upload
                 :disabled="isDisabled"
@@ -189,12 +191,18 @@
                 :show-file-list="false"
                 :on-success="handleAvatarSuccessAvatar"
               >
-            <img v-if="formData.avatar" :src="formData.avatar" class="avatar" />
+                <img
+                  v-if="formData.avatar"
+                  :src="formData.avatar"
+                  class="avatar"
+                />
                 <el-icon v-else class="avatar-uploader-icon">
                   <Plus />
                 </el-icon>
               </el-upload>
             </div>
+          </el-col>
+          <el-col :span="20">
             <el-row>
               <el-col :span="12">
                 <el-form-item label="姓名" prop="master_name">
@@ -258,7 +266,7 @@
                   <el-input
                     :disabled="isDisabled"
                     v-model="formData.id_card"
-                placeholder="请输入生份证"
+                    placeholder="请输入身份证"
                     clearable
                     :style="{ width: '100%' }"
                   ></el-input>
@@ -278,6 +286,8 @@
                     </el-col> -->
             </el-row>
           </el-col>
+        </el-row>
+      </el-col>
       <el-col :span="24" class="el-card pt-6">
         <div class="tit">其他联系人</div>
 
@@ -381,7 +391,7 @@
             </el-form-item>
             <el-form-item class="others" label="其他资质">
               <div
-                v-for="(v, i) in formData.qualification.qualifications"
+                v-for="(v, i) in formData.qualification.other_qualifications"
                 :key="i"
                 class="otherimg"
               >
@@ -653,7 +663,7 @@ const formData = reactive({
   qualification: {
     business_license: "",
     business_licenseB: "",
-    qualifications: [],
+    other_qualifications: [],
     bank_accountB: [],
     bank_account: [],
   },
@@ -816,7 +826,8 @@ const handleAvatarSuccess_two: UploadProps["onSuccess"] = (
     ElMessage.error(response.msg);
     return;
   }
-  formData.qualification.qualifications.push(response.data.uri);
+  formData.qualification.other_qualifications.push(response.data.uri);
+  // console.log(formData.qualification.other_qualifications);
 };
 const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = (
   response,
@@ -981,23 +992,30 @@ const getDetails = async () => {
     ];
     if (data[key] != null && data[key] != undefined) {
       formData[key] = data[key];
-      if (key == "qualification" && formData.qualification.qualifications) {
+      // if (
-        try {
+      //   key == "qualification" &&
-          if (Array.isArray(JSON.parse(formData.qualification.qualifications))) {
+      //   formData.qualification.other_qualifications
-            formData.qualification.qualifications = JSON.parse(
+      // ) {
-              formData.qualification.qualifications
+      //   try {
-            );
+      //     if (
-          } else {
+      //       Array.isArray(
-            const str = formData.qualification.qualifications;
+      //         JSON.parse(formData.qualification.other_qualifications)
-            formData.qualification.qualifications = [];
+      //       )
-            formData.qualification.qualifications.push(str);
+      //     ) {
-          }
+      //       formData.qualification.other_qualifications = JSON.parse(
-        } catch (error) {
+      //         formData.qualification.other_qualifications
-          const str = formData.qualification.qualifications;
+      //       );
-          formData.qualification.qualifications = [];
+      //     } else {
-          formData.qualification.qualifications.push(str);
+      //       const str = formData.qualification.other_qualifications;
-        }
+      //       formData.qualification.other_qualifications = [];
-      }
+      //       formData.qualification.other_qualifications.push(str);
+      //     }
+      //   } catch (error) {
+      //     const str = formData.qualification.other_qualifications;
+      //     formData.qualification.other_qualifications = [];
+      //     formData.qualification.other_qualifications.push(str);
+      //   }
+      // }
     }
     if (stringArr.includes(key)) formData[key] = formData[key].toString();
   });
@@ -1017,7 +1035,7 @@ const getDetails = async () => {
 };
 const clickdelete = (index) => {
   if (!route.query.read) {
-    formData.qualification.qualifications.splice(index, 1);
+    formData.qualification.other_qualifications.splice(index, 1);
   }
 };
 
@@ -1037,8 +1055,8 @@ const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
 const create = async () => {
   await formRef.value?.validate();
   const data = JSON.parse(JSON.stringify({ ...formData }));
-  data.qualification.qualifications = JSON.stringify(
+  data.qualification.other_qualifications = JSON.stringify(
-    data.qualification.qualifications
+    data.qualification.other_qualifications
   );
   if (route.query.id) {
     await apiCompanyEdit(data);
@@ -1075,9 +1093,9 @@ defineExpose({
 
 .headimg {
   margin-left: 18px;
+  margin-bottom: 18px;
   width: 120px;
   height: 140px;
-  float: left;
   overflow: hidden;
 }
 

src/views/company/index.vue

@@ -219,8 +219,11 @@
                   @click="handleAuthentication(row.id)"
                   >企业认证</el-button
                 >
-                <template v-if="row.is_contract == 0">
+                <template v-if="row.is_authentication && row.is_contract == 0">
                   <el-button
+                    v-if="
+                      Array.isArray(row.contract) && row.contract.length == 0
+                    "
                     v-perms="['company/initiate_contract']"
                     type="primary"
                     link
@@ -228,6 +231,17 @@
                     >生成合同</el-button
                   >
                   <el-button
+                    v-if="
+                      Array.isArray(row.contract) && row.contract.length == 0
+                    "
+                    v-perms="['company/initiate_contract']"
+                    type="warning"
+                    link
+                    @click="showChangeCompany(row)"
+                    >生成合同</el-button
+                  >
+                  <el-button
+                    v-else-if="row.contract?.check_status == 2"
                     v-perms="['company/Draftingcontracts']"
                     type="primary"
                     link
@@ -235,6 +249,7 @@
                     >发送合同</el-button
                   >
                   <el-button
+                    v-else-if="row.contract?.check_status == 3"
                     v-perms="['company/postsms']"
                     type="primary"
                     link
@@ -567,8 +582,8 @@ h1 {
   display: flex;
   justify-content: space-around;
 }
-.formdata{
+.formdata {
-  .el-form-item{
+  .el-form-item {
     width: 20%;
   }
 }

src/views/contract/contractDetil.vue

@@ -12,7 +12,11 @@
       class="select"
     >
       <el-form-item label="公司名称" prop="company_name" required>
-                <el-input disabled v-model="compeny.company_name" placeholder="请输入公司名称" />
+        <el-input
+          disabled
+          v-model="compeny.company_name"
+          placeholder="请输入公司名称"
+        />
       </el-form-item>
       <el-form-item label="社会代码" prop="organization_code" required>
         <el-input
@@ -22,7 +26,11 @@
         />
       </el-form-item>
       <el-form-item label="主要联系人" prop="company_name" required>
-                <el-input disabled v-model="compeny.master_name" placeholder="请输入主要联系人" />
+        <el-input
+          disabled
+          v-model="compeny.master_name"
+          placeholder="请输入主要联系人"
+        />
       </el-form-item>
       <el-form-item label="公司类型" prop="compeny">
         <el-select
@@ -33,17 +41,27 @@
         </el-select>
       </el-form-item>
       <el-form-item label="省" prop="province">
-                <el-select disabled v-model="compeny.province_name" placeholder="请选择省">
+        <el-select
+          disabled
+          v-model="compeny.province_name"
+          placeholder="请选择省"
+        >
         </el-select>
       </el-form-item>
       <el-form-item label="市" prop="city">
-                <el-select disabled v-model="compeny.city_name" placeholder="请选择市"> </el-select>
+        <el-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="请选择镇">
+        <el-select
+          disabled
+          v-model="compeny.street_name"
+          placeholder="请选择镇"
+        >
         </el-select>
       </el-form-item>
       <el-form-item label="地址" prop="address">
@@ -73,13 +91,22 @@
           <img :src="compenyimg.business_license" />
         </div>
       </el-form-item>
-            <el-form-item label-width="120px" label="开户许可证" prop="contract_no" required>
+      <el-form-item
+        label-width="120px"
+        label="开户许可证"
+        prop="contract_no"
+        required
+      >
         <div class="company">
           <img :src="compenyimg.business_licenseB" />
         </div>
       </el-form-item>
       <el-form-item label="其他资质" prop="contract_no" required>
-                <div class="company other" v-for="(v,i) in  compenyimg.bank_account" :key="i">
+        <div
+          class="company other"
+          v-for="(v, i) in compenyimg.bank_account"
+          :key="i"
+        >
           <img :src="v" />
         </div>
       </el-form-item>
@@ -98,7 +125,11 @@
       class="select"
     >
       <el-form-item label="公司名称" prop="company_name" required>
-                <el-input disabled v-model="compenyB.company_name" placeholder="请输入公司名称" />
+        <el-input
+          disabled
+          v-model="compenyB.company_name"
+          placeholder="请输入公司名称"
+        />
       </el-form-item>
       <el-form-item label="社会代码" prop="organization_code" required>
         <el-input
@@ -117,10 +148,18 @@
         </el-select>
       </el-form-item>
       <el-form-item label="主要联系人" prop="master_name" required>
-                <el-input disabled v-model="compenyB.master_name" placeholder="请输入主要联系人" />
+        <el-input
+          disabled
+          v-model="compenyB.master_name"
+          placeholder="请输入主要联系人"
+        />
       </el-form-item>
       <el-form-item label="省" prop="province">
-                <el-select disabled v-model="compenyB.province_name" placeholder="请选择省">
+        <el-select
+          disabled
+          v-model="compenyB.province_name"
+          placeholder="请选择省"
+        >
         </el-select>
       </el-form-item>
       <el-form-item label="市" prop="city">
@@ -132,7 +171,11 @@
         </el-select>
       </el-form-item>
       <el-form-item label="镇" prop="street">
-                <el-select disabled v-model="compenyB.street_name" placeholder="请选择镇">
+        <el-select
+          disabled
+          v-model="compenyB.street_name"
+          placeholder="请选择镇"
+        >
           <el-option></el-option>
         </el-select>
       </el-form-item>
@@ -163,13 +206,22 @@
           <img :src="compenyBimg.business_license" />
         </div>
       </el-form-item>
-            <el-form-item label-width="120px" label="开户许可证" prop="contract_no" required>
+      <el-form-item
+        label-width="120px"
+        label="开户许可证"
+        prop="contract_no"
+        required
+      >
         <div class="company">
           <img :src="compenyBimg.business_licenseB" />
         </div>
       </el-form-item>
       <el-form-item class="other" label="其他资质" prop="contract_no" required>
-                <div class="company" v-for="(v,i) in  compenyBimg.qualifications" :key="i">
+        <div
+          class="company"
+          v-for="(v, i) in compenyBimg.other_qualifications"
+          :key="i"
+        >
           <img :src="v" />
         </div>
       </el-form-item>
@@ -190,19 +242,31 @@
         class="person_select"
       >
         <el-form-item label="姓名">
-                    <el-input disabled v-model="persen.nickname" placeholder="请输入姓名" />
+          <el-input
+            disabled
+            v-model="persen.nickname"
+            placeholder="请输入姓名"
+          />
         </el-form-item>
         <el-form-item label="性别">
           <el-input disabled v-model="persen.sex" placeholder="请输入性别" />
         </el-form-item>
         <el-form-item label="联系电话">
-                    <el-input disabled v-model="persen.mobile" placeholder="请输入联系电话" />
+          <el-input
+            disabled
+            v-model="persen.mobile"
+            placeholder="请输入联系电话"
+          />
         </el-form-item>
         <el-form-item label="身份证号">
           <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="请选择省">
+          <el-select
+            disabled
+            v-model="persen.province_name"
+            placeholder="请选择省"
+          >
           </el-select>
         </el-form-item>
         <el-form-item label="市" prop="city">
@@ -215,7 +279,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="镇" prop="street">
-                    <el-select disabled v-model="persen.street_name" placeholder="请选择镇">
+          <el-select
+            disabled
+            v-model="persen.street_name"
+            placeholder="请选择镇"
+          >
             <el-option></el-option>
           </el-select>
         </el-form-item>
@@ -227,18 +295,21 @@
       <span>个人资质信息</span>
     </template>
     <el-form class="idcard" :model="persenimg" :inline="true">
-            <el-form-item label="身份证号">
+      <el-form-item label="身份证">
         <img :src="persenimg.id_card" />
         <img :src="persenimg.id_card_b" />
       </el-form-item>
-            <el-form-item label="行驶证号">
+      <el-form-item label="银行卡">
-                <img :src="persenimg.car_card" />
-                <img :src="persenimg.car_card_b" />
-            </el-form-item>
-            <el-form-item label="银行卡号">
         <img :src="persenimg.bank_account" />
         <img :src="persenimg.bank_account_b" />
       </el-form-item>
+      <el-form-item
+        v-if="persenimg.car_card || persenimg.car_card_b"
+        label="行驶证"
+      >
+        <img v-if="persenimg.car_card" :src="persenimg.car_card" />
+        <img v-if="persenimg.car_card_b" :src="persenimg.car_card_b" />
+      </el-form-item>
     </el-form>
   </el-card>
   <el-card>
@@ -253,25 +324,25 @@
       label-width="90px"
       :rules="formRules"
     >
-            <el-form-item label="签约方" prop="contract_type">
+      <el-form-item label="甲方" prop="contract_type">
         <el-input
           v-model="compeny.company_name"
           :disabled="true"
-                    placeholder="暂无签约方"
+          placeholder="暂无甲方方"
         />
       </el-form-item>
-            <el-form-item label="被签约公司" prop="contract_no">
+      <el-form-item label="乙方" prop="contract_no">
         <el-input
           v-model="compenyB.company_name"
           :disabled="true"
-                    placeholder="暂无签约方"
+          placeholder="暂无乙方"
         />
       </el-form-item>
       <el-form-item label="合同类型" prop="contract_no">
         <el-input
           v-model="basicdata.contract_type_name"
           :disabled="true"
-                    placeholder="暂无签约方"
+          placeholder="暂无合同"
         />
       </el-form-item>
       <!-- <el-form-item label="合同编号" prop="contract_no">
@@ -282,10 +353,10 @@
                 />
             </el-form-item> -->
     </el-form>
-    </el-card >
+  </el-card>
   <el-card v-if="isshow">
-        <el-form>
+    <el-form label>
-            <el-form-item label="合同上传" prop="field127">
+      <el-form-item label="合同上传" label-width="100px" prop="field127">
         <el-upload
           :headers="{ Token: userStore.token }"
           v-model:file-list="fileList"
@@ -298,96 +369,121 @@
           <el-button type="primary">上传</el-button>
         </el-upload>
       </el-form-item>
+      <el-form-item>
+        <el-button
+          style="margin-left: 100px"
+          type="primary"
+          @click="submitContract"
+          >确定</el-button
+        >
+      </el-form-item>
     </el-form>
   </el-card>
 </template>
 
 <script lang="ts" setup>
-import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
+import {
-import { apiContractDetail } from '@/api/contract'
+  type FormInstance,
-import { ref, reactive, defineExpose, computed } from 'vue'
+  type UploadProps,
-import { useRoute } from 'vue-router'
+  ElMessage,
-import { dictDataLists } from '@/api/setting/dict'
+  type UploadUserFile,
-import { upContact } from '@/api/consumer'
+} from "element-plus";
-const { query } = useRoute()
+import { apiContractDetail } from "@/api/contract";
-import useUserStore from '@/stores/modules/user'
+import { ref, reactive, defineExpose, computed } from "vue";
+import { useRoute } from "vue-router";
+import { dictDataLists } from "@/api/setting/dict";
+import { upContact } from "@/api/consumer";
+const { query } = useRoute();
+import useUserStore from "@/stores/modules/user";
 
 const formData = reactive({
-    id: '',
+  id: "",
-    company_id: '',
+  company_id: "",
-    contract_type: '',
+  contract_type: "",
-    contract_type_name: '',
+  contract_type_name: "",
-    contract_no: '',
+  contract_no: "",
-    file: '',
+  file: "",
-    status: '',
+  status: "",
-    party_a: '',
+  party_a: "",
-    party_a_name: '',
+  party_a_name: "",
-    party_b: '',
+  party_b: "",
-    party_b_name: '',
+  party_b_name: "",
-    area_manager: '',
+  area_manager: "",
-    area_manager_name: '',
+  area_manager_name: "",
-    type_name: '',
+  type_name: "",
-    url: '',
+  url: "",
-    status_name: ''
+  status_name: "",
-})
+});
-const fileList = ref<UploadUserFile[]>([])
+const fileList = ref<UploadUserFile[]>([]);
-const basicdata = ref({})
+const basicdata = ref({});
-const compeny = ref({})
+const compeny = ref({});
-const compenyimg = ref([])
+const compenyimg = ref([]);
-const compenyB = ref([])
+const compenyB = ref([]);
-const compenyBimg = ref([])
+const compenyBimg = ref([]);
-const persen = ref([])
+const persen = ref([]);
-const persenimg = ref([])
+const persenimg = ref([]);
-const show = ref(true)
+const show = ref(true);
-const flag = ref(true)
+const flag = ref(true);
-const isshow=ref(true)
+const isshow = ref(true);
-const route = useRoute()
+const route = useRoute();
-const userStore = useUserStore()
+const userStore = useUserStore();
 
 async function render() {
   // 传值赋值
-    const res = await apiContractDetail({ id: query.id })
+  const res = await apiContractDetail({ id: query.id });
-    compeny.value = res.party_a_info
+  compeny.value = res.party_a_info;
-    basicdata.value = res
+  basicdata.value = res;
-     if(basicdata.value.status==1){isshow.value=false}
+  if (basicdata.value.status == 1) {
+    isshow.value = false;
+  }
   try {
     res.party_a_info.qualification.bank_account = JSON.parse(
       res.party_a_info.qualification.bank_account
-        )
+    );
-        compenyimg.value = res.party_a_info.qualification
+    compenyimg.value = res.party_a_info.qualification;
-        res.party_b_info.qualification.qualifications = JSON.parse(
+    res.party_b_info.qualification.other_qualifications = JSON.parse(
-            res.party_b_info.qualification.qualifications
+      res.party_b_info.qualification.other_qualifications
-        )
+    );
-        compenyBimg.value = res.party_b_info.qualification
+    compenyBimg.value = res.party_b_info.qualification;
   } catch (error) {}
-    compenyimg.value = res.party_a_info.qualification
+  compenyimg.value = res.party_a_info.qualification;
-    console.log(compenyimg.value );
+  console.log(compenyimg.value);
   if (res.type == 2) {
-        show.value = false
+    show.value = false;
-        res.party_b_info.sex == 1 ? (res.party_b_info.sex = '男') : (res.party_b_info.sex = '女')
+    res.party_b_info.sex == 1
-        persen.value = res.party_b_info
+      ? (res.party_b_info.sex = "男")
-        persenimg.value = res.party_b_info.qualification
+      : (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
+    compenyB.value = res.party_b_info;
-        compenyBimg.value = res.party_b_info.qualification
+    compenyBimg.value = res.party_b_info.qualification;
-        flag.value = false
+    flag.value = false;
   } else {
-        compenyB.value.company_name = res.party_b_info.nickname
+    compenyB.value.company_name = res.party_b_info.nickname;
   }
 }
 
-const handleAvatarSuccess_four: UploadProps['onSuccess'] = (response, uploadFile) => {
+const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
+  response,
+  uploadFile
+) => {
   if (response.code == 0) {
-        ElMessage.error(response.msg)
+    ElMessage.error(response.msg);
-        return
+    return;
   }
-    formData.file = response.data.uri
+  formData.file = response.data.uri;
-    upContact({ file: formData.file, id: route.query.id })
+};
-}
+
+const submitContract = () => {
+  if (!formData.file) ElMessage.error("请先上传合同!");
+  upContact({ file: formData.file, id: route.query.id });
+};
+
 onMounted(async () => {
-    await render()
+  await render();
-})
+});
 </script>
 
 <style lang="scss" scoped>
@@ -435,17 +531,26 @@ onMounted(async () => {
   img {
     width: 10vw;
     height: 6.3vw;
+    margin-right: 12px;
   }
 }
 .company_z {
   .el-form-item {
     width: 40%;
   }
-    .other{
+  .other {
     width: 100% !important;
   }
 }
 .el-card {
   margin-top: 10px;
 }
+
+.el-upload-list .el-upload-list__item-thumbnail {
+  width: 500px; /* 设置文件缩略图的宽度 */
+}
+
+.el-upload-list .el-upload-list__item-name {
+  max-width: 450px; /* 设置文件名的最大宽度 */
+}
 </style>

src/views/permission/admin/edit.vue

@@ -135,7 +135,12 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="镇" prop="street" style="flex: 1">
+            <el-form-item
+              v-if="disabledPartyA"
+              label="镇"
+              prop="street"
+              style="flex: 1"
+            >
               <el-select
                 :disabled="isCheck"
                 v-model="formData.street"
@@ -152,7 +157,12 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="村社小队" prop="address" style="flex: 1.5">
+            <el-form-item
+              v-if="disabledPartyA"
+              label="村社小队"
+              prop="address"
+              style="flex: 1.5"
+            >
               <el-input
                 :disabled="isCheck"
                 v-model="formData.address"
@@ -190,262 +200,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="disabledPartyA">
-              <el-form-item label="签约方" prop="field130">
-                <el-input
-                  :disabled="isCheck"
-                  v-model="formData.party_a_name"
-                  placeholder="请选择签约方"
-                  clearable
-                  :style="{ width: '100%' }"
-                  @click="isCompany = true"
-                  @clear="clearPartyA"
-                ></el-input>
-              </el-form-item>
-            </el-col>
           </el-row>
         </el-col>
-        <div v-if="disabledPartyA" style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
-        <div v-if="disabledPartyA" style="display: flex; justify-content: space-between">
-          <div>
-            <el-form-item label="身份证" prop="id_card">
-              <el-upload
-                :disabled="isCheck"
-                v-model="formData.qualification.id_card"
-                class="avatar-uploader pl-3"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccessIdA"
-              >
-                <img
-                  v-if="formData.qualification.id_card"
-                  :src="formData.qualification.id_card"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-              <el-upload
-                :disabled="isCheck"
-                v-model="formData.qualification.id_card_b"
-                class="avatar-uploader pl-3"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccessIdB"
-              >
-                <img
-                  v-if="formData.qualification.id_card_b"
-                  :src="formData.qualification.id_card_b"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-            </el-form-item>
-          </div>
-          <div>
-            <el-form-item label="行驶证" prop="car_card">
-              <el-upload
-                :disabled="isCheck"
-                v-model="formData.qualification.car_card"
-                class="avatar-uploader pl-3"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccessCarA"
-              >
-                <img
-                  v-if="formData.qualification.car_card"
-                  :src="formData.qualification.car_card"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-              <el-upload
-                :disabled="isCheck"
-                v-model="formData.qualification.car_card_b"
-                class="avatar-uploader pl-3"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccessCarB"
-                :before-upload="beforeAvatarUpload_two"
-              >
-                <img
-                  v-if="formData.qualification.car_card_b"
-                  :src="formData.qualification.car_card_b"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-            </el-form-item>
-          </div>
-          <div>
-            <el-form-item label="银行卡号" prop="bank_account">
-              <el-upload
-                :disabled="isCheck"
-                v-model="formData.qualification.bank_account"
-                class="avatar-uploader pl-3"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccessBankA"
-                :before-upload="beforeAvatarUpload_three"
-              >
-                <img
-                  v-if="formData.qualification.bank_account"
-                  :src="formData.qualification.bank_account"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-              <el-upload
-                :disabled="isCheck"
-                v-model="formData.qualification.bank_account_b"
-                class="avatar-uploader pl-3"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccessBankB"
-                :before-upload="beforeAvatarUpload_three"
-              >
-                <img
-                  v-if="formData.qualification.bank_account_b"
-                  :src="formData.qualification.bank_account_b"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-            </el-form-item>
-          </div>
-        </div>
-        <template v-if="disabledPartyA">
-          <el-col :span="24">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="签约姓名" prop="name">
-                  <el-input
-                    v-model="formData.name"
-                    placeholder="请输入签约姓名"
-                    :disabled="true"
-                    clearable
-                    :style="{ width: '100%' }"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
-                  <el-input
-                    placeholder="请输入性别"
-                    :disabled="true"
-                    clearable
-                    :style="{ width: '100%' }"
-                    :value="formData.sex == 1 ? '男' : '女'"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="身份证号" prop="id_card">
-                  <el-input
-                    v-model="formData.id_card"
-                    placeholder="请输入身份证号"
-                    :disabled="true"
-                    clearable
-                    :style="{ width: '100%' }"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="联系电话" prop="account">
-                  <el-input
-                    v-model="formData.account"
-                    placeholder="请输入联系电话"
-                    :disabled="true"
-                    clearable
-                    :style="{ width: '100%' }"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12" v-if="formData.name">
-                <el-form-item label="账号">
-                  <el-input
-                    v-model="formData.account"
-                    :disabled="true"
-                    clearable
-                    :style="{ width: '100%' }"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12" v-if="formData.name">
-                <el-form-item label="初始密码" prop="password">
-                  <el-input
-                    :model-value="'m' + formData.account"
-                    :disabled="true"
-                    clearable
-                    :style="{ width: '100%' }"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="合同类型" prop="contract_type">
-                  <el-col :span="24">
-                    <el-select
-                      :disabled="isCheck"
-                      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>
-          <el-col :span="24" v-if="!isCheck && mode != 'view'">
-            <el-form-item label="合同上传" prop="field127">
-              <el-upload
-                :headers="{ Token: userStore.token }"
-                v-model:file-list="fileList"
-                class="upload-demo"
-                action="https://worker-task.lihaink.cn/adminapi/upload/file"
-                :on-success="handleAvatarSuccess_four"
-                multiple
-                :limit="1"
-              >
-                <el-button type="primary">上传</el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="mode == 'view'">
-            <el-form-item label="合同地址">
-              <el-link
-                type="success"
-                :href="formData.contract.url"
-                target="_blank"
-                >在线查看</el-link
-              >
-            </el-form-item>
-          </el-col>
-        </template>
       </el-form>
     </popup>
     <el-dialog v-model="isCompany" title="选择签约方" width="60%">
@@ -831,15 +587,15 @@ const setFormData = async (row: any) => {
       if (stringArr.includes(key)) formData[key] = formData[key].toString();
     }
   }
-  formData.contract_type = data.contract.contract_type;
+  formData.contract_type = data.contract?.contract_type;
-  formData.party_a_name = data.contract.party_a_name;
+  formData.party_a_name = data.contract?.party_a_name;
-  formData.party_a = data.contract.party_a;
+  formData.party_a = data.contract?.party_a;
-  formData.file = data.contract.file;
+  formData.file = data.contract?.file;
   if (data.role_id[0] == 8) {
     disabledPartyA.value = false;
   }
   fileList.value[0] = {
-    url: data["contract"]["file"],
+    url: data.contract?.file,
     name: "合同文件",
   };
   await getCityList();

src/views/permission/admin/index.vue

@@ -57,10 +57,14 @@
             align="center"
           >
             <template #default="{ row }">
-                            {{ row.company.company_name || '/' }}
+              {{ row.company.company_name || "/" }}
             </template>
           </el-table-column>
-                    <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
+          <el-table-column
+            label="所在乡镇"
+            prop="street_name"
+            min-width="120"
+          />
           <el-table-column label="授权身份" prop="role_name" min-width="120" />
           <el-table-column
             label="是否签约"
@@ -69,11 +73,17 @@
             min-width="120"
           >
             <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="最近登录时间" prop="login_time" min-width="180" />
+          <el-table-column
+            label="最近登录时间"
+            prop="login_time"
+            min-width="180"
+          />
           <el-table-column
             label="创建时间"
             prop="create_time"
@@ -81,7 +91,11 @@
             align="center"
           />
           <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
-                    <el-table-column label="账号状态" min-width="100" v-perms="['auth.admin/edit']">
+          <el-table-column
+            label="账号状态"
+            min-width="100"
+            v-perms="['auth.admin/edit']"
+          >
             <template #default="{ row }">
               <el-switch
                 v-if="row.root != 1"
@@ -93,7 +107,12 @@
             </template>
           </el-table-column>
 
-                    <el-table-column label="操作" width="330" align="center" fixed="right">
+          <el-table-column
+            label="操作"
+            width="230"
+            align="center"
+            fixed="right"
+          >
             <template #default="{ row }">
               <div style="display: flex">
                 <el-button
@@ -126,7 +145,7 @@
                                     @click="handleAbolition(row.id)"
                                     >废除合同</el-button
                                 > -->
-                                <template v-if="row.company_id != 0 && row.is_contract == 0">
+                <!-- <template v-if="row.company_id != 0 && row.is_contract == 0">
                                     <el-button
                                         v-perms="['auth.admin/Draftingcontracts']"
                                         type="primary"
@@ -145,7 +164,7 @@
                                         @click=";(showPop = true), (contractId = row.id)"
                                         >重新短信</el-button
                                     >
-                                </template>
+                                </template> -->
               </div>
             </template>
           </el-table-column>
@@ -171,10 +190,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>
@@ -188,48 +213,48 @@ import {
   adminDelete,
   generateGontract,
   sendMsgApi,
-    abolition
+  abolition,
-} from '@/api/perms/admin'
+} from "@/api/perms/admin";
-import { roleAll } from '@/api/perms/role'
+import { roleAll } from "@/api/perms/role";
-import { useDictOptions } from '@/hooks/useDictOptions'
+import { useDictOptions } from "@/hooks/useDictOptions";
-import { usePaging } from '@/hooks/usePaging'
+import { usePaging } from "@/hooks/usePaging";
-import feedback from '@/utils/feedback'
+import feedback from "@/utils/feedback";
-import EditPopup from './edit.vue'
+import EditPopup from "./edit.vue";
-const route = useRoute()
+const route = useRoute();
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 // 表单数据
 const formData = reactive({
-    name: '',
+  name: "",
-    role_id: '',
+  role_id: "",
-    company_id: ''
+  company_id: "",
-})
+});
-const contractId = ref('')
+const contractId = ref("");
 // 弹窗
-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;
-}
+};
 const creContct = () => {
   //   feedback.msgSuccess("复制成功");
   generateGontract({ id: contractId.value }).then(() => {
-        feedback.msgSuccess('发送成功')
+    feedback.msgSuccess("发送成功");
-    })
+  });
-    offPop()
+  offPop();
-}
+};
 const sendMsg = () => {
   sendMsgApi({ id: contractId.value }).then((res) => {
-        feedback.msgSuccess('发送成功')
+    feedback.msgSuccess("发送成功");
-    })
+  });
-    offPop()
+  offPop();
-}
+};
 //
-const showEdit = ref(false)
+const showEdit = ref(false);
 const { pager, getLists, resetParams, resetPage } = usePaging({
   fetchFun: adminLists,
-    params: formData
+  params: formData,
-})
+});
 
 const changeStatus = (data: any) => {
   adminEdit({
@@ -238,65 +263,65 @@ const changeStatus = (data: any) => {
     name: data.name,
     role_id: data.role_id,
     disable: data.disable,
-        multipoint_login: data.multipoint_login
+    multipoint_login: data.multipoint_login,
   }).finally(() => {
-        getLists()
+    getLists();
-    })
+  });
-}
+};
 // 查看
-const isCheck = ref(false)
+const isCheck = ref(false);
 const handleCheck = async (data: any) => {
-    isCheck.value = true
+  isCheck.value = true;
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('edit')
+  editRef.value?.open("edit");
-    editRef.value?.setFormData(data)
+  editRef.value?.setFormData(data);
-}
+};
 const handleAdd = async () => {
-    isCheck.value = false
+  isCheck.value = false;
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('add')
+  editRef.value?.open("add");
-}
+};
 
 const handleEdit = async (data: any) => {
-    isCheck.value = false
+  isCheck.value = false;
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('edit')
+  editRef.value?.open("edit");
-    editRef.value?.setFormData(data)
+  editRef.value?.setFormData(data);
-}
+};
 const handleView = async (data: any) => {
-    isCheck.value = false
+  isCheck.value = false;
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('view')
+  editRef.value?.open("view");
-    editRef.value?.setFormData(data)
+  editRef.value?.setFormData(data);
-}
+};
 const handleDelete = async (id: number) => {
-    await feedback.confirm('确定要删除？')
+  await feedback.confirm("确定要删除？");
-    await adminDelete({ id })
+  await adminDelete({ id });
-    getLists()
+  getLists();
-}
+};
 const handleAbolition = async (id: number) => {
-    await feedback.confirm('确定要废除合同？')
+  await feedback.confirm("确定要废除合同？");
-    await abolition({ id })
+  await abolition({ id });
-    getLists()
+  getLists();
-}
+};
 
 const { optionsData } = useDictOptions<{
-    role: any[]
+  role: any[];
 }>({
   role: {
-        api: roleAll
+    api: roleAll,
-    }
+  },
-})
+});
 if (route.query.company_id) {
-    formData.company_id = route.query.company_id?.toString()
+  formData.company_id = route.query.company_id?.toString();
 }
 onMounted(() => {
-    getLists()
+  getLists();
-})
+});
 </script>
 <style lang="scss" scoped>
 h1 {

src/views/task/editTow.vue

@@ -0,0 +1,93 @@
+<template>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      title="创建日程安排"
+      :async="true"
+      width="800px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <el-form class="formdata" :model="detailsdt" label-width="120px">
+        <el-form-item label="任务日期">
+          <el-date-picker
+            v-model="formData.time"
+            type="date"
+            placeholder="选择日期"
+          />
+        </el-form-item>
+        <el-form-item label="任务模板">
+          <el-input v-model="formData.template_id" />
+        </el-form-item>
+        <el-form-item label="任务排期">
+          <el-input v-model="formData.scheduling_id" />
+        </el-form-item>
+      </el-form>
+    </popup>
+  </div>
+</template>
+
+<script lang="ts" setup name="taskEidt">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import { apiTaskCreat, apiTaskView } from "@/api/task";
+import { apiTaskTemplateLists } from "@/api/task_template";
+import { timeFormat } from "@/utils/util";
+import { reactive, onUpdated, type PropType } from "vue";
+import DialogIndexMan from "./dialog_index_man.vue";
+
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+const detailsdt = ref({});
+const datetime = ref([]);
+
+const templateList = ref([]);
+const getTemplateList = () => {
+  apiTaskTemplateLists().then((res) => {
+    templateList.value = res;
+    console.log(templateList.value);
+  });
+};
+getTemplateList();
+
+// 表单数据
+const formData = reactive({
+  time: "",
+  template_id: "",
+  scheduling_id: "",
+});
+
+// 提交按钮
+// const handleSubmit = async () => {
+//   const data = { ...formData };
+//   mode.value == "edit" ? await apiTaskCreat(data) : await apiTaskCreat(data);
+//   popupRef.value?.close();
+//   emit("success");
+// };
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+});
+</script>
+<style lang="scss" scoped>
+.formdata {
+  .el-form-item {
+    .el-date-picker {
+      width: 100%;
+    }
+  }
+}
+</style>

src/views/task/taskCalendar.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-card class="!border-none" v-loading="loading" shadow="never">
-      <!-- <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
+      <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
         <template #icon>
           <icon name="el-icon-Plus" />
         </template>
         新增
-      </el-button> -->
+      </el-button>
       <div class="mt-4">
         <el-calendar v-model="dateValue">
           <template #dateCell="{ data }">
@@ -48,6 +48,14 @@
       @success="loadTask"
       @close="showEdit = false"
     />
+    <EditTowPopup
+      ref="editTowRef"
+      :dict-data="dictData"
+      :dateValue="dateValue"
+      :detailsdata="detailsdata"
+      @success="loadTask"
+      @close="showEditTow = false"
+    />
   </div>
 </template>
   
@@ -58,8 +66,11 @@ import { timeFormat } from "@/utils/util";
 import feedback from "@/utils/feedback";
 // import { getRoutePath } from "router";
 import EditPopup from "./edit.vue";
+import EditTowPopup from "./editTow.vue";
 import { reactive, watch } from "vue";
 import { apiTaskList, apiTaskDetails } from "@/api/task";
+import { apiTaskSchedulingPlanAdd } from "@/api/task_scheduling_plan";
+
 const dateValue = ref(new Date());
 const detailsdata = reactive({
   create_time: "",
@@ -92,8 +103,11 @@ const detailsdata = reactive({
 watch(
   () => dateValue,
   async (newValue, oldValue) => {
-    const id = taskList.value.find((item) =>item.start_time.split(" ")[0] == timeFormat(newValue.value.getTime()))?.id;
+    const id = taskList.value.find(
-    if(id){
+      (item) =>
+        item.start_time.split(" ")[0] == timeFormat(newValue.value.getTime())
+    )?.id;
+    if (id) {
       const res = await apiTaskDetails({ id });
       Object.keys(detailsdata).forEach((key) => {
         res[key] ? (detailsdata[key] = res[key]) : null;
@@ -101,7 +115,6 @@ watch(
       editRef.value?.open("add");
       initShowDate(timeFormat(newValue.value.getTime()));
     }
-
   },
   { deep: true }
 );
@@ -110,8 +123,10 @@ watch(
 const loading = ref(true);
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+const editTowRef = shallowRef<InstanceType<typeof EditPopup>>();
 // 是否显示编辑框
 const showEdit = ref(false);
+const showEditTow = ref(false);
 
 // 查询条件
 const queryParams = reactive({
@@ -168,9 +183,9 @@ const dateNow = (day) => {
 
 // 添加
 const handleAdd = async () => {
-  showEdit.value = true;
+  showEditTow.value = true;
   await nextTick();
-  editRef.value?.open("add");
+  editTowRef.value?.open("add");
 };
 
 // 编辑

src/views/task_scheduling/index.vue

@@ -177,6 +177,7 @@ const handleCalendar = async (data: any) => {
     editRef.value?.open('edit')
     editRef.value?.setFormData(data)
 }
+
 // 删除
 const handleDelete = async (id: number | any[]) => {
     await feedback.confirm('确定要删除？')