From d9e47835783145387294bceb1ba7c3f0d010b9cc Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 15 Sep 2023 10:50:04 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/shop_contract/details.vue | 137 +++++++++++----------------- 1 file changed, 52 insertions(+), 85 deletions(-) diff --git a/src/views/shop_contract/details.vue b/src/views/shop_contract/details.vue index 365346c..ed2e960 100644 --- a/src/views/shop_contract/details.vue +++ b/src/views/shop_contract/details.vue @@ -12,81 +12,64 @@ class="select" > - + - + - + - + - - + + - - + + - - + --> + - + @@ -146,75 +129,58 @@ class="select" > - + - + - + - + - - + + - - + + - - + --> + - + @@ -282,17 +248,17 @@ > - + @@ -301,29 +267,29 @@ - + - + @@ -370,35 +336,35 @@ @@ -660,6 +626,7 @@ onMounted(async () => { } .el-card { margin-top: 10px; + pointer-event: none; } .el-upload-list .el-upload-list__item-thumbnail { From dd02933da17edcd5420ce19d1a22c57f1d2af929 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 15 Sep 2023 11:48:07 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/edit.vue | 511 ++++++++++++--------------- src/views/contract/contractDetil.vue | 8 +- src/views/shop_contract/details.vue | 1 + 3 files changed, 243 insertions(+), 277 deletions(-) diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index 21d2595..3bd04a9 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -10,217 +10,182 @@
公司基本信息创建
- - - - - - - - - - - - + + + + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - - - - - + + + + + +
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + -->
@@ -463,6 +417,7 @@ - 确定 + 确定 Date: Fri, 15 Sep 2023 13:36:34 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/app_update/edit.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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更新"; From 438f9043ebc193b3b490aed206d10354985dc644 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 15 Sep 2023 13:39:27 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/finance/audit.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/finance/audit.vue b/src/views/finance/audit.vue index b7d2907..552c056 100644 --- a/src/views/finance/audit.vue +++ b/src/views/finance/audit.vue @@ -65,6 +65,7 @@ class="upload-demo" style="width: 100%" drag + :accept="fileTypeList.join(', ')" :headers="{ Token: userStore.token }" :action="actionUrl" :limit="1" From fb21725734a61b3b29039efcfc214e56c2b6f10f Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 15 Sep 2023 14:37:22 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/shop_contract.ts | 5 +++ src/views/contract/contractDetil.vue | 2 +- src/views/shop_contract/details.vue | 7 +++- src/views/shop_contract/index.vue | 58 +++++++++++++++++++++++++++- 4 files changed, 69 insertions(+), 3 deletions(-) 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/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue index 28f9162..c3ade47 100644 --- a/src/views/contract/contractDetil.vue +++ b/src/views/contract/contractDetil.vue @@ -557,7 +557,7 @@ const handleAvatarSuccess_four: UploadProps["onSuccess"] = ( const router = useRouter(); const submitContract = () => { - if (!formData.file) ElMessage.error("请先上传合同!"); + if (!formData.file) return ElMessage.error("请先上传合同!"); upContact({ file: formData.file, id: route.query.id }); removeTab(); router.back(); diff --git a/src/views/shop_contract/details.vue b/src/views/shop_contract/details.vue index 055e9cd..e67a4d5 100644 --- a/src/views/shop_contract/details.vue +++ b/src/views/shop_contract/details.vue @@ -361,6 +361,10 @@ placeholder="商户入驻合同" /> +
+ + + + + + + + + + + +
+ + + diff --git a/src/views/company_form/index.vue b/src/views/company_form/index.vue index 69361d7..6b551c5 100644 --- a/src/views/company_form/index.vue +++ b/src/views/company_form/index.vue @@ -1,155 +1,200 @@ - - - - + + + + From 779920703ecd1ad3acc5d8701f5ca0b39e447704 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 15 Sep 2023 15:29:22 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company_form/index.vue | 6 +++--- src/views/shop_merchant/index.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/company_form/index.vue b/src/views/company_form/index.vue index 6b551c5..9bfb510 100644 --- a/src/views/company_form/index.vue +++ b/src/views/company_form/index.vue @@ -10,12 +10,12 @@ placeholder="请输入商户名称" /> - + -
@@ -45,27 +49,6 @@ 未审核 - - @@ -111,10 +86,10 @@
- diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue index 1e1d7e1..960eceb 100644 --- a/src/views/task_template/edit.vue +++ b/src/views/task_template/edit.vue @@ -230,6 +230,7 @@ import type { PropType } from "vue"; import { dictDataLists } from "@/api/setting/dict"; import taskMap from "./map.vue"; import personnelPopup from "./dialog_index_personnel.vue"; +import { number } from "echarts/core"; defineProps({ dictData: { type: Object as PropType>, @@ -242,6 +243,7 @@ const popupRef = shallowRef>(); const mode = ref("add"); const datalist = ref([]); const route = useRoute(); + // 弹窗标题 const popupTitle = computed(() => { return mode.value == "edit" ? "编辑任务安排" : "新增任务安排"; diff --git a/src/views/task_template/edit_admin.vue b/src/views/task_template/edit_admin.vue new file mode 100644 index 0000000..1a288fb --- /dev/null +++ b/src/views/task_template/edit_admin.vue @@ -0,0 +1,423 @@ + + + + \ 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: "隐藏" }, From 859c5603519a901ad2562a82a518fee0e8ffabaf Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 20 Sep 2023 10:22:15 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/dialog_index_man.vue | 125 ++++++++++-------- src/views/task/taskCalendar.vue | 2 +- .../component/banquetBirthday.vue | 2 - .../component/banquetFullMoon.vue | 2 - .../component/banquetFuneral.vue | 2 - .../component/banquetMarry.vue | 2 - .../component/banquetOther.vue | 2 - .../user_informationg/component/breeding.vue | 2 - .../component/deepProcessing.vue | 24 ++-- .../component/houseDecoration.vue | 2 - .../component/houseRenovate.vue | 2 - .../component/houseRepair.vue | 2 - .../component/houseTransaction.vue | 2 - .../user_informationg/component/plant.vue | 2 - .../user_informationg/component/store.vue | 2 - .../component/thickProcessing.vue | 24 ++-- 16 files changed, 94 insertions(+), 105 deletions(-) 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/task/taskCalendar.vue b/src/views/task/taskCalendar.vue index e618f3e..0cfd316 100644 --- a/src/views/task/taskCalendar.vue +++ b/src/views/task/taskCalendar.vue @@ -100,7 +100,7 @@ const queryParams = reactive({ start_time: "", end_time: "", page_no: 1, - pageSize: 150, + page_size: 300, }); if (route.query.id) { queryParams.scheduling_id = route.query.id.toString(); 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 @@ - - 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/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 @@ From 9160177c7c0918190fb9c37cfea0a8224bb6077e Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 22 Sep 2023 17:33:14 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=A5=E7=A8=8B=E7=9A=84=E8=AF=A6=E7=BB=86=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/editTow.vue | 131 ++++++++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-) diff --git a/src/views/task/editTow.vue b/src/views/task/editTow.vue index 29f4170..9bfaa0f 100644 --- a/src/views/task/editTow.vue +++ b/src/views/task/editTow.vue @@ -50,10 +50,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +