mkm/TaskSystem-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增任务下发

Browse Source
This commit is contained in:
lxz 2024-01-16 10:33:20 +08:00
parent a030a96bda
commit b3f830138a
7 changed files with 64 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -2,8 +2,8 @@ NODE_ENV = 'development'
# VITE_APP_BASE_URL = 'https://new-worker.lihaink.cn/'
#
VITE_APP_BASE_URL = 'https://ceshi-new-wokr.lihaink.cn/'
# VITE_APP_BASE_URL = 'https://ceshi-new-wokr.lihaink.cn/'
# VITE_APP_BASE_URL = 'https://preview-worker-task.lihaink.cn'
# VITE_APP_BASE_URL = 'https://worker-task.lihaink.cn'
VITE_APP_BASE_URL = 'http://192.168.1.24:8083'

BIN
dist.zip Normal file
View File

Binary file not shown.

21
src/views/consumer/lists/detail.vue
View File

@ -191,7 +191,7 @@
</el-col>
<el-col :span="12" v-if="mode=='detail'">
<el-form-item label="邀请码" prop="invite_code" >
<el-input v-model="formData.invite_code" placeholder="请输入" clearable type="number"
<el-input v-model="formData.invite_code" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
@ -233,13 +233,22 @@
:value="item.village_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="小队" prop="brigade" label-width="200px">
<!-- <el-form-item label="小队" prop="brigade" label-width="200px">
<el-select v-model="formData.brigade" placeholder="请选择小队" clearable
:style="{ width: '100%' }" @change="brigadeChange" :disabled="mode=='detail'">
<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-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-input v-model="formData.brigade" placeholder="请输入队/小区名称" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-row>
</el-col>
@ -342,7 +351,7 @@ import {
apiStreetList,
apiVillageList,
apiProvinceList,
apiBrigadeList
// apiBrigadeList
} from "@/api/common";
import { dictDataLists } from "@/api/setting/dict";
@ -397,8 +406,6 @@ const formData = reactive({
merchant_num:"",
trade_amount :"",
invite_code:""
});
const rules = ref({
company_name: [{ required: true, message: "请选择公司", trigger: "blur" }],
@ -468,7 +475,7 @@ const getDetails = async () => {
formData[key] = data[key];
});
mode.value = route.query.mode;
formData.brigade=Number(formData.brigade)
// formData.brigade=(formData.brigade)
formData.contract_type = data.contract?.contract_type;
formData.party_b_name = data.contract?.party_b_name;
formData.party_b = data.contract?.party_b;
@ -483,7 +490,7 @@ const getDetails = async () => {
await getAreaList();
await getStreetList();
await getVillageList()
await getBrigadeList()
// await getBrigadeList()
};

2
src/views/consumer/lists/dialog_index.vue
View File

@ -55,7 +55,7 @@
<el-table-column label="联系方式" property="master_phone" />
</el-table>
</div>
<div class="flex mt-4 justify-end">
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>

9
src/views/consumer/lists/edit.vue
View File

@ -233,13 +233,14 @@
: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
<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-select> -->
<el-input v-model="formData.brigade" placeholder="请输入队/小区名称" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-row>
</el-col>

87
src/views/consumer/lists/index.vue
View File

@ -1,20 +1,10 @@
<template>
<div>
<el-card class="!border-none" shadow="never">
<el-form
ref="formRef"
class="mb-[-16px]"
:model="queryParams"
:inline="true"
>
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="用户信息">
<el-input
class="w-[280px]"
v-model="queryParams.keyword"
placeholder="用户编号/昵称/手机号码"
clearable
@keyup.enter="resetPage"
/>
<el-input class="w-[280px]" v-model="queryParams.keyword" placeholder="用户编号/昵称/手机号码" clearable
@keyup.enter="resetPage" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
@ -25,19 +15,14 @@
:params="queryParams"
:page-size="pager.size"
/> -->
<el-button
v-perms="['user.user/edit']"
class="ml-2.5"
type="primary"
>
<router-link
:to="{
path: getRoutePath('user.user/edit'),
}"
>
创建
</router-link>
</el-button>
<router-link :to="{
path: getRoutePath('user.user/edit'),
}">
<el-button v-perms="['user.user/edit']" class="ml-2.5" type="primary"> 创建
</el-button>
</router-link>
</el-form-item>
</el-form>
</el-card>
@ -53,12 +38,7 @@
<el-table-column label="账号" prop="account" min-width="120" />
<el-table-column label="姓名" prop="nickname" min-width="100" />
<el-table-column label="联系方式" prop="mobile" min-width="120" />
<el-table-column
label="隶属公司"
prop="company_name"
min-width="180"
align="center"
>
<el-table-column label="隶属公司" prop="company_name" min-width="180" align="center">
<template #default="{ row }">
{{ row.company?.company_name || "/" }}
</template>
@ -87,40 +67,31 @@
<span v-else style="color: #fe0000">未签约</span>
</template>
</el-table-column> -->
<el-table-column
label="操作"
min-width="300"
align="center"
fixed="right"
>
<el-table-column label="操作" min-width="300" align="center" fixed="right">
<template #default="{ row }">
<el-button v-perms="['user.user/detail']" type="primary" link>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode:'detail'
},
}"
>
<router-link :to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'detail'
},
}">
详情
</router-link>
</el-button>
<el-button v-perms="['user.user/detail']" type="primary" link>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode:'edit'
},
}"
>
编辑
<router-link :to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'edit'
},
}">
编辑
</router-link>
</el-button>
<!-- <template v-if="row.is_contract == 0">
<el-button

13
src/views/task_template/edit.vue
View File

@ -22,6 +22,7 @@
<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
v-if="formData.type == 32"
label="起点"
@ -102,6 +103,10 @@
<el-radio :label="5">隐藏</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="完成时间" prop="end_time">
<el-date-picker format="YYYY/MM/DD" value-format="YYYY-MM-DD" :disabled="mode != 'add'" v-model="formData.end_time" type="date"
placeholder="请选择时间" style="width: 50vw;" />
</el-form-item>
<el-form-item label="任务描述" prop="content">
<el-input v-model="formData.content" clearable placeholder="请输入任务描述" type="textarea"
autosize />
@ -163,6 +168,7 @@ const formData = reactive({
status: "",
content: "",
// cron_time: "",//任务下发时间
end_time:"",//任务完成时间
// stage_day_one: 0,
// money: 0, // 一阶段金额
// stage_day_two: 0,
@ -249,6 +255,13 @@ const formRules = reactive<any>({
// trigger: ["blur"],
// },
// ],
end_time: [
{
required: true,
message: "请选择任务下发时间",
trigger: ["blur"],
},
],
director_uid: [
{
required: true,