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

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

@@ -450,6 +450,11 @@ const regionConfigInfo = (record) => {
 const handleOkConfgModal = () => {
   formModelConfig.value.formSave((data => {
     openConfig.value = false;
+    if (data['code'] == 200) {
+      getData()
+    } else {
+      message.error(data.message)
+    }
   }));
 }
 

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

@@ -9,7 +9,7 @@
       <a-col :xs="24">
         <a-form-item
           required
-          name="isOperate"
+          name="onlineService"
           :rules="[{ required: true, message: '请选择在线客服' }]"
           :label-col="{ sm: { span: 4 }}"
           :wrapper-Col="{span: 24 }"
@@ -21,9 +21,8 @@
             </a-tooltip>
           </template>
           <a-radio-group
-            v-model:value="form.authentication"
+            v-model:value="form.onlineService"
             name="radioGroup"
-            @change="changeIsOperate"
           >
             <a-radio value="1">开启</a-radio>
             <a-radio value="2">关闭</a-radio>
@@ -116,18 +115,8 @@ import { getGUID } from '@/utils/tools';
 import { TimeRangePicker } from 'ant-design-vue'
 import _ from 'lodash'
 
-
-
 const formRef = ref();
-const time = ref(false);
-const week = ref(false);
-const showoperateTime = ref(false);
 const form = ref({
-  isOperate: "1",
-  operateType: "1",
-  outageNotice: "",
-  accessChannel: "",
-  operateTimeBytime: "",
   customerServiceConfig: []
 });
 const columns = ref([
@@ -162,10 +151,6 @@ const columns = ref([
     fixed: 'right',
   }])
 
-const changeIsOperate = () => {
-
-}
-
 const addRecord = () => {
   form.value.customerServiceConfig.push({
     key: getGUID(),
@@ -190,32 +175,11 @@ const remove = (val, filed, array) => {
 }
 
 
-const changeOperateType = (data) => {
-  const value = data.target.value;
-  if (value == "2") {
-    showoperateTime.value = true;
-    time.value = true;
-    week.value = false;
-  } else if (value == "3") {
-    showoperateTime.value = true;
-    week.value = true;
-    time.value = false;
-  } else {
-    week.value = false;
-    time.value = false;
-    showoperateTime.value = false;
-  }
-}
-
 const validateForm = async () => {
-  try {
+
-    // 手动触发表单验证
+  await formRef.value.validate();
-    await formRef.value.validate();
+  form.value.tableName = 'ebikeSysLinktelDto'
-    // 验证通过
+  return form.value;
-    console.log("表单验证通过");
-  } catch (error) {
-    
-  }
 }
 defineExpose({
   validateForm

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

@@ -157,9 +157,6 @@
 <script setup>
 import { ref, defineProps } from 'vue'
 const formRef = ref();
-const time = ref(false);
-const week = ref(false);
-const showoperateTime = ref(false);
 const form = ref({});
 const autoReturn = ref(false);
 const autoLock = ref(false);
@@ -178,32 +175,10 @@ const changeAutoReturnType = (e) => {
   }
 }
 
-const changeOperateType = (data) => {
-  const value = data.target.value;
-  if (value == "2") {
-    showoperateTime.value = true;
-    time.value = true;
-    week.value = false;
-  } else if (value == "3") {
-    showoperateTime.value = true;
-    week.value = true;
-    time.value = false;
-  } else {
-    week.value = false;
-    time.value = false;
-    showoperateTime.value = false;
-  }
-}
-
 const validateForm = async () => {
-  try {
+  await formRef.value.validate();
-    // 手动触发表单验证
+  form.value.tableName = 'ebikeSysrlocksetDto'
-    await formRef.value.validate();
+  return form.value;
-    // 验证通过
-    console.log("表单验证通过");
-  } catch (error) {
-
-  }
 }
 defineExpose({
   validateForm

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

@@ -69,21 +69,40 @@ const openForm = (params = {}) => {
   }
 };
 
-const formSave = () => {
+const formSave = (onCallBack) => {
   const forms = [switchForm, operateForm, useCarForm, lockCarForm, returnCarForm, customerServiceForm];
-  let flag = false;
+  let params = {};
-  for (let form of forms) {
+  // 创建一个数组，保存所有表单的校验 Promise
+  const validationPromises = forms.map(form => {
     if (form.value) {
-      form.value.validateForm().then(res => {
+      return form.value.validateForm().then(res => {
-        debugger
+        const tableName = res['tableName'];
-      }).catch(() => {
+        if (tableName == "ebikeSysLinktelDto") {
-        flag = true;
+          params['ebikeSysRoperatesetDto'] = { ...params['ebikeSysRoperatesetDto'], onlineService: res['onlineService'] };
+          params[tableName] = res['customerServiceConfig'];
+        } else {
+          delete res['tableName'];
+          params[tableName] = res;
+        }
+      }).catch((e) => {
+        return Promise.reject(e);
       });
     }
-  }
+  });
-  if (!flag) {
+  // 使用 Promise.all 等待所有的表单校验完成
-
+  Promise.all(validationPromises).then(() => {
-  }
+    tipContent.value = "保存中..."
+    spinning.value = true;
+    callOperate("/ebikeSysRoperateset/save", params).then(res => {
+      spinning.value = false;
+      if (onCallBack) {
+        res.data = params;
+        onCallBack(res);
+      }
+    })
+  }).catch(error => {
+    console.log(error);
+  });
 };
 
 defineExpose({ openForm, formSave });

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

@@ -655,6 +655,7 @@
               v-model:value="amountInput"
               placeholder="请输入充值金额"
               type="number"
+              :rules="[]"
             />
             <a-button
               style="margin-left: 20px;"
@@ -693,7 +694,9 @@ import _ from 'lodash'
 
 const amountInput = ref();
 const formRef = ref();
-const form = ref({});
+const form = ref({
+  rechargeRule: []
+});
 const extraText = ref("");
 const showFirstFreeAmount = ref(false);
 const orderAppeal = ref(false);
@@ -737,7 +740,7 @@ const changeEnableRecharge = (e) => {
     showRechargeRule.value = true
   } else {
     showRechargeRule.value = false
-    form.value.rechargeRule = null;
+    form.value.rechargeRule = [];
   }
 }
 
@@ -747,7 +750,8 @@ const changeBalanceRefund = (e) => {
     showBalanceRefund.value = true
   } else {
     showBalanceRefund.value = false
-    form.value.rechargeRule = null;
+    form.value.BalanceAutomaticRefund = null;
+    form.value.deductionGift = null;
   }
 }
 
@@ -789,12 +793,9 @@ const remove = (val, filed, array) => {
 }
 
 const validateForm = async () => {
-  try {
+  await formRef.value.validate();
-    await formRef.value.validate();
+  form.value.tableName = 'ebikeSysRoperatesetDto'
-    return form.value;
+  return form.value;
-  } catch (error) {
-
-  }
 }
 defineExpose({
   validateForm

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

@@ -208,7 +208,10 @@
           </a-radio-group>
         </a-form-item>
       </a-col>
-      <a-col v-if="showDistance" :xs="12">
+      <a-col
+        v-if="showDistance"
+        :xs="12"
+      >
         <a-form-item
           required
           name="distance"
@@ -244,12 +247,61 @@
           <a-radio-group
             v-model:value="form.freeDispatchStudy"
             name="radioGroup"
+            @change="changeFreeDispatchStudy"
           >
             <a-radio value="1">是</a-radio>
             <a-radio value="2">否</a-radio>
           </a-radio-group>
         </a-form-item>
       </a-col>
+      <a-col
+        v-if="isFreeDispatchStudy"
+        :xs="12"
+      >
+        <a-form-item
+          required
+          label="学习免调度费次数"
+          name="freeDispatchCount"
+          :rules="[{ required: true, message: '请输入学习免调度费次数' }]"
+        >
+          <a-input
+            v-model:value="form.freeDispatchCount"
+            placeholder="请输入学习免调度费次数"
+            type="number"
+          />
+        </a-form-item>
+      </a-col>
+      <a-col
+        v-if="isFreeDispatchStudy"
+        :xs="12"
+      >
+        <a-form-item
+          required
+          name="freeFeturnType"
+          :rules="[{ required: true, message: '请选择学习免调度费还车类型' }]"
+          :label-col="{ sm: { span: 10 }}"
+          :wrapper-Col="{span: 24 }"
+        >
+          <template #label>
+            学习免调度费还车类型
+            <a-tooltip title="允许用户可以通过学习还车规则，免调度费还车的不规范还车类型">
+              <QuestionCircleOutlined style="margin-left: 5px;color: rgb(192,192,192);" />
+            </a-tooltip>
+          </template>
+          <a-select
+            v-model:value="form.freeFeturnType"
+            mode="multiple"
+            style="width: 100%"
+            placeholder="请选择"
+            :max-tag-count="1"
+          >
+            <a-select-option value="1">不在运营区</a-select-option>
+            <a-select-option value="2">不在停车区</a-select-option>
+            <a-select-option value="3">禁停区</a-select-option>
+            <a-select-option value="4">道钉还车</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
     </a-row>
     <a-row :gutter="8">
       <a-col :xs="12">
@@ -282,13 +334,12 @@
 <script setup>
 import { ref, defineProps } from 'vue'
 const formRef = ref();
-const time = ref(false);
-const week = ref(false);
-const showoperateTime = ref(false);
 const form = ref({});
 const showAngularOffsetError = ref(false);
 const isIgnoreRegular = ref(false);
 const showDistance = ref(false);
+const isFreeDispatchStudy = ref(false);
+
 
 const changeParkNinety = (e) => {
   const value = e.target.value;
@@ -296,6 +347,7 @@ const changeParkNinety = (e) => {
     showAngularOffsetError.value = true;
   } else {
     showAngularOffsetError.value = false;
+    form.value.angularOffsetError = null;
   }
 }
 
@@ -305,44 +357,35 @@ const changeLocation = (e) => {
     showDistance.value = true;
   } else {
     showDistance.value = false;
+    form.value.distance = null;
   }
 }
 
+const changeFreeDispatchStudy = (e) => {
+  const value = e.target.value;
+  if (value == '1') {
+    isFreeDispatchStudy.value = true;
+  } else {
+    isFreeDispatchStudy.value = false;
+    form.value.freeFeturnType = null;
+    form.value.freeDispatchCount = null;
+  }
+}
 const changeIgnoreRegular = (e) => {
   const value = e.target.value;
   if (value == '1') {
     isIgnoreRegular.value = true;
   } else {
     isIgnoreRegular.value = false;
-  }
+    form.value.ignoreRegularErrorCount = null;
-}
+    form.value.ignoreRegularType = null;
-
-const changeOperateType = (data) => {
-  const value = data.target.value;
-  if (value == "2") {
-    showoperateTime.value = true;
-    time.value = true;
-    week.value = false;
-  } else if (value == "3") {
-    showoperateTime.value = true;
-    week.value = true;
-    time.value = false;
-  } else {
-    week.value = false;
-    time.value = false;
-    showoperateTime.value = false;
   }
 }
 
 const validateForm = async () => {
-  try {
+  await formRef.value.validate();
-    // 手动触发表单验证
+  form.value.tableName = 'ebikeSysRbacksetDto'
-    await formRef.value.validate();
+  return form.value;
-    // 验证通过
-    console.log("表单验证通过");
-  } catch (error) {
-
-  }
 }
 defineExpose({
   validateForm

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

@@ -221,7 +221,6 @@
 <script setup>
 import { ref, defineProps } from 'vue'
 import { TimeRangePicker } from 'ant-design-vue'
-import { TimePicker } from 'ant-design-vue'
 import { getGUID } from '@/utils/tools';
 import _ from 'lodash'
 
@@ -312,12 +311,10 @@ const changeOperateType = (data) => {
 }
 
 const validateForm = async () => {
-  try {
-    await formRef.value.validate();
-    return form.value;
-  } catch (error) {
 
-  }
+  await formRef.value.validate();
+  form.value.tableName = 'ebikeSysRoperatesetDto'
+  return form.value;
 }
 defineExpose({
   validateForm

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

@@ -304,7 +304,7 @@
             </a-tooltip>
           </template>
           <a-input
-            v-model:value="form.freeDuration"
+            v-model:value="form.poweroffCapcity"
             placeholder="请输入低电骑行断电电量"
             type="number"
           />
@@ -472,7 +472,7 @@
           :wrapper-Col="{span: 24 }"
         >
           <a-input
-            v-model:value="form.useOutTime"
+            v-model:value="form.outTempPoweredOnTime"
             placeholder="请输入区域外临时通电时间"
             type="number"
           />
@@ -767,9 +767,6 @@
 <script setup>
 import { ref, defineProps } from 'vue'
 const formRef = ref();
-const time = ref(false);
-const week = ref(false);
-const showoperateTime = ref(false);
 const showMinimumAmount = ref(false);
 const form = ref({});
 const prefixText = ref("");
@@ -864,32 +861,10 @@ const changeMinimumAmount = (e) => {
   }
 }
 
-const changeOperateType = (data) => {
-  const value = data.target.value;
-  if (value == "2") {
-    showoperateTime.value = true;
-    time.value = true;
-    week.value = false;
-  } else if (value == "3") {
-    showoperateTime.value = true;
-    week.value = true;
-    time.value = false;
-  } else {
-    week.value = false;
-    time.value = false;
-    showoperateTime.value = false;
-  }
-}
-
 const validateForm = async () => {
-  try {
+  await formRef.value.validate();
-    // 手动触发表单验证
+  form.value.tableName = 'ebikeSysRusecondsetDto'
-    await formRef.value.validate();
+  return form.value;
-    // 验证通过
-    console.log("表单验证通过");
-  } catch (error) {
-
-  }
 }
 defineExpose({
   validateForm