Merge branch 'main' of http://47.109.71.130:3000/attiya/ebike-ui

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 {

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) {

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) {

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();
-                const data = form.value.getFormData();
+              if (data['tableName'] == "ebikeSysLinktelDto") {
-                if (key == data['tableName']) {
+                const ebikeSysLinktelDtos = _.cloneDeep(res.data['ebikeSysLinktelDtos']);
-                  form.value.loadFormData(res.data[key]);
+                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") {
+        if (tableName == "ebikeSysLinktelDto") {
-          params['reqEbikeSysRoperatesetDto'] = { ...params['reqEbikeSysRoperatesetDto'], onlineService: res['onlineService'] };
+          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']) {
+    if (params['ebikeSysRoperatesetDto']['rechargeRule']) {
-      params['reqEbikeSysRoperatesetDto']['rechargeRule'] = params['reqEbikeSysRoperatesetDto']['rechargeRule'].map(item => item.value);
+      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) {

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) {

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) {

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) {

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) {