Merge branch 'personnelPerformance' into dev

src/views/performanceManage/monthlyAssess/index.vue

@@ -536,42 +536,49 @@
           </div>
         </el-form-item>
 
-        <template
-          v-for="(detail, index) in (indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList || [])"
-          :key="index">
-          <div style="display: flex; align-items: center; gap: 10px; margin-bottom: 10px;">
-            <h4 style="margin-left: 80px;">明细{{ index + 1 }}</h4>
-            <el-button type="danger" size="small" @click="removeRewardPunishmentDetail(index)">删除</el-button>
-          </div>
-          <el-form-item label="检查部门">
-            <div style="display: flex; align-items: center; gap: 10px; width: 100%;">
-              <el-select v-model="detail.qcDeptType" placeholder="请选择" style="width: 200px;">
-                <el-option v-for="item in base_performance_indicator_qc_dept_type" :key="item.value" :label="item.label"
-                  :value="item.value" />
-              </el-select>
-            </div>
-          </el-form-item>
-          <el-form-item v-if="indicatorDialog.form.score > 0" label="奖励明细">
-            <el-input v-model="detail.rewardPunishmentDetail" type="textarea" :rows="2" />
-          </el-form-item>
-          <el-form-item v-if="indicatorDialog.form.score > 0" label="奖励">
-            <div style="display: flex; align-items: center; gap: 10px;">
-              <el-input-number v-model="detail.amount" :min="0" :precision="2" style="width: 200px;"
-                @change="updateTotal" />
-              <span>元</span>
-            </div>
-          </el-form-item>
-          <el-form-item v-if="indicatorDialog.form.score < 0" label="惩罚明细">
-            <el-input v-model="detail.rewardPunishmentDetail" type="textarea" :rows="2" />
-          </el-form-item>
-          <el-form-item v-if="indicatorDialog.form.score < 0" label="扣罚">
-            <div style="display: flex; align-items: center; gap: 10px;">
-              <el-input-number v-model="detail.amount" :min="0" :precision="2" style="width: 200px;"
-                @change="updateTotal" />
-              <span>元</span>
-            </div>
-          </el-form-item>
-        </template>
+        <el-form-item label="记录明细">
+          <el-table :data="indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList" border max-height="400" >
+            <el-table-column label="序号" type="index" width="60" align="center" />
+            <el-table-column label="日期" width="180">
+              <template #default="scope">
+                <el-date-picker v-model="scope.row.recordDate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 100%" />
+              </template>
+            </el-table-column>
+            <el-table-column label="检查部门" >
+              <template #default="scope">
+                <el-select v-model="scope.row.qcDeptType" placeholder="请选择" clearable>
+                  <el-option v-for="item in base_performance_indicator_qc_dept_type" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="扣罚明细"  v-if="indicatorDialog.form.score < 0">
+              <template #default="scope">
+                <el-input v-model="scope.row.rewardPunishmentDetail" type="textarea" :rows="1" placeholder="请输入扣罚明细" />
+              </template>
+            </el-table-column>
+            <el-table-column label="扣罚（元）"  v-if="indicatorDialog.form.score < 0">
+              <template #default="scope">
+                <el-input-number v-model="scope.row.amount" :max="0" :precision="2" style="width: 170px;" @change="updateTotal" />
+              </template>
+            </el-table-column>
+            <el-table-column label="奖励明细" v-if="indicatorDialog.form.score > 0">
+              <template #default="scope">
+                <el-input v-model="scope.row.rewardPunishmentDetail" type="textarea" :rows="1" placeholder="请输入奖励明细" />
+              </template>
+            </el-table-column>
+            <el-table-column label="奖励（元）"  v-if="indicatorDialog.form.score > 0">
+              <template #default="scope">
+                <el-input-number v-model="scope.row.amount" :min="0" :precision="2" style="width: 170px;" @change="updateTotal" />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作"align="center">
+              <template #default="scope">
+                <el-button type="danger" link icon="Delete" @click="removeRewardPunishmentDetail(scope.$index)" />
+              </template>
+            </el-table-column>
+          </el-table>
+          
+        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -843,6 +850,7 @@ function transformIndicatorTree(treeData) {
 
 function onIndicatorCascaderChange(value) {
   const selected = findIndicatorById(indicatorDialog.cascaderOptions, value)
+
   if (selected) {
     indicatorDialog.form = {
       ...selected,
@@ -1420,12 +1428,18 @@ const updateTotal = () => {
     return
   }
   const targetCount = indicatorDialog.form.occurCount
+  const today = `${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}-${String(new Date().getDate()).padStart(2, '0')}`
   if (list.length < targetCount) {
     for (let i = list.length; i < targetCount; i++) {
+      const isCoreIndicator = indicatorDialog.form.categoryNameOne === '核心指标'
+      const defaultAmount = isCoreIndicator
+        ? (indicatorDialog.form.score * 100)
+        : (indicatorDialog.form.score * 50)
       list.push({
+        recordDate: today,
         qcDeptType: '',
         rewardPunishmentDetail: '',
-        amount: 0
+        amount: defaultAmount
       })
     }
   }

vite.config.js

@@ -3,7 +3,7 @@ import path from 'path'
 import createVitePlugins from './vite/plugins'
 
 // const baseUrl = 'http://192.168.3.221:8088' // 后端接口
-const baseUrl = 'http://airport.samsundot.com:9024/prod-api'
+const baseUrl = 'http://airport-test.samsundot.com:9025/prod-api'
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {
   const env = loadEnv(mode, process.cwd())