✨ feat: 部分修改

gear-ui3/src/views/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login">
+  <div class="login" :class="{ 'dark': isDark }">
     <div class="login-container">
       <div class="login-right">
         <img :src="RightImage" alt="" class="right-img" />
@@ -55,7 +55,9 @@ import { encrypt, decrypt } from "@/utils/jsencrypt"
 import useUserStore from '@/store/modules/user'
 import useProductStore from '@/store/modules/product'
 import RightImage from '@/assets/images/right.png'
-import LogoImage from '@/assets/logo/logo.png'
+import { useDark } from "@vueuse/core"
+
+const isDark = useDark()
 
 const title = import.meta.env.VITE_APP_TITLE
 const userStore = useUserStore()
@@ -152,115 +154,168 @@ getCookie()
 </script>
 
 <style lang='scss' scoped>
+// 亮色主题（默认）
 .login {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-color: #1a1a1a;
   background-size: cover;
-}
+  
+  /* 亮色主题变量 */
+  --color-bg-primary: #f5f7fa;
+  --color-bg-form: #ffffff;
+  --color-bg-input: #f0f2f5;
+  --color-border-input: #dcdfe6;
+  --color-text-primary: #303133;
+  --color-text-secondary: #606266;
+  --color-text-placeholder: #909399;
+  --color-btn-primary: #409eff;
+  --color-btn-primary-hover: #66b1ff;
 
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #ebebeb;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+  .title {
+    margin: 0px auto 30px auto;
+    text-align: center;
+    color: var(--color-text-primary);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 
-.right-img {
-  width: 100%;
-  height: 100%;
-}
+  .right-img {
+    width: 100%;
+    height: 100%;
+  }
 
-.logo-img {
-  width: 50px;
-  height: 50px;
-}
+  .logo-img {
+    width: 50px;
+    height: 50px;
+  }
 
-.login-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  box-sizing: border-box;
-  // height: 60%;
-  width: 60%;
-  padding: 25px 25px 5px 25px;
-}
+  .login-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    box-sizing: border-box;
+    width: 60%;
+    padding: 25px 25px 5px 25px;
+  }
 
-:deep(.el-input__wrapper) {
-  background: #333333;
-  border-radius: 6px;
-  border: 1px solid #444444;
-}
-
-.el-input {
-  color: #ebebeb;
-}
-
-.login-form {
-  z-index: 1;
-  flex: 3;
-  border-radius: 6px;
-  background: #292929;
-  padding: 25px;
+  :deep(.el-input__wrapper) {
+    background: var(--color-bg-input);
+    border-radius: 6px;
+    border: 1px solid var(--color-border-input);
+  }
 
   .el-input {
-    height: 40px;
+    color: var(--color-text-primary);
+  }
 
-    input {
+  .login-form {
+    z-index: 1;
+    flex: 3;
+    border-radius: 6px;
+    background: var(--color-bg-form);
+    padding: 25px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+
+    .el-input {
       height: 40px;
+
+      input {
+        height: 40px;
+        color: var(--color-text-primary);
+      }
+      
+      input::placeholder {
+        color: var(--color-text-placeholder);
+      }
+    }
+
+    .input-icon {
+      height: 39px;
+      width: 14px;
+      margin-left: 0px;
+      color: var(--color-text-secondary);
     }
   }
 
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 0px;
+  .login-right {
+    display: flex;
+    padding: 30px;
+    flex: 4;
+  }
+
+  .login-tip {
+    font-size: 13px;
+    text-align: center;
+    color: var(--color-text-secondary);
+  }
+
+  .login-code {
+    width: 33%;
+    height: 40px;
+    float: right;
+
+    img {
+      cursor: pointer;
+      vertical-align: middle;
+    }
+  }
+
+  .el-login-footer {
+    height: 40px;
+    line-height: 40px;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+    color: var(--color-text-secondary);
+    font-family: Arial;
+    font-size: 12px;
+    letter-spacing: 1px;
+  }
+
+  .login-code-img {
+    height: 40px;
+    padding-left: 12px;
+  }
+
+  /* Element组件样式调整 */
+  :deep(.el-checkbox__label) {
+    color: var(--color-text-primary);
+  }
+  
+  :deep(.el-button--primary) {
+    background-color: var(--color-btn-primary);
+    border-color: var(--color-btn-primary);
+  }
+  
+  :deep(.el-button--primary:hover) {
+    background-color: var(--color-btn-primary-hover);
+    border-color: var(--color-btn-primary-hover);
+  }
+  
+  :deep(.link-type) {
+    color: var(--color-btn-primary);
   }
 }
 
-.login-right {
-  display: flex;
-  padding: 30px;
+// 暗色主题
+.login.dark {
+  /* 暗色主题变量 - 覆盖亮色变量 */
+  --color-bg-primary: #1a1a1a;
+  --color-bg-form: #292929;
+  --color-bg-input: #333333;
+  --color-border-input: #444444;
+  --color-text-primary: #ebebeb;
+  --color-text-secondary: #bfbfbf;
+  --color-text-placeholder: #999999;
+  --color-btn-primary: #409eff;
+  --color-btn-primary-hover: #66b1ff;
 
-  flex: 4;
-}
-
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-
-.login-code {
-  width: 33%;
-  height: 40px;
-  float: right;
-
-  img {
-    cursor: pointer;
-    vertical-align: middle;
+  .login-form {
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.3);
   }
 }
-
-.el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-
-.login-code-img {
-  height: 40px;
-  padding-left: 12px;
-}
 </style>

gear-ui3/src/views/oms/pay/index.vue

@@ -104,6 +104,7 @@
             type="text"
             icon="Money"
             @click="handlePay(scope.row)"
+            v-if="scope.row.balanceAmount > 0"
           >付款</el-button>
         </template>
       </el-table-column>

gear-ui3/src/views/oms/receive/index.vue

@@ -104,6 +104,7 @@
             type="text"
             icon="Money"
             @click="handleReceive(scope.row)"
+            v-if="scope.row.balanceAmount > 0"
           >收款</el-button>
         </template>
       </el-table-column>

gear-ui3/src/views/peoples/attendance/components/attendancePage.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="用户ID" prop="userId">
+      <el-form-item label="薪酬类型" prop="paymentType">
+        <el-radio-group v-model="queryParams.paymentType" @change="getList">
+            <el-radio-button label="hourly">计时</el-radio-button>
+            <el-radio-button label="piecework">计件</el-radio-button>
+          </el-radio-group>
+      </el-form-item>
+      <el-form-item label="用户" prop="userId">
         <user-select v-model="queryParams.userId" />
       </el-form-item>
       <el-form-item label="记录日期" prop="recordDate">
@@ -95,7 +101,13 @@
           <span>{{ parseTime(scope.row.endTime, '{h}:{i}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="时长(小时)" align="center" prop="durationHour" />
+      <el-table-column label="时长(小时)" align="center" prop="durationHour" v-if="queryParams.paymentType === 'hourly'"/>
+      <el-table-column label="计件数量" align="center" prop="pieceCount" v-if="queryParams.paymentType === 'piecework'">
+        <template #default="scope">
+          <span @click="handlePieceCount(scope.row)" style="color: #409EFF; cursor: pointer;">{{ scope.row.pieceCount }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="薪酬" align="center" prop="wage" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -158,9 +170,21 @@
             value-format="HH:mm:ss"
           />
         </el-form-item>
-        <el-form-item label="时长(小时)" prop="durationHour">
+        <el-form-item label="薪酬类型" prop="paymentType" style="width: 100%;">
+          <el-radio-group v-model="form.paymentType" >
+            <el-radio-button label="hourly">计时</el-radio-button>
+            <el-radio-button label="piecework">计件</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="时长(小时)" prop="durationHour" style="width: 100%;" v-if="form.paymentType === 'hourly'">
           <el-input-number v-model="form.durationHour" placeholder="请输入时长(小时)" />
         </el-form-item>
+        <el-form-item label="计件数量" prop="pieceCount" style="width: 100%;" v-if="form.paymentType === 'piecework'">
+          <el-input-number v-model="form.pieceCount" placeholder="请输入计件数量" />
+        </el-form-item>
+        <el-form-item label="薪酬" prop="wage">
+          <el-input v-model="form.wage" placeholder="请输入薪酬" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -172,13 +196,20 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 计件详情 -->
+    <el-dialog title="计件详情" v-model="pieceDetailOpen" width="1000px" append-to-body>
+      <AttendancePieceDetail :recordId="form.recordId" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="AttendanceRecord">
 import UserSelect from '@/components/UserSelect'
+import AttendancePieceDetail from './detail.vue'
 import { listAttendanceRecord, getAttendanceRecord, delAttendanceRecord, addAttendanceRecord, updateAttendanceRecord } from "@/api/oa/attendanceRecord";
 
+
 const { proxy } = getCurrentInstance();
 
 const props = defineProps({
@@ -198,10 +229,12 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
+const pieceDetailOpen = ref(false);
 
 const data = reactive({
   form: {},
   queryParams: {
+    paymentType: 'hourly', // 薪酬类型: hourly(计时),piecework(计件)
     pageNum: 1,
     pageSize: 10,
     userId: undefined,
@@ -268,7 +301,10 @@ function reset() {
     updateTime: null,
     updateBy: null,
     delFlag: null,
-    remark: null
+    remark: null,
+    wage: null,
+    paymentType: queryParams.value.paymentType,
+    pieceCount: null
   };
   proxy.resetForm("attendanceRecordRef");
 }
@@ -374,5 +410,12 @@ function handleExport() {
   }, `attendanceRecord_${new Date().getTime()}.xlsx`)
 }
 
+function handlePieceCount(row) {
+  // 获取计件详情
+  console.log(row);
+  pieceDetailOpen.value = true;
+  form.value.recordId = row.recordId;
+}
+
 getList();
 </script>

gear-ui3/src/views/peoples/attendance/components/detail.vue

@@ -0,0 +1,259 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="attendancePieceDetailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工件编码" align="center" prop="workpieceCode" />
+      <el-table-column label="工件名称" align="center" prop="workpieceName" />
+      <el-table-column label="工件数量" align="center" prop="pieceQuantity" />
+      <el-table-column label="单位单价" align="center" prop="unitPrice" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改考勤计件明细 - 记录具体工件的数量和单价信息对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="attendancePieceDetailRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="工件编码" prop="workpieceCode">
+          <el-input v-model="form.workpieceCode" placeholder="请输入工件编码" />
+        </el-form-item>
+        <el-form-item label="工件名称" prop="workpieceName">
+          <el-input v-model="form.workpieceName" placeholder="请输入工件名称" />
+        </el-form-item>
+        <el-form-item label="工件数量" prop="pieceQuantity">
+          <el-input v-model="form.pieceQuantity" placeholder="请输入工件数量" />
+        </el-form-item>
+        <el-form-item label="单位单价" prop="unitPrice">
+          <el-input v-model="form.unitPrice" placeholder="请输入单位单价" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="AttendancePieceDetail">
+import { listAttendancePieceDetail, getAttendancePieceDetail, delAttendancePieceDetail, addAttendancePieceDetail, updateAttendancePieceDetail } from "@/api/oa/attendancePieceDetail";
+
+const { proxy } = getCurrentInstance();
+
+const attendancePieceDetailList = ref([]);
+const open = ref(false);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const props = defineProps({
+  recordId: {
+    required: true,
+    type: [String, Number],
+    default: undefined
+  }
+})
+
+const formatterTime = (time) => {
+  return proxy.parseTime(time, '{y}-{m}-{d}')
+}
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    recordId: props.recordId,
+    workpieceCode: undefined,
+    workpieceName: undefined,
+    pieceQuantity: undefined,
+    unitPrice: undefined,
+  },
+  rules: {
+  }
+});
+
+watch(props.recordId, (newVal) => {
+  if (newVal) {
+    queryParams.value.recordId = newVal;
+    getList();
+  }
+}, { immediate: true });
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询考勤计件明细 - 记录具体工件的数量和单价信息列表 */
+function getList() {
+  loading.value = true;
+  listAttendancePieceDetail(queryParams.value).then(response => {
+    attendancePieceDetailList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    detailId: null,
+    recordId: props.recordId,
+    workpieceCode: null,
+    workpieceName: null,
+    pieceQuantity: null,
+    unitPrice: null,
+    createTime: null,
+    createBy: null,
+    updateTime: null,
+    updateBy: null,
+    delFlag: null,
+    remark: null
+  };
+  proxy.resetForm("attendancePieceDetailRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.detailId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加考勤计件明细 - 记录具体工件的数量和单价信息";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  loading.value = true
+  reset();
+  const _detailId = row.detailId || ids.value
+  getAttendancePieceDetail(_detailId).then(response => {
+    loading.value = false;
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改考勤计件明细 - 记录具体工件的数量和单价信息";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["attendancePieceDetailRef"].validate(valid => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.detailId != null) {
+        updateAttendancePieceDetail(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        }).finally(() => {
+          buttonLoading.value = false;
+        });
+      } else {
+        addAttendancePieceDetail(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        }).finally(() => {
+          buttonLoading.value = false;
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _detailIds = row.detailId || ids.value;
+  proxy.$modal.confirm('是否确认删除考勤计件明细 - 记录具体工件的数量和单价信息编号为"' + _detailIds + '"的数据项？').then(function() {
+    loading.value = true;
+    return delAttendancePieceDetail(_detailIds);
+  }).then(() => {
+    loading.value = true;
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {
+  }).finally(() => {
+    loading.value = false;
+  });
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('oa/attendancePieceDetail/export', {
+    ...queryParams.value
+  }, `attendancePieceDetail_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>

gear-ui3/src/views/product/info/index.vue

@@ -50,6 +50,11 @@
       <el-table-column label="产品名称" align="center" prop="productName" />
       <el-table-column label="负责人" align="center" prop="owner" />
       <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="样品图" align="center">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.image" />
+        </template>
+      </el-table-column>
       <el-table-column label="BOM" align="center">
         <template #default="scope">
           <BomInfoMini :bomId="scope.row.bomId" />
@@ -81,6 +86,9 @@
         <el-form-item label="单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入单位" />
         </el-form-item>
+        <el-form-item label="样品图" prop="">
+          <ImageUpload v-model="form.image" />
+        </el-form-item>
         <el-form-item label="产品分类" prop="categoryId">
           <!-- <el-tree-select v-model="form.categoryId" :data="categoryList" :props="defaultProps" /> -->
           <el-select v-model="form.categoryId" placeholder="请选择产品分类">