fix：“优化今日做糖列表”

src/views/device/deviceOper.vue

@@ -1,14 +1,14 @@
 <template>
   <!-- 设备常见操作弹窗 -->
-  <van-dialog class-name="operDialog" width="auto" v-model:show="show" :showConfirmButton="false"
+  <van-dialog class-name="operDialog" width="350px" v-model:show="show" :showConfirmButton="false"
     :showCancelButton="false">
     <slot name="title">
-      <div class="van-dialog__header">{{ $t("device.commonOperations") }}</div>
+      <div class="van-dialog__header" style="padding-bottom: 1em;">{{ $t("device.commonOperations") }}</div>
       <div class="txt1" style="padding: 0.2em 1em">
         {{ $t("device.equipmentName") }}: {{ device.name != null ? device.name : $t("device.equipmentNameTips") }}
       </div>
       <div class="txt1" style="padding: 0.2em 1em">
-        {{ $t("device.equipmentNo") }}: {{ device.clientId }}
+        {{ $t("device.equipmentNo") }}: {{ device.clientId.slice(-6) }}
       </div>
     </slot>
     <van-icon name="cross" class="close" @click="show = false" />

src/views/device/deviceSet.vue

@@ -205,6 +205,7 @@
                   <van-radio name="26" icon-size="16px">26</van-radio>
                   <van-radio name="30" icon-size="16px">30</van-radio>
                   <van-radio name="42" icon-size="16px">42</van-radio>
+                  <van-radio name="60" icon-size="16px">60</van-radio>
                 </van-radio-group>
               </div>
             </template>

src/views/home/index.vue

@@ -120,10 +120,11 @@
         <van-image src="https://fastly.jsdelivr.net/npm/@vant/assets/apple-3.jpeg" />
       </div>
     </van-dialog> -->
-    <!-- <van-dialog v-model:show="showAlarm" title="以下机器报警，请及时处理！">
-      <div v-for="(item, index) in alarmList" :key="index" style="padding: 20px 20px;"> 
-        <div>设备：{{ item. clientId }}</div>
-        <div>报警内容：{{ item. alarmContent }}</div>
+    <!-- <van-dialog v-model:show="showAlarm" title="以下机器出现报警，请及时处理！">
+      <div style="max-height: 30vh; overflow-y: auto;">
+        <div v-for="(item, index) in alarmList" :key="index" style="padding: 2px 5px;">
+            <van-cell :title="'设备：'+ (item.name ? item.name : item.clientId.slice(-6)) + ' , 报警内容：' + item.alarmContent" />
+        </div>
       </div>
     </van-dialog> -->
   </div>
@@ -167,7 +168,6 @@ export default {
     // 获取设备情况
     const getMachineNum = () => {
       Api_postMachineNum({ adminId: user.id }).then((res) => {
-        // console.log("res", res);
         equipStatus.value = res.data.data || {};
       });
     };
@@ -192,7 +192,6 @@ export default {
       Api_getUpdateNotice({
         adminId: user.id,
       }).then((res) => {
-        // console.log("res", res);
         showToast(res.data.message);
         setTimeout(() => {
           getNotice();
@@ -218,7 +217,6 @@ export default {
     } else {
       currencySymbol.value = "￥";
     }
-    // console.log("currencySymbol是》》》" + user.currencySymbol);
 
     // 图表对象
     const chartBox = ref();
@@ -390,7 +388,7 @@ export default {
     const showAlarm = ref(false);
     const alarmList = ref([]);
     // 页面初始化
-    onMounted(async() => {
+    onMounted(async () => {
       // 加载样式
       styleUrl('home');
       if (localStorage.getItem("loginSys")) {
@@ -428,7 +426,7 @@ export default {
           todayDate: dateUtil.formateDate(new Date(), "yyyy-MM-dd"), // 当天时间
         };
         const { data } = await getIsAlarm(queryParams);
-        if(data.data.length > 0) {
+        if (data.data.length > 0) {
           showAlarm.value = true;
           alarmList.value = data.data;
           console.log("alarmList", alarmList.value)

src/views/merchantManage/set.vue

@@ -247,14 +247,14 @@ export default {
     }
     const onSubmit = async () => {
       try {
-        const result = await getRelationAdminId({ relationUsername: relationObj.value.relationUsername });
-        // console.log("result.data.data --> ", result.data.data);
-        if (result.data.code === "00000") {
-          if (result.data.data != null) {
-            adminObj.value.relationAdminId = result.data.data;
+        if (relationObj.value.relationUsername != null) {
+          const result = await getRelationAdminId({ relationUsername: relationObj.value.relationUsername });
+          if (result.data.code === "00000") {
+            if (result.data.data != null) {
+              adminObj.value.relationAdminId = result.data.data;
+            }
           }
         }
-        // console.log("relationAdminId --> ", adminObj.value.relationAdminId);
         const params = {
           id: adminObj.value.id,
           name: adminObj.value.name,

src/views/settlement/index.vue

@@ -232,21 +232,28 @@
             :label="$t('huifuMch.huifuBankAddress')" :placeholder="$t('huifuMch.huifuBankAddressPlaceholder')"
             :rules="[{ required: true, message: $t('huifuMch.huifuBankAddressPlaceholder') }]"
             @click="showBankAddress = true" />
-          <div v-if="bankAccountType === '4'" class="requiredLeft">
-            <!-- 联行号 -->
-            <van-field v-model="bankChannelNo" name="bankChannelNo" :label="$t('joinpayMch.interBankNoLabel')"
-              :placeholder="$t('joinpayMch.interBankNoPlaceholder')"
-              :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.interBankNoPlaceholder') }]"
-              @update:model-value="fieldUpdate" />
-            <van-field v-model="bankCodeValue" name="bankCodeValue" :label="$t('huifuMch.bankCodeLabel')"
-              :placeholder="$t('huifuMch.bankCodePlaceholder')"
-              :rules="[{ required: true, message: $t('huifuMch.bankCodePlaceholder') }]"
-              @update:model-value="fieldUpdate" />
-            <!-- <van-field v-model="openLicenceNoValue" name="openLicenceNoValue" :label="$t('huifuMch.openLicenceNo')"
-              :placeholder="$t('huifuMch.openLicenceNoPlaceholder')"
-              :rules="[{ required: true, message: $t('huifuMch.openLicenceNoPlaceholder') }]"
-              @update:model-value="fieldUpdate" /> -->
-          </div>
+          <!-- <div v-if="bankAccountType === '4'" class="requiredLeft"> -->
+          <!-- 联行号 -->
+          <van-field v-if="bankAccountType === '4'" class="requiredLeft" v-model="bankChannelNo" name="bankChannelNo"
+            :label="$t('joinpayMch.interBankNoLabel')" :placeholder="$t('joinpayMch.interBankNoPlaceholder')"
+            :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.interBankNoPlaceholder') }]"
+            @update:model-value="fieldUpdate" />
+          <!-- 银行编号 -->
+          <van-field v-if="bankAccountType === '4'" class="requiredLeft" v-model="bankCodeValue" name="bankCodeValue"
+            :label="$t('huifuMch.bankCodeLabel')" :placeholder="$t('huifuMch.bankCodePlaceholder')"
+            :rules="[{ required: true, message: $t('huifuMch.bankCodePlaceholder') }]" @update:model-value="fieldUpdate">
+            <template #button>
+              <van-button size="small" type="primary" @click="showBankCode = true" style="padding: 0 1em;">
+                选择所属银行
+              </van-button>
+            </template>
+          </van-field>
+          <!-- </div> -->
+          <!-- 银行编号弹窗 -->
+          <van-popup v-model:show="showBankCode" position="bottom">
+            <van-picker title="请选择所属银行" :columns="bankCodePopList" @confirm="bankCodePopConfirm"
+              @cancel="showBankCode = false" />
+          </van-popup>
           <div v-if="altMerchantType === '12'" class="requiredLeft">
             <!-- 营业执照编号 -->
             <van-field v-model="licenseNo" name="licenseNo" :label="$t('joinpayMch.businessLicenseNoLabel')"
@@ -479,6 +486,55 @@ export default {
     const showArea = ref(false); // 是否弹窗
     const showBankAddress = ref(false);
     const showReAddress = ref(false);
+    const showBankCode = ref(false);
+    const bankCodePopList = [
+      {
+        text: '中国银行',
+        value: "01040000",
+      },
+      {
+        text: '中国农业银行',
+        value: "01030000",
+      },
+      {
+        text: '中国工商银行',
+        value: "01020000",
+      },
+      {
+        text: '中国建设银行',
+        value: "01050000",
+      },
+      {
+        text: '交通银行',
+        value: "03010000",
+      },
+      {
+        text: '中国邮政储蓄银行',
+        value: "04030000",
+      },
+      {
+        text: '中国民生银行',
+        value: "03050000",
+      },
+      {
+        text: '广发银行',
+        value: "03060000",
+      },
+      {
+        text: '招商银行',
+        value: "03080000",
+      },
+      {
+        text: '其他，请咨询售后人员',
+        value: "",
+      },
+    ];
+    const bankCodePopConfirm = ({ selectedOptions }) => {
+      console.log(selectedOptions[0])
+      addParams.bankCodeValue = selectedOptions[0].value;
+      fieldUpdate();
+      showBankCode.value = false;
+    };
     const verCodeTime = reactive({
       time: 0
     });
@@ -1253,6 +1309,9 @@ export default {
       onConfirmBeginDate,
       onConfirmEndDate,
       showBankAddress,
+      showBankCode,
+      bankCodePopList,
+      bankCodePopConfirm,
       areaList,
       onConfirmBankAddress,
       showArea,