From 0bfc94eb5f318111580e65eaef4805ce726e0264 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 21 May 2025 17:13:33 +0800
Subject: [PATCH] init

---
 src/assets/scss/global.scss        |  6 ++++++
 src/views/main.vue                 | 29 ++++++++++++++++++-----------
 src/views/modules/recv/po-recv.vue |  4 ++--
 src/views/modules/recv/recv.vue    | 26 +++++++++++++++++++++++++-
 4 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 9fc000b..58da195 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -471,3 +471,9 @@ a:hover{
   flex-shrink: 0;
   margin-bottom: 2px;
 }
+/* 默认$confirm弹出框尺寸 */
+.el-message-box {
+  width: 80% !important;  /* 调整宽度 */
+  max-width: 300px !important;  /* 限制最大宽度 */
+  min-width: 200px !important;  /* 限制最小宽度 */
+}
diff --git a/src/views/main.vue b/src/views/main.vue
index 3259c5b..68f1515 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -106,15 +106,22 @@ export default {
     },
     // 退出
     logoutHandle() {
-      this.$http({
-        url: this.$http.adornUrl('/sys/logout'),
-        method: 'post',
-        data: this.$http.adornData()
-      }).then(({data}) => {
-        if (data && data.code === 0) {
-          //clearLoginInfo()
-          this.$router.push({name: 'login'})
-        }
+      this.$confirm('确定退出?', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http({
+          url: this.$http.adornUrl('/sys/logout'),
+          method: 'post',
+          data: this.$http.adornData()
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            //clearLoginInfo()
+            this.$router.push({name: 'login'})
+          }
+        })
+      }).catch(() => {
       })
     },
   }
@@ -197,10 +204,10 @@ export default {
 
 @media (max-width: 480px) {
   .button-icon {
-    font-size: 30px;
+    font-size: 20px;
   }
   .button-label {
-    font-size: 18px;
+    font-size: 14px;
   }
 }
 </style>
diff --git a/src/views/modules/recv/po-recv.vue b/src/views/modules/recv/po-recv.vue
index 343d5e7..de79351 100644
--- a/src/views/modules/recv/po-recv.vue
+++ b/src/views/modules/recv/po-recv.vue
@@ -179,10 +179,10 @@ export default {
 
 @media (max-width: 480px) {
   .button-icon {
-    font-size: 30px;
+    font-size: 20px;
   }
   .button-label {
-    font-size: 18px;
+    font-size: 14px;
   }
 }
 </style>
diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue
index 8ab8624..cea10b6 100644
--- a/src/views/modules/recv/recv.vue
+++ b/src/views/modules/recv/recv.vue
@@ -1,4 +1,5 @@
 <template>
+  <div>
   <div class="pda-receipt">
     <div class="status-bar">
       <div class="time">{{ new Date().toTimeString().substr(0, 5) }}</div>
@@ -35,12 +36,35 @@
       确认收货 ({{ totalQty }})
     </el-button>
   </div>
+    <el-dialog
+      style="font-size: 12px"
+      v-drag
+      :title="'Dialog'"
+      :visible.sync="siteVisible"
+      width="260px" :append-to-body="true" >
+      <el-form label-position="top"  style="margin-left: 7px;margin-top: 10px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item :label="'Test'" >
+              <el-radio label="Y">Y</el-radio>
+              <el-radio label="N">N</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="">确定</el-button>
+        <el-button type="primary" @click="siteVisible=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 export default {
   data() {
     return {
+      siteVisible: false,
       scanCode: '',
       items: [{code: 'A001', qty: 1}, {code: 'A002', qty: 2}]
     }
@@ -82,7 +106,7 @@ export default {
 .pda-receipt {
   display: flex;
   flex-direction: column;
-  height: 100vh;
+  height: 80vh;
   padding: 10px;
 }