diff --git a/src/api/company.ts b/src/api/company.ts index a3c7786..ca99e62 100644 --- a/src/api/company.ts +++ b/src/api/company.ts @@ -33,6 +33,10 @@ export function sendMsgApi(params: any) { return request.get({ url: '/company/postsms', params }) } // 生成合同 +export function initiate_contract(params: any) { + return request.get({ url: '/company/initiate_contract', params }) +} +// 发送合同 export function generateGontract(params: any) { return request.get({ url: '/company/Draftingcontracts', params }) } diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index 22ffce3..3987378 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -237,6 +237,7 @@ @@ -467,7 +468,7 @@ - + @@ -494,7 +495,7 @@ >修改 () const popupRef = shallowRef>() const mode = ref() -isDisabled = route.query.read -isEdit = route.query.edit +if (route.query.read) { + isDisabled = route.query.read +} +if (route.query.edit) { + isEdit = route.query.edit +} // 表单数据 const formData = reactive({ admin_id: '', @@ -589,20 +594,7 @@ const formData = reactive({ master_position: '', master_phone: '', master_email: '', - other_contacts: [ - // { - // name: "", - // position: "", - // phone: "", - // email: "", - // }, - ], - // area_manager: '', - // is_contract: '', - // account: '', - // password: '', - // deposit: '', - // deposit_time: '', + other_contacts: [], qualification: { business_license: '', business_licenseB: '', @@ -888,7 +880,7 @@ const getDetails = async () => { id: route.query.id }) Object.keys(formData).forEach((key) => { - const stringArr = ['province', 'city', 'area', 'street'] + const stringArr = ['province', 'city', 'area', 'street', 'village', 'brigade'] if (data[key] != null && data[key] != undefined) { formData[key] = data[key] if (key == 'qualification' && formData.qualification.bank_account) { @@ -916,12 +908,13 @@ const getDetails = async () => { await getStreetList() await getVillageList() await getBrigadeList() - formData['party_a_name'] = data.contract?.party_a_name - formData['file_image'] = data.contract?.file - if (data.contract?.file) { - fileList.value[0].url = data.contract?.file - fileList.value[0].name = '合同文件' - } + formData['party_a_name'] = data.contract?.party_a_info.company_name + // formData['file_image'] = data.contract?.file + // if (data.contract?.file) { + // fileList.value[0].url = data.contract?.file + // fileList.value[0].name = '合同文件' + // } + console.log(formData) company_type_change(formData.company_type) } @@ -1020,4 +1013,10 @@ defineExpose({ margin-left: 12px; } } +.el-card { + margin-bottom: 10px; +} +.tit { + margin-top: 15px; +} diff --git a/src/views/company/index.vue b/src/views/company/index.vue index 371f811..745ba34 100644 --- a/src/views/company/index.vue +++ b/src/views/company/index.vue @@ -1,404 +1,390 @@ diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue index 0b8f851..6fc8900 100644 --- a/src/views/contract/contractDetil.vue +++ b/src/views/contract/contractDetil.vue @@ -22,7 +22,11 @@ /> - + @@ -30,12 +34,10 @@ - - + - - + @@ -73,9 +75,9 @@ - +
- +
@@ -96,10 +98,18 @@ - + - + @@ -179,11 +189,7 @@ - + @@ -267,7 +273,7 @@ --> - + import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus' import { apiContractDetail } from '@/api/contract' -import { ref, reactive, defineExpose ,computed} from 'vue' +import { ref, reactive, defineExpose, computed } from 'vue' import { useRoute } from 'vue-router' import { dictDataLists } from '@/api/setting/dict' import { upContact } from '@/api/consumer' @@ -315,7 +321,7 @@ const formData = reactive({ status_name: '' }) const fileList = ref([]) -const basicdata=ref({}) +const basicdata = ref({}) const compeny = ref({}) const compenyimg = ref([]) const compenyB = ref([]) @@ -330,23 +336,27 @@ const userStore = useUserStore() async function render() { // 传值赋值 const res = await apiContractDetail({ id: query.id }) - compeny.value = res.party_a_info; - basicdata.value=res + compeny.value = res.party_a_info + basicdata.value = res try { -    res.party_a_info.qualification.bank_account=JSON.parse(res.party_a_info.qualification.bank_account) + res.party_a_info.qualification.bank_account = JSON.parse( + res.party_a_info.qualification.bank_account + ) compenyimg.value = res.party_a_info.qualification -  } catch (error) {} + } catch (error) {} compenyimg.value = res.party_a_info.qualification if (res.type == 2) { show.value = false - res.party_b_info.sex==1?res.party_b_info.sex="男":res.party_b_info.sex="女" - persen.value = res.party_b_info - persenimg.value = res.party_b_info.qualification - } + res.party_b_info.sex == 1 ? (res.party_b_info.sex = '男') : (res.party_b_info.sex = '女') + persen.value = res.party_b_info + persenimg.value = res.party_b_info.qualification + } if (res.type == 1) { compenyB.value = res.party_b_info compenyBimg.value = res.party_b_info.qualification flag.value = false + } else { + compenyB.value.company_name = res.party_b_info.nickname } } @@ -356,7 +366,7 @@ const handleAvatarSuccess_four: UploadProps['onSuccess'] = (response, uploadFile return } formData.file = response.data.uri - upContact({ file: formData.file, id: route.query.id }) + upContact({ file: formData.file, id: route.query.id }) } onMounted(async () => { await render() @@ -364,9 +374,6 @@ onMounted(async () => { diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index 4240b11..8f41f46 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -56,24 +56,28 @@ 新增 --> - 删除 + > -->
- + - + - + + +