From a6cd1710da1485bce9ef76dd04e0d2a65b10146e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Mar 2024 10:57:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=9D=E5=85=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/pages/upkeepOrder/addServiceRecord.vue | 4 ++-- src/pages/upkeepOrder/detail.vue | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index 1244d0b..7dc61fc 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ -VITE_BASE_URL=http://localhost:12080/admin-api +VITE_BASE_URL=http://192.168.0.106:12080/admin-api VITE_BASE_URL_IMAGE=http://localhost:12080/admin-api \ No newline at end of file diff --git a/src/pages/upkeepOrder/addServiceRecord.vue b/src/pages/upkeepOrder/addServiceRecord.vue index aeb038a..cf199c8 100644 --- a/src/pages/upkeepOrder/addServiceRecord.vue +++ b/src/pages/upkeepOrder/addServiceRecord.vue @@ -251,7 +251,7 @@ const form = ref({ } } if (form.value.id) { - proxy.$modal.confirm('是否修改检修内容').then(() => { + proxy.$modal.confirm('是否修改保养内容').then(() => { proxy.$modal.loading('加载中') loading.value = true upkeepOrderApi.upkeepOrderDetailUpdate(form.value).then((res) => { @@ -276,7 +276,7 @@ const form = ref({ }) }) } else { - proxy.$modal.confirm('是否添加检修内容').then(() => { + proxy.$modal.confirm('是否添加保养内容').then(() => { proxy.$modal.loading('加载中') loading.value = true upkeepOrderApi.upkeepOrderDetailCreate(form.value).then((res) => { diff --git a/src/pages/upkeepOrder/detail.vue b/src/pages/upkeepOrder/detail.vue index c965b7e..4a3c766 100644 --- a/src/pages/upkeepOrder/detail.vue +++ b/src/pages/upkeepOrder/detail.vue @@ -160,7 +160,7 @@ const list = ref([{ name: '设备信息' }, { - name: '检修内容' + name: '保养内容' }]) const current = ref(0) const changeItem = ref({ @@ -197,13 +197,13 @@ proxy.$modal.showToast('没有保养内容') return; } - if(type == 2){ - isTrue.value = serviceList.value.some(item=>item.items.length == 0) - if(isTrue.value){ - proxy.$modal.showToast('保养项目没有全部完成') - return; - } - } + // if(type == 2){ + // isTrue.value = serviceList.value.some(item=>item.items.length == 0) + // if(isTrue.value){ + // proxy.$modal.showToast('保养项目没有全部完成') + // return; + // } + // } const paramsData = { id: data.value.id