im

.env.development

@@ -1,7 +1,9 @@
 NODE_ENV = 'development'
 
+# VITE_APP_BASE_URL = 'http://192.168.1.12:8001'
+
 VITE_APP_BASE_URL = 'https://ceshi-worker-task.lihaink.cn'
 
 # VITE_APP_BASE_URL = 'https://preview-worker-task.lihaink.cn'
 
-# VITE_APP_BASE_URL = 'https://worker-task.lihaink.cn'preview
+# VITE_APP_BASE_URL = 'https://worker-task.lihaink.cn'

src/api/company.ts

@@ -66,3 +66,20 @@ export function companyResponsibleArea(params: any) {
 export function organizationFaceCreate(params: any) {
     return request.get({ url: '/company/organizationFaceCreate', params })
 }
+
+// 押金线下对公账号转账凭证录入接口
+export function depositRechargeTransferVoucher(params: any) {
+    return request.post({ url: '/company/depositRechargeTransferVoucher', params })
+}
+
+// 获取押金凭证录入列表
+export function getDepositRechargeTransferVoucherList(params: any) {
+    return request.get({ url: '/company/getDepositRechargeTransferVoucherList', params })
+}
+
+// 根据公司id获取甲方公司信息
+export function getPartyAbyCompanyId(params: any) {
+    return request.get({ url: '/company/getPartyA', params })
+}
+
+

src/views/company/edit.vue

@@ -28,6 +28,21 @@
               :style="{ width: '300px' }"
             ></el-input>
           </el-form-item>
+          <el-form-item
+            label="对公账号"
+            :rules="[
+              { required: true, message: '请输入对公账号', trigger: 'blur' },
+            ]"
+            prop="qualification.corporate_account"
+          >
+            <el-input
+              v-model="formData.qualification.corporate_account"
+              placeholder="请输入对公账号"
+              clearable
+              :disabled="isDisabled"
+              :style="{ width: '300px' }"
+            ></el-input>
+          </el-form-item>
           <el-form-item
             label="公司类型"
             :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
@@ -44,6 +59,7 @@
                 v-for="(item, index) in datas.dictTypeLists"
                 :key="index"
                 :label="item.name"
+                gon
                 :value="item.id"
               ></el-option>
             </el-select>
@@ -727,6 +743,7 @@ const formData = reactive({
   master_email: "",
   other_contacts: [],
   qualification: {
+    corporate_account: "", //对公账号
     business_license: "",
     business_licenseB: "",
     other_qualifications: [],
@@ -984,8 +1001,11 @@ function company_type_change(type: any) {
     isBrigade.value = false;
     formData.village = "";
     formData.brigade = "";
+    if (!formData.id) {
+      // 创建公司时切换公司类型进行清空
       formData.street = "";
       formData.area = "";
+    }
     formData.responsible_area = []; // 同级别公司切换时清空已选择区域
     partyDisabled.value = true;
     indexType.value = 30;
@@ -1003,8 +1023,11 @@ function company_type_change(type: any) {
     isBrigade.value = false;
     formData.village = "";
     formData.brigade = "";
+    if (!formData.id) {
+      // 创建公司时切换公司类型进行清空
       formData.street = "";
       formData.area = "";
+    }
     formData.responsible_area = []; // 同级别公司切换时清空已选择区域
     // partyDisabled.value = true;
     // indexType.value = 30;
@@ -1134,14 +1157,6 @@ const getDetails = async () => {
     partyDisabled.value = true;
   }
   Object.keys(formData).forEach((key) => {
-    const stringArr = [
-      "province",
-      "city",
-      "area",
-      "street",
-      "village",
-      "brigade",
-    ];
     if (data[key] != null && data[key] != undefined) {
       formData[key] = data[key];
       // if (
@@ -1169,7 +1184,17 @@ const getDetails = async () => {
       //   }
       // }
     }
-    if (stringArr.includes(key)) formData[key] = formData[key].toString();
+  });
+  const stringArr = [
+    "province",
+    "city",
+    "area",
+    "street",
+    "village",
+    "brigade",
+  ];
+  stringArr.forEach((key: string) => {
+    formData[key] = formData[key].toString();
   });
   await getCityList();
   await getAreaList();
@@ -1182,6 +1207,7 @@ const getDetails = async () => {
   //     fileList.value[0].url = data.contract?.file
   //     fileList.value[0].name = '合同文件'
   // }
+
   company_type_change(formData.company_type);
 };
 const clickdelete = (index) => {

src/views/finance/audit.vue

@@ -88,6 +88,7 @@
             :on-success="handleFile"
             :on-exceed="handleExceed"
             :before-upload="beforeUpload"
+            :before-remove="removeFile"
             ref="upload"
           >
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
@@ -111,7 +112,12 @@
 </template>
   
 <script lang="ts" setup name="withdrawEdit">
-import type { FormInstance, UploadRawFile } from "element-plus";
+import type {
+  FormInstance,
+  UploadRawFile,
+  UploadFile,
+  UploadFiles,
+} from "element-plus";
 import Popup from "@/components/popup/index.vue";
 import {
   apiWithdrawAdd,
@@ -243,6 +249,11 @@ const handleExceed = (files: any) => {
   upload.value!.submit();
 };
 
+const removeFile = (uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+  formData.voucher = "";
+  return true;
+};
+
 // 上传文件
 const handleFile = (e: any) => {
   if (e.code == 0 && e.show == 1) {

src/views/finance/company.vue

@@ -82,11 +82,11 @@
           />
           <el-table-column
             label="公司收益"
-            prop="deposit"
+            prop="company_money"
             show-overflow-tooltip
           >
             <template #default="{ row }">
-              <span class="text-success">{{ row.deposit }}</span>
+              <span class="text-success">{{ row.company_money }}</span>
             </template>
           </el-table-column>
           <el-table-column label="区县" prop="area" show-overflow-tooltip />

src/views/finance/component/voucher.vue

@@ -0,0 +1,290 @@
+<template>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="580px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <el-form
+        ref="formRef"
+        :model="formData"
+        label-width="120px"
+        :rules="formRules"
+      >
+        <el-form-item label="甲方公司名称">
+          <el-input
+            readonly
+            v-model="partyA.company_name"
+            clearable
+            placeholder=""
+          />
+        </el-form-item>
+        <el-form-item label="甲方对公账号">
+          <el-input
+            readonly
+            v-model="partyA.qualification.corporate_account"
+            clearable
+            placeholder=""
+          />
+        </el-form-item>
+        <el-form-item label="公司名称" prop="company_name">
+          <el-input
+            readonly
+            v-model="formData.company_name"
+            clearable
+            placeholder=""
+          />
+        </el-form-item>
+        <el-form-item label="主要联系人" prop="master_name">
+          <el-input
+            readonly
+            v-model="formData.master_name"
+            clearable
+            placeholder=""
+          />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="master_phone">
+          <el-input
+            readonly
+            v-model="formData.master_phone"
+            clearable
+            placeholder=""
+          />
+        </el-form-item>
+        <el-form-item label="押金金额" prop="deposit">
+          <el-input
+            v-model="formData.deposit"
+            type="number"
+            :maxlength="10"
+            clearable
+            placeholder="请输入押金金额"
+          />
+        </el-form-item>
+        <el-form-item label="上传凭证" prop="voucher">
+          <el-upload
+            class="upload-demo"
+            style="width: 100%"
+            drag
+            :accept="fileTypeList.join(', ')"
+            :headers="{ Token: userStore.token }"
+            :action="actionUrl"
+            :limit="1"
+            :on-success="handleFile"
+            :on-exceed="handleExceed"
+            :before-upload="beforeUpload"
+            :before-remove="removeFile"
+            :on-preview="onPreview"
+            ref="upload"
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">文件拖入或点击上传</div>
+            <template #tip>
+              <div class="el-upload__tip">请上传JPG/JPEG/PNG/GIF/PDF文件</div>
+            </template>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+    </popup>
+  </div>
+</template>
+  
+  <script lang="ts" setup name="withdrawEdit">
+import type {
+  FormInstance,
+  UploadRawFile,
+  UploadFile,
+  UploadFiles,
+} from "element-plus";
+import { genFileId } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import { getPartyAbyCompanyId } from "@/api/company";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+import { depositRechargeTransferVoucher } from "@/api/company.ts";
+import { inject } from "vue";
+const base_url: any = inject("base_url");
+import useUserStore from "@/stores/modules/user";
+import { rules } from "@/views/channel/wx_oa/menu_com/useMenuOa";
+const userStore = useUserStore();
+defineProps({
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({}),
+  },
+});
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+// 弹窗标题
+const popupTitle = computed(() => {
+  return "凭证录入";
+});
+
+// 表单数据
+const formData = reactive({
+  id: "",
+  company_name: "",
+  master_name: "",
+  master_phone: "",
+  deposit: "", // 钱
+  voucher: "", // 凭证
+});
+
+// 表单验证
+const formRules = reactive<any>({
+  deposit: [
+    {
+      required: true,
+      message: "请输入押金金额",
+      trigger: ["blur"],
+    },
+  ],
+  voucher: [
+    {
+      required: true,
+      message: "请上传凭证",
+      trigger: ["blur", "change"],
+    },
+  ],
+});
+
+// 文件选择
+const upload = ref(null);
+// 文件上传地址
+const actionUrl = ref("");
+const fileTypeList = [
+  "application/pdf",
+  "image/jpeg",
+  "image/gif",
+  "image/png",
+];
+// 限制上传类型
+const beforeUpload = (rawFile: UploadRawFile) => {
+  if (!fileTypeList.includes(rawFile.type)) {
+    ElMessage.error("请上传JPG/JPEG/PNG/GIF/PDF文件");
+    return false;
+  }
+  if (rawFile.type != "application/pdf") {
+    actionUrl.value = base_url + "/upload/image";
+  } else {
+    actionUrl.value = base_url + "/upload/file";
+  }
+  return true;
+};
+
+const handleExceed = (files: any) => {
+  upload.value!.clearFiles();
+  const file = files[0] as UploadRawFile;
+  file.uid = genFileId();
+  upload.value!.handleStart(file);
+  upload.value!.submit();
+};
+
+const removeFile = (uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+  formData.voucher = "";
+  return true;
+};
+
+const onPreview = (event: any) => {
+  if (event?.response?.data?.uri) openTransfer(event?.response?.data?.uri);
+  else ElMessage("文件错误");
+};
+
+// 查看凭证
+const openTransfer = (uri: any) => {
+  window.open(uri);
+};
+
+// 上传文件
+const handleFile = (e: any) => {
+  if (e.code == 0 && e.show == 1) {
+    formData.voucher = "";
+    upload.value!.clearFiles();
+    return ElMessage.error(e.msg || "上传失败");
+  }
+  formData.voucher = e.data.uri;
+};
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+  let obj = {
+    id: "",
+    company_name: "",
+    master_name: "",
+    master_phone: "",
+  };
+  for (const key in obj) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+  getDetail();
+};
+
+// 甲方公司信息
+const partyA = reactive({
+  company_name: "",
+  qualification: {
+    corporate_account: "",
+  },
+});
+const getDetail = async () => {
+  getPartyAbyCompanyId({
+    company_id: formData.id,
+  }).then((data) => {
+    partyA["company_name"] = data["company_name"];
+    if (typeof data.qualification == "string") {
+      data.qualification = JSON.parse(data.qualification);
+      partyA.qualification.corporate_account =
+        data.qualification.corporate_account;
+    } else {
+      partyA.qualification.corporate_account =
+        data.qualification.corporate_account;
+    }
+    if (!partyA.qualification.corporate_account) {
+      ElMessage.error("甲方公司没有对公账号,请补充账号后再试");
+    }
+  });
+};
+
+// 提交按钮
+const handleSubmit = async () => {
+  if (!partyA.company_name) return ElMessage.error("甲方公司不可为空");
+  if (!partyA.qualification.corporate_account)
+    return ElMessage.error("甲方公司对公账户不可为空");
+  if (!formData.id) return ElMessage.error("请先选择公司");
+  await formRef.value?.validate();
+  const data = { ...formData };
+  await depositRechargeTransferVoucher({
+    company_id: data.id,
+    deposit: data.deposit,
+    voucher: data.voucher,
+  });
+  ElMessage.success("录入成功");
+  popupRef.value?.close();
+  emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+  setFormData,
+});
+</script>
+  

src/views/finance/deposit.vue

@@ -0,0 +1,253 @@
+<template>
+  <div>
+    <el-card class="!border-none mb-4" shadow="never">
+      <el-form class="mb-[-16px] formdata" :model="queryParams" inline>
+        <el-form-item label="公司名称" prop="company_name">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.company_name"
+            clearable
+            placeholder="请输入公司名称"
+          />
+        </el-form-item>
+        <el-form-item label="区" prop="area" v-show="company_type_show">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.area"
+            clearable
+            placeholder="请输入区"
+          />
+        </el-form-item>
+        <el-form-item label="镇" prop="street" v-show="company_type_show">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.street"
+            clearable
+            placeholder="请输入镇"
+          />
+        </el-form-item>
+        <el-form-item
+          label="公司类型"
+          prop="company_type"
+          v-show="company_type_show"
+        >
+          <el-select
+            v-model="queryParams.company_type"
+            placeholder="请选择公司类型"
+            clearable
+            class="w-[280px]"
+          >
+            <el-option
+              v-for="(item, index) in datas.dictTypeLists"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="片区经理" prop="area_manager">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.area_manager"
+            clearable
+            placeholder="请输入片区经理"
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" @click="resetPage">查询</el-button>
+          <el-button @click="resetParams">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <el-table-column
+            label="ID"
+            prop="id"
+            show-overflow-tooltip
+            width="80"
+          />
+          <el-table-column
+            label="公司名称"
+            prop="company_name"
+            width="300"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="公司类型"
+            prop="company_type"
+            show-overflow-tooltip
+          />
+          <el-table-column label="押金" prop="deposit" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span class="text-success">{{ row.deposit }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="区县" prop="area" show-overflow-tooltip />
+          <el-table-column label="乡镇" prop="street" show-overflow-tooltip />
+          <el-table-column
+            label="主联系人"
+            prop="master_name"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="联系方式"
+            prop="master_phone"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="片区经理"
+            prop="area_manager"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <div style="display: flex">
+                <el-button type="primary" link @click="handleEdit(row)">
+                  凭证录入
+                </el-button>
+                <el-button type="primary" link>
+                  <router-link
+                    :to="{
+                      path: getRoutePath('finance.depositList'),
+                      query: {
+                        company_id: row.id,
+                      },
+                    }"
+                    >凭证列表</router-link
+                  >
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+  </div>
+</template>
+  
+  <script lang="ts" setup name="financeCompanyLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import useUserStore from "@/stores/modules/user";
+import { apiCompanyLists } from "@/api/company";
+import { timeFormat } from "@/utils/util";
+import { dictDataLists } from "@/api/setting/dict";
+import { getRoutePath } from "@/router";
+import { dictContractTypeList } from "@/utils/dict.ts";
+import EditPopup from "./component/voucher.vue";
+
+const userStore = useUserStore();
+// console.log(userStore.userInfo.company_id);
+const route = useRoute();
+const company_type_show = ref(true);
+
+// 是否显示编辑框
+const showEdit = ref(false);
+const editRef = ref(null);
+// 编辑
+const handleEdit = async (data: any) => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("edit");
+  editRef.value?.setFormData(data);
+};
+
+// 创建合同与发送短信结束
+// 查询条件
+const queryParams = reactive({
+  company_name: "",
+  area: "",
+  street: "",
+  company_type: "",
+  area_manager: "",
+  // 是否签约
+  is_contract: "",
+});
+
+if (route.query.company_type) {
+  company_type_show.value = false;
+  queryParams["company_type"] = route.query.company_type?.toString() || "";
+}
+
+const datas = reactive({
+  dictTypeLists: [],
+});
+const getdictTypeLists = async () => {
+  const data = await dictDataLists({ type_id: 6 });
+  datas["dictTypeLists"] = data["lists"];
+};
+getdictTypeLists();
+// 选中数据
+const selectData = ref<any[]>([]);
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+  selectData.value = val.map(({ id }) => id);
+};
+
+// 获取字典数据
+const { dictData } = useDictData("");
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: apiCompanyLists,
+  params: queryParams,
+});
+
+getLists();
+</script>
+  <style lang="scss">
+.btn {
+  position: absolute;
+}
+h1 {
+  text-align: center;
+  font-weight: bold;
+  font-size: 30px;
+  color: red;
+  margin-bottom: 10px;
+}
+
+.content {
+  font-size: 20px;
+}
+
+.info {
+  color: red;
+  font-weight: bold;
+  font-size: 18px;
+  display: inline-block;
+  margin: 0 5px;
+}
+
+.btn_menu {
+  margin-top: 10vh;
+  display: flex;
+  justify-content: space-around;
+}
+.formdata {
+  .el-form-item {
+    width: 20%;
+  }
+}
+</style>
+  

src/views/finance/depositList.vue

@@ -0,0 +1,215 @@
+<template>
+  <div>
+    <!-- <el-card class="!border-none mb-4" shadow="never">
+      <el-form class="mb-[-16px] formdata" :model="queryParams" inline>
+        <el-form-item>
+          <el-button type="primary" @click="resetPage">查询</el-button>
+          <el-button @click="resetParams">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card> -->
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <el-button type="primary" @click="handleEdit(company_info)"
+        >添加凭证</el-button
+      >
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <el-table-column
+            label="ID"
+            prop="id"
+            show-overflow-tooltip
+            width="80"
+          />
+          <el-table-column
+            label="公司名称"
+            prop="company_name"
+            width="300"
+            show-overflow-tooltip
+          >
+            <span>{{ company_info.company_name }}</span>
+          </el-table-column>
+          <el-table-column
+            label="充值金额"
+            prop="deposit"
+            width="180"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="凭证地址"
+            prop="voucher"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="创建时间"
+            prop="create_time"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="更新时间"
+            prop="update_time"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="100"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <div style="display: flex">
+                <el-button
+                  type="primary"
+                  link
+                  @click="openTransfer(row.voucher)"
+                >
+                  查看凭证
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+  </div>
+</template>
+  
+<script lang="ts" setup name="financeCompanyLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import useUserStore from "@/stores/modules/user";
+import {
+  apiCompanyLists,
+  apiCompanyDetail,
+  getDepositRechargeTransferVoucherList,
+} from "@/api/company";
+import { timeFormat } from "@/utils/util";
+import { dictDataLists } from "@/api/setting/dict";
+import { getRoutePath } from "@/router";
+import { dictContractTypeList } from "@/utils/dict.ts";
+import EditPopup from "./component/voucher.vue";
+
+const userStore = useUserStore();
+// console.log(userStore.userInfo.company_id);
+const route = useRoute();
+
+// 是否显示添加框
+const showEdit = ref(false);
+const editRef = ref(null);
+// 添加
+const handleEdit = async (data: any) => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("edit");
+  editRef.value?.setFormData(data);
+};
+
+const company_info = reactive({
+  id: "",
+  company_name: "",
+  master_name: "",
+  master_phone: "",
+});
+
+const getCompanyInfo = () => {
+  apiCompanyDetail({ id: queryParams.company_id }).then((data) => {
+    for (const key in company_info) {
+      if (data[key] != null && data[key] != undefined) {
+        //@ts-ignore
+        company_info[key] = data[key];
+      }
+    }
+  });
+};
+
+// 查看凭证
+const openTransfer = (uri: any) => {
+  window.open(uri);
+};
+
+// 创建合同与发送短信结束
+// 查询条件
+const queryParams = reactive({
+  company_id: "",
+});
+
+if (route.query.company_id) {
+  queryParams["company_id"] = route.query.company_id;
+  getCompanyInfo();
+}
+
+const datas = reactive({
+  dictTypeLists: [],
+});
+const getdictTypeLists = async () => {
+  const data = await dictDataLists({ type_id: 6 });
+  datas["dictTypeLists"] = data["lists"];
+};
+getdictTypeLists();
+// 选中数据
+const selectData = ref<any[]>([]);
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+  selectData.value = val.map(({ id }) => id);
+};
+
+// 获取字典数据
+const { dictData } = useDictData("");
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: getDepositRechargeTransferVoucherList,
+  params: queryParams,
+});
+
+getLists();
+</script>
+  <style lang="scss">
+.btn {
+  position: absolute;
+}
+h1 {
+  text-align: center;
+  font-weight: bold;
+  font-size: 30px;
+  color: red;
+  margin-bottom: 10px;
+}
+
+.content {
+  font-size: 20px;
+}
+
+.info {
+  color: red;
+  font-weight: bold;
+  font-size: 18px;
+  display: inline-block;
+  margin: 0 5px;
+}
+
+.btn_menu {
+  margin-top: 10vh;
+  display: flex;
+  justify-content: space-around;
+}
+.formdata {
+  .el-form-item {
+    width: 20%;
+  }
+}
+</style>
+  

src/views/task_template/edit_admin.vue

@@ -31,7 +31,6 @@
             />
           </el-select>
         </el-form-item>
-
         <el-form-item label="任务类型" prop="type">
           <el-select
             v-model="formData.type"
@@ -77,6 +76,15 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item v-if="showTarget" label="目标数">
+          <el-input
+            v-model="formData.extend.target"
+            clearable
+            placeholder="请输入目标数"
+            type="number"
+          >
+          </el-input>
+        </el-form-item>
         <el-form-item label="一阶段天数">
           <el-input
             v-model="formData.stage_day_one"
@@ -98,7 +106,7 @@
           </el-input>
         </el-form-item>
         <el-form-item
-          v-if="formData.type_value != 'town_task_type_5'"
+          v-if="showTow && formData.type_value != 'town_task_type_5'"
           label="二阶段天数"
         >
           <el-input
@@ -111,7 +119,7 @@
           </el-input>
         </el-form-item>
         <el-form-item
-          v-if="formData.type_value != 'town_task_type_5'"
+          v-if="showTow && formData.type_value != 'town_task_type_5'"
           label="二阶段金额"
         >
           <el-input
@@ -123,7 +131,10 @@
             <template #append>元</template>
           </el-input>
         </el-form-item>
-        <el-form-item v-if="noThreefilter(+formData.type)" label="三阶段天数">
+        <el-form-item
+          v-if="showThree && noThreefilter(formData.type_value)"
+          label="三阶段天数"
+        >
           <el-input
             v-model="formData.stage_day_three"
             clearable
@@ -133,7 +144,10 @@
             <template #append>天</template>
           </el-input>
         </el-form-item>
-        <el-form-item v-if="noThreefilter(+formData.type)" label="三阶段金额">
+        <el-form-item
+          v-if="showThree && noThreefilter(formData.type_value)"
+          label="三阶段金额"
+        >
           <el-input
             v-model="formData.new_money_three"
             clearable
@@ -223,9 +237,13 @@ const popupTitle = computed(() => {
 });
 
 // 没有三阶段的任务类型ID, 使用以下方法过滤
-const noThreeList = reactive([45, 48, 49]);
+const noThreeList = reactive([
-const noThreefilter = (id: number) => {
+  "town_task_type_2",
-  if (noThreeList.includes(id)) return false;
+  "town_task_type_5",
+  "town_task_type_6",
+]);
+const noThreefilter = (type: string) => {
+  if (noThreeList.includes(type)) return false;
   else return true;
 };
 
@@ -254,6 +272,7 @@ const formData = reactive({
   recharge: "",
   extend: {
     task_role: "", // 任务角色
+    target: "", //目标数量
   },
 });
 if (route.query.id) {
@@ -264,6 +283,50 @@ if (route.query.id) {
 //   datalist.value = res.lists;
 // });
 
+// 显示目标数的任务类型
+const showTargetTypeList = [
+  "town_task_type_marketing_director_9",
+  "town_task_type_marketing_director_8",
+  "town_task_type_marketing_director_6",
+  "town_task_type_marketing_director_5",
+  "town_task_type_marketing_director_4",
+];
+const showTarget = computed(() => {
+  let flag = false;
+  if (showTargetTypeList.includes(formData.type_value)) flag = true;
+  return flag;
+});
+
+// 不显示第二阶段的任务类型
+const noShowTowTypeList = [
+  "town_task_type_marketing_director_9",
+  "town_task_type_marketing_director_8",
+  "town_task_type_marketing_director_6",
+  "town_task_type_marketing_director_2",
+  "town_task_type_marketing_director_1",
+];
+const showTow = computed(() => {
+  let flag = true;
+  if (noShowTowTypeList.includes(formData.type_value)) flag = false;
+  return flag;
+});
+
+// 不显示第三阶段的任务类型
+const noShowThreeTypeList = [
+  "town_task_type_marketing_director_9",
+  "town_task_type_marketing_director_8",
+  "town_task_type_marketing_director_7",
+  "town_task_type_marketing_director_6",
+  "town_task_type_marketing_director_3",
+  "town_task_type_marketing_director_2",
+  "town_task_type_marketing_director_1",
+];
+const showThree = computed(() => {
+  let flag = true;
+  if (noShowThreeTypeList.includes(formData.type_value)) flag = false;
+  return flag;
+});
+
 // 表单验证
 const formRules = reactive<any>({
   title: [
@@ -336,8 +399,10 @@ const setFormData = async (data: Record<any, any>) => {
       formData[key] = data[key];
     }
   }
-  if (formData.extend?.task_role)
+  if (formData.extend?.task_role) {
     formData.extend.task_role = +formData.extend.task_role;
+    changeTaskRole(formData.extend.task_role);
+  }
 };
 
 const getDetail = async (row: Record<string, any>) => {
@@ -357,6 +422,7 @@ const changeTaskType = async (e: any) => {
     if (item.id == e) {
       formData.title = item.name;
       formData.type_value = item.value;
+      // console.log(item.id, formData.type_value);
     }
   });
 };
@@ -377,6 +443,11 @@ const changeTaskRole = async (e: any) => {
   }
   apiTaskTypeList({ type_value: taskType.value }).then((res) => {
     datalist.value = res.lists;
+    datalist.value.forEach((item: any) => {
+      if (item.id == formData.type) {
+        formData.type_value = item.value;
+      }
+    });
   });
 };
 
@@ -412,11 +483,11 @@ const handleSubmit = async () => {
 const open = (type = "add") => {
   mode.value = type;
   popupRef.value?.open();
-  if (type == "edit") {
+  // if (type == "edit") {
-    apiTaskTypeList({ type_value: taskType.value }).then((res) => {
+  //   apiTaskTypeList({ type_value: taskType.value }).then((res) => {
-      datalist.value = res.lists;
+  //     datalist.value = res.lists;
-    });
+  //   });
-  }
+  // }
 };
 
 // 关闭回调

src/views/task_template/edit_village.vue

@@ -0,0 +1,479 @@
+<template>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="550px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <el-form
+        ref="formRef"
+        :model="formData"
+        label-width="120px"
+        :rules="formRules"
+      >
+        <!-- <el-form-item label="任务角色" prop="extend.task_role">
+          <el-select
+            v-model="formData.extend.task_role"
+            clearable
+            :disabled="mode != 'add'"
+            placeholder="请选择任务角色"
+            @change="changeTaskRole"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in taskRoleRow"
+              :key="item.key"
+              :value="item.key"
+              :label="item.value"
+            />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item label="任务类型" prop="type">
+          <el-select
+            v-model="formData.type"
+            clearable
+            :disabled="mode != 'add'"
+            placeholder="请选择任务类型"
+            @change="changeTaskType"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in datalist"
+              :key="item.label"
+              :value="item.id"
+              :label="item.name"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="阶段类型" prop="types">
+          <div style="width: 100%">
+            <el-select
+              v-model="formData.types"
+              clearable
+              :disabled="mode != 'add'"
+              placeholder="请选择阶段类型"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in [
+                  { label: 1, name: '循环' },
+                  { label: 2, name: '长期' },
+                  { label: 3, name: '单次' },
+                ]"
+                :key="item.label"
+                :value="item.label"
+                :label="item.name"
+              />
+            </el-select>
+            <div
+              v-if="formData.types == 3"
+              style="color: #e6a23c; font-size: 12px"
+            >
+              提示 : 单次任务不会每日结算,而是按阶段合计天数结算
+            </div>
+          </div>
+        </el-form-item>
+        <!-- <el-form-item v-if="showTarget" label="目标数">
+          <el-input
+            v-model="formData.extend.target"
+            clearable
+            placeholder="请输入目标数"
+            type="number"
+          >
+          </el-input>
+        </el-form-item> -->
+        <el-form-item label="一阶段天数">
+          <el-input
+            v-model="formData.stage_day_one"
+            clearable
+            placeholder="请输入天数"
+            type="number"
+          >
+            <template #append>天</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="一阶段金额">
+          <el-input
+            v-model="formData.money"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="showTow && formData.type_value != 'town_task_type_5'"
+          label="二阶段天数"
+        >
+          <el-input
+            v-model="formData.stage_day_two"
+            clearable
+            placeholder="请输入天数"
+            type="number"
+          >
+            <template #append>天</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          v-if="showTow && formData.type_value != 'town_task_type_5'"
+          label="二阶段金额"
+        >
+          <el-input
+            v-model="formData.money_two"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item v-if="showThree" label="三阶段天数">
+          <el-input
+            v-model="formData.stage_day_three"
+            clearable
+            placeholder="请输入天数"
+            type="number"
+          >
+            <template #append>天</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item v-if="showThree" label="三阶段金额">
+          <el-input
+            v-model="formData.new_money_three"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="长期金额" v-if="+formData.types == 2">
+          <el-input
+            v-model="formData.money_three"
+            clearable
+            placeholder="请输入金额"
+            type="number"
+          >
+            <template #append>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">显示</el-radio>
+            <el-radio :label="0">隐藏</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="任务描述" prop="content">
+          <el-input
+            v-model="formData.content"
+            clearable
+            placeholder="请输入任务描述"
+            type="textarea"
+            autosize
+          />
+        </el-form-item>
+      </el-form>
+      <el-dialog
+        v-model="personnelShow"
+        ref="personnelRef"
+        title="选择负责人"
+        width="60%"
+      >
+        <personnelPopup
+          @custom-event="changePersonner"
+          :company_id="formData.company_id"
+        ></personnelPopup>
+      </el-dialog>
+    </popup>
+  </div>
+</template>
+  
+  <script lang="ts" setup name="taskTemplateEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import {
+  apiTaskTemplateAdd,
+  apiTaskTemplateEdit,
+  apiTaskTemplateDetail,
+  apiTaskTypeList,
+} from "@/api/task_template";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+import { dictDataLists } from "@/api/setting/dict";
+import taskMap from "./map.vue";
+import personnelPopup from "./dialog_index_personnel.vue";
+defineProps({
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({}),
+  },
+});
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+const datalist = ref([]);
+const route = useRoute();
+const taskType = ref("village_task_type");
+const taskRoleRow = ref([
+  { key: 1, value: "负责人" },
+  { key: 2, value: "市场部长" },
+  { key: 3, value: "服务部长" },
+]);
+
+// 弹窗标题
+const popupTitle = computed(() => {
+  return mode.value == "edit" ? "编辑任务安排" : "新增任务安排";
+});
+
+// 表单数据
+const formData = reactive({
+  id: "",
+  // task_role: 1,
+  task_scheduling: 0,
+  company_id: "",
+  title: "",
+  admin_id: "",
+  type: "", // 任务类型
+  type_value: "",
+  status: "",
+  content: "",
+  stage_day_one: 0,
+  money: 0, // 一阶段金额
+  stage_day_two: 0,
+  money_two: 0, // 二阶段金额
+  stage_day_three: 0,
+  new_money_three: 0, // 三阶段金额
+  money_three: 0, // 长期金额
+  types: "", //阶段类型
+  task_admin: "", //任务负责人
+  task_admin_name: "", //任务负责人
+  recharge: "",
+  extend: {
+    task_role: "", // 任务角色
+    target: "", //目标数量
+  },
+});
+if (route.query.id) {
+  formData.task_scheduling = route.query.id;
+}
+//任务类型接口
+apiTaskTypeList({ type_value: taskType.value }).then((res) => {
+  datalist.value = res.lists;
+});
+
+// // 显示目标数的任务类型
+// const showTargetTypeList = [
+//   "town_task_type_marketing_director_9",
+//   "town_task_type_marketing_director_8",
+//   "town_task_type_marketing_director_6",
+//   "town_task_type_marketing_director_5",
+//   "town_task_type_marketing_director_4",
+// ];
+// const showTarget = computed(() => {
+//   let flag = false;
+//   if (showTargetTypeList.includes(formData.type_value)) flag = true;
+//   return flag;
+// });
+
+// 不显示第二阶段的任务类型
+const noShowTowTypeList = ["village_task_type_2"];
+const showTow = computed(() => {
+  let flag = true;
+  if (noShowTowTypeList.includes(formData.type_value)) flag = false;
+  return flag;
+});
+
+// 不显示第三阶段的任务类型
+const noShowThreeTypeList = [
+  "village_task_type_1",
+  "village_task_type_2",
+  "village_task_type_3",
+  "village_task_type_4",
+  "village_task_type_5",
+  "village_task_type_6",
+];
+const showThree = computed(() => {
+  let flag = true;
+  if (noShowThreeTypeList.includes(formData.type_value)) flag = false;
+  return flag;
+});
+
+// 表单验证
+const formRules = reactive<any>({
+  title: [
+    {
+      required: true,
+      message: "请输入任务名称",
+      trigger: ["blur"],
+    },
+  ],
+  "extend.task_role": [
+    {
+      required: true,
+      message: "请选择任务角色",
+      trigger: ["blur"],
+    },
+  ],
+  admin_id: [
+    {
+      required: true,
+      message: "请输入创建人",
+      trigger: ["blur"],
+    },
+  ],
+  type: [
+    {
+      required: true,
+      message: "请选择任务类型",
+      trigger: ["blur"],
+    },
+  ],
+  status: [
+    {
+      required: true,
+      message: "请选择状态",
+      trigger: ["blur"],
+    },
+  ],
+  types: [
+    {
+      required: true,
+      message: "请选择阶段类型",
+      trigger: ["blur"],
+    },
+  ],
+  task_admin: [
+    {
+      required: true,
+      message: "请选择负责人",
+      trigger: ["blur"],
+    },
+  ],
+  recharge: [
+    {
+      required: true,
+      // message: "请输入充值金额",
+      validator: (rule: any, value: any, callback: any) => {
+        if (value <= 0) callback(new Error("充值金额不能小于0"));
+        else callback();
+      },
+      trigger: ["blur"],
+    },
+  ],
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+  // if (formData.extend?.task_role) {
+  //   formData.extend.task_role = +formData.extend.task_role;
+  //   changeTaskRole(formData.extend.task_role);
+  // }
+};
+
+const getDetail = async (row: Record<string, any>) => {
+  const data = await apiTaskTemplateDetail({
+    id: row.id,
+  });
+  setFormData(data);
+};
+
+// 地图控件
+const mapShow = ref(false);
+const mapRef = shallowRef<InstanceType<typeof taskMap>>();
+
+// 选择任务类型
+const changeTaskType = async (e: any) => {
+  datalist.value.forEach((item: any) => {
+    if (item.id == e) {
+      formData.title = item.name;
+      formData.type_value = item.value;
+    }
+  });
+};
+
+// 选择任务角色
+const changeTaskRole = async (e: any) => {
+  // 负责人
+  if (e == 1) {
+    taskType.value = "town_task_type_master";
+  }
+  // 市场部长
+  if (e == 2) {
+    taskType.value = "town_task_type_marketing_director";
+  }
+  // 服务部长
+  if (e == 3) {
+    taskType.value = "town_task_type";
+  }
+  apiTaskTypeList({ type_value: taskType.value }).then((res) => {
+    datalist.value = res.lists;
+    datalist.value.forEach((item: any) => {
+      if (item.id == formData.type) {
+        formData.type_value = item.value;
+      }
+    });
+  });
+};
+
+const setMap = (e: any) => {
+  formData.extend[mapType.value] = e[0];
+};
+
+// 选择负责人
+const personnelShow = ref(false);
+const personnelRef = shallowRef<InstanceType<typeof personnelPopup>>();
+const changePersonner = (e: any) => {
+  formData.task_admin = e.id;
+  formData.task_admin_name = e.nickname;
+  personnelShow.value = false;
+};
+
+const clickTaskAdmin = async () => {
+  personnelShow.value = true;
+};
+
+// 提交按钮
+const handleSubmit = async () => {
+  await formRef.value?.validate();
+  const data = { ...formData };
+  mode.value == "edit"
+    ? await apiTaskTemplateEdit(data)
+    : await apiTaskTemplateAdd(data);
+  popupRef.value?.close();
+  emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+  // if (type == "edit") {
+  //   apiTaskTypeList({ type_value: taskType.value }).then((res) => {
+  //     datalist.value = res.lists;
+  //   });
+  // }
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+  setFormData,
+  getDetail,
+});
+</script>
+  

src/views/task_template/index.vue

@@ -149,14 +149,21 @@
         <pagination v-model="pager" @change="getLists" />
       </div>
     </el-card>
-    <edit-popup
+    <edit-admin-popup
-      v-if="showEdit && taskTypeId != 15"
+      v-if="showEdit && companyType == 41"
       ref="editRef"
       :dict-data="dictData"
       @success="getLists"
       @close="showEdit = false"
     />
-    <edit-admin-popup
+    <edit-village-popup
+      v-else-if="showEdit && companyType == 17"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+    <edit-popup
       v-else-if="showEdit"
       ref="editRef"
       :dict-data="dictData"
@@ -177,6 +184,7 @@ import { timeFormat } from "@/utils/util";
 import feedback from "@/utils/feedback";
 import EditPopup from "./edit.vue";
 import EditAdminPopup from "./edit_admin.vue";
+import EditVillagePopup from "./edit_village.vue";
 import { dictDataLists } from "@/api/setting/dict";
 const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 const datalist = ref([]);
@@ -196,10 +204,10 @@ const queryParams = reactive({
   status: "",
   content: "",
 });
-const taskTypeId = ref(10);
+const companyType = ref(10);
 if (route.query?.id) queryParams.id = route.query.id;
 if (route.query?.company_id) queryParams.company_id = route.query.company_id;
-if (route.query?.company_type == 41) taskTypeId.value = 15;
+if (route.query?.company_type) companyType.value = route.query.company_type;
 const statusdata = reactive([
   { id: 1, name: "显示" },
   { id: 2, name: "隐藏" },

src/views/user_menu/index.vue

@@ -59,6 +59,8 @@
       <div class="mt-4">
         <el-table
           :data="pager.lists"
+          default-expand-all
+          :expand-all="true"
           @selection-change="handleSelectionChange"
           row-key="id"
           :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"