Merge remote-tracking branch 'origin/main'

src/components/inventory/apply/AddApply.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-descriptions title="新增领用" border label-width="100">
+  <el-descriptions border label-width="100">
     <el-descriptions-item label="领用人" width="200">
       <el-input v-model="formData.name" disabled></el-input>
     </el-descriptions-item>
@@ -8,7 +8,7 @@
     </el-descriptions-item>
   </el-descriptions>
   <GoodsSearch @selectCallBack="goodsSelectCallBack"></GoodsSearch>
-  <table class="simple-table" style="margin-top: 15px;">
+  <table class="simple-table" style="margin-top: 15px">
     <thead>
     <tr>
       <th>名称</th>
@@ -270,6 +270,81 @@ onMounted(() => {
 })
 </script>
 <style scoped lang="scss">
+.simple-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 14px;
+  border: none;
+  color: #606266;
+
+  thead {
+    background-color: #f5f7fa;
+
+    th {
+      padding: 12px 0;
+      text-align: left;
+      font-weight: bold; /* 表头加粗 */
+      font-size: 14px; /* 表头字号 */
+      border-bottom: 1px solid #ebeef5;
+    }
+  }
+  tbody {
+    tr:hover {
+      background-color: #f5f7fa; /* 悬停效果 */
+    }
+
+    td {
+      padding: 12px 0;
+      text-align: left;
+      font-size: 14px; /* 单元格字号 */
+      border-bottom: 1px solid #ebeef5;
+    }
+  }
+}
+
+.table-select {
+  .el-select-dropdown__item {
+    padding: 0 !important;
+    height: auto;
+  }
+
+  // 表头样式
+  .select-header {
+    display: flex;
+    padding: 8px 16px;
+    background: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+
+    span {
+      flex: 1;
+      min-width: 110px;
+      font-weight: bold;
+    }
+  }
+
+  // 选项行样式
+  .option-row {
+    display: flex;
+    padding: 8px 16px;
+
+    span {
+      flex: 1;
+      min-width: 110px;
+    }
+  }
+}
+
+.remark {
+  // 前置标签背景色
+  :deep(.el-input-group__prepend) {
+    background-color: #fffdec;
+  }
+
+  // 输入框主体背景色
+  :deep(.el-input__wrapper) {
+    background-color: #fffdec;
+  }
+}
 .btn {
   margin-top: 5px;
 }

src/components/inventory/apply/DetailApply.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-descriptions title="详情领用" border label-width="100">
+  <el-descriptions border label-width="100">
     <el-descriptions-item label="领用人" width="200">
       <el-input v-model="formData.name" disabled></el-input>
     </el-descriptions-item>
@@ -7,7 +7,7 @@
       <el-input v-model="formData.remark" disabled></el-input>
     </el-descriptions-item>
   </el-descriptions>
-  <table class="simple-table" style="margin-top: 15px;">
+  <table class="simple-table" style="margin-top: 15px">
     <thead>
     <tr>
       <th>名称</th>
@@ -137,7 +137,9 @@ interface Inventory {
   name?: string;
   trdnFlag?: number;
 }
+
 const tableList = ref<Inventory[]>([]);
+
 interface childCheck {
   id?: number,
   goodsId: number,
@@ -157,6 +159,7 @@ interface childCheck {
 
 
 }
+
 const addLine = (row: any) => {
   post('inventory/goods/getListByIds', {idList: row.selectList}).then((list: any) => {
     let children = [];
@@ -209,6 +212,81 @@ onMounted(() => {
 })
 </script>
 <style scoped lang="scss">
+.simple-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 14px;
+  border: none;
+  color: #606266;
+
+  thead {
+    background-color: #f5f7fa;
+
+    th {
+      padding: 12px 0;
+      text-align: left;
+      font-weight: bold; /* 表头加粗 */
+      font-size: 14px; /* 表头字号 */
+      border-bottom: 1px solid #ebeef5;
+    }
+  }
+}
+tbody {
+  tr:hover {
+    background-color: #f5f7fa; /* 悬停效果 */
+  }
+
+  td {
+    padding: 12px 0;
+    text-align: left;
+    font-size: 14px; /* 单元格字号 */
+    border-bottom: 1px solid #ebeef5;
+  }
+}
+
+.table-select {
+  .el-select-dropdown__item {
+    padding: 0 !important;
+    height: auto;
+  }
+
+  // 表头样式
+  .select-header {
+    display: flex;
+    padding: 8px 16px;
+    background: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+
+    span {
+      flex: 1;
+      min-width: 110px;
+      font-weight: bold;
+    }
+  }
+
+  // 选项行样式
+  .option-row {
+    display: flex;
+    padding: 8px 16px;
+
+    span {
+      flex: 1;
+      min-width: 110px;
+    }
+  }
+}
+
+.remark {
+  // 前置标签背景色
+  :deep(.el-input-group__prepend) {
+    background-color: #fffdec;
+  }
+
+  // 输入框主体背景色
+  :deep(.el-input__wrapper) {
+    background-color: #fffdec;
+  }
+}
 .btn {
   margin-top: 5px;
 }

src/views/Login.vue

@@ -61,9 +61,8 @@ const success = () => {
 }
 const error = () => {
   ElMessageBox.alert('签到失败，我们将已非签到模式启动系统', '签到提示', {
-    // if you want to disable its autofocus
-    // autofocus: false,
     confirmButtonText: '确定',
+    showClose: false,
     callback: (action: Action) => {
       router.push("/home/index")
     },

src/views/inventory/apply.vue

@@ -28,10 +28,10 @@
         />
       </div>
     </div>
-    <Mask :width="1200" :height="600" :top="100" :is-show="is_add" @close="is_add=false" title="新增">
+    <Mask :width="1200" :height="600" :top="100" :is-show="is_add" @close="is_add=false" title="新增领用">
       <AddApply @close="closeAddApply"/>
     </Mask>
-    <Mask :width="1200" :height="600" :top="100" :is-show="is_detail" @close="is_detail=false" title="编辑">
+    <Mask :width="1200" :height="600" :top="100" :is-show="is_detail" @close="is_detail=false" title="查看领用">
       <DetailApply :id="id" @close="closeDetailApply"/>
     </Mask>
   </div>