This commit is contained in:
lxz 2023-12-29 18:49:40 +08:00
parent a46a49e750
commit c28169ade9
13 changed files with 1164 additions and 785 deletions

View File

@ -1,6 +1,6 @@
NODE_ENV = 'development'
VITE_APP_BASE_URL = 'http://192.168.1.29:8000'
VITE_APP_BASE_URL = ''
#
# VITE_APP_BASE_URL = 'https://ceshi-worker-task.lihaink.cn'

BIN
dist.zip Normal file

Binary file not shown.

15
src/api/newTask.ts Normal file
View File

@ -0,0 +1,15 @@
import request from '@/utils/request'
//添加任务
export function addTask(params: any) {
return request.post({ url: '/task/addTask', params })
}
//任务列表
export function taskList(params: any) {
return request.get({ url: '/task/taskList', params })
}
//任务列表
export function editTask(params: any) {
return request.post({ url: '/task/editTask', params })
}

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 村或社区人员建档目标数列表
export function apiUserInformationThresholdLists(params: any) {
return request.get({ url: '/user_information_threshold/lists', params })
}
// 添加村或社区人员建档目标数
export function apiUserInformationThresholdAdd(params: any) {
return request.post({ url: '/user_information_threshold/add', params })
}
// 编辑村或社区人员建档目标数
export function apiUserInformationThresholdEdit(params: any) {
return request.post({ url: '/user_information_threshold/edit', params })
}
// 删除村或社区人员建档目标数
export function apiUserInformationThresholdDelete(params: any) {
return request.post({ url: '/user_information_threshold/delete', params })
}
// 村或社区人员建档目标数详情
export function apiUserInformationThresholdDetail(params: any) {
return request.get({ url: '/user_information_threshold/detail', params })
}

View File

@ -1,22 +1,15 @@
<template>
<div>
<div>
<el-card class="!border-none" shadow="never">
<el-page-header content="用户详情" @back="$router.back()" />
<el-page-header content="新增用户" @back="$router.back()" />
</el-card>
<el-card class="mt-4 !border-none" shadow="never">
<el-form ref="formRef" :model="formData" label-width="84px">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="84px">
<div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
<div class="headimg">
<el-upload
v-model="formData.avatar"
class="avatar-uploader-head"
:disabled="flag"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/upload/image'"
:show-file-list="false"
:on-success="handleAvatarSuccessAvatar"
>
<el-upload v-model="formData.avatar" class="avatar-uploader-head" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/upload/image'" :show-file-list="false"
:on-success="handleAvatarSuccessAvatar">
<img v-if="formData.avatar" :src="formData.avatar" class="avatar" />
<el-icon v-else class="avatar-uploader-icon">
<Plus />
@ -25,191 +18,222 @@
</div>
<el-col class="pt-6 !border-none">
<el-row>
<el-col :span="11">
<el-form-item label="姓名" prop="nickname">
<!-- <el-col :span="11">
<el-form-item label="公司" prop="company_name">
<el-input
v-model="formData.nickname"
:disabled="flag"
placeholder="请输入姓名"
v-model="formData.company_name"
placeholder="请选择公司"
readonly
clearable
:style="{ width: '100%' }"
@click="showCompany = true"
></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="13">
<el-form-item label="角色" prop="group_id">
<el-select
v-model="formData.group_id"
placeholder="请选择角色"
readonly
:style="{ width: '100%' }"
@change="formRef?.clearValidate(['group_id'])"
>
<el-option
v-for="(item, index) in roleList"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col> -->
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="姓名" prop="nickname">
<el-input v-model="formData.nickname" placeholder="请输入姓名" clearable :style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="性别" prop="sex">
<el-form-item label="角色" prop="group_id">
<el-select v-model="formData.group_id" placeholder="请选择角色" readonly :style="{ width: '100%' }"
@change="formRef?.clearValidate(['group_id'])">
<el-option v-for="(item, index) in roleList" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<!-- <el-form-item label="性别" >
<el-select
v-model="formData.sex"
:disabled="flag"
placeholder="请选择性别"
:style="{ width: '100%' }"
@change="formRef?.clearValidate(['sex'])"
>
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
</el-select>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="联系电话" prop="account">
<el-input v-model="formData.account" placeholder="请输入联系电话" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="身份证号">
<el-input v-model="formData.id_card" placeholder="请输入身份证号" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="押金" >
<el-input v-model="formData.deposit" placeholder="请输入押金" clearable type="number"
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="13">
<!-- <el-form-item label="角色" prop="group_id">
<el-select
v-model="formData.group_id"
placeholder="请选择角色"
readonly
:style="{ width: '100%' }"
@change="formRef?.clearValidate(['group_id'])"
>
<el-option
v-for="(item, index) in roleList"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> -->
<el-form-item label="押金缴纳时间" label-width="120px">
<!-- <el-input v-model="formData.deposit_date" placeholder="请输入押金" clearable type="number"
:style="{ width: '100%' }"></el-input> -->
<el-date-picker format="YYYY/MM/DD" value-format="YYYY-MM-DD" v-model="formData.deposit_date" style="width: 150%" placeholder="请选择押金缴纳时间" clearable></el-date-picker>
</el-form-item>
<!-- <el-form-item label="性别">
<el-select v-model="formData.sex" placeholder="请选择性别" :style="{ width: '100%' }"
@change="formRef?.clearValidate(['sex'])">
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
</el-select>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="管理户数" prop="user_information_count" label-width="200px">
<el-input v-model="formData.user_information_count" placeholder="管理户数" clearable type="number"
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别">
<el-select v-model="formData.sex" placeholder="请选择性别" :style="{ width: '100%' }"
@change="formRef?.clearValidate(['sex'])">
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="身份证号" prop="id_card">
<el-input
v-model="formData.id_card"
:disabled="flag"
placeholder="请输入身份证号"
clearable
<!-- <el-col :span="13">
<el-form-item label="角色" prop="group_id">
<el-select
v-model="formData.group_id"
placeholder="请选择角色"
readonly
:style="{ width: '100%' }"
></el-input>
@change="formRef?.clearValidate(['group_id'])"
>
<el-option
v-for="(item, index) in roleList"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="联系电话" prop="account">
<el-input
v-model="formData.account"
placeholder="请输入联系电话"
:disabled="flag"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-form-item label="省" prop="province" style="flex: 1">
<el-select
v-model="formData.province"
placeholder="请选择省"
:disabled="flag"
clearable
@change="province_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.provinceOptions"
:key="index"
:label="item.province_name"
:value="item.province_code"
></el-option>
<el-form-item label="省" prop="province" label-width="200px">
<el-select v-model="formData.province" placeholder="请选择省" clearable @change="province_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.provinceOptions" :key="index" :label="item.province_name"
:value="item.province_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="市" prop="city" style="flex: 1">
<el-select
v-model="formData.city"
placeholder="请选择市"
clearable
:disabled="flag"
@change="city_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.cityOptions"
:key="index"
:label="item.city_name"
:value="item.city_code"
></el-option>
<el-form-item label="市" prop="city">
<el-select v-model="formData.city" placeholder="请选择市" clearable @change="city_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
:value="item.city_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="区" prop="area" style="flex: 1">
<el-select
v-model="formData.area"
placeholder="请选择区"
:disabled="flag"
clearable
@change="area_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.areaOptions"
:key="index"
:label="item.area_name"
:value="item.area_code"
></el-option>
<el-form-item label="区县" prop="area">
<el-select v-model="formData.area" placeholder="请选择区县" clearable @change="area_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.area_name"
:value="item.area_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="镇" prop="street" style="flex: 1">
<el-select
v-model="formData.street"
placeholder="请选择镇"
:disabled="flag"
clearable
@change="street_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.streetOptions"
:key="index"
:label="item.street_name"
:value="item.street_code"
></el-option>
<el-form-item label="乡镇" prop="street">
<el-select v-model="formData.street" placeholder="请选择乡镇" clearable @change="street_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.streetOptions" :key="index" :label="item.street_name"
:value="item.street_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="村社小队" prop="address" style="flex: 1.5">
<el-input
v-model="formData.address"
:disabled="flag"
placeholder="请输入村社小队"
clearable
:style="{ width: '100%' }"
></el-input>
<el-form-item label="村社" prop="village">
<el-select v-model="formData.village" placeholder="请选择村社" clearable @change="village_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.villageOptions" :key="index" :label="item.village_name"
:value="item.village_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="小队" prop="brigade" label-width="200px">
<el-select v-model="formData.brigade" placeholder="请选择小队" clearable
:style="{ width: '100%' }" @change="brigadeChange">
<el-option v-for="(item, index) in datas.brigadeOptions" :key="index" :label="item.brigade_name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-row>
</el-col>
<el-col :span="24" style="margin-top: 1vh">
<!-- <el-row>
<el-col :span="12" v-if="mode == 'initiate' || formData.party_b">
<el-form-item label="签约方" prop="field130">
<el-input
v-model="formData.party_b_name"
placeholder="请选择签约方"
clearable
:style="{ width: '100%' }"
@click="isCompany = true"
@clear="clearPartyA"
></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-col>
<div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
<div style="display: flex; justify-content: space-between">
<div>
<el-form-item label="身份证" prop="id_card">
<el-upload
v-model="formData.qualification.id_card"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/upload/image'"
:show-file-list="false"
:on-success="handleAvatarSuccessIdA"
>
<img
v-if="formData.qualification.id_card"
:src="formData.qualification.id_card"
class="avatar"
/>
<el-form-item label="身份证">
<el-upload v-model="formData.qualification.id_card" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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
v-model="formData.qualification.id_card_b"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-upload v-model="formData.qualification.id_card_b" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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>
@ -217,43 +241,21 @@
</el-form-item>
</div>
<div>
<el-form-item label="银行卡" prop="bank_account">
<el-upload
v-model="formData.qualification.bank_account"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-form-item label="银行卡">
<el-upload v-model="formData.qualification.bank_account" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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
v-model="formData.qualification.bank_account_b"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-upload v-model="formData.qualification.bank_account_b" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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>
@ -263,41 +265,18 @@
<div>
<el-form-item label="行驶证" prop="car_card">
<el-upload
v-model="formData.qualification.car_card"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/upload/image'"
:show-file-list="false"
:on-success="handleAvatarSuccessCarA"
>
<img
v-if="formData.qualification.car_card"
:src="formData.qualification.car_card"
class="avatar"
/>
<el-upload v-model="formData.qualification.car_card" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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
v-model="formData.qualification.car_card_b"
:disabled="flag"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-upload v-model="formData.qualification.car_card_b" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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>
@ -305,145 +284,10 @@
</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.nickname"
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-row>
</el-col>
</template>
<el-col :span="24" v-if="mode == 'uplode'">
<el-form-item label="合同上传" prop="field127">
<el-upload
:headers="{ Token: userStore.token }"
v-model:file-list="fileList"
class="upload-demo"
:action="base_url + '/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="formData.contract">
<el-form-item label="合同地址">
<el-link
type="success"
:href="formData.contract.file"
target="_blank"
>在线查看</el-link
>
</el-form-item>
</el-col> -->
<el-col :span="24" v-if="mode == 'initiate'" class="pt-6">
<el-row>
<el-col :span="8">
<el-form-item label="合同类型" prop="contract_type">
<el-col :span="24">
<el-select
v-model="formData.contract_type"
placeholder="请选择合同类型"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.contract_type"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-col>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="field139">
<el-button
type="primary"
v-if="mode == 'initiate'"
@click="initiateContactFn"
>发起合同</el-button
>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
</el-card>
<account-adjust
v-model:show="adjustState.show"
:value="adjustState.value"
@confirm="handleConfirmAdjust"
/>
<!-- <el-dialog v-model="isCompany" title="选择签约方" width="60%">
<DialogIndex @customEvent="customEvent" />
<!-- <el-dialog v-model="showCompany">
<DialogIndex :companyTypeList="datas.dictTypeLists" :type="41" @customEvent="customEvent"></DialogIndex>
</el-dialog> -->
</div>
</template>
@ -467,7 +311,10 @@ import {
apiCityList,
apiAreaList,
apiStreetList,
apiVillageList,
apiProvinceList,
apiBrigadeList
} from "@/api/common";
import { dictDataLists } from "@/api/setting/dict";
import DialogIndex from "@/components/dialog_index.vue";
@ -487,16 +334,26 @@ const formData = reactive({
sex: "",
id_card: "",
nickname: "",
group_id: "",
company_id: 0,
user_information_count: "",
company_name: "",
deposit_date: "",
deposit: "",
province: "",
city: "",
area: "",
street: "",
village: "",
brigade: "",
province_name: "",
city_name: "",
area_name: "",
street_name: "",
village_name: "",
brigade_name: "",
address: "",
account: "",
is_contract: 0,
//
party_b_name: "",
party_b: "",
qualification: {
id_card: "",
id_card_b: "",
@ -505,14 +362,8 @@ const formData = reactive({
bank_account: "",
bank_account_b: "",
},
//
contract_type: "",
file: "",
avatar: "",
multipoint_login: 1,
contract: {
url: "",
},
});
const disabledPartyA = ref(false);
@ -526,8 +377,10 @@ const datas: any = reactive({
cityOptions: [],
areaOptions: [],
streetOptions: [],
villageOptions:[],
dictTypeLists: [],
contract_type: [],
brigadeOptions:[],
contract: [],
});
@ -562,6 +415,7 @@ const getDetails = async () => {
formData[key] = data[key];
});
mode.value = route.query.mode;
formData.brigade=Number(formData.brigade)
formData.contract_type = data.contract?.contract_type;
formData.party_b_name = data.contract?.party_b_name;
@ -576,6 +430,10 @@ const getDetails = async () => {
await getCityList();
await getAreaList();
await getStreetList();
await getVillageList()
await getBrigadeList()
};
const handleEdit = async (value: string, field: string) => {
@ -692,6 +550,11 @@ function area_change(value: string) {
function street_change(value: string) {
formData.street = value;
}
function brigadeChange(value: string) {
// getVillageList()
formData.brigade = value;
console.log(value)
}
const getProvinceList = async () => {
const data = await apiProvinceList({});
datas["provinceOptions"] = data;
@ -708,6 +571,18 @@ const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area });
datas["streetOptions"] = data;
};
const getVillageList = async () => {
const data = await apiVillageList({ village: formData.street });
datas["villageOptions"] = data;
// datas["streetOptions"] = data;
};
const getBrigadeList = async () => {
const data = await apiBrigadeList({ brigade: formData.village });
datas["brigadeOptions"] = data;
// datas["streetOptions"] = data;
};
const handleAdjust = (value: string) => {
adjustState.show = true;
adjustState.value = value;

View File

@ -4,23 +4,12 @@
<el-page-header content="新增用户" @back="$router.back()" />
</el-card>
<el-card class="mt-4 !border-none" shadow="never">
<el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="84px"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="84px">
<div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
<div class="headimg">
<el-upload
v-model="formData.avatar"
class="avatar-uploader-head"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/upload/image'"
:show-file-list="false"
:on-success="handleAvatarSuccessAvatar"
>
<el-upload v-model="formData.avatar" class="avatar-uploader-head" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/upload/image'" :show-file-list="false"
:on-success="handleAvatarSuccessAvatar">
<img v-if="formData.avatar" :src="formData.avatar" class="avatar" />
<el-icon v-else class="avatar-uploader-icon">
<Plus />
@ -29,7 +18,7 @@
</div>
<el-col class="pt-6 !border-none">
<el-row>
<el-col :span="11">
<!-- <el-col :span="11">
<el-form-item label="公司" prop="company_name">
<el-input
v-model="formData.company_name"
@ -40,8 +29,8 @@
@click="showCompany = true"
></el-input>
</el-form-item>
</el-col>
<el-col :span="13">
</el-col> -->
<!-- <el-col :span="13">
<el-form-item label="角色" prop="group_id">
<el-select
v-model="formData.group_id"
@ -57,21 +46,24 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="formData.nickname"
placeholder="请输入姓名"
clearable
:style="{ width: '100%' }"
></el-input>
<el-input v-model="formData.nickname" placeholder="请输入姓名" clearable :style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="性别" >
<el-form-item label="角色" prop="group_id">
<el-select v-model="formData.group_id" placeholder="请选择角色" readonly :style="{ width: '100%' }"
@change="formRef?.clearValidate(['group_id'])">
<el-option v-for="(item, index) in roleList" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<!-- <el-form-item label="性别" >
<el-select
v-model="formData.sex"
placeholder="请选择性别"
@ -81,130 +73,147 @@
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="身份证号" >
<el-input
v-model="formData.id_card"
placeholder="请输入身份证号"
clearable
:style="{ width: '100%' }"
></el-input>
<el-form-item label="联系电话" prop="account">
<el-input v-model="formData.account" placeholder="请输入联系电话" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="联系电话" prop="account">
<el-input
v-model="formData.account"
placeholder="请输入联系电话"
clearable
:style="{ width: '100%' }"
></el-input>
<el-form-item label="身份证号">
<el-input v-model="formData.id_card" placeholder="请输入身份证号" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="省" prop="province">
<el-select
v-model="formData.province_name"
placeholder="请选择省"
:disabled="flag"
clearable
@change="province_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.provinceOptions"
:key="index"
:label="item.province_name"
:value="item.province_code"
></el-option>
<el-col :span="11">
<el-form-item label="押金" >
<el-input v-model="formData.deposit" placeholder="请输入押金" clearable type="number"
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="13">
<!-- <el-form-item label="角色" prop="group_id">
<el-select
v-model="formData.group_id"
placeholder="请选择角色"
readonly
:style="{ width: '100%' }"
@change="formRef?.clearValidate(['group_id'])"
>
<el-option
v-for="(item, index) in roleList"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> -->
<el-form-item label="押金缴纳时间" label-width="120px">
<!-- <el-input v-model="formData.deposit_date" placeholder="请输入押金" clearable type="number"
:style="{ width: '100%' }"></el-input> -->
<el-date-picker v-model="formData.deposit_date" style="width: 150%" placeholder="请选择押金缴纳时间" @change="dateChange" clearable></el-date-picker>
</el-form-item>
<!-- <el-form-item label="性别">
<el-select v-model="formData.sex" placeholder="请选择性别" :style="{ width: '100%' }"
@change="formRef?.clearValidate(['sex'])">
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
</el-select>
</el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="管理户数" prop="user_information_count" label-width="200px">
<el-input v-model="formData.user_information_count" placeholder="管理户数" clearable type="number"
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别">
<el-select v-model="formData.sex" placeholder="请选择性别" :style="{ width: '100%' }"
@change="formRef?.clearValidate(['sex'])">
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="13">
<el-form-item label="角色" prop="group_id">
<el-select
v-model="formData.group_id"
placeholder="请选择角色"
readonly
:style="{ width: '100%' }"
@change="formRef?.clearValidate(['group_id'])"
>
<el-option
v-for="(item, index) in roleList"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col> -->
</el-row>
<el-row>
<el-form-item label="省" prop="province" label-width="200px">
<el-select v-model="formData.province" placeholder="请选择省" clearable @change="province_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.provinceOptions" :key="index" :label="item.province_name"
:value="item.province_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="市" prop="city">
<el-select
v-model="formData.city_name"
placeholder="请选择市"
clearable
:disabled="flag"
@change="city_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.cityOptions"
:key="index"
:label="item.city_name"
:value="item.city_code"
></el-option>
<el-select v-model="formData.city" placeholder="请选择市" clearable @change="city_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
:value="item.city_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="区县" prop="area">
<el-select
v-model="formData.area_name"
placeholder="请选择区县"
:disabled="flag"
clearable
@change="area_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.areaOptions"
:key="index"
:label="item.area_name"
:value="item.area_code"
></el-option>
<el-select v-model="formData.area" placeholder="请选择区县" clearable @change="area_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.area_name"
:value="item.area_code"></el-option>
</el-select>
</el-form-item>
<el-form-item
v-if="formData.street_name"
label="乡镇"
prop="street"
>
<el-select
v-model="formData.street_name"
placeholder="请选择乡镇"
:disabled="flag"
clearable
@change="street_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.streetOptions"
:key="index"
:label="item.street_name"
:value="item.street_code"
></el-option>
<el-form-item label="乡镇" prop="street">
<el-select v-model="formData.street" placeholder="请选择乡镇" clearable @change="street_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.streetOptions" :key="index" :label="item.street_name"
:value="item.street_code"></el-option>
</el-select>
</el-form-item>
<el-form-item
v-if="formData.village_name"
label="村社"
prop="village"
>
<el-input
v-model="formData.village_name"
:disabled="flag"
placeholder="请输入村社"
clearable
:style="{ width: '100%' }"
></el-input>
<el-form-item label="村社" prop="village">
<el-select v-model="formData.village" placeholder="请选择村社" clearable @change="village_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.villageOptions" :key="index" :label="item.village_name"
:value="item.village_code"></el-option>
</el-select>
</el-form-item>
<el-form-item
v-if="formData.brigade_name"
label="小队"
prop="brigade"
>
<el-input
v-model="formData.brigade_name"
:disabled="flag"
placeholder="请输入小队"
clearable
:style="{ width: '100%' }"
></el-input>
<el-form-item label="小队" prop="brigade" label-width="200px">
<el-select v-model="formData.brigade" placeholder="请选择小队" clearable
:style="{ width: '100%' }" @change="brigadeChange">
<el-option v-for="(item, index) in datas.brigadeOptions" :key="index" :label="item.brigade_name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-row>
</el-col>
@ -212,39 +221,19 @@
<div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
<div style="display: flex; justify-content: space-between">
<div>
<el-form-item label="身份证" >
<el-upload
v-model="formData.qualification.id_card"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/upload/image'"
:show-file-list="false"
:on-success="handleAvatarSuccessIdA"
>
<img
v-if="formData.qualification.id_card"
:src="formData.qualification.id_card"
class="avatar"
/>
<el-form-item label="身份证">
<el-upload v-model="formData.qualification.id_card" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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
v-model="formData.qualification.id_card_b"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-upload v-model="formData.qualification.id_card_b" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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>
@ -252,41 +241,21 @@
</el-form-item>
</div>
<div>
<el-form-item label="银行卡" >
<el-upload
v-model="formData.qualification.bank_account"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-form-item label="银行卡">
<el-upload v-model="formData.qualification.bank_account" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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
v-model="formData.qualification.bank_account_b"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-upload v-model="formData.qualification.bank_account_b" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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>
@ -296,39 +265,18 @@
<div>
<el-form-item label="行驶证" prop="car_card">
<el-upload
v-model="formData.qualification.car_card"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/upload/image'"
:show-file-list="false"
:on-success="handleAvatarSuccessCarA"
>
<img
v-if="formData.qualification.car_card"
:src="formData.qualification.car_card"
class="avatar"
/>
<el-upload v-model="formData.qualification.car_card" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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
v-model="formData.qualification.car_card_b"
class="avatar-uploader pl-3"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="base_url + '/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-upload v-model="formData.qualification.car_card_b" class="pl-3 avatar-uploader" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="base_url + '/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>
@ -340,16 +288,12 @@
</el-form>
</el-card>
<el-dialog v-model="showCompany">
<DialogIndex
:companyTypeList="datas.dictTypeLists"
:type="41"
@customEvent="customEvent"
></DialogIndex>
<DialogIndex :companyTypeList="datas.dictTypeLists" :type="41" @customEvent="customEvent"></DialogIndex>
</el-dialog>
</div>
</template>
<script lang="ts" setup name="consumerDetail">
<script lang="ts" setup name="consumerDetail">
import {
type FormInstance,
type UploadProps,
@ -367,6 +311,9 @@ import {
apiAreaList,
apiStreetList,
apiProvinceList,
apiVillageList,
apiBrigadeList
} from "@/api/common";
import { dictDataLists } from "@/api/setting/dict";
import { isEmpty } from "@/utils/util";
@ -387,8 +334,11 @@ const formData = reactive({
id_card: "",
nickname: "",
group_id: "",
company_id: "",
company_id: 0,
user_information_count: "",
company_name: "",
deposit_date: "",
deposit: "",
province: "",
city: "",
area: "",
@ -429,14 +379,24 @@ const rules = ref({
// { required: true, message: "", trigger: "blur" },
// ],
});
const dateChange=()=>{
let date=formData.deposit_date
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
formData.deposit_date=`${year}-${month}-${day}`
console.log(formData.deposit_date)
}
//
const datas: any = reactive({
provinceOptions: [],
cityOptions: [],
areaOptions: [],
streetOptions: [],
villageOptions:[],
dictTypeLists: [],
brigadeOptions:[],
contract_type: [],
contract: [],
});
@ -566,6 +526,7 @@ const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
//
function province_change(value: string) {
console.log(formData)
getCityList();
}
function city_change(value: string) {
@ -575,8 +536,20 @@ function area_change(value: string) {
getStreetList();
}
function street_change(value: string) {
getVillageList()
formData.street = value;
}
function village_change(value: string) {
// getVillageList()
getBrigadeList()
// formData.street = value;
}
function brigadeChange(value: string) {
// getVillageList()
formData.brigade = value;
}
const getProvinceList = async () => {
const data = await apiProvinceList({});
datas["provinceOptions"] = data;
@ -593,6 +566,21 @@ const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area });
datas["streetOptions"] = data;
};
const getVillageList = async () => {
const data = await apiVillageList({ village: formData.street });
datas["villageOptions"] = data;
// datas["streetOptions"] = data;
};
const getBrigadeList = async () => {
const data = await apiBrigadeList({ brigade: formData.village });
// datas["villageOptions"] = data;
datas["brigadeOptions"] = data;
// datas["streetOptions"] = data;
};
getProvinceList();
@ -617,7 +605,7 @@ const submit = () => {
};
</script>
<style lang="scss">
<style lang="scss">
.headimg {
margin-top: 24px;
width: 115px;

View File

@ -19,12 +19,12 @@
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
<export-data
<!-- <export-data
class="ml-2.5"
:fetch-fun="getUserList"
:params="queryParams"
:page-size="pager.size"
/>
/> -->
<el-button
v-perms="['user.user/edit']"
class="ml-2.5"
@ -65,16 +65,16 @@
</el-table-column>
<el-table-column label="所在乡镇" prop="street_name" min-width="120" />
<el-table-column label="授权身份" prop="role_name" min-width="120">
<template #default="{ row }">
<!-- <template #default="{ row }">
<span
v-if="row.admin_id == row.company?.admin_id"
style="color: #67c23a"
>公司后台管理人员</span
>
<span v-else style="color: #fe0000"></span>
</template>
</template> -->
</el-table-column>
<el-table-column
<!-- <el-table-column
label="是否签约"
prop="is_contract"
align="center"
@ -86,7 +86,7 @@
>
<span v-else style="color: #fe0000">未签约</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="操作"
min-width="300"
@ -106,7 +106,7 @@
详情
</router-link>
</el-button>
<template v-if="row.is_contract == 0">
<!-- <template v-if="row.is_contract == 0">
<el-button
v-perms="['user.user/launch']"
type="primary"
@ -165,12 +165,12 @@
@click="(showPop = true), (contractId = row.id)"
>重新发送短信</el-button
>
</template>
</template> -->
</template>
</el-table-column>
</el-table>
<el-dialog v-model="showPop" @close="offPop">
<!-- <el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
@ -191,7 +191,7 @@
>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
</el-dialog> -->
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>

View File

@ -5,21 +5,23 @@
<el-form-item label="任务模板">
<!-- <el-form-item label="任务模板">
<el-select v-model="taskTempId" clearable :disabled="mode != 'add'" placeholder="请选择任务模板"
@change="changeTaskTypeFn" style="width:100%">
<el-option v-for="item in taskTempList" :key="item.id" :value="item.id" :label="item.title" />
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="type">
<el-select v-model="formData.type" clearable placeholder="请输入任务类型" @change="changeTaskType" style="width:100%">
</el-form-item> -->
<el-form-item label="任务名称" prop="type">
<!-- <el-select v-model="formData.type" clearable placeholder="请输入任务类型" @change="changeTaskType" style="width:100%">
<el-option v-for="(item, index) in roleTypeList" :key="item" :value="item.id" :label="item.name" />
</el-select>
</el-select> -->
<el-input placeholder="请输入任务名称" v-model="formData.title" />
</el-form-item>
<el-form-item label="任务下发时间" prop="cron_time">
<!-- <el-form-item label="任务下发时间" prop="cron_time">
<el-date-picker format="YYYY/MM/DD" value-format="YYYY-MM-DD" :disabled="mode != 'add'" v-model="formData.cron_time" type="date"
placeholder="请选择时间" style="width: 50vw;" />
</el-form-item>
</el-form-item> -->
<!-- <el-form-item
v-if="formData.type == 32"
label="起点"
@ -32,16 +34,16 @@
:value="formData.extend?.origin?.address"
/>
</el-form-item> -->
<el-form-item v-if="formData.type == 32" label="中转点" @click="changeMap(1)" prop="extend.transfer.address">
<!-- <el-form-item v-if="formData.type == 32" label="中转点" @click="changeMap(1)" prop="extend.transfer.address">
<el-input placeholder="请选择中转点" readonly :value="formData.extend?.transfer?.address" />
</el-form-item>
<el-form-item v-if="formData.type == 32" label="终点" @click="changeMap(2)" prop="extend.terminus.address">
<el-input placeholder="请选择终点" readonly :value="formData.extend?.terminus?.address" />
</el-form-item> -->
<el-form-item label="负责人" prop="director_uid" @click="clickTaskAdmin">
<el-input placeholder="请选择负责人" :disabled="mode !='add'" readonly v-model="formData.task_admin_name" />
</el-form-item>
<el-form-item v-if="formData.type == 35" label="负责人" prop="task_admin" @click="clickTaskAdmin">
<el-input placeholder="请选择负责人" readonly v-model="formData.task_admin_name" />
</el-form-item>
<el-form-item label="阶段类型" prop="types">
<!-- <el-form-item label="阶段类型" prop="types">
<div>
<el-select v-model="formData.types" clearable placeholder="请输入阶段类型" style="width:21vw">
<el-option v-for="item in [
@ -93,12 +95,13 @@
<el-form-item v-if="formData.type == 35" label="充值金额(元)" prop="recharge">
<el-input placeholder="请输入充值金额(元)" v-model="formData.recharge" type="number" />
</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 :label="2">显示</el-radio>
<el-radio :label="5">隐藏</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item>
<el-form-item label="任务描述" prop="content">
<el-input v-model="formData.content" clearable placeholder="请输入任务描述" type="textarea"
autosize />
@ -121,6 +124,8 @@ import {
apiTaskTemplateDetail,
apiTaskTypeList,
} from "@/api/task_template";
import {addTask,taskList,editTask} from "@/api/newTask"
import { apiSelectList, apiCreatetaskTypeInfo } from '@/api/create_task_template'
import { timeFormat } from "@/utils/util";
@ -150,41 +155,41 @@ const popupTitle = computed(() => {
//
const formData = reactive({
id: "",
task_scheduling: 0,
// task_scheduling: 0,
company_id: "",
title: "",
admin_id: "",
type: "",
// admin_id: "",
// type: "",
status: "",
content: "",
cron_time: "",//
stage_day_one: 0,
money: 0, //
stage_day_two: 0,
money_two: 0, //
money_three: 0, //
types: "", //
task_admin: "", //
// cron_time: "",//
// stage_day_one: 0,
// money: 0, //
// stage_day_two: 0,
// money_two: 0, //
// money_three: 0, //
// types: "", //
director_uid: "", //
task_admin_name: "", //
recharge: "",
extend: {
// origin: {
// address: "",
// lnglat: [],
// }, //
transfer: {
address: "",
lnglat: [],
}, //
terminus: {
address: "",
lnglat: [],
}, //
},
// recharge: "",
// extend: {
// // origin: {
// // address: "",
// // lnglat: [],
// // }, //
// transfer: {
// address: "",
// lnglat: [],
// }, //
// terminus: {
// address: "",
// lnglat: [],
// }, //
// },
});
if (route.query.id) {
formData.task_scheduling = route.query.id;
}
// if (route.query.id) {
// formData.task_scheduling = route.query.id;
// }
let type_value = "xxx"
if (route.query.company_type == 18) {
@ -209,20 +214,20 @@ const formRules = reactive<any>({
trigger: ["blur"],
},
],
admin_id: [
{
required: true,
message: "请输入创建人",
trigger: ["blur"],
},
],
type: [
{
required: true,
message: "请输入任务类型",
trigger: ["blur"],
},
],
// admin_id: [
// {
// required: true,
// message: "",
// trigger: ["blur"],
// },
// ],
// type: [
// {
// required: true,
// message: "",
// trigger: ["blur"],
// },
// ],
status: [
{
required: true,
@ -230,59 +235,59 @@ const formRules = reactive<any>({
trigger: ["blur"],
},
],
types: [
{
required: true,
message: "请输入阶段类型",
trigger: ["blur"],
},
],
cron_time: [
{
required: true,
message: "请选择任务下发时间",
trigger: ["blur"],
},
],
task_admin: [
// types: [
// {
// required: true,
// message: "",
// trigger: ["blur"],
// },
// ],
// cron_time: [
// {
// required: true,
// message: "",
// trigger: ["blur"],
// },
// ],
director_uid: [
{
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"],
},
],
"extend.origin.address": [
{
required: true,
message: "请选择中转点",
trigger: ["blur"],
},
],
"extend.transfer.address": [
{
required: true,
message: "请选择中转点",
trigger: ["blur"],
},
],
"extend.terminus.address": [
{
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"],
// },
// ],
// "extend.origin.address": [
// {
// required: true,
// message: "",
// trigger: ["blur"],
// },
// ],
// "extend.transfer.address": [
// {
// required: true,
// message: "",
// trigger: ["blur"],
// },
// ],
// "extend.terminus.address": [
// {
// required: true,
// message: "",
// trigger: ["blur"],
// },
// ],
});
//
@ -401,7 +406,7 @@ const setMap = (e: any) => {
const personnelShow = ref(false);
const personnelRef = shallowRef<InstanceType<typeof personnelPopup>>();
const changePersonner = (e: any) => {
formData.task_admin = e.id;
formData.director_uid = e.id;
formData.task_admin_name = e.nickname;
personnelShow.value = false;
};
@ -414,10 +419,13 @@ const clickTaskAdmin = async () => {
const handleSubmit = async () => {
await formRef.value?.validate();
const data = { ...formData };
if (data.type != 32) data.extend = {}; // ,
const {title,content,status,id}=data
// if (data.type != 32) data.extend = {}; // ,
mode.value == "edit"
? await apiTaskTemplateEdit(data)
: await apiTaskTemplateAdd(data);
? await editTask({title,content,status,id})
: await addTask(data);
popupRef.value?.close();
emit("success");
};
@ -432,7 +440,7 @@ const open = (type = "add") => {
const handleClose = () => {
emit("close");
};
getTaskTempFn()
// getTaskTempFn()
defineExpose({
open,
setFormData,

View File

@ -3,14 +3,9 @@
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px] formtabel" :model="queryParams" inline>
<el-form-item label-width="100px" label="任务名称" prop="title">
<el-input
class="w-[280px]"
v-model="queryParams.title"
clearable
placeholder="请输入任务名称"
/>
<el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label-width="100px" label="创建人" prop="admin_id">
<!-- <el-form-item label-width="100px" label="创建人" prop="admin_id">
<el-input
class="w-[280px]"
v-model="queryParams.admin_id"
@ -59,70 +54,44 @@
class="w-[280px]"
v-model="queryParams.content"
clearable
placeholder="请输入任务描述"
placeholder="请输入任务描454述"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label-width="100px" label="">
<el-button class="el-btn" type="primary" @click="resetPage"
>查询</el-button
>
<el-button class="el-btn" type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button
v-perms="['task_template.task_template/add']"
type="primary"
@click="handleAdd"
>
<el-button v-perms="['task_template.task_template/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['task_template.task_template/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
<el-button v-perms="['task_template.task_template/delete']" :disabled="!selectData.length"
@click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column
label="ID"
width="80"
prop="id"
show-overflow-tooltip
/>
<el-table-column
label="任务名称"
prop="title"
show-overflow-tooltip
/>
<el-table-column
label="创建人"
prop="admin_name"
show-overflow-tooltip
/>
<el-table-column label="金额" prop="money" show-overflow-tooltip />
<el-table-column
<el-table-column label="ID" width="80" prop="id" show-overflow-tooltip />
<el-table-column label="任务名称" prop="title" show-overflow-tooltip />
<el-table-column label="负责人" prop="directorInfo.nickname" show-overflow-tooltip />
<!-- <el-table-column label="金额" prop="money" show-overflow-tooltip /> -->
<!-- <el-table-column
label="任务类型"
prop="type_name"
show-overflow-tooltip
/>
/> -->
<el-table-column label="状态" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ row.status == 1 ? "显示" : "隐藏" }}</span>
<span>{{ row.status == 2 ? "显示" : "隐藏" }}</span>
</template>
</el-table-column>
<el-table-column
label="任务描述"
prop="content"
show-overflow-tooltip
/>
<el-table-column label="任务描述" prop="content" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
@ -133,14 +102,14 @@
>
编辑
</el-button>
<el-button
<!-- <el-button
v-perms="['task_template.task_template/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</el-button> -->
</template>
</el-table-column>
</el-table>
@ -149,27 +118,11 @@
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-admin-popup
v-if="showEdit && companyType == 16"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
<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"
@success="getLists"
@close="showEdit = false"
/>
<edit-admin-popup v-if="showEdit && companyType == 16" ref="editRef" :dict-data="dictData" @success="getLists"
@close="showEdit = false" />
<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" @success="getLists" @close="showEdit = false" />
</div>
</template>
@ -186,6 +139,7 @@ import EditPopup from "./edit.vue";
import EditAdminPopup from "./edit_admin.vue";
import EditVillagePopup from "./edit_village.vue";
import { dictDataLists } from "@/api/setting/dict";
import { taskList } from "@/api/newTask"
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
const datalist = ref([]);
//
@ -226,7 +180,7 @@ const { dictData } = useDictData("");
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiTaskTemplateLists,
fetchFun: taskList,
params: queryParams,
});
//
@ -242,6 +196,10 @@ const handleEdit = async (data: any) => {
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
data.task_admin_name=data.directorInfo.nickname
editRef.value?.setFormData(data);
};
@ -261,6 +219,7 @@ getLists();
.formtabel {
.el-form-item {
width: 20%;
.el-btn {
margin-left: 60px;
}

View File

@ -0,0 +1,270 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px] formtabel" :model="queryParams" inline>
<el-form-item label-width="100px" label="任务名称" prop="title">
<el-input
class="w-[280px]"
v-model="queryParams.title"
clearable
placeholder="请输入任务名称"
/>
</el-form-item>
<el-form-item label-width="100px" label="创建人" prop="admin_id">
<el-input
class="w-[280px]"
v-model="queryParams.admin_id"
clearable
placeholder="请输入创建人"
/>
</el-form-item>
<el-form-item label-width="100px" label="金额" prop="money">
<el-input
class="w-[280px]"
v-model="queryParams.money"
clearable
placeholder="请输入金额"
/>
</el-form-item>
<el-form-item label-width="100px" label="任务类型" prop="type">
<el-select
v-model="queryParams.type"
clearable
placeholder="请输入任务类型"
>
<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-width="100px" label="状态" prop="status">
<el-select
v-model="queryParams.status"
clearable
placeholder="请选择状态"
>
<el-option
v-for="item in statusdata"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label-width="100px" label="任务描述" prop="content">
<el-input
class="w-[280px]"
v-model="queryParams.content"
clearable
placeholder="请输入任务描述"
/>
</el-form-item>
<el-form-item label-width="100px" label="">
<el-button class="el-btn" type="primary" @click="resetPage"
>查询</el-button
>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button
v-perms="['task_template.task_template/add']"
type="primary"
@click="handleAdd"
>
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['task_template.task_template/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column
label="ID"
width="80"
prop="id"
show-overflow-tooltip
/>
<el-table-column
label="任务名称"
prop="title"
show-overflow-tooltip
/>
<el-table-column
label="创建人"
prop="admin_name"
show-overflow-tooltip
/>
<el-table-column label="金额" prop="money" show-overflow-tooltip />
<el-table-column
label="任务类型"
prop="type_name"
show-overflow-tooltip
/>
<el-table-column label="状态" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ row.status == 1 ? "显示" : "隐藏" }}</span>
</template>
</el-table-column>
<el-table-column
label="任务描述"
prop="content"
show-overflow-tooltip
/>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['task_template.task_template/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['task_template.task_template/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-admin-popup
v-if="showEdit && companyType == 16"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
<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"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template>
<script lang="ts" setup name="taskTemplateLists">
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import {
apiTaskTemplateLists,
apiTaskTemplateDelete,
} from "@/api/task_template";
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([]);
//
const showEdit = ref(false);
const route = useRoute();
//
const queryParams = reactive({
id: "", //id
company_id: "",
title: "",
admin_id: "",
money: "",
type: "",
status: "",
content: "",
});
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) companyType.value = route.query.company_type;
const statusdata = reactive([
{ id: 1, name: "显示" },
{ id: 2, name: "隐藏" },
]);
//
const selectData = ref<any[]>([]);
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id);
};
//
const { dictData } = useDictData("");
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiTaskTemplateLists,
params: queryParams,
});
//
const handleAdd = async () => {
showEdit.value = true;
await nextTick();
editRef.value?.open("add");
editRef.value?.setFormData({ company_id: queryParams.company_id });
};
//
const handleEdit = async (data: any) => {
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
editRef.value?.setFormData(data);
};
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除?");
await apiTaskTemplateDelete({ id });
getLists();
};
//
dictDataLists({ type_id: 10 }).then((res) => {
datalist.value = res.lists;
});
getLists();
</script>
<style lang="scss" scoped>
.formtabel {
.el-form-item {
width: 20%;
.el-btn {
margin-left: 60px;
}
}
}
</style>

View File

@ -0,0 +1,109 @@
<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="90px" :rules="formRules">
<el-form-item label="" prop="village_code">
<el-input class="flex-1" v-model="formData.village_code" type="textarea" rows="4" clearable placeholder="请输入" />
</el-form-item>
<el-form-item label="" prop="threshold_value">
<el-input v-model="formData.threshold_value" clearable placeholder="请输入" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="userInformationThresholdEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiUserInformationThresholdAdd, apiUserInformationThresholdEdit, apiUserInformationThresholdDetail } from '@/api/user_information_threshold'
import { timeFormat } from '@/utils/util'
import type { PropType } from '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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑村或社区人员建档目标数' : '新增村或社区人员建档目标数'
})
//
const formData = reactive({
id: '',
village_code: '',
threshold_value: '',
})
//
const formRules = reactive<any>({
})
//
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiUserInformationThresholdDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiUserInformationThresholdEdit(data)
: await apiUserInformationThresholdAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

View File

@ -0,0 +1,129 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="" prop="threshold_value">
<el-input class="w-[280px]" v-model="queryParams.threshold_value" clearable placeholder="请输入" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['user_information_threshold/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['user_information_threshold/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="" prop="village_code" show-overflow-tooltip />
<el-table-column label="" prop="threshold_value" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['user_information_threshold/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['user_information_threshold/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex justify-end mt-4">
<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="userInformationThresholdLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiUserInformationThresholdLists, apiUserInformationThresholdDelete } from '@/api/user_information_threshold'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
village_code: '',
threshold_value: '',
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiUserInformationThresholdLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiUserInformationThresholdDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -14,7 +14,7 @@ import vueSetupExtend from 'vite-plugin-vue-setup-extend'
export default defineConfig({
base: '/admin/',
server: {
host: '0.0.0.0'
host: '0.0.0.0',
},
plugins: [
vue(),