diff --git a/src/api/company_complaint_feedback.ts b/src/api/company_complaint_feedback.ts new file mode 100644 index 0000000..fc0e28d --- /dev/null +++ b/src/api/company_complaint_feedback.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 投诉反馈列表 +export function apiCompanyComplaintFeedbackLists(params: any) { + return request.get({ url: '/company_complaint_feedback/lists', params }) +} + +// 添加投诉反馈 +export function apiCompanyComplaintFeedbackAdd(params: any) { + return request.post({ url: '/company_complaint_feedback/add', params }) +} + +// 编辑投诉反馈 +export function apiCompanyComplaintFeedbackEdit(params: any) { + return request.post({ url: '/company_complaint_feedback/edit', params }) +} + +// 删除投诉反馈 +export function apiCompanyComplaintFeedbackDelete(params: any) { + return request.post({ url: '/company_complaint_feedback/delete', params }) +} + +// 投诉反馈详情 +export function apiCompanyComplaintFeedbackDetail(params: any) { + return request.get({ url: '/company_complaint_feedback/detail', params }) +} \ No newline at end of file diff --git a/src/api/examined.ts b/src/api/examined.ts index 3a63493..9809f01 100644 --- a/src/api/examined.ts +++ b/src/api/examined.ts @@ -28,3 +28,14 @@ export function apiFlowStatus(params: any) { export function apiFlowDetil(params: any) { return request.get({ url: "/flow/view", params }); } + +// 任务 +// 任务审批列表(待审批列表) +export function apiApproveList(params: any) { + return request.get({ url: "/approve.approve/lists", params }); +} + +// 任务审批(待审批列表) +export function apiApproveAudit(params: any) { + return request.get({ url: "/approve.approve/audit", params }); +} diff --git a/src/api/finance.ts b/src/api/finance.ts index bdaa444..826b5ed 100644 --- a/src/api/finance.ts +++ b/src/api/finance.ts @@ -5,6 +5,11 @@ export function accountLog(params?: any) { return request.get({ url: '/finance.account_log/lists', params }) } +// 成员信息 +export function getCompanyUserList(params?: any) { + return request.get({ url: '/finance.account_log/getCompanyUserList', params }) +} + // 充值记录 export function rechargeLists(params?: any) { return request.get({ url: '/recharge.recharge/lists', params }, { ignoreCancelToken: true }) diff --git a/src/api/shop_contract.ts b/src/api/shop_contract.ts index 597de85..17820a1 100644 --- a/src/api/shop_contract.ts +++ b/src/api/shop_contract.ts @@ -43,4 +43,9 @@ export function apiShopSendMsgApi(params: any) { //请求证据包下载地址 export function contractEvidence(params: any) { return request.get({ url: "/shop_contract/evidence", params }); +} + +// 设置备注 +export function apiShopContractAddNotes(params: any) { + return request.post({ url: '/shop_contract/addNote', params }) } \ No newline at end of file diff --git a/src/api/task_template.ts b/src/api/task_template.ts index b62e3eb..2869ded 100644 --- a/src/api/task_template.ts +++ b/src/api/task_template.ts @@ -23,4 +23,9 @@ export function apiTaskTemplateDelete(params: any) { // 任务安排详情 export function apiTaskTemplateDetail(params: any) { return request.get({ url: '/task_template.task_template/detail', params }) -} \ No newline at end of file +} + +// 任务类型 +export function apiTaskTypeList(params: any) { + return request.get({ url: '/setting.dict.dict_data/lists', params }) +} diff --git a/src/views/app_update/edit.vue b/src/views/app_update/edit.vue index a45cf54..a2c5d64 100644 --- a/src/views/app_update/edit.vue +++ b/src/views/app_update/edit.vue @@ -53,11 +53,13 @@ class="upload-demo" style="width: 100%" drag + accept=".apk, .ipa, .wgt" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :limit="1" :on-success="handleFile" :on-exceed="handleExceed" + :before-upload="handleBeforeUpload" ref="upload" > @@ -140,6 +142,18 @@ const handleExceed = (files: any) => { upload.value!.submit(); }; +const appTypeList = [".apk", ".ipa", ".wgt"]; +const handleBeforeUpload = (e: any) => { + let a = appTypeList.find((item: any) => { + return item == e?.name?.substring(e.name.length - 4, e.name.length); + }); + if (a) return true; + else { + ElMessage.error("仅支持上传APK/IPA/WGT文件"); + return false; + } +}; + // 弹窗标题 const popupTitle = computed(() => { return mode.value == "edit" ? "编辑app更新" : "新增app更新"; diff --git a/src/views/card/detail.vue b/src/views/card/detail.vue deleted file mode 100644 index d76bc25..0000000 --- a/src/views/card/detail.vue +++ /dev/null @@ -1,338 +0,0 @@ - - - - diff --git a/src/views/card/index.vue b/src/views/card/index.vue deleted file mode 100644 index 20bbdf0..0000000 --- a/src/views/card/index.vue +++ /dev/null @@ -1,195 +0,0 @@ - - - diff --git a/src/views/company/dialog_index_man.vue b/src/views/company/dialog_index_man.vue index 4c101b2..7c33095 100644 --- a/src/views/company/dialog_index_man.vue +++ b/src/views/company/dialog_index_man.vue @@ -1,17 +1,17 @@ diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index 21d2595..73b89a1 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -10,217 +10,186 @@
公司基本信息创建
- - - - - - - - - - - - + + + + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - - - - + + + + + +
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + -->
@@ -463,6 +421,7 @@ +
+ + + + + + + + + + +
+ + + diff --git a/src/views/company_complaint_feedback/index.vue b/src/views/company_complaint_feedback/index.vue new file mode 100644 index 0000000..3065722 --- /dev/null +++ b/src/views/company_complaint_feedback/index.vue @@ -0,0 +1,161 @@ + + + + diff --git a/src/views/company_form/edit.vue b/src/views/company_form/edit.vue index 953975a..db424f7 100644 --- a/src/views/company_form/edit.vue +++ b/src/views/company_form/edit.vue @@ -1,133 +1,170 @@ diff --git a/src/views/company_form/index.vue b/src/views/company_form/index.vue index 93bab60..9bfb510 100644 --- a/src/views/company_form/index.vue +++ b/src/views/company_form/index.vue @@ -1,43 +1,56 @@ diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue index c96b467..2dab38d 100644 --- a/src/views/contract/contractDetil.vue +++ b/src/views/contract/contractDetil.vue @@ -96,7 +96,12 @@ >
- +
- +
- +
@@ -217,7 +232,12 @@ >
- +
- +
- + @@ -386,6 +416,7 @@ prop="field127" > - 确定 + 确定 { - if (!formData.file) ElMessage.error("请先上传合同!"); + if (!formData.file) return ElMessage.error("请先上传合同!"); upContact({ file: formData.file, id: route.query.id }); removeTab(); router.back(); @@ -589,7 +625,7 @@ onMounted(async () => { .company { display: flex; justify-content: space-between; - img { + .el-image { width: 10vw; height: 6.3vw; margin-right: 10px; diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index cf050fb..e89c2ca 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -164,7 +164,11 @@ v-perms="['contract.contract/contract_send_again']" type="primary" link - @click="(showPop = true), (contractId = row.party_b)" + @click=" + (showPop = true), + (party_b_id = row.party_b), + (contract_id = row.id) + " >发送短信 @@ -236,24 +240,32 @@ const datalist = ref([]); const showPop = ref(false); const showConctactPop = ref(false); // 发送合同的id -const contractId = ref(""); +const contract_id = ref(""); +const party_b_id = ref(""); // 发送合同 -const showCreateConctPop = (row) => { +const showCreateConctPop = (row: any) => { (showPop.value = true), (showConctactPop.value = true), - (contractId.value = row.party_b); + (contract_id.value = row.id), + (party_b_id.value = row.party_b); }; const offPop = () => { showPop.value = false; showConctactPop.value = false; }; const creContct = async () => { - await generateGontract({ id: contractId.value }); + await generateGontract({ + id: party_b_id.value, + contract_id: contract_id.value, + }); getLists(); offPop(); }; const sendMsg = async () => { - await sendMsgApi({ id: contractId.value }); + await sendMsgApi({ + id: party_b_id.value, + contract_id: contract_id.value, + }); getLists(); offPop(); }; diff --git a/src/views/contract/vehicle_detail.vue b/src/views/contract/vehicle_detail.vue index aff2594..fcb4228 100644 --- a/src/views/contract/vehicle_detail.vue +++ b/src/views/contract/vehicle_detail.vue @@ -1,262 +1,156 @@ diff --git a/src/views/contract/vehicle_list.vue b/src/views/contract/vehicle_list.vue index c4caf3c..e6bab53 100644 --- a/src/views/contract/vehicle_list.vue +++ b/src/views/contract/vehicle_list.vue @@ -1,198 +1,96 @@ diff --git a/src/views/examined/index_list.vue b/src/views/examined/index_list.vue index a49c8c1..42ba5af 100644 --- a/src/views/examined/index_list.vue +++ b/src/views/examined/index_list.vue @@ -1,98 +1,113 @@ - diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue index 1e1d7e1..d6ed4bc 100644 --- a/src/views/task_template/edit.vue +++ b/src/views/task_template/edit.vue @@ -18,6 +18,7 @@ @@ -82,6 +83,7 @@ >, @@ -242,6 +246,7 @@ const popupRef = shallowRef>(); const mode = ref("add"); const datalist = ref([]); const route = useRoute(); + // 弹窗标题 const popupTitle = computed(() => { return mode.value == "edit" ? "编辑任务安排" : "新增任务安排"; @@ -285,7 +290,7 @@ if (route.query.id) { formData.task_scheduling = route.query.id; } //任务类型接口 -dictDataLists({ type_id: 10 }).then((res) => { +apiTaskTypeList({ type_value: "task_type" }).then((res) => { datalist.value = res.lists; }); diff --git a/src/views/task_template/edit_admin.vue b/src/views/task_template/edit_admin.vue new file mode 100644 index 0000000..d2654e6 --- /dev/null +++ b/src/views/task_template/edit_admin.vue @@ -0,0 +1,426 @@ + + + + \ No newline at end of file diff --git a/src/views/task_template/index.vue b/src/views/task_template/index.vue index ef4eeea..933d67e 100644 --- a/src/views/task_template/index.vue +++ b/src/views/task_template/index.vue @@ -150,7 +150,14 @@ + >(); const datalist = ref([]); @@ -188,8 +196,10 @@ const queryParams = reactive({ status: "", content: "", }); +const taskTypeId = 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 == 41) taskTypeId.value = 15; const statusdata = reactive([ { id: 1, name: "显示" }, { id: 2, name: "隐藏" }, diff --git a/src/views/user_informationg/component/banquetBirthday.vue b/src/views/user_informationg/component/banquetBirthday.vue index c09077b..5269149 100644 --- a/src/views/user_informationg/component/banquetBirthday.vue +++ b/src/views/user_informationg/component/banquetBirthday.vue @@ -89,8 +89,6 @@