From 83297d49b9c7ebfe3bddde64b5df74186c4fb983 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Tue, 6 May 2025 17:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E5=9F=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=8D=95=E7=BC=96=E5=86=99?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/Urban/OperateRegion/index.vue | 4 +- .../CustomerServiceConfigForm.vue | 5 +-- .../form/operateregion/LockCarConfigForm.vue | 4 +- .../form/operateregion/OperateConfForm.vue | 44 ++++++++++++++----- .../form/operateregion/OperateConfigForm.vue | 4 +- .../operateregion/ReturnCarConfigForm.vue | 4 +- .../form/operateregion/SwitchConfigForm.vue | 18 +++++++- .../form/operateregion/UseCarConfigForm.vue | 4 +- 8 files changed, 60 insertions(+), 27 deletions(-) diff --git a/ebike-operate/src/views/Urban/OperateRegion/index.vue b/ebike-operate/src/views/Urban/OperateRegion/index.vue index 8a92ac5..c92a8c0 100644 --- a/ebike-operate/src/views/Urban/OperateRegion/index.vue +++ b/ebike-operate/src/views/Urban/OperateRegion/index.vue @@ -444,7 +444,7 @@ const handleOkFeeModal = () => { * @param record */ const regionConfigInfo = (record) => { -// modalOperateKey.value = getGUID(); + modalOperateKey.value = getGUID(); openTitleConfig.value = "运营配置 - " + record['regionName'] openConfig.value = true nextTick(() => { @@ -461,7 +461,7 @@ const regionConfigInfo = (record) => { */ const handleOkConfgModal = () => { formModelConfig.value.formSave((data => { - // openConfig.value = false; + openConfig.value = false; if (data['code'] == 200) { getData() } else { diff --git a/ebike-operate/src/views/form/operateregion/CustomerServiceConfigForm.vue b/ebike-operate/src/views/form/operateregion/CustomerServiceConfigForm.vue index a40a3cd..747d468 100644 --- a/ebike-operate/src/views/form/operateregion/CustomerServiceConfigForm.vue +++ b/ebike-operate/src/views/form/operateregion/CustomerServiceConfigForm.vue @@ -121,7 +121,7 @@ import { callOperate } from '@/apis/call.js' const formRef = ref(); const form = ref({ customerServiceConfig: [], - tableName: 'reqEbikeSysLinktelDto' + tableName: 'ebikeSysLinktelDto' }); const columns = ref([ { @@ -184,7 +184,6 @@ const remove = (val, filed, array) => { const validateForm = async () => { await formRef.value.validate(); - form.value.tableName = 'reqEbikeSysLinktelDto' const formData = _.cloneDeep(form.value); formData['customerServiceConfig'].map(item => { item['worktimeStart'] = item['workTime'][0]; @@ -198,7 +197,7 @@ const validateForm = async () => { const loadFormData = (formData) => { if (formData) { - form.value = formData + form.value = { ...form.value, ...formData } } else { callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => { if (res.code == 200) { diff --git a/ebike-operate/src/views/form/operateregion/LockCarConfigForm.vue b/ebike-operate/src/views/form/operateregion/LockCarConfigForm.vue index ce43e54..8d36865 100644 --- a/ebike-operate/src/views/form/operateregion/LockCarConfigForm.vue +++ b/ebike-operate/src/views/form/operateregion/LockCarConfigForm.vue @@ -160,7 +160,7 @@ import _ from 'lodash' import { callOperate } from '@/apis/call.js' const formRef = ref(); const form = ref({ - tableName: 'reqEbikeSysRlocksetDto' + tableName: 'ebikeSysRlocksetDto' }); const autoReturn = ref(false); const autoLock = ref(false); @@ -183,7 +183,7 @@ const validateForm = async () => { const loadFormData = (formData) => { if (formData) { - form.value = formData + form.value = { ...form.value, ...formData } } else { callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => { if (res.code == 200) { diff --git a/ebike-operate/src/views/form/operateregion/OperateConfForm.vue b/ebike-operate/src/views/form/operateregion/OperateConfForm.vue index f0d7a44..fc1941f 100644 --- a/ebike-operate/src/views/form/operateregion/OperateConfForm.vue +++ b/ebike-operate/src/views/form/operateregion/OperateConfForm.vue @@ -39,6 +39,7 @@ import LockCarConfigForm from './LockCarConfigForm.vue'; import ReturnCarConfigForm from './ReturnCarConfigForm.vue'; import CustomerServiceConfigForm from './CustomerServiceConfigForm.vue'; import OperateConfigForm from './OperateConfigForm.vue'; +import dayjs from 'dayjs'; const props = defineProps({ @@ -72,12 +73,28 @@ const openForm = (params = {}) => { if (res.data) { isAdd.value = false; forms.map(form => { - Object.keys(res.data).forEach((key) => { - const data = form.value.getFormData(); - if (key == data['tableName']) { - form.value.loadFormData(res.data[key]); + const data = form.value.getFormData(); + if (data['tableName'] == "ebikeSysLinktelDto") { + const ebikeSysLinktelDtos = _.cloneDeep(res.data['ebikeSysLinktelDtos']); + let customerServiceConfig = []; + ebikeSysLinktelDtos.map(item => { + customerServiceConfig.push({ + telnum: item['telnum'], + workTime: [dayjs(item['worktimeStart'], 'HH:mm:ss'), dayjs(item['worktimeEnd'], 'HH:mm:ss')] + }) + }) + let formData = { + onlineService: res.data['ebikeSysRoperatesetDto']['onlineService'], + customerServiceConfig: customerServiceConfig } - }) + customerServiceForm.value.loadFormData(formData) + } else { + Object.keys(res.data).forEach((key) => { + if (key == data['tableName']) { + form.value.loadFormData(_.cloneDeep(res.data[key])); + } + }) + } }) } else { forms.map(form => { @@ -99,12 +116,15 @@ const formSave = (onCallBack) => { if (form.value) { return form.value.validateForm().then(res => { const tableName = res['tableName']; - if (tableName == "reqEbikeSysLinktelDto") { - params['reqEbikeSysRoperatesetDto'] = { ...params['reqEbikeSysRoperatesetDto'], onlineService: res['onlineService'] }; + if (tableName == "ebikeSysLinktelDto") { + params['ebikeSysRoperatesetDto'] = { ...params['ebikeSysRoperatesetDto'], onlineService: res['onlineService'] }; params[tableName] = res['customerServiceConfig']; - } else if (tableName == "reqEbikeSysRoperatesetDto") { + params[tableName].map(item => { + item['regionId'] = regionId.value; + }) + } else if (tableName == "ebikeSysRoperatesetDto") { delete res['tableName']; - params[tableName] = { ...params['reqEbikeSysRoperatesetDto'], ...res }; + params[tableName] = { ...params['ebikeSysRoperatesetDto'], ...res }; if (params[tableName]['operateTime']) { params[tableName]['operateTime'].map(item => { item['regionId'] = regionId.value; @@ -128,10 +148,10 @@ const formSave = (onCallBack) => { if (!isAdd.value) { url = "update" } - if (params['reqEbikeSysRoperatesetDto']['rechargeRule']) { - params['reqEbikeSysRoperatesetDto']['rechargeRule'] = params['reqEbikeSysRoperatesetDto']['rechargeRule'].map(item => item.value); + if (params['ebikeSysRoperatesetDto']['rechargeRule']) { + params['ebikeSysRoperatesetDto']['rechargeRule'] = params['ebikeSysRoperatesetDto']['rechargeRule'].map(item => item.value); } - // isAdd.value = false; + isAdd.value = false; callOperate("/ebikeSysRoperateset/" + url, params).then(res => { spinning.value = false; if (res.code == 200) { diff --git a/ebike-operate/src/views/form/operateregion/OperateConfigForm.vue b/ebike-operate/src/views/form/operateregion/OperateConfigForm.vue index 7c776c8..3086d1f 100644 --- a/ebike-operate/src/views/form/operateregion/OperateConfigForm.vue +++ b/ebike-operate/src/views/form/operateregion/OperateConfigForm.vue @@ -698,7 +698,7 @@ const amountInput = ref(); const formRef = ref(); const form = ref({ rechargeRule: [], - tableName: 'reqEbikeSysRoperatesetDto' + tableName: 'ebikeSysRoperatesetDto' }); const extraText = ref(""); const showFirstFreeAmount = ref(false); @@ -802,7 +802,7 @@ const validateForm = async () => { const loadFormData = (formData) => { if (formData) { - form.value = formData + form.value = { ...form.value, ...formData } } else { callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => { if (res.code == 200) { diff --git a/ebike-operate/src/views/form/operateregion/ReturnCarConfigForm.vue b/ebike-operate/src/views/form/operateregion/ReturnCarConfigForm.vue index 038b79a..7a45def 100644 --- a/ebike-operate/src/views/form/operateregion/ReturnCarConfigForm.vue +++ b/ebike-operate/src/views/form/operateregion/ReturnCarConfigForm.vue @@ -337,7 +337,7 @@ import _ from 'lodash' import { callOperate } from '@/apis/call.js' const formRef = ref(); const form = ref({ - tableName: 'reqEbikeSysRbacksetDto' + tableName: 'ebikeSysRbacksetDto' }); const showAngularOffsetError = ref(false); const isIgnoreRegular = ref(false); @@ -393,7 +393,7 @@ const validateForm = async () => { const loadFormData = (formData) => { if (formData) { - form.value = formData + form.value = { ...form.value, ...formData } } else { callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => { if (res.code == 200) { diff --git a/ebike-operate/src/views/form/operateregion/SwitchConfigForm.vue b/ebike-operate/src/views/form/operateregion/SwitchConfigForm.vue index 5a867bd..be6a8ce 100644 --- a/ebike-operate/src/views/form/operateregion/SwitchConfigForm.vue +++ b/ebike-operate/src/views/form/operateregion/SwitchConfigForm.vue @@ -258,6 +258,7 @@ import { ref, defineProps } from 'vue' import { TimeRangePicker } from 'ant-design-vue' import _ from 'lodash' import { callOperate } from '@/apis/call.js' +import dayjs from 'dayjs'; const stopInfoFlag = ref(false); const formRef = ref(); @@ -267,7 +268,7 @@ const showOperateTime = ref(false); const form = ref({ operateTimeByWeek: [], operateTimeBytime: null, - tableName: 'reqEbikeSysRoperatesetDto' + tableName: 'ebikeSysRoperatesetDto' }); const showStopTimeInfo = ref(false); const saveFlag = ref(true); @@ -413,7 +414,20 @@ const validateForm = async () => { const loadFormData = (formData) => { if (formData) { - form.value = formData + if (formData['operateType'] == "2") { + formData['operateTimeBytime'].map(item => { + item['operateTimeBytime'] = [dayjs(item['startWorktime'], 'HH:mm:ss'), dayjs(item['endWorktime'], 'HH:mm:ss')] + delete item['startWorktime']; + delete item['endWorktime']; + }) + } else if (formData['operateType'] == "3") { + formData['operateTimeByWeek'].map(item => { + item['workTime'] = [dayjs(item['startWorktime'], 'HH:mm:ss'), dayjs(item['endWorktime'], 'HH:mm:ss')] + delete item['startWorktime']; + delete item['endWorktime']; + }) + } + form.value = { ...form.value, ...formData } } else { callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => { if (res.code == 200) { diff --git a/ebike-operate/src/views/form/operateregion/UseCarConfigForm.vue b/ebike-operate/src/views/form/operateregion/UseCarConfigForm.vue index 4687892..869d27f 100644 --- a/ebike-operate/src/views/form/operateregion/UseCarConfigForm.vue +++ b/ebike-operate/src/views/form/operateregion/UseCarConfigForm.vue @@ -771,7 +771,7 @@ import { callOperate } from '@/apis/call.js' const formRef = ref(); const showMinimumAmount = ref(false); const form = ref({ - tableName: 'reqEbikeSysRusecondsetDto' + tableName: 'ebikeSysRusecondsetDto' }); const prefixText = ref(""); const extraTextByRidingFace = ref(""); @@ -872,7 +872,7 @@ const validateForm = async () => { const loadFormData = (formData) => { if (formData) { - form.value = formData + form.value = { ...form.value, ...formData } } else { callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => { if (res.code == 200) {