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

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

Browse Source
This commit is contained in:
jiangyouyi 2023-08-08 19:09:44 +08:00
commit 05b985475f
5 changed files with 265 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/company.ts
View File

@ -44,3 +44,8 @@ export function generateGontract(params: any) {
export function authentication(params: any) { export function authentication(params: any) {
return request.get({ url: '/company/authentication', params }) return request.get({ url: '/company/authentication', params })
} }
// 平台公司
export function companyListTwo(params: any) {
return request.get({ url: '/company/list_two', params })
}

158
src/views/company/dialog_index.vue
View File

@ -1,91 +1,101 @@
<template> <template>
<div> <div>
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline> <el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="公司名称" prop="company_name"> <el-form-item label="公司名称" prop="company_name">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="queryParams.company_name" v-model="queryParams.company_name"
clearable clearable
placeholder="请输入公司名称" placeholder="请输入公司名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="公司类型" prop="company_type"> <el-form-item label="公司类型" prop="company_type">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="queryParams.company_type" v-model="queryParams.company_type"
clearable clearable
placeholder="请输入公司类型" placeholder="请输入公司类型"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button> <el-button @click="resetParams">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @cell-click="handleCurrentChange"> <el-table :data="pager.lists" @cell-click="handleCurrentChange">
<el-table-column label="公司名称" property="company_name" /> <el-table-column label="公司名称" property="company_name" />
<el-table-column label="公司类型" property="company_type" /> <el-table-column label="公司类型" property="company_type" />
<el-table-column label="区县" property="area" /> <el-table-column label="区县" property="area" />
<el-table-column label="乡镇" property="street" /> <el-table-column label="乡镇" property="street" />
<el-table-column label="主联系人" property="master_name" /> <el-table-column label="主联系人" property="master_name" />
<el-table-column label="联系方式" property="master_phone" /> <el-table-column label="联系方式" property="master_phone" />
</el-table> </el-table>
</div> </div>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
</el-card> </el-card>
</div> </div>
</template> </template>
<script lang="ts" setup name="companyLists"> <script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from "@/hooks/useDictOptions";
import { apiCompanyLists, apiCompanyDelete } from '@/api/company' import { apiCompanyLists, apiCompanyDelete } from "@/api/company";
import { defineEmits } from 'vue' import { defineEmits } from "vue";
// 当前类型
const props = defineProps({
type: {
type: Number,
default: 0,
},
});
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
level_two: '', level_two: "",
level_one: '', level_one: "",
company_name: '', company_name: "",
organization_code: '', organization_code: "",
city: '', city: "",
area: '', area: "",
street: '', street: "",
company_type: '', company_type: "",
master_name: '', master_name: "",
master_position: '', master_position: "",
master_phone: '', master_phone: "",
master_email: '', master_email: "",
other_contacts: '', other_contacts: "",
area_manager: '', area_manager: "",
is_contract: '', is_contract: "",
account: '', account: "",
password: '', password: "",
deposit: '', deposit: "",
deposit_time: '', deposit_time: "",
qualification: '', qualification: "",
status: '' status: "",
}) });
if (props.type) queryParams.company_type = props.type;
// 选中数据 // 选中数据
const emits = defineEmits(['customEvent']) const emits = defineEmits(["customEvent"]);
// 选中数据子父传递 // 选中数据子父传递
const handleCurrentChange = (value: any) => { const handleCurrentChange = (value: any) => {
emits('customEvent', value) emits("customEvent", value);
} };
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCompanyLists, fetchFun: apiCompanyLists,
params: queryParams params: queryParams,
}) });
getLists() getLists();
</script> </script>

39
src/views/company/edit.vue
View File

@ -422,8 +422,23 @@
placeholder="请选择签约方" placeholder="请选择签约方"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
:disabled="true" :disabled="!partyDisabled || isDisabled"
@click="openCompany"
></el-input> ></el-input>
<!-- <el-select
:disabled="partyDisabled"
v-model="formData.party_a_name"
placeholder="请选择签约方"
clearable
:style="{ width: '100%' }"
>
<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>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -493,10 +508,10 @@
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<el-form-item label prop="field139"> <el-form-item label prop="field139">
<el-button v-if="isEdit" type="primary" size="medium" @click="create" <el-button v-if="isEdit" type="primary" size="medium" @click="create"
>修改</el-button >完成</el-button
> >
<el-button <el-button
v-if="isDisabled == false" v-if="isDisabled == false && isEdit == false"
type="primary" type="primary"
:disabled="isDisabled" :disabled="isDisabled"
size="medium" size="medium"
@ -507,7 +522,7 @@
</el-col> </el-col>
</el-form> </el-form>
<el-dialog v-model="isCompany" title="选择签约方" width="60%"> <el-dialog v-model="isCompany" title="选择签约方" width="60%">
<DialogIndex @customEvent="customEvent" /> <DialogIndex @customEvent="customEvent" :type="indexType" />
</el-dialog> </el-dialog>
<el-dialog v-model="isMan" title="选择管理人员" width="60%"> <el-dialog v-model="isMan" title="选择管理人员" width="60%">
<DialogIndexMan @customEvent="customEventMan" /> <DialogIndexMan @customEvent="customEventMan" />
@ -551,6 +566,9 @@ if (route.query.isshow) {
imgflag = false imgflag = false
isDisabled = true isDisabled = true
} }
console.log(isDisabled)
// 公司类型
const indexType = ref(0)
let isEdit = ref(false) let isEdit = ref(false)
defineProps({ defineProps({
@ -627,7 +645,8 @@ const datas = reactive({
villageOptions: [], villageOptions: [],
brigadeOptions: [], brigadeOptions: [],
dictTypeLists: [], dictTypeLists: [],
contract_type: [] contract_type: [],
company_list: []
}) })
const fileList = ref<UploadUserFile[]>([]) const fileList = ref<UploadUserFile[]>([])
// 表单验证 // 表单验证
@ -689,6 +708,7 @@ const isArea = ref(false)
const isStreet = ref(false) const isStreet = ref(false)
const isVillage = ref(false) const isVillage = ref(false)
const isBrigade = ref(false) const isBrigade = ref(false)
const partyDisabled = ref(true)
function customEvent(data: any) { function customEvent(data: any) {
isCompany.value = false isCompany.value = false
@ -801,8 +821,13 @@ function company_type_change(type: any) {
isBrigade.value = false isBrigade.value = false
formData.village = '' formData.village = ''
formData.brigade = '' formData.brigade = ''
partyDisabled.value = true
indexType.value = 30
return true return true
} }
if (type != 16) {
partyDisabled.value = false
}
//村 //村
if (type == 17) { if (type == 17) {
isArea.value = true isArea.value = true
@ -880,6 +905,10 @@ const getDetails = async () => {
const data = await apiCompanyDetail({ const data = await apiCompanyDetail({
id: route.query.id id: route.query.id
}) })
if (data.company_type == 16) {
indexType.value = 30
partyDisabled.value = true
}
Object.keys(formData).forEach((key) => { Object.keys(formData).forEach((key) => {
const stringArr = ['province', 'city', 'area', 'street', 'village', 'brigade'] const stringArr = ['province', 'city', 'area', 'street', 'village', 'brigade']
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {

164
src/views/company/index.vue
View File

@ -83,18 +83,18 @@
创建 创建
</el-button> </el-button>
</router-link> </router-link>
&nbsp; &nbsp; <!-- <router-link
<router-link :to="{
:to="{ path: getRoutePath('company/add:edit'),
path: getRoutePath('company/add:edit'), query: {
query: { id: userStore.userInfo.company_id,
id: userStore.userInfo.company_id, read: true,
read: true },
} }"
}" >
> <el-button type="primary" class="mb-4">
<el-button type="primary" class="mb-4"> 我的公司 </el-button></router-link 我的公司
> </el-button></router-link -->
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
@ -161,7 +161,7 @@
edit: true edit: true
} }
}" }"
>编辑</router-link >合同签约</router-link
> >
</el-button> </el-button>
<el-button <el-button
@ -184,7 +184,7 @@
v-perms="['company/initiate_contract']" v-perms="['company/initiate_contract']"
type="primary" type="primary"
link link
@click="ShowInitiateContractPop(row)" @click="showChangeCompany(row)"
>生成合同</el-button >生成合同</el-button
> >
<el-button <el-button
@ -213,12 +213,85 @@
</el-card> </el-card>
<el-dialog v-model="showInitiateContractPop" @close="offInitiateContractPop"> <el-dialog v-model="showInitiateContractPop" @close="offInitiateContractPop">
<h1>重要提醒</h1> <h1>重要提醒</h1>
<div class="content">请确认信息是否有误</div> <div>
<div class="content">请确认信息是否有误</div>
<el-card>
<el-col :span="24" class="el-card pt-6">
<el-row>
<el-col :span="12">
<el-form-item label-width="100px" label="签约方" prop="field130">
<el-select
v-model="contractFormData.party_a"
placeholder="请选择签约方"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in company_list"
:key="index"
:label="item.company_name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="100px"
label="被签约公司"
prop="field131"
>
<el-input
:disabled="true"
v-model="contractFormData.party_b_name"
placeholder="请输入被签约公司"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="100px"
label="合同类型"
prop="contract_type"
>
<el-select
v-model="contractFormData.contract_type"
placeholder="请选择合同类型"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in contract_type"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label-width="100px" label="合同编号" prop="field133">
<el-input
placeholder="系统自动生成"
v-model="contractFormData.contract_no"
clearable
:style="{ width: '100%' }"
:disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-card>
</div>
<p class="btn_menu"> <p class="btn_menu">
<el-button type="primary" size="large" @click="InitiateContract" <el-button type="primary" size="large" @click="InitiateContract"
>确认创建</el-button >确认创建</el-button
> >
<el-button type="info" size="large" @click="offPop">返回</el-button> <el-button type="info" size="large" @click="offInitiateContractPop">返回</el-button>
</p> </p>
</el-dialog> </el-dialog>
<el-dialog v-model="showPop" @close="offPop"> <el-dialog v-model="showPop" @close="offPop">
@ -246,16 +319,19 @@ import { useDictData } from '@/hooks/useDictOptions'
import useUserStore from '@/stores/modules/user' import useUserStore from '@/stores/modules/user'
import { import {
apiCompanyLists, apiCompanyLists,
companyListTwo,
apiCompanyDelete, apiCompanyDelete,
generateGontract, generateGontract,
sendMsgApi, sendMsgApi,
authentication, authentication,
apiCompanyDetail,
initiate_contract initiate_contract
} from '@/api/company' } from '@/api/company'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict' import { dictDataLists } from '@/api/setting/dict'
import { getRoutePath } from '@/router' import { getRoutePath } from '@/router'
import DialogIndex from './dialog_index.vue'
const userStore = useUserStore() const userStore = useUserStore()
console.log(userStore.userInfo.company_id) console.log(userStore.userInfo.company_id)
@ -272,22 +348,64 @@ const offPop = () => {
const InitiateContractPop = ref(false) const InitiateContractPop = ref(false)
const showInitiateContractPop = ref(false) const showInitiateContractPop = ref(false)
const offInitiateContractPop = () => { const offInitiateContractPop = () => {
showPop.value = false showInitiateContractPop.value = false
showConctactPop.value = false InitiateContractPop.value = false
} }
// 创建合同的id // 创建合同的id
const contractId = ref('') const contractId = ref('')
const ShowInitiateContractPop = (row) => { // 合同
;(InitiateContractPop.value = true), const contractFormData = ref({
(showInitiateContractPop.value = true), party_a: '',
(contractId.value = row.id) party_a_name: '',
party_b: '',
party_b_name: '',
contract_type: '',
contract_no: ''
})
const company_list = ref([])
const contract_type = ref([])
const getDetails = async (id: any) => {
const data = await apiCompanyDetail({
id: id
})
companyListTwo().then((res) => {
company_list.value = res
})
dictDataLists({ type_id: 7 }).then((res) => {
contract_type.value = res.lists
})
contractFormData.value.party_b = data.id
contractFormData.value.party_b_name = data.company_name
if (userStore.userInfo.company.id) {
contractFormData.value.party_a = userStore.userInfo.company.id
contractFormData.value.party_a_name = userStore.userInfo.company.company_name
} else {
contractFormData.value.party_a = ''
contractFormData.value.party_a_name = ''
}
}
const showChangeCompany = (row: any) => {
contractId.value = row.id
getDetails(row.id)
// showPop.value = true
ShowInitiateContractPop()
}
const ShowInitiateContractPop = () => {
;(InitiateContractPop.value = true), (showInitiateContractPop.value = true)
} }
const showCreateConctPop = (row) => { const showCreateConctPop = (row) => {
;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id) ;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
} }
const InitiateContract = () => { const InitiateContract = () => {
initiate_contract({ id: contractId.value }).catch((res) => { initiate_contract({
id: contractId.value,
...contractFormData.value
}).catch((res) => {
console.log(res) console.log(res)
}) })
offInitiateContractPop() offInitiateContractPop()

6
src/views/task/taskCalendar.vue
View File

@ -70,10 +70,6 @@ watch(
); );
// apiTaskList() // apiTaskList()
const test = (e: any) => {
console.log(e);
};
// 加载 // 加载
const loading = ref(true); const loading = ref(true);
@ -126,7 +122,7 @@ const initShowDate = (dateStr = "") => {
initShowDate(); initShowDate();
// 获取字典数据 // 获取字典数据
const { dictData } = useDictData(""); // const { dictData } = useDictData("");
// 添加 // 添加
const handleAdd = async () => { const handleAdd = async () => {