mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跟进记录bug修复

Browse Source
This commit is contained in:
lxz 2024-01-20 09:42:31 +08:00
parent d1c21243c0
commit 3d13078b90
7 changed files with 60 additions and 23 deletions
dist.zip
src/views
custom
edit.vueindex.vue
custom_follow
edit.vue
project_travel_reimbursement
edit.vue
project_travel_reimbursement_invoice_detail
edit.vueindex.vue

BIN
dist.zip

Binary file not shown.

18
src/views/custom/edit.vue

@ -33,10 +33,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="上级公司" prop="parent_company">
<el-input v-model="companyname" readonly placeholder="请输入上级公司" clearable
:style="{ width: '100%' }" @click="showDialog = true">
<el-input v-model="companyname" placeholder="请输入上级公司"
@change="companyname.length == 0 ? formData.parent_company = '' : ''" clearable
:style="{ width: '100%' }">
<template #append>
<el-button>选择</el-button>
<el-button @click="showDialog = true">选择</el-button>
{{ formData.parent_company }}
</template>
</el-input>
</el-form-item>
@ -577,10 +579,10 @@ const handleClose = () => {
//获取省份
function province_change (value: string) {
function province_change(value: string) {
getCityList();
}
function city_change (value: string) {
function city_change(value: string) {
getAreaList();
}
@ -609,11 +611,13 @@ defineExpose({
getDetail
})
</script>
<style lang="scss" scoped>.tit {
<style lang="scss" scoped>
.tit {
font-size: 1.2em;
margin-bottom: 10px;
}
:deep(.my-label) {
width: 150px;
}</style>
}
</style>

15
src/views/custom/index.vue

@ -20,7 +20,10 @@
<el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="省份" prop="province">
<el-input class="w-[280px]" v-model="queryParams.province" clearable placeholder="请输入省份" />
<el-select v-model="queryParams.province" clearable placeholder="请选择省" style="width: 280px;">
<el-option v-for="(item, index) in ProvinceList" :key="index" :label="item.province_name"
:value="parseInt(item.province_code)" />
</el-select>
</el-form-item>
<el-form-item>
@ -99,7 +102,9 @@ import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import DetailPopup from './detail.vue'
import {
apiProvinceList,
} from "@/api/common";
import Statistics from '@/components/statistics/index.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
@ -203,6 +208,12 @@ const handleDelete = async (id: number | any[]) => {
getLists()
}
const ProvinceList = ref([])
const getProvinceList = async () => {
ProvinceList.value = await apiProvinceList({});
}
getProvinceList()
getLists()
</script>

44
src/views/custom_follow/edit.vue

@ -12,14 +12,14 @@
<el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="日期" prop="date">
<el-date-picker class="flex-1 !flex" v-model="formData.date" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期">
<el-date-picker class="flex-1 !flex" v-model="formData.date" clearable value-format="YYYY-MM-DD"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="类型" prop="types">
<el-select class="flex-1" v-model="formData.types" clearable placeholder="请选择类型">
<el-option v-for="(item, index) in dictData.types" :key="index" :label="item.name"
<el-option v-for="(item, index) in dictData.follow_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
@ -30,14 +30,29 @@
<el-input v-model="formData.description" clearable placeholder="请输入行动描述" />
</el-form-item>
<el-form-item label="附件/现场照片" prop="annex">
<material-picker v-model="formData.annex" />
<!-- <material-picker v-model="formData.annex" /> -->
<el-upload
accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }"
:action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
</el-upload>
<div>
<div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
</el-form-item>
<el-form-item label="位置" prop="coordinate">
<el-input v-model="formData.coordinate" clearable placeholder="请输入位置" />
</el-form-item>
<el-form-item label="下次回访日期" prop="next_follow_date">
<el-date-picker class="flex-1 !flex" v-model="formData.next_follow_date" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择下次回访日期">
<el-date-picker class="flex-1 !flex" v-model="formData.next_follow_date" clearable
value-format="YYYY-MM-DD" placeholder="选择下次回访日期">
</el-date-picker>
</el-form-item>
</el-form>
@ -57,7 +72,10 @@ import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
import { usePaging } from '@/hooks/usePaging'
import { apiCustomLists } from '@/api/custom'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
const base_url = configs.baseUrl + configs.urlPrefix
const userStore = useUserStore();
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
@ -86,13 +104,21 @@ const formData = reactive({
types: '',
admin_id: '',
description: '',
annex: '',
annex: [],
coordinate: '',
next_follow_date: '',
status: '',
})
// 上传文件
const handleAvatarSuccess_four = (response: any) => {
// @ts-ignore
response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
// 删除上传的文件
const delFileFn = (index: number) => {
formData.annex.splice(index, 1)
}
// 表单验证
const formRules = reactive<any>({

2
src/views/project_travel_reimbursement/edit.vue

@ -202,12 +202,10 @@ import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiProjectTravelReimbursementAdd, apiProjectTravelReimbursementEdit, apiProjectTravelReimbursementDetail } from '@/api/project_travel_reimbursement'
import type { PropType } from 'vue'
import projectTripApply from "@/components/project_trip_apply/index.vue"
import projectLoanApply from "@/components/project_loan_apply/index.vue"
import bankaccount from "@/components/bankaccount/index.vue"
import projectcostTemLists from '@/components/projectcostTemLists/index.vue'
import configs from "@/config"
import useUserStore from "@/stores/modules/user";
const base_url = configs.baseUrl + configs.urlPrefix

2
src/views/project_travel_reimbursement_invoice_detail/edit.vue

@ -199,8 +199,6 @@ const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,

2
src/views/project_travel_reimbursement_invoice_detail/index.vue

@ -59,7 +59,7 @@
</el-table-column>
</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>