Pārlūkot izejas kodu

fix:"修复闹钟修改不生效问题,优化汇聚绑卡"

soobin 1 mēnesi atpakaļ
vecāks
revīzija
bb1f5c4262

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "shenze-vue3-app",
-  "version": "1.5.702",
+  "version": "1.5.707",
   "private": true,
   "scripts": {
     "start": "vue-cli-service serve",

+ 2 - 2
public/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.702",
-  "timestamp": "2025-07-02T11:24:22.767",
+  "version": "1.5.707",
+  "timestamp": "2025-07-07T11:11:48.076",
   "commitHash": "dev-build"
 }

+ 1 - 1
src/components/typeDownMenu/index.vue

@@ -430,7 +430,7 @@ export default {
       border-radius: var(--card-radius);
       box-shadow: var(--card-shadow);
       border: 0;
-      max-height: 60vh;
+      max-height: 45vh;
       z-index: 9999;
       /* 确保层级 */
     }

+ 0 - 6
src/views/accountPer/add.vue

@@ -90,12 +90,6 @@
           readonly
           clearable
           @click="busiEquipInpClk"
-          :rules="[
-            {
-              required: true,
-              message: $t('accountPer.manageMachinesPlaceholder'),
-            },
-          ]"
         >
           <template #right-icon>
             <div class="field-icons">

+ 2 - 0
src/views/bindBankCard/huifuBind.vue

@@ -757,6 +757,7 @@
         :min-date="minDate"
         :max-date="maxDate"
         @confirm="idStartDateConfirm"
+        @cancel="showStartDatePicker = false"
       />
     </van-popup>
     <van-popup
@@ -771,6 +772,7 @@
         :min-date="minDate"
         :max-date="maxDate"
         @confirm="idEndDateConfirm"
+        @cancel="showEndDatePicker = false"
       />
     </van-popup>
     <!-- 公司注册日期选择器弹窗 -->

+ 5 - 4
src/views/bindBankCard/joinPayBind.vue

@@ -681,6 +681,7 @@
         :min-date="minDate"
         :max-date="maxDate"
         @confirm="idDateConfirm"
+        @cancel="showDatePicker = false"
       />
     </van-popup>
     <!-- 公司注册日期选择器弹窗 -->
@@ -927,13 +928,13 @@ export default {
               break;
             // 身份证国徽面
             case "idCardBack":
-              if (data.data.idCardEndDate) {
-                validDate.value = data.data.idCardEndDate.split(".");
-                formData.value.validDate = validDate.value.join("-");
-              } else {
+              if (data.data.idCardEndDate === "长期") {
                 // 长期身份证
                 validDate.value = data.data.idCardStartDate.split(".");
                 formData.value.validDate = validDate.value.join("-");
+              } else {
+                validDate.value = data.data.idCardEndDate.split(".");
+                formData.value.validDate = validDate.value.join("-");
               }
               break;
             // 营业执照

+ 14 - 6
src/views/device/alarmClock.vue

@@ -50,7 +50,7 @@
 <script>
 import { onMounted, ref } from 'vue';
 import sHeader from "@/components/SimpleHeader";
-import { getAlaramClockList, getAlaramClockByDevice, deleteAlaramClock, updateAlaramClockStatus } from '@/service/device'
+import { getAlaramClockList, getAlaramClockByDevice, deleteAlaramClock, alaramClockUpdate } from '@/service/device'
 import { showConfirmDialog, showFailToast, showSuccessToast } from 'vant';
 import { getLoginUser } from '@/common/js/utils';
 import { useRoute, useRouter } from 'vue-router';
@@ -104,8 +104,6 @@ export default {
       if (e.indexOf('1') > -1 && e.indexOf('2') > -1 && e.indexOf('3') > -1 && e.indexOf('4') > -1 && e.indexOf('5') > -1 && e.indexOf('6') == -1 && e.indexOf('7') == -1) {
         return t('device.weekday2')
       }
-      // if (e === '1,2,3,4,5,') { return t('device.weekday2') }
-      // if (e === '6,7,') { return t('device.weekend2') }
       if (e.indexOf('1') == -1 && e.indexOf('2') == -1 && e.indexOf('3') == -1 && e.indexOf('4') == -1 && e.indexOf('5') == -1 && e.indexOf('6') > -1 && e.indexOf('7') > -1) {
         return t('device.weekend2')
       }
@@ -141,13 +139,23 @@ export default {
 
     // 修改状态
     const updateStatus = async (item) => {
+      console.log(item);
+      const params = {
+        id: item.id,
+        adminId: item.adminId,
+        equipmentIds: item.equipmentIds,
+        hour: item.hour,
+        name: item.name,
+        status: item.status === "1" ? "0" : "1",
+        type: item.type,
+        week: item.week,
+      };
+      console.log(params);
       showConfirmDialog({
         title: t('device.operationConfirmation'),
         message: t('device.pleaseConfirmAgainWhetherToOperate'),
       }).then(async () => {
-        if (item.status == '1') { item.status = '0'; } else { item.status = '1'; }
-        const { data } = await updateAlaramClockStatus({ id: item.id, status: item.status });
-        console.log("data", data);
+        const { data } = await alaramClockUpdate(params);
         if (data.code) {
           showSuccessToast(t("device.modificationSucceeded"));
           setTimeout(() => {