运营区域配置表单优化

ebike-operate/src/views/Urban/OperateRegion/index.vue

@@ -418,7 +418,7 @@ const feeConfigInfo = (record) => {
   open.value = true
   nextTick(() => {
     if (formModel.value) {
-      formModel.value.openForm({ regionId: record['operationRegionId'] });
+      formModel.value.openForm({ operationRegionId: record['operationRegionId'] });
     } else {
       console.log('formModel is not ready yet');
     }
@@ -449,7 +449,7 @@ const regionConfigInfo = (record) => {
   openConfig.value = true
   nextTick(() => {
     if (formModelConfig) {
-      formModelConfig.value.openForm({ regionId: record['operationRegionId'] });
+      formModelConfig.value.openForm({ operationRegionId: record['operationRegionId'] });
     } else {
       console.log('formModel is not ready yet');
     }
@@ -473,7 +473,7 @@ const handleOkConfgModal = () => {
 const handleEditORMap = (record) => {
   openORMapTitle.value = '绘制地图（' + record['operationRegionName'] + '）';
   const data = {
-    regionId: record['operationRegionId']
+    operationRegionId: record['operationRegionId']
   }
   editORMapModel.value.showModal(data);
 }

ebike-operate/src/views/Urban/OperateRegionMap/index.vue

@@ -96,16 +96,16 @@ const loadMap = (dataRegion) => {
   if (editorRef.value) {
     clearTimeout(timer);
     if (dataRegion) {
-      const { regionId } = dataRegion;
+      const { operationRegionId } = dataRegion;
-      callOperate("/ebikeRegion/getOperationById?regionId=" + regionId, {}, "get").then((res) => {
+      callOperate("/ebikeRegion/getOperationById?regionId=" + operationRegionId, {}, "get").then((res) => {
         if (res.code != 200) {
           message.error(res.message)
           return
         }
-        const { regionName, simpleName, zoneId, points, shapeType, radius } = res.data;
+        const { operationRegionName, simpleName, zoneId, points, shapeType, radius } = res.data;
         formData.value = {
-          "regionId": regionId,
+          "operationRegionId": operationRegionId,
-          "regionName": regionName,
+          "operationRegionName": operationRegionName,
           "simpleName": simpleName,
           "zoneId": zoneId,
           "points": points,
@@ -273,8 +273,7 @@ const onEditorComplete = () => {
         });
         formData.value.shapeType = 2;
       }
-      debugger
+      if (!isNullOrEmpty(formData.value.operationRegionId)) {
-      if (!isNullOrEmpty(formData.value.regionId)) {
         callOperate("/ebikeRegion/updateOperation", formData.value, "post").then((res) => {
           if (res.code == 200) {
             message.success(res.message, 3, handleClose);

ebike-operate/src/views/form/operateregion/CustomerServiceConfigForm.vue

@@ -117,6 +117,8 @@ 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 formRef = ref();
 const form = ref({
@@ -184,26 +186,21 @@ const remove = (val, filed, array) => {
 
 const validateForm = async () => {
   await formRef.value.validate();
-  const formData = _.cloneDeep(form.value);
+  const formData = _.cloneDeep(formRef.value.getFieldsValue());
   formData['customerServiceConfig'].map(item => {
-    item['worktimeStart'] = item['workTime'][0];
+    item['worktimeStart'] = dayjs(item['workTime'][0]).format('HH:mm:ss');
-    item['worktimeEnd'] = item['workTime'][1];
+    item['worktimeEnd'] = dayjs(item['workTime'][1]).format('HH:mm:ss');
     delete item['workTime'];
     delete item['key'];
     delete item['phase'];
   })
+  formData['tableName'] = form.value.tableName
   return formData;
 }
 
 const loadFormData = (formData) => {
   if (formData) {
     form.value = { ...form.value, ...formData }
-  } else {
-    callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => {
-      if (res.code == 200) {
-        form.value['id'] = res.data;
-      }
-    })
   }
 }
 

ebike-operate/src/views/form/operateregion/LockCarConfigForm.vue

@@ -178,12 +178,18 @@ const changeAutoReturnType = (e) => {
 
 const validateForm = async () => {
   await formRef.value.validate();
-  return _.cloneDeep(form.value);
+  const formData = _.cloneDeep(formRef.value.getFieldsValue());
+  formData['tableName'] = form.value.tableName
+  formData['id'] = form.value.id
+  return formData;
 }
 
 const loadFormData = (formData) => {
   if (formData) {
     form.value = { ...form.value, ...formData }
+    if (formData['autoReturnType']) {
+      changeAutoReturnType({ target: { value: formData['autoReturnType'] } })
+    }
   } else {
     callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => {
       if (res.code == 200) {

ebike-operate/src/views/form/operateregion/OperateConfForm.vue

@@ -58,16 +58,16 @@ const customerServiceForm = ref(null);
 const isAdd = ref(true);
 const spinning = ref(false);
 const tipContent = ref("加载中...");
-const regionId = ref(null);
+const operationRegionId = ref(null);
 
 const openForm = (params = {}) => {
   isAdd.value = true;
   const forms = [switchForm, operateForm, useCarForm, lockCarForm, returnCarForm, customerServiceForm];
-  if (params['regionId']) {
+  if (params['operationRegionId']) {
-    regionId.value = params['regionId'];
+    operationRegionId.value = params['operationRegionId'];
     spinning.value = true;
-    callOperate("/ebikeSysRoperateset/getRegionConfigById?regionId="
+    callOperate("/ebikeSysRoperateset/getRegionConfigById?operationRegionId="
-      + params['regionId'], {}, "get").then(res => {
+      + params['operationRegionId'], {}, "get").then(res => {
         spinning.value = false;
         if (res.code == 200) {
           if (res.data) {
@@ -120,21 +120,22 @@ const formSave = (onCallBack) => {
           params['ebikeSysRoperatesetDto'] = { ...params['ebikeSysRoperatesetDto'], onlineService: res['onlineService'] };
           params[tableName] = res['customerServiceConfig'];
           params[tableName].map(item => {
-            item['regionId'] = regionId.value;
+            item['operationRegionId'] = operationRegionId.value;
           })
         } else if (tableName == "ebikeSysRoperatesetDto") {
           delete res['tableName'];
           params[tableName] = { ...params['ebikeSysRoperatesetDto'], ...res };
           if (params[tableName]['operateTime']) {
             params[tableName]['operateTime'].map(item => {
-              item['regionId'] = regionId.value;
+              item['operationRegionId'] = operationRegionId.value;
             })
           }
+          params[tableName]['operationRegionId'] = operationRegionId.value;
         } else {
           delete res['tableName'];
           params[tableName] = res;
+          params[tableName]['operationRegionId'] = operationRegionId.value;
         }
-        params[tableName]['regionId'] = regionId.value;
       }).catch((e) => {
         return Promise.reject(e);
       });

ebike-operate/src/views/form/operateregion/OperateConfigForm.vue

@@ -692,7 +692,7 @@ import { getGUID } from '@/utils/tools';
 import { ref, defineProps } from 'vue'
 import _ from 'lodash'
 import { callOperate } from '@/apis/call.js'
-
+import dayjs from 'dayjs';
 
 const amountInput = ref();
 const formRef = ref();
@@ -768,7 +768,6 @@ const changeUserApplyIncoice = (e) => {
   }
 }
 
-
 const addAmount = (data) => {
   if (amountInput) {
     if (amountInput.value == undefined || amountInput.value == "") return;
@@ -797,18 +796,48 @@ const remove = (val, filed, array) => {
 
 const validateForm = async () => {
   await formRef.value.validate();
-  return _.cloneDeep(form.value);
+  const formData = _.cloneDeep(formRef.value.getFieldsValue());
+  formData['issueAnInvoiceStartTime'] = dayjs(formData['issueAnInvoiceStartTime']).format('YYYY-MM-DD')
+  formData['tableName'] = form.value.tableName
+  formData['id'] = form.value.id
+  return formData;
 }
 
 const loadFormData = (formData) => {
   if (formData) {
+    if (formData['userApplyIncoice'] == "1") {
+      formData['issueAnInvoiceStartTime'] = dayjs(formData['issueAnInvoiceStartTime'], 'YYYY-MM-DD')
+    }
+    let rechargeRule = [];
+    if (formData['rechargeRule']) {
+      formData['rechargeRule'].map(item => {
+        rechargeRule.push({
+          name: item + "元",
+          value: item,
+          key: getGUID()
+        })
+      })
+      formData['rechargeRule'] = rechargeRule
+    }
     form.value = { ...form.value, ...formData }
-  } else {
+    if (formData['firstFree']) {
-    callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => {
+      changeFirstFree({ target: { value: formData['firstFree'] } })
-      if (res.code == 200) {
+    }
-        form.value['id'] = res.data;
+    if (formData['faceRecogintion']) {
-      }
+      changeFaceRecogintion({ target: { value: formData['faceRecogintion'] } })
-    })
+    }
+    if (formData['orderAppeal']) {
+      changeOrderAppeal({ target: { value: formData['orderAppeal'] } })
+    }
+    if (formData['enableRecharge']) {
+      changeEnableRecharge({ target: { value: formData['enableRecharge'] } })
+    }
+    if (formData['balanceRefund']) {
+      changeBalanceRefund({ target: { value: formData['balanceRefund'] } })
+    }
+    if (formData['userApplyIncoice']) {
+      changeUserApplyIncoice({ target: { value: formData['userApplyIncoice'] } })
+    }
   }
 }
 

ebike-operate/src/views/form/operateregion/RegionFeeCofFrom.vue

@@ -409,7 +409,7 @@ const costConfigId = ref("");
 
 const formData = () => ({
   costConfigId: "",
-  regionId: "",
+  operationRegionId: "",
   chargingMode: "",
   freeDurationMode: "1",
   freeDuration: "免费时长(分钟)",
@@ -591,11 +591,11 @@ const openForm = (params = {}) => {
   deteilShow.value = false;
   Object.assign(form.value, formData());
   isAdd.value = true;
-  if (params['regionId']) {
+  if (params['operationRegionId']) {
-    form.value.regionId = params['regionId']
+    form.value.operationRegionId = params['operationRegionId']
     spinning.value = true;
-    callOperate("/ebikesysrcostset/getRegionFeeConfigById?regionId="
+    callOperate("/ebikesysrcostset/getRegionFeeConfigById?operationRegionId="
-      + params['regionId'], {}, "get").then(res => {
+      + params['operationRegionId'], {}, "get").then(res => {
         spinning.value = false;
         if (res.code == 200) {
           if (res.data.costConfigId) {

ebike-operate/src/views/form/operateregion/ReturnCarConfigForm.vue

@@ -340,7 +340,7 @@ const form = ref({
   tableName: 'ebikeSysRbacksetDto'
 });
 const showAngularOffsetError = ref(false);
-const isIgnoreRegular = ref(false);
+const isIgnoreRegular = ref(true);
 const showDistance = ref(false);
 const isFreeDispatchStudy = ref(false);
 
@@ -388,12 +388,27 @@ const changeIgnoreRegular = (e) => {
 
 const validateForm = async () => {
   await formRef.value.validate();
-  return _.cloneDeep(form.value);
+  const formData = _.cloneDeep(formRef.value.getFieldsValue());
+  formData['tableName'] = form.value.tableName
+  formData['id'] = form.value.id
+  return formData;
 }
 
 const loadFormData = (formData) => {
   if (formData) {
     form.value = { ...form.value, ...formData }
+    if (formData['parkNinety']) {
+      changeParkNinety({ target: { value: formData['parkNinety'] } })
+    }
+    if (formData['location']) {
+      changeLocation({ target: { value: formData['location'] } })
+    }
+    if (formData['freeDispatchStudy']) {
+      changeFreeDispatchStudy({ target: { value: formData['freeDispatchStudy'] } })
+    }
+    if (formData['ignoreRegular']) {
+      changeIgnoreRegular({ target: { value: formData['ignoreRegular'] } })
+    }
   } else {
     callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => {
       if (res.code == 200) {

ebike-operate/src/views/form/operateregion/SwitchConfigForm.vue

@@ -386,26 +386,30 @@ const checkWeek = () => {
 const validateForm = async () => {
 
   await formRef.value.validate();
-  const formData = _.cloneDeep(form.value);
+  const formData = _.cloneDeep(formRef.value.getFieldsValue());
   if (formData['isOperate'] == '2') {
-    formData['stopStartTime'] = formData['stopTimeInfo'][0]
+    formData['stopStartTime'] = dayjs(formData['stopTimeInfo'][0]).format('YYYY-MM-DD HH:mm'),
-    formData['stopEndTime'] = formData['stopTimeInfo'][1]
+      formData['stopEndTime'] = dayjs(formData['stopTimeInfo'][1]).format('YYYY-MM-DD HH:mm')
   }
   if (formData['operateType'] == '2') {
     formData['operateTime'] = [{
-      startWorktime: formData['operateTimeBytime'][0],
+      startWorktime: dayjs(formData['operateTimeBytime'][0]).format('HH:mm:ss'),
-      endWorktime: formData['operateTimeBytime'][1]
+      endWorktime: dayjs(formData['operateTimeBytime'][1]).format('HH:mm:ss')
     }]
   } else if (formData['operateType'] == '3') {
     formData['operateTime'] = [];
     formData['operateTimeByWeek'].map(item => {
       formData['operateTime'].push({
         weekday: item['weekday'],
-        startWorktime: item['workTime'][0],
+        startWorktime: dayjs(item['workTime'][0]).format('HH:mm:ss'),
-        endWorktime: item['workTime'][1],
+        endWorktime: dayjs(item['workTime'][1]).format('HH:mm:ss'),
       })
     })
+  } else {
+    formData['operateTime'] = [];
   }
+  formData['tableName'] = form.value.tableName
+  formData['id'] = form.value.id
   delete formData['operateTimeBytime'];
   delete formData['operateTimeByWeek'];
   delete formData['stopTimeInfo'];
@@ -414,6 +418,12 @@ const validateForm = async () => {
 
 const loadFormData = (formData) => {
   if (formData) {
+    if (formData['isOperate'] == '2') {
+      formData['stopTimeInfo'] = [dayjs(formData['stopTimeInfo'][0], 'YYYY-MM-DD HH:mm'),
+      dayjs(formData['stopTimeInfo'][0], 'YYYY-MM-DD HH:mm')]
+      delete formData['stopStartTime']
+      delete formData['stopEndTime']
+    }
     if (formData['operateType'] == "2") {
       formData['operateTimeBytime'].map(item => {
         item['operateTimeBytime'] = [dayjs(item['startWorktime'], 'HH:mm:ss'), dayjs(item['endWorktime'], 'HH:mm:ss')]
@@ -428,6 +438,12 @@ const loadFormData = (formData) => {
       })
     }
     form.value = { ...form.value, ...formData }
+    if (formData['isOperate'] == '2') {
+      changeIsOperate({ target: { value: formData['isOperate'] } })
+    }
+    if (formData['operateType']) {
+      changeOperateType({ target: { value: formData['operateType'] } })
+    }
   } else {
     callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => {
       if (res.code == 200) {

ebike-operate/src/views/form/operateregion/UseCarConfigForm.vue

@@ -867,12 +867,39 @@ const changeMinimumAmount = (e) => {
 
 const validateForm = async () => {
   await formRef.value.validate();
-  return _.cloneDeep(form.value);
+  const formData = _.cloneDeep(formRef.value.getFieldsValue());
+  formData['tableName'] = form.value.tableName
+  formData['id'] = form.value.id
+  return formData;
 }
 
 const loadFormData = (formData) => {
   if (formData) {
     form.value = { ...form.value, ...formData }
+    if (formData['minimumAmount']) {
+      changeMinimumAmount({ target: { value: formData['minimumAmount'] } })
+    }
+    if (formData['useRecharge']) {
+      changeUseRecharge({ target: { value: formData['useRecharge'] } })
+    }
+    if (formData['ridingFaceRecognition']) {
+      changeRidingFaceRecognition({ target: { value: formData['ridingFaceRecognition'] } })
+    }
+    if (formData['overFaceRecognition']) {
+      changeOverFaceRecognition({ target: { value: formData['overFaceRecognition'] } })
+    }
+    if (formData['intelligentSkipping']) {
+      changeIntelligentSkipping({ target: { value: formData['intelligentSkipping'] } })
+    }
+    if (formData['lowBatteryReminder']) {
+      changeLowBatteryReminder({ target: { value: formData['lowBatteryReminder'] } })
+    }
+    if (formData['useOuter']) {
+      changeUseOuter({ target: { value: formData['useOuter'] } })
+    }
+    if (formData['outerTempRecharge']) {
+      changeOuterTempRecharge({ target: { value: formData['outerTempRecharge'] } })
+    }
   } else {
     callOperate("/ebikesysrcostset/createSnowflakeId", {}, "get").then(res => {
       if (res.code == 200) {