diff --git a/src/api/costManagement/costConfiguration.js b/src/api/costManagement/costConfiguration.js
new file mode 100644
index 00000000..325b3633
--- /dev/null
+++ b/src/api/costManagement/costConfiguration.js
@@ -0,0 +1,50 @@
+// 成本计算配置
+import request from '@/axios';
+
+// 工序维护列表
+export const getCostList = params =>
+  request({
+    url: '/api/blade-desk/costCalculationProcess/page',
+    method: 'get',
+    params
+  });
+
+// 工序列表
+export const getProcessList = params =>
+  request({
+    url: '/api/blade-desk/bsProcessSet/list',
+    method: 'get',
+    params
+  });
+
+// 新增
+export const addCost = data =>
+  request({
+    url: '/api/blade-desk/costCalculationProcess/save',
+    method: 'post',
+    data
+  });
+
+// 删除工序
+export const deleteProcess = params =>
+  request({
+    url: '/api/blade-desk/costCalculationProcess/remove',
+    method: 'post',
+    params
+  });
+
+  // 物料维护列表
+  export const getMaterialList = params =>
+  request({
+    url: '/api/blade-desk/costCalculationGoods/page',
+    method: 'get',
+    params
+  });
+
+  // 删除物料
+  export const deleteMaterial = params =>
+  request({
+    url: '/api/blade-desk/costCalculationGoods/remove',
+    method: 'post',
+    params
+  });
\ No newline at end of file
diff --git a/src/api/costManagement/costStatistics.js b/src/api/costManagement/costStatistics.js
new file mode 100644
index 00000000..f6164dd5
--- /dev/null
+++ b/src/api/costManagement/costStatistics.js
@@ -0,0 +1,49 @@
+// 成本统计
+import request from '@/axios';
+import { exportBlob } from '@/api/common';
+
+// 获取列表
+export const getList = (params) =>{
+    return request({
+        url:'/api/blade-desk/costStatistics/page',
+        method:'get',
+        params
+    })
+}
+
+// 删除
+export const deleteTable = (params) =>
+  request({
+    url: '/api/blade-desk/costStatistics/remove',
+    method: 'post',
+    params
+  });
+
+// 校验
+export const verifyTable = (params) =>
+  request({
+    url: '/api/blade-desk/costStatistics/costCalculationCheck',
+    method: 'get',
+    params
+  });
+
+// 计算
+export const calculateTable = (params) =>
+  request({
+    url: '/api/blade-desk/costStatistics/costCalculation',
+    method: 'get',
+    params
+  });
+
+// 导出
+export const exportData = (params) => {
+    return exportBlob('/api/blade-desk/costStatistics/export', params);
+};
+
+// 查看明细
+export const getDetail = (params) =>
+  request({
+    url: '/api/blade-desk/subjectFeeDetail/findList',
+    method: 'get',
+    params
+  });
\ No newline at end of file
diff --git a/src/api/costManagement/subjectFeeMaintenance.js b/src/api/costManagement/subjectFeeMaintenance.js
new file mode 100644
index 00000000..f449fc72
--- /dev/null
+++ b/src/api/costManagement/subjectFeeMaintenance.js
@@ -0,0 +1,50 @@
+// 费用科目维护
+import request from '@/axios';
+
+// 作业中心下拉
+export const getWorkCenter = params =>
+  request({
+    url: '/api/blade-desk/BA/WorkCenter/listForSelect',
+    method: 'get',
+    params
+  });
+
+// 查询列表
+export const getList = params =>
+  request({
+    url: '/api/blade-desk/subjectFee/page',
+    method: 'get',
+    params
+  });
+
+// 新增科目
+export const addSubjectFee = params =>
+  request({
+    url: '/api/blade-desk/subjectFee/save',
+    method: 'post',
+    data: params
+  });
+
+// 维护
+export const maintainSubjectFee = params =>
+  request({
+    url: '/api/blade-desk/subjectFee/maintain',
+    method: 'post',
+    data: params
+  });
+
+// 详情
+export const detailSubjectFee = data =>
+  request({
+    url: '/api/blade-desk/subjectFee/detail',
+    method: 'post',
+    data
+  });
+
+//   删除
+export const delSubjectFee = params =>
+  request({
+    url: '/api/blade-desk/subjectFee/remove',
+    method: 'post',
+    params
+  });
\ No newline at end of file
diff --git a/src/api/performanceManagement/salaryManagement.js b/src/api/performanceManagement/salaryManagement.js
new file mode 100644
index 00000000..9176e0cb
--- /dev/null
+++ b/src/api/performanceManagement/salaryManagement.js
@@ -0,0 +1,43 @@
+// 薪资维护标准
+import request from '@/axios';
+
+// /bsSalaryStandard/page
+// /bsSalaryStandard/submit
+// /bsSalaryStandard/remove
+// /bsSalaryStandard/detail
+// /bsSalaryStandard/download-excel-template
+// /bsSalaryStandard/import-excel
+
+// 获取工序下拉数据
+export const getProcessList = (params) =>{
+    return request({
+        url:'/api/blade-desk/bsProcessSet/list',
+        method:'get',
+        params
+    })
+}
+
+// 薪资标准列表
+export const getList = (params) =>{
+    return request({
+        url:'/api/blade-desk/bsSalaryStandard/page',
+        method:'get',
+        params
+    })
+}
+
+// 删除
+export const deleteTable = (params) =>
+  request({
+    url: '/api/blade-desk/bsSalaryStandard/remove',
+    method: 'post',
+    params
+  });
+
+//   新增
+export const addTable = (data) =>
+  request({
+    url: '/api/blade-desk/bsSalaryStandard/submit',
+    method: 'post',
+    data
+  });
\ No newline at end of file
diff --git a/src/views/costManagement/components/batchAddProcess.vue b/src/views/costManagement/components/batchAddProcess.vue
new file mode 100644
index 00000000..8481ebf9
--- /dev/null
+++ b/src/views/costManagement/components/batchAddProcess.vue
@@ -0,0 +1,343 @@
+<template>
+    <el-dialog :title="title" append-to-body :modelValue="openShow" width="70%" @close="closeDialog()">
+        <div style="margin-bottom: 12px" v-if="moldAddMore">
+            <el-button type="primary" @click="addTable">插入一行</el-button>
+            <el-button type="danger" @click="delTable">删除选中行</el-button>
+        </div>
+        <!-- 单个 Form 包裹整个表格 -->
+        <el-form 
+            ref="tableForm" 
+            :model="form"  
+            :rules="formRules"
+            label-width="0px"
+        >
+            <!-- 全局错误提示 -->
+            <div v-if="formError" class="error-message" style="color: #f56c6c; margin-bottom: 10px;">
+                {{ formError }}
+            </div>
+            <el-table :data="form.tableData" @select="selectChange" border>
+                <el-table-column type="selection" width="55"></el-table-column>
+                <!-- 作业中心（绑定数组字段） -->
+                <el-table-column align="center" label="作业中心">
+                    <template #header>
+                        <span><i style="color: red">*</i>作业中心</span>
+                    </template>
+                    <template #default="scope">
+                        <!-- prop 格式：数组名[索引].字段名 -->
+                        <el-form-item :prop="`tableData[${scope.$index}].workCenterId`" :rules="formRules.workCenterId">
+                            <el-select 
+                                v-model="scope.row.workCenterId" 
+                                placeholder="请选择"
+                                style="width: 100%"
+                                @change="(val) => changeWork(val,scope.row)"
+                            >
+                                <el-option
+                                v-for="item in wcData"
+                                :key="item.id"
+                                :value="item.id"
+                                :label="item.wcName"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="工序" prop="processId">
+                    <template #header>
+                        <span><i style="color: red">*</i>工序</span>
+                    </template>
+                    <template #default="scope">
+                        <!-- prop 格式：数组名[索引].字段名 -->
+                        <el-form-item :prop="`tableData[${scope.$index}].processId`" :rules="formRules.processId">
+                            <el-select 
+                                multiple 
+                                v-model="scope.row.processId"
+                                remote
+                                :remote-method="remoteProcess"
+                                filterable
+                                :loading="processLoading"
+                                @change="(val) => changeProcess(val,scope.row)"
+                            >
+                                <el-option v-for="item in processData" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" label="计算方式" prop="type">
+                    <template #header>
+                        <span><i style="color: red">*</i>计算方式</span>
+                    </template>
+                    <template #default="scope">
+                        <!-- prop 格式：数组名[索引].字段名 -->
+                        <el-form-item :prop="`tableData[${scope.$index}].type`" :rules="formRules.type">
+                            <el-radio-group v-model="scope.row.type" style="display: flex;margin:0 auto;">
+                                <el-radio label="0">面积</el-radio>
+                                <el-radio label="1">体积</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="closeDialog()">取 消</el-button>
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
+import {getProcessList,addCost} from "@/api/costManagement/costConfiguration.js"
+export default {
+    props:{
+        title:{
+            type:String,
+            default:''
+        },
+        moldAddMore:{
+            type:Boolean,
+            default:false
+        },
+        showDialog:{
+            type:Boolean,
+            default:false
+        }
+    },
+    data(){
+        return{
+            openShow:false,
+            formError:'',
+            wcData:[],
+            processLoading:false,
+            form:{
+                tableData:[]
+            },
+            selectProcess:[],
+            formRules:{
+                // 表格数据数组的整体校验（可选：如最少1行数据）
+                tableData: [
+                    { 
+                        required: true, 
+                        message: '请至少添加一行数据', 
+                        trigger: 'submit',
+                        type: 'array' // 明确类型为数组
+                    },
+                    {
+                        validator: (rule, value, callback) => {
+                        if (value.length === 0) {
+                            callback(new Error('请至少添加一行数据'));
+                        } else {
+                            callback();
+                        }
+                        },
+                        trigger: 'submit'
+                    }
+                ],
+                // 数组中每一项的 workCenterId 字段校验
+                workCenterId: [
+                    { required: true, message: '请选择作业中心', trigger: ['change', 'submit'] }
+                ],
+                processId:[
+                    { required: true, message: '请选择工序', trigger: ['change', 'submit'] }
+                ],
+                type:[
+                    { required: true, message: '请选择计算方式', trigger: ['change', 'submit'] }
+                ]
+            },
+        }
+    },
+    created(){
+        this.openShow = this.showDialog
+        this.getWorkCenterList()
+        if(this.title == '新增'){
+            this.form.tableData = []
+            this.addTable()
+        }
+    },
+    methods:{
+        getWorkCenterList() {
+            getWorkCenterList().then(res => {
+                this.wcData = res.data.data || [];
+            });
+        },
+        remoteProcess(query){
+            this.processLoading = true
+            if(query == ''){
+                getProcessList({
+                    current:1,
+                    size:100
+                }).then(res =>{
+                    this.processData = res.data.data.records
+                    this.processLoading = false
+                })
+            }else{
+                getProcessList({
+                    current:1,
+                    size:100,
+                    name:query
+                }).then(res =>{
+                    this.processData = res.data.data.records
+                    this.processLoading = false
+                })
+            }
+        },
+        addTable(){
+            this.form.tableData.push({
+                _select:false,
+                batchNo:''
+            })
+        },
+        changeWork(val,row){
+            row.workCenterName = this.wcData.find(item => item.id == val).wcName
+        },
+        changeProcess(val,row){
+            const result = this.processData.filter(item => 
+                val.some(val => val === item.id)
+            );
+            this.selectProcess = [...result,...this.selectProcess]
+        },
+        // 提交表单（单次校验所有行）
+        submitForm() {
+            this.formError = '';
+            // 调用单个 Form 的校验方法
+            this.$refs.tableForm.validate((isValid, invalidFields) => {
+                if (!isValid) {
+                    // 校验失败：显示提示并滚动到第一个错误字段
+                    this.formError = '存在未完善的字段，请检查表格中的红色提示';
+                    
+                    this.$nextTick(() => {
+                        // 找到第一个错误字段并滚动到视图
+                        const firstError = document.querySelector('.el-form-item.is-error');
+                        if (firstError) {
+                        firstError.scrollIntoView({ behavior: 'smooth', block: 'center' });
+                        }
+                    });
+                    return;
+                }
+                // 校验通过：准备提交数据（过滤无用字段）
+                const submitData = this.form.tableData.map(row => {
+                    const { _select, ...validData } = row; // 剔除选择状态字段
+                    return validData;
+                });
+                console.log('submitData---------',submitData)
+                console.log('process=========',this.selectProcess)
+
+                const sumitResult = submitData.flatMap(item => {
+                    // 1. 将字符串按逗号分割成数组
+                    
+                    // 2. 将数组映射为新的对象数组
+                    return item.processId.map(val => ({
+                        workCenterId:item.workCenterId,
+                        workCenterName:item.workCenterName,
+                        processId:val,
+                        type:item.type
+                    }));
+                });
+
+                
+
+                const data2Map = new Map();
+                this.selectProcess.forEach(item => {
+                    data2Map.set(item.id, item.name);
+                });
+
+                // 2. 遍历 data1 并注入 processName
+                const result = sumitResult.map(item => {
+                    // 从 Map 中获取对应的 name
+                    const processName = data2Map.get(item.processId);
+                    
+                    // 返回新对象（包含原有的属性 + 新增的 processName）
+                    return {
+                        ...item,
+                        processName: processName || '' // 如果没找到，可以设为空字符串或 null
+                    };
+                });
+
+                // 【新增】校验：作业中心-工序唯一性
+                const uniqueMap = new Map();
+                const duplicates = [];
+
+                for (const item of result) {
+                    // 生成唯一键：作业中心ID_工序ID
+                    const key = `${item.workCenterId}_${item.processId}`;
+                    
+                    if (uniqueMap.has(key)) {
+                        // 如果已存在，记录重复项
+                        duplicates.push(item);
+                    } else {
+                        uniqueMap.set(key, item);
+                    }
+                }
+
+                if (duplicates.length > 0) {
+                    // 获取重复的工序名称用于提示（可选）
+                    const duplicateProcessNames = duplicates.map(d => {
+                        const proc = this.selectProcess.find(p => p.id === d.processId);
+                        return proc ? proc.name : d.processId;
+                    });
+                    // 去重提示信息
+                    const uniqueNames = [...new Set(duplicateProcessNames)];
+                    
+                    this.$message.error(`以下工序在相同作业中心下重复选择：${uniqueNames.join('、')}`);
+                    return;
+                }
+
+                console.log('sumitResult===========',sumitResult)
+                console.log('result===========',result)
+                if(this.title == '新增'){
+                    addCost(result).then(res =>{
+                        if(res.data.code == 200){
+                            this.$message.success('新增成功');
+                            this.selectProcess = []
+                            this.closeDialog(true);
+                        }
+                    })
+                }
+            })
+        },
+        closeDialog(val){
+            this.openShow = false
+            this.$emit('closeDialog',val)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+// 优化表单字段样式
+:deep(.el-table .el-form-item) {
+  margin-bottom: 0; // 去掉默认边距
+}
+
+// 错误提示样式优化
+:deep(.el-form-item__error) {
+  font-size: 12px;
+  white-space: nowrap;
+  z-index: 10;
+  background: #fff;
+  padding: 2px 4px;
+  border: 1px solid #f56c6c;
+  border-radius: 4px;
+}
+
+// 表格行高适配 textarea
+.el-table__row {
+  height: 80px !important;
+}
+
+.el-table__cell {
+  vertical-align: middle !important;
+}
+
+.error-message {
+  font-size: 14px;
+  line-height: 1.5;
+}
+:deep(.el-table .el-table__cell) {
+  height: 50px !important;
+  padding: 0 !important;
+  line-height: 50px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/costManagement/components/maintenanceCost.vue b/src/views/costManagement/components/maintenanceCost.vue
new file mode 100644
index 00000000..5e13dfbc
--- /dev/null
+++ b/src/views/costManagement/components/maintenanceCost.vue
@@ -0,0 +1,264 @@
+<template>
+    <el-dialog :title="title" append-to-body :modelValue="openShow" width="70%" @close="closeDialog()">
+        <el-form :inline="true" :model="maintainForm" ref="maintainForm" :rules="maintainRules">
+            <el-form-item label="月份" prop="month">
+                <el-date-picker
+                    v-if="title == '维护'"
+                    v-model="maintainForm.month"
+                    type="month"
+                    placeholder="选择月份"
+                    format="YYYY年MM月"
+                    value-format="YYYY-MM"
+                    :disabled="title == '详情'"
+                    :disabled-date="disabledDate" 
+                    @change="changeMonth"
+                ></el-date-picker>
+                <el-date-picker
+                    v-if="title == '详情'"
+                    v-model="maintainForm.month"
+                    type="month"
+                    placeholder="选择月份"
+                    format="YYYY年MM月"
+                    value-format="YYYY-MM"
+                    @change="changeMonth"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="费用分配方式" prop="type">
+                <el-radio-group v-model="maintainForm.type" :disabled="title == '详情' || subjectName == '辅助人员材料费用'" @change="changeType">
+                    <el-radio label="0">按金额</el-radio>
+                    <el-radio label="1">按比例</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="总费用金额" prop="totalFee">
+                <el-input-number
+                    v-model="maintainForm.totalFee"
+                    controls-position="right"
+                    :min="0"
+                    :disabled="title == '详情' || maintainForm.type == 0 || subjectName == '辅助人员材料费用'"
+                    @change="changeTotal"
+                ></el-input-number>
+            </el-form-item>
+        </el-form>
+      <el-table :data="tableData" v-loading="loading">
+        <el-table-column type="index"></el-table-column>
+        <el-table-column label="作业中心" prop="workCenterName" align="center"></el-table-column>
+        <el-table-column label="比例" prop="rate" align="center">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.rate"
+              controls-position="right"
+              :min="0"
+              :max="100"
+              @change="(val) => changeRate(val,scope.row)"
+              :disabled="title == '详情' || maintainForm.type == 0"
+            ></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column label="费用金额(元)" prop="fee" align="center">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.fee"
+              controls-position="right"
+              :min="0"
+              :disabled="title == '详情' || maintainForm.type == 1"
+              @change="changePrice"
+            ></el-input-number>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="closeDialog()">取 消</el-button>
+          <el-button v-if="title == '维护'" type="primary" @click="submitMaintain">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script>
+import {getWorkCenter,maintainSubjectFee,detailSubjectFee} from "@/api/costManagement/subjectFeeMaintenance"
+export default {
+    props:{
+        showDialog:{
+            type:Boolean,
+            default:false
+        },
+        title:{
+            type:String,
+            default:''
+        },
+        checkId:{
+            type:String,
+            default:''
+        },
+        month:{
+            type:String,
+            default:''
+        },
+        subjectName:{
+            type:String,
+            default:''
+        }
+    },
+    data(){
+        return{
+            openShow:false,
+            maintainForm:{
+                month:this.$dayjs().format('YYYY-MM')
+            },
+            tableData:[],
+            loading:false
+        }
+    },
+    mounted(){
+        this.openShow = this.showDialog
+        this.maintainForm.month = this.month ? this.month : this.$dayjs().format('YYYY-MM')
+        this.getDetail()
+    },
+    methods:{
+        getDetail(){
+            this.loading = true
+            detailSubjectFee({
+                id:this.checkId,
+                month:this.maintainForm.month
+            }).then(res =>{
+                console.log('res---------------------',res)
+                if(!res.data.data.subjectFeeDetailList || res.data.data.subjectFeeDetailList.length == 0){
+                    this.tableData = []
+                    if(this.title == '维护'){
+                        this.maintainForm = {
+                            month:res.data.data.month,
+                            type:this.subjectName == '辅助人员材料费用' ? '1' : '0',
+                            totalFee:res.data.data.totalFee == -1 ? null :  res.data.data.totalFee,
+                        }
+                        
+                        this.getWorkCenterData()
+                    }else{
+                        this.maintainForm = {
+                            month:res.data.data.month,
+                            type:res.data.data.type,
+                            totalFee:res.data.data.totalFee == -1 ? null : res.data.data.totalFee,  
+                        }
+                        this.getWorkCenterData()
+                    }
+                }else{
+                    this.maintainForm = {
+                        month:res.data.data.month,
+                        type:res.data.data.type,
+                        totalFee:res.data.data.totalFee,
+                    }
+                    this.tableData = res.data.data.subjectFeeDetailList
+                    this.loading = false   
+                }
+            })
+        },
+        changeMonth(){
+            this.getDetail()
+        },
+        changeType(val){
+            if(val == 0){
+                this.maintainForm.totalFee = null
+                this.tableData.map(item =>{
+                    item.rate = 0
+                    item.fee = 0
+                })
+            }else{
+                this.maintainForm.totalFee = null
+                this.tableData.map(item =>{
+                    item.fee = 0
+                })
+            }
+        },
+        changeTotal(val){
+            if(this.maintainForm.type == 1){
+                this.tableData.map(item =>{
+                    item.fee = item.rate / 100 * this.maintainForm.totalFee
+                })
+            }
+        },
+        getWorkCenterData(){
+            this.loading = true
+            getWorkCenter().then(res =>{
+                res.data.data.map(item =>{
+                    this.tableData.push({
+                        workCenterId:item.id,
+                        workCenterName:item.wcName,
+                        rate: this.title == '维护' ? 0 : null,
+                        fee:this.title == '维护' ? 0 : null,
+                    })
+                })
+                this.loading = false   
+            })
+        },
+        changePrice(val){
+            console.log('val---------------------',val)
+            if(this.maintainForm.type == 0){
+                const totalMoney = this.tableData.reduce((sum, item) => {
+                // 确保 item.money 是数字类型，如果是 null 或 undefined 则视为 0
+                return sum + (Number(item.fee) || 0);
+                }, 0);
+                console.log('totalMoney---------------------',totalMoney)
+                this.maintainForm.totalFee = totalMoney;
+
+            }else{
+                return
+            }
+        },
+        changeRate(val,row){
+            console.log('val=============',val)
+            console.log('row=============',row)
+            if(this.maintainForm.type == '1'){
+                row.fee = this.maintainForm.totalFee * (val / 100)
+            }else{
+                return
+            }
+        },
+        submitMaintain(){
+            let params = {
+                ...this.maintainForm,
+                id:this.checkId,
+                subjectFeeDetailList:this.tableData,
+            }
+            console.log('params---------------------',params)
+            if(params.type == 1){
+                const totalRatio = this.tableData.reduce((sum, item) => {
+                // 确保 item.money 是数字类型，如果是 null 或 undefined 则视为 0
+                    return sum + (Number(item.rate) || 0);
+                }, 0);
+                if(totalRatio != 100){
+                    this.$message.error('比例总和需为100%,请进行调整')
+                    return
+                }
+            }
+            maintainSubjectFee(params).then(res =>{
+                console.log('res---------------------',res)
+                if(res.data.code == 200){
+                    this.$message.success('保存成功')
+                    this.closeDialog(true)
+                }
+            })
+        },
+        closeDialog(val){
+            this.openShow = false
+            this.$emit('closeDialog',val)
+        },
+        disabledDate(time) {
+            // 获取当前时间的年月
+            const now = new Date();
+            const currentYear = now.getFullYear();
+            const currentMonth = now.getMonth(); // 0-11
+
+            // 获取传入日期的年月
+            const targetYear = time.getFullYear();
+            const targetMonth = time.getMonth(); // 0-11
+
+            // 如果年份小于当前年份，或者年份相同但月份小于当前月份，则禁用
+            return (targetYear < currentYear) || (targetYear === currentYear && targetMonth < currentMonth);
+        },
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/costManagement/components/materialMaintenance.vue b/src/views/costManagement/components/materialMaintenance.vue
new file mode 100644
index 00000000..44a62172
--- /dev/null
+++ b/src/views/costManagement/components/materialMaintenance.vue
@@ -0,0 +1,212 @@
+<template>
+    <div>
+        <el-alert
+          title="维护的物料不进行材料费用计算"
+          style="margin-bottom: 10px; background: #e6f7ff; border-color: #91d5ff"
+          show-icon
+          :closable="false"
+        >
+        </el-alert>
+        <avue-crud
+            height="calc(352px - 40px)"
+            :option="option"
+            :table-loading="loading"
+            :data="data"
+            v-model="form"
+            v-model:page="page"
+            ref="crud"
+            @search-change="searchChange"
+            @search-reset="searchReset"
+            @selection-change="selectionChange"
+            @current-change="currentChange"
+            @size-change="sizeChange"
+            @refresh-change="refreshChange"
+            @on-load="onLoad"
+        >
+            <template #menu-left>
+                <el-button type="danger" @click="handleDelete">删除</el-button>
+            </template>
+            <template #menu-right>
+                <el-button type="primary" @click="handleImport">导入</el-button>
+            </template>
+        </avue-crud>
+        <!-- 导入 -->
+        <basic-import
+            v-if="isShowImport"
+            title="导入"
+            :isShow="isShowImport"
+            templateUrl="/blade-desk/costCalculationGoods/importTemplate"
+            templateName="成本-物料维护模板.xls"
+            importUrl="/blade-desk/costCalculationGoods/import"
+            @closeDialog="closeDialog"
+        ></basic-import>
+    </div>
+</template>
+
+<script>
+import {getMaterialList,deleteMaterial} from "@/api/costManagement/costConfiguration"
+import basicImport from '@/components/basic-import/main.vue';
+export default {
+    components:{
+        basicImport
+    },
+    data(){
+        return{
+            loading:false,
+            isShowImport:false,
+            data:[],
+            form:{},
+            query:{},
+            page:{
+                pageSize:10,
+                currentPage:1,
+                total:0,
+            },
+            selectionList:[],
+            option: {
+                height: 'auto',
+                calcHeight: 32,
+                tip: false,
+                simplePage: true,
+                searchShow: true,
+                searchMenuSpan: 12,
+                searchIcon: true,
+                searchIndex: 3,
+                tree: false,
+                border: true,
+                index: true,
+                selection: true,
+                viewBtn: false,
+                delBtn: false,
+                addBtn: false,
+                editBtn: false,
+                editBtnText: '修改',
+                viewBtnIcon: ' ',
+                delBtnIcon: ' ',
+                editBtnIcon: ' ',
+                viewBtnText: '详情',
+                labelWidth: 120,
+                searchLabelWidth: "auto",
+                menuWidth: 100,
+                dialogWidth: 1200,
+                dialogClickModal: false,
+                searchEnter: true,
+                excelBtn: false,
+                filterBtn: true,
+                searchShowBtn: false,
+                columnSort: true,
+                excelBtn: true,
+                columnSort: true,
+                index: false,
+                showOverflowTooltip: true,
+                searchLabelPosition: 'left',
+                searchLabelPosition: 'left',
+                searchGutter: 24,
+                searchSpan: 6,
+                menuAlign: 'left',
+                gridBtn: false,
+                searchMenuPosition: 'right',
+                menu:false,
+                addBtnIcon: ' ',
+                viewBtnIcon: ' ',
+                delBtnIcon: ' ',
+                editBtnIcon: ' ',
+                align: 'center',
+
+                column: [
+                    {
+                        label:"物料编号",
+                        prop:"goodsCode",
+                        search:true
+                    },
+                    {
+                        label:"物料名称",
+                        prop:"goodsName",
+                        search:true
+                    },
+                    {
+                        label:"维护人",
+                        prop:"updateUserName",
+                    },
+                    {
+                        label:"维护时间",
+                        prop:"updateTime",
+                    }
+                ],
+            },
+        }
+    },
+    created(){
+
+    },
+    methods:{
+        searchChange(params, done){
+            this.query = params;
+            this.page.currentPage = 1
+            this.onLoad()
+            done()
+        },
+        searchReset(){
+            this.query = {}
+            this.onLoad()
+        },
+        selectionChange(list){
+            this.selectionList = list
+        },
+        currentChange(currentPage){
+            this.page.currentPage = currentPage
+        },
+        sizeChange(pageSize){
+            this.page.pageSize = pageSize
+        },
+        refreshChange(){
+            this.onLoad()
+        },
+        handleDelete(){
+            if (this.selectionList.length == 0) {
+                this.$message.error('请先选择数据');
+                return;
+            }
+            this.$confirm('确定将选择数据删除?', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(res => {
+                deleteMaterial({
+                    ids:this.selectionList.map(item => item.id).join(',')
+                }).then(res =>{
+                    if(res.data.code == 200){
+                        this.$message.success('删除成功')
+                        this.onLoad()
+                    }
+                })
+            });
+        },
+        handleImport(){
+            this.isShowImport = true
+        },
+        closeDialog(val){
+            this.isShowImport = false
+            if(val){
+                this.onLoad()
+            }  
+        },
+        onLoad(){
+            this.loading = true
+            getMaterialList({
+                current:this.page.currentPage,
+                size:this.page.pageSize,
+                ...this.query
+            }).then(res =>{
+                this.data = res.data.data.records
+                this.page.total = res.data.data.total
+                this.loading = false
+            })
+        },
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/costManagement/components/processMaintenance.vue b/src/views/costManagement/components/processMaintenance.vue
new file mode 100644
index 00000000..3c12ced7
--- /dev/null
+++ b/src/views/costManagement/components/processMaintenance.vue
@@ -0,0 +1,318 @@
+<template>
+    <div>
+        <avue-crud
+            :option="option"
+            :table-loading="loading"
+            :data="data"
+            v-model="form"
+            v-model:page="page"
+            ref="crud"
+            @search-change="searchChange"
+            @search-reset="searchReset"
+            @selection-change="selectionChange"
+            @current-change="currentChange"
+            @size-change="sizeChange"
+            @refresh-change="refreshChange"
+            @on-load="onLoad"
+        >
+            <template #menu-left>
+                <el-button type="primary" @click="handleAdd">新增</el-button>
+                <el-button type="danger" @click="handleDelete">删除</el-button>
+            </template>
+            <template #menu-right>
+                <el-button type="primary" @click="handleImport">导入</el-button>
+            </template>
+            <template #menu="scope">
+                <el-button
+                    type="text"
+                    v-if="tabPosition == 'processMaintenance'"
+                    @click="maintainProcess(scope.row)"
+                    >维护</el-button
+                    >
+                <el-button
+                    type="text"
+                    v-if="tabPosition == 'processMaintenance'"
+                    @click="deleteRow(scope.row)"
+                    >删除</el-button
+                    >
+            </template>
+        </avue-crud>
+        <batchAddProcess
+            v-if="showDialog"
+            :title="title"
+            :showDialog="showDialog"
+            :moldAddMore="moldAddMore"
+            @closeDialog="closeDialog"
+        ></batchAddProcess>
+        <!-- 导入 -->
+        <basic-import
+            v-if="isShowImport"
+            title="导入"
+            :isShow="isShowImport"
+            templateUrl="/blade-desk/costCalculationProcess/importTemplate"
+            templateName="成本-工序维护模板.xls"
+            importUrl="/blade-desk/costCalculationProcess/import"
+            @closeDialog="closeDialog"
+        ></basic-import>
+    </div>
+</template>
+
+<script>
+import {getCostList,deleteProcess} from "@/api/costManagement/costConfiguration"
+import batchAddProcess from './batchAddProcess.vue'
+import basicImport from '@/components/basic-import/main.vue';
+export default {
+    components:{
+        batchAddProcess,
+        basicImport
+    },
+    data(){
+        return{
+            form: {},
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+            },
+            isShowImport:false,
+            showDialog:false,
+            title:"",
+            selectionList:[],
+            moldAddMore:false,
+            loading:false,
+            data:[],
+            query:{},
+            option: {
+                height: 'auto',
+                calcHeight: 32,
+                tip: false,
+                simplePage: true,
+                searchShow: true,
+                searchMenuSpan: 12,
+                searchIcon: true,
+                searchIndex: 3,
+                tree: false,
+                border: true,
+                index: true,
+                selection: true,
+                viewBtn: false,
+                delBtn: false,
+                addBtn: false,
+                editBtn: false,
+                editBtnText: '修改',
+                viewBtnIcon: ' ',
+                delBtnIcon: ' ',
+                editBtnIcon: ' ',
+                viewBtnText: '详情',
+                labelWidth: 120,
+                searchLabelWidth: "auto",
+                menuWidth: 100,
+                dialogWidth: 1200,
+                dialogClickModal: false,
+                searchEnter: true,
+                excelBtn: false,
+                filterBtn: true,
+                searchShowBtn: false,
+                columnSort: true,
+                excelBtn: true,
+                columnSort: true,
+                index: false,
+                showOverflowTooltip: true,
+                searchLabelPosition: 'left',
+                searchLabelPosition: 'left',
+                searchGutter: 24,
+                searchSpan: 6,
+                menuAlign: 'left',
+                gridBtn: false,
+                searchMenuPosition: 'right',
+                menu:false,
+                addBtnIcon: ' ',
+                viewBtnIcon: ' ',
+                delBtnIcon: ' ',
+                editBtnIcon: ' ',
+                align: 'center',
+
+                column: [
+                    {
+                        label: '作业中心',
+                        prop: 'workCenterId',
+                        type: 'select',
+                        search: true,
+                        sortable: true,
+                        overHidden: true,
+                        dicUrl: '/blade-desk/bsWorkCenter/getList',
+                        props: {
+                        label: 'wcName',
+                        value: 'id',
+                        },
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入作业中心',
+                                trigger: 'blur',
+                            },
+                        ],
+                    },
+                    {
+                        label: '工序',
+                        prop: 'processName',
+                        search:false
+                    },
+                    {
+                        label: '工序',
+                        prop: 'processId',
+                        type:"select",
+                        search: true,
+                        sortable: true,
+                        overHidden: true,
+                        hide:true,
+                        remote:true,
+                        // multiple: true,
+                        dicUrl:"/api/blade-desk/bsProcessSet/list?current=1&size=300&name={{key}}",
+                        props:{
+                            label:"name",
+                            value:"id",
+                            res:'data.records'
+                        },
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入工序',
+                                trigger: 'blur',
+                            },
+                        ],
+                    },
+                    {
+                        label: '计算方式',
+                        prop: 'type',
+                        type:'select',
+                        search: false,
+                        sortable: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入计算方式',
+                                trigger: 'blur',
+                            },
+                        ],
+                        dicData:[
+                            {label:'面积',value:'0'},
+                            {label:'体积',value:'1'},
+                        ]
+                    },
+                    {
+                        label: '维护人',
+                        prop: 'updateUserName',
+                        search: false,
+                        sortable: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入维护人',
+                                trigger: 'blur',
+                            },
+                        ],
+                    },
+                    {
+                        label: '维护时间',
+                        prop: 'updateTime',
+                        search: false,
+                        sortable: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入维护时间',
+                                trigger: 'blur',
+                            },
+                        ],
+                    },
+                ],
+            },
+        }
+    },
+    created(){
+
+    },
+    methods:{
+        handleImport(){
+            this.isShowImport = true
+        },
+        searchChange(params, done){
+            this.query = params;
+            this.page.currentPage = 1
+            this.onLoad()
+            done()
+        },
+        searchReset(){
+            this.query = {}
+            this.onLoad()
+        },
+        selectionChange(list){
+            this.selectionList = list
+        },
+        currentChange(currentPage){
+            this.page.currentPage = currentPage
+        },
+        sizeChange(pageSize){
+            this.page.pageSize = pageSize
+        },
+        refreshChange(){
+            this.onLoad()
+        },
+        handleAdd(){
+            this.title = '新增'
+            this.moldAddMore = true
+            this.showDialog = true
+        },
+        handleDelete(){
+            if (this.selectionList.length == 0) {
+                this.$message.error('请先选择数据');
+                return;
+            }
+            this.$confirm('确定将选择数据删除?', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(res => {
+                deleteProcess({
+                    ids:this.selectionList.map(item=>item.id).join(',')
+                }).then(res =>{
+                    if(res.data.code == 200){
+                        this.$message.success('删除成功')
+                        this.onLoad()
+                    }
+                })
+            });
+        },
+        closeDialog(val){
+            this.showDialog = false
+            this.isShowImport = false
+            if(val){
+                this.onLoad()
+            }
+        },
+        onLoad(){
+            this.loading = true
+            getCostList({
+                current:this.page.currentPage,
+                size:this.page.pageSize,
+                ...this.query
+            }).then(res =>{
+                res.data.data.records.map(item =>{
+                    item.processId = item.processId + ''
+                })
+                this.data = res.data.data.records
+                this.page.total = res.data.data.total
+                this.loading = false
+            })
+        }
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/costManagement/costConfiguration.vue b/src/views/costManagement/costConfiguration.vue
index 543f6404..7c3bbb1c 100644
--- a/src/views/costManagement/costConfiguration.vue
+++ b/src/views/costManagement/costConfiguration.vue
@@ -3,16 +3,12 @@
     <!-- 成本计算配置 -->
     <el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
       <el-tab-pane label="工序维护" name="processMaintenance"></el-tab-pane>
-      <el-tab-pane label="物料维护" name="materialMaintenance">
-        <el-alert
-          title="维护的物料不进行材料费用计算"
-          style="margin-bottom: 10px; background: #e6f7ff; border-color: #91d5ff"
-          show-icon
-        >
-        </el-alert>
-      </el-tab-pane>
+      <el-tab-pane label="物料维护" name="materialMaintenance"></el-tab-pane>
     </el-tabs>
-    <avue-crud
+    <processMaintenance v-if="tabPosition == 'processMaintenance'"></processMaintenance>
+    <materialMaintenance v-if="tabPosition == 'materialMaintenance'"></materialMaintenance>
+    
+    <!-- <avue-crud
       :option="option"
       :table-loading="loading"
       :data="data"
@@ -108,7 +104,7 @@
         </el-table-column>
         <el-table-column align="center" label="物料名称" prop="goodsName"></el-table-column>
       </el-table>
-    </el-dialog>
+    </el-dialog> -->
 
     <!-- 导入 -->
     <basic-import
@@ -126,9 +122,13 @@
 <script>
 import costColumnData from './js/costColumnData';
 import basicImport from '@/components/basic-import/main.vue';
+import processMaintenance from './components/processMaintenance.vue';
+import materialMaintenance from './components/materialMaintenance.vue';
 export default {
   components: {
     basicImport,
+    processMaintenance,
+    materialMaintenance
   },
   data() {
     return {
diff --git a/src/views/costManagement/subjectFeeMaintenance.vue b/src/views/costManagement/subjectFeeMaintenance.vue
index df39e5ef..d876629e 100644
--- a/src/views/costManagement/subjectFeeMaintenance.vue
+++ b/src/views/costManagement/subjectFeeMaintenance.vue
@@ -8,8 +8,6 @@
       v-model="form"
       v-model:page="page"
       ref="crud"
-      @row-update="rowUpdate"
-      @row-save="rowSave"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -29,8 +27,8 @@
       </template>
 
       <template #menu="scope">
-        <el-button type="text" @click="viewRow(scope.row)">详情</el-button>
-        <el-button type="text" @click="maintainRow(scope.row)">维护</el-button>
+        <el-button type="primary" text @click="viewRow(scope.row)">详情</el-button>
+        <el-button type="primary" text @click="maintenanceRow(scope.row)">维护</el-button>
       </template>
     </avue-crud>
     <el-dialog
@@ -57,7 +55,7 @@
       append-to-body
       :title="title"
       :model-value="showMaintain"
-      @update:model-value="val => (showMaintain = val)"
+      @close="showMaintain = false"
     >
       <el-form :inline="true" :model="maintainForm" ref="maintainForm" :rules="maintainRules">
         <el-form-item label="月份" prop="month">
@@ -96,7 +94,6 @@
               controls-position="right"
               :min="0"
               :max="100"
-              @change="(val) => changeRatio(val,scope.row)"
               :disabled="title == '详情' || maintainForm.distributeType == 1"
             ></el-input-number>
           </template>
@@ -106,9 +103,8 @@
             <el-input-number
               v-model="scope.row.money"
               controls-position="right"
-              :min="1"
+              :min="0"
               :disabled="title == '详情' || maintainForm.distributeType == 2"
-              @change="changePrice"
             ></el-input-number>
           </template>
         </el-table-column>
@@ -116,7 +112,7 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="showMaintain = false">取 消</el-button>
-          <el-button v-if="title == '维护'" type="primary" @click="submitMaintain">保 存</el-button>
+          <el-button v-if="title == '维护'" type="primary" @click="submitMaintain">确 定</el-button>
         </span>
       </template>
     </el-dialog>
@@ -158,24 +154,41 @@
         </span>
       </template>
     </el-dialog>
+    <maintenaceCost 
+      v-if="showDialog"
+      :showDialog="showDialog" 
+      :title="maintenceTitle" 
+      :checkId="checkId"
+      :month="month"
+      :subjectName="subjectName"
+      @closeDialog="closeDialog"
+    ></maintenaceCost>
   </basic-container>
 </template>
 
 <script>
+import {getList,addSubjectFee,delSubjectFee} from '@/api/costManagement/subjectFeeMaintenance'
 import basicImport from '@/components/basic-import/main.vue';
+import maintenaceCost from "./components/maintenanceCost.vue"
 export default {
   components: {
     basicImport,
+    maintenaceCost
   },
   data() {
     return {
       isShowImport: false,
       data: [],
       form: {},
+      query:{},
       distributeType: '',
       loading: false,
       showAdd: false,
       title: '详情',
+      subjectName:'',
+      showDialog:false,
+      checkId:'',
+      maintenceTitle:"",
       tableData: [],
       addForm: {},
       selectionList: [],
@@ -201,6 +214,7 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      month:'',
       option: {
         height: 'auto',
         calcHeight: 32,
@@ -214,6 +228,7 @@ export default {
         border: true,
         index: true,
         selection: true,
+        selectable: (row, index) => row.subjectName != '辅助人员材料费用',
         viewBtn: false,
         delBtn: false,
         addBtn: false,
@@ -252,7 +267,7 @@ export default {
         column: [
           {
             label: '费用科目',
-            prop: 'expenseAccount',
+            prop: 'subjectName',
             search: true,
             sortable: true,
             overHidden: true,
@@ -263,12 +278,20 @@ export default {
                 trigger: 'blur',
               },
             ],
+            minWidth:100
+          },
+          {
+            label:"费用时间",
+            prop: 'month',
+            sortable: true,
+            minWidth:100
           },
           {
             label: '分配方式',
-            prop: 'distributeType',
+            prop: 'type',
             type: 'select',
             search: false,
+            minWidth:100,
             sortable: true,
             overHidden: true,
             rules: [
@@ -279,16 +302,17 @@ export default {
               },
             ],
             dicData: [
-              { label: '按金额', value: '1' },
-              { label: '按比例', value: '2' },
+              { label: '按金额', value: '0' },
+              { label: '按比例', value: '1' },
             ],
           },
           {
             label: '费用总金额(元)',
-            prop: 'totalCost',
+            prop: 'totalFee',
             search: false,
             sortable: true,
             overHidden: true,
+            minWidth:100,
             rules: [
               {
                 required: true,
@@ -299,7 +323,8 @@ export default {
           },
           {
             label: '操作人',
-            prop: 'createUser',
+            prop: 'updateUserName',
+            minWidth:100,
             search: false,
             sortable: true,
             overHidden: true,
@@ -314,6 +339,7 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime',
+            minWidth:100,
             search: false,
             sortable: true,
             overHidden: true,
@@ -331,47 +357,16 @@ export default {
   },
   mounted() {},
   methods: {
-    disabledDate(time) {
-    // 获取当前时间的年月
-      const now = new Date();
-      const currentYear = now.getFullYear();
-      const currentMonth = now.getMonth(); // 0-11
-
-      // 获取传入日期的年月
-      const targetYear = time.getFullYear();
-      const targetMonth = time.getMonth(); // 0-11
-
-      // 如果年份小于当前年份，或者年份相同但月份小于当前月份，则禁用
-      return (targetYear < currentYear) || (targetYear === currentYear && targetMonth < currentMonth);
-    },
     changeType(val){
       console.log('val---------------------',val)
       if(val == 1){
         this.tableData.map(item =>{
-          item.ratio = 0
+          item.ratio = null
         })
-      }
-    },
-    changePrice(val){
-      console.log('val---------------------',val)
-      if(this.maintainForm.distributeType == 1){
-        const totalMoney = this.tableData.reduce((sum, item) => {
-          // 确保 item.money 是数字类型，如果是 null 或 undefined 则视为 0
-          return sum + (Number(item.money) || 0);
-        }, 0);
-        this.maintainForm.totalCost = totalMoney;
-
-      }else{
-        return
-      }
-    },
-    changeRatio(val,row){
-      console.log('val=============',val)
-      console.log('row=============',row)
-      if(this.maintainForm.distributeType == '2'){
-        row.money = this.maintainForm.totalCost * (val / 100)
       }else{
-        return
+        this.tableData.map(item =>{
+          item.money = null
+        })
       }
     },
     // 点击导入按钮
@@ -382,6 +377,25 @@ export default {
     selectionChange(val) {
       this.selectionList = val;
     },
+    searchChange(params, done){
+      this.query = params;
+      this.page.currentPage = 1
+      this.onLoad()
+      done()
+    },
+    searchReset(){
+      this.query = {}
+      this.onLoad()
+    },
+    currentChange(currentPage){
+      this.page.currentPage = currentPage
+    },
+    sizeChange(pageSize){
+      this.page.pageSize = pageSize
+    },
+    refreshChange(){
+      this.onLoad()
+    },
     // 点击删除按钮
     handleDelete() {
       if (this.selectionList.length == 0) {
@@ -392,17 +406,36 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(res => {});
+      }).then(res => {
+        delSubjectFee({
+          ids:this.selectionList.map(item => item.id).join(',')
+        }).then(res =>{
+          if(res.data.code == 200){
+            this.$message.success('删除成功')
+            this.onLoad()
+          }
+        })
+      });
     },
     // 点击新增按钮
     handleAdd() {
+      this.addForm = {}
       this.showAdd = true;
     },
     // 新增提交
     submitAdd() {
       this.$refs.addForm.validate(valid => {
         if (valid) {
-          this.showAdd = false;
+          // this.showAdd = false;
+          addSubjectFee({
+            subjectName:this.addForm.expenseAccount
+          }).then(res =>{
+            if(res.data.code == 200){
+              this.$message.success('新增成功')
+              this.showAdd = false
+              this.onLoad()
+            }
+          })
         }
       });
     },
@@ -410,28 +443,57 @@ export default {
     submitMaintain() {
       this.$refs.maintainForm.validate(valid => {
         if (valid) {
+          if(this.maintainForm.distributeType == 2){
+            const totalRatio = this.tableData.reduce((sum, item) => {
+              // 确保 item.money 是数字类型，如果是 null 或 undefined 则视为 0
+              return sum + (Number(item.ratio) || 0);
+            }, 0);
+            if(totalRatio != 100){
+              this.$message.error('比例总和需为100%,请进行调整')
+              return
+            }
+          }
           this.showMaintain = false;
+
         }
       });
     },
     // 详情
     viewRow(row) {
-      this.title = '详情';
-      this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() };
-      this.tableData = row.tableData;
-      this.showMaintain = true;
+      this.maintenceTitle = '详情'
+      this.checkId = row.id
+      this.month = row.month
+      console.log('111111111111')
+      this.showDialog = true
+      // this.title = '详情';
+      // this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() };
+      // this.tableData = row.tableData;
+      // this.showMaintain = true;
     },
     // 维护
-    maintainRow(row) {
-      this.title = '维护';
-      this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() };
-      this.tableData = row.tableData;
-      if(this.maintainForm.distributeType == 1){
-        this.tableData.map(item =>{
-          item.ratio = 0
-        })
+    maintenanceRow(row) {
+      this.maintenceTitle = '维护'
+      this.checkId = row.id
+      this.subjectName = row.subjectName
+      this.month = row.month
+      console.log('111111111111')
+      this.showDialog = true
+
+      // this.title = '维护';
+      // this.maintainForm = { ...row, month: row.month || this.getCurrentMonth() };
+      // this.tableData = row.tableData;
+      // if(this.maintainForm.distributeType == 1){
+      //   this.tableData.map(item =>{
+      //     item.ratio = 0
+      //   })
+      // }
+      // this.showMaintain = true;
+    },
+    closeDialog(val){
+      this.showDialog = false
+      if(val){
+        this.onLoad()
       }
-      this.showMaintain = true;
     },
     // 获取当前月份
     getCurrentMonth() {
@@ -497,47 +559,16 @@ export default {
       }, 2000);
     },
     onLoad() {
-      this.data = [
-        {
-          id: 1,
-          expenseAccount: '房租补贴',
-          distributeType: '1',
-          totalCost: 1000,
-          createUser: '张三',
-          updateTime: '2016-09-21  08:50:08',
-          tableData: [
-            { workCenter: '作业中心一', ratio: 40, money: 400 },
-            { workCenter: '作业中心二', ratio: 30, money: 300 },
-            { workCenter: '作业中心三', ratio: 30, money: 300 },
-          ],
-        },
-        {
-          id: 2,
-          expenseAccount: '电话费',
-          distributeType: '2',
-          totalCost: 1000,
-          createUser: '张三',
-          updateTime: '2016-09-21  08:50:08',
-          tableData: [
-            { workCenter: '作业中心一', ratio: 20, money: 200 },
-            { workCenter: '作业中心二', ratio: 50, money: 500 },
-            { workCenter: '作业中心三', ratio: 30, money: 300 },
-          ],
-        },
-        {
-          id: 3,
-          expenseAccount: '差旅费',
-          distributeType: '1',
-          totalCost: 1000,
-          createUser: '张三',
-          updateTime: '2016-09-21  08:50:08',
-          tableData: [
-            { workCenter: '作业中心一', ratio: 15, money: 150 },
-            { workCenter: '作业中心二', ratio: 35, money: 350 },
-            { workCenter: '作业中心三', ratio: 50, money: 500 },
-          ],
-        },
-      ];
+      this.loading = true
+      getList({
+        current:this.page.currentPage,
+        size:this.page.pageSize,
+        ...this.query
+      }).then(res =>{
+        this.data = res.data.data.records
+        this.page.total = res.data.data.total
+        this.loading = false
+      })
     },
   },
 };
diff --git a/src/views/costStatistics/index.vue b/src/views/costStatistics/index.vue
index 1ce69bab..7d6b0a21 100644
--- a/src/views/costStatistics/index.vue
+++ b/src/views/costStatistics/index.vue
@@ -1,28 +1,16 @@
 <template>
   <basic-container>
-    <!-- 成本统计 -->
-    <el-form :inline="true" :model="searchForm">
-      <el-form-item label="月份">
-        <el-date-picker v-model="searchForm.monthDate" type="month" placeholder="选择月" required>
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary">查询</el-button>
-        <!-- <el-button type="primary">分派</el-button>
-        <el-button type="primary">保存</el-button> -->
-      </el-form-item>
-    </el-form>
-    <el-row>
-      <el-col :span="20">
+    <div style="width:100%;height:100%;display:flex;justify-content:space-between;">
+      <div style="width:80%;height:100%;">
         <avue-crud
+          @current-row-change="handleCurrentRowChange"
+          :row-class-name="tableRowClassName"
           :option="option"
           :table-loading="loading"
           :data="data"
           v-model="form"
           v-model:page="page"
           ref="crud"
-          @row-update="rowUpdate"
-          @row-save="rowSave"
           @search-change="searchChange"
           @search-reset="searchReset"
           @selection-change="selectionChange"
@@ -32,85 +20,94 @@
           @on-load="onLoad"
         >
           <template #menu-left>
-            <el-button type="primary" @click="openCostCalcDialog">成本计算</el-button>
-            <!-- <el-button type="primary" @click="isLockClick">锁定/解锁</el-button> -->
+            <el-button type="primary" @click="handleCost">成本计算</el-button>
             <el-button type="danger" @click="handleDelete">删除</el-button>
           </template>
           <template #menu-right>
-            <el-button type="primary">导出</el-button>
+            <el-button type="primary" @click="handleExport">导出</el-button>
           </template>
-
-          <!-- <template #wcCode="{ row }">{{ row.saCostConfig.bsWorkCenter.wcCode }}</template>
-          <template #wcName="{ row }">{{ row.saCostConfig.bsWorkCenter.wcName }}</template> -->
         </avue-crud>
-      </el-col>
-      <el-col :span="4">
+      </div>
+      <div style="width:19%;height:100%;padding-top: 80px;">
         <avue-crud
-          :option="detailsOption"
-          :table-loading="loading"
-          :data="data"
-          v-model="form"
-          v-model:page="page"
-          ref="crud"
-          @row-update="rowUpdate"
-          @row-save="rowSave"
-          @search-change="searchChange"
-          @search-reset="searchReset"
-          @selection-change="selectionChange"
-          @current-change="currentChange"
-          @size-change="sizeChange"
-          @refresh-change="refreshChange"
-          @on-load="onLoad"
-          style="margin-top: 30px; margin-left: 12px"
+          :option="detailOption"
+          :table-loading="detailLoading"
+          :data="detailData"
+          v-model="detailForm"
+          ref="detailCrud"
+          @current-change="detailCurrentChange"
+          @size-change="detailSizeChange"
+          @refresh-change="detailRefreshChange"
         ></avue-crud>
-      </el-col>
-    </el-row>
-    <el-dialog
-      :modelValue="openShow"
-      title="提示"
-      width="400px"
-      :close-on-click-modal="false"
-      class="cost-confirm-dialog"
-    >
-      <div class="dialog-content">
-        <i class="el-icon-warning"></i>
-        <p>
-          <span class="month-highlight">{{ selectMonth }}</span
-          >月已计算成本，是否重新计算？
-        </p>
       </div>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="handleRecalculate">重新计算</el-button>
-          <el-button @click="CloseDialog">取消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+      <el-dialog
+        :modelValue="openShow"
+        title="成本计算"
+        width="400px"
+        :close-on-click-modal="false"
+        class="cost-confirm-dialog"
+      >
+        <el-form ref="costForm" :model="costForm" :rules="costRules">
+          <el-form-item label="月份" prop="month">
+            <el-date-picker
+              style="width:100%;"
+              type="month"
+              :disabled="disabled" 
+              v-model="costForm.month"
+              format="YYYY-MM"
+              value-format="YYYY-MM"
+              :clearable="false"
+            ></el-date-picker>
+          </el-form-item>
+        </el-form>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button :disabled="disabled" @click="openShow = false">取消</el-button>
+            <el-button :disabled="disabled"  type="primary" @click="handleRecalculate">确定</el-button>
+          </div>
+        </template>
+      </el-dialog>
+    </div>
   </basic-container>
 </template>
 
 <script>
+import {getList,deleteTable,verifyTable,calculateTable,exportData,getDetail} from "@/api/costManagement/costStatistics"
+import { tr } from 'element-plus/es/locales.mjs'
 export default {
-  data() {
-    return {
-      openShow: false,
-      searchForm: {},
-      loading: false,
-      data: [],
-      form: {},
-      selectionList: [],
-      page: {
+  data(){
+    return{
+      loading:false,
+      openShow:false,
+      data:[],
+      form:{},
+      query:{},
+      page:{
         pageSize: 10,
         currentPage: 1,
         total: 0,
       },
-      option: {
+      detailLoading:false,
+      detailData:[],
+      detailForm:{},
+      detailPage:{
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      costForm:{},
+      costRules:{
+        month:{required:true,message:'请选择月份',trigger:'change'}
+      },
+      disabled:false,
+      selectionList:[],
+      option:{
         height: 'auto',
         calcHeight: 32,
         tip: false,
         simplePage: true,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         searchIcon: true,
         searchIndex: 3,
         tree: false,
@@ -124,7 +121,7 @@ export default {
         editBtnText: '修改',
         viewBtnText: '详情',
         labelWidth: 120,
-        searchLabelWidth: 120,
+        searchLabelWidth: "auto",
         menu: false,
         menuWidth: 220,
         dialogWidth: 1200,
@@ -137,6 +134,7 @@ export default {
         excelBtn: true,
         columnSort: true,
         index: false,
+        highlightCurrentRow:true,  //单选数据
         showOverflowTooltip: true,
         searchLabelPosition: 'left',
         searchGutter: 24,
@@ -149,11 +147,10 @@ export default {
         delBtnIcon: ' ',
         editBtnIcon: ' ',
         align: 'center',
-
         column: [
           {
             label: '作业中心',
-            prop: 'wcName',
+            prop: 'workCenterName',
             search: false,
             sortable: false,
             overHidden: true,
@@ -161,31 +158,35 @@ export default {
           {
             label: '月份',
             prop: 'month',
-            search: false,
+            type:"month",
+            format:"YYYY-MM",
+            valueFormat:"YYYY-MM",
+            search: true,
             sortable: false,
             overHidden: true,
+            width:80,
           },
           {
             label: '制造费用(元)',
-            prop: 'drainCosts',
+            prop: 'productCost',
             search: false,
             sortable: false,
             overHidden: true,
-            width: 100,
+            width: 95,
           },
           {
             label: '作业中心材料费用(元)',
-            prop: 'materialCosts',
+            prop: 'workCenterMaterialCost',
             search: false,
             sortable: false,
             overHidden: true,
-            width: 160,
+            width: 140,
           },
           {
             label: '辅助人员材料费用(元)',
-            prop: 'materialCosts1',
+            prop: 'assistantMaterialCost',
             search: false,
-            width: 160,
+            width: 140,
             sortable: false,
             overHidden: true,
           },
@@ -195,33 +196,32 @@ export default {
             search: false,
             sortable: false,
             overHidden: true,
-            width: 120,
+            width: 100,
           },
           {
             label: '月度产出(dm²)',
-            prop: 'monthlyOutput',
+            prop: 'monthOutputArea',
             search: false,
-            width: 120,
             sortable: false,
             overHidden: true,
           },
           {
             label: '月度产出(v)',
-            prop: 'volumeOutput2',
+            prop: 'monthOutputVolume',
             search: false,
             sortable: false,
             overHidden: true,
           },
         ],
       },
-      detailsOption: {
+      detailOption:{
         height: 'auto',
         calcHeight: 32,
         tip: false,
         size: 'medium',
         simplePage: true,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         searchIcon: true,
         searchIndex: 3,
         tree: false,
@@ -235,7 +235,7 @@ export default {
         editBtnText: '修改',
         viewBtnText: '详情',
         labelWidth: 120,
-        searchLabelWidth: 120,
+        searchLabelWidth: 'auto',
         menu: false,
         menuWidth: 220,
         dialogWidth: 1200,
@@ -267,75 +267,255 @@ export default {
         column: [
           {
             label: '类型',
-            prop: 'wcCode',
+            prop: 'subjectName',
             search: false,
             sortable: false,
             overHidden: true,
           },
           {
             label: '金额',
-            prop: 'wcCode1',
+            prop: 'fee',
             search: false,
             sortable: false,
             overHidden: true,
           },
         ],
-      },
-    };
+      }
+    }
   },
-  mounted() {},
-  methods: {
-    openCostCalcDialog() {
-      this.openShow = true;
-    },
-    CloseDialog() {
-      this.openShow = false;
-    },
-    handleRecalculate() {
-      this.$message.success('重新计算成功');
-      this.openShow = false;
-    },
-    selectionChange(val) {
-      this.selectionList = val;
-    },
-    isLockClick() {
-      if (this.selectionList.length == 0) {
-        this.$message.error('请先选择数据');
+  created(){
+
+  },
+  methods:{
+    handleCurrentRowChange(row){
+      if (!row) {
+        this.detailData = [];
         return;
       }
+      
+      this.detailLoading = true;
+      getDetail({
+        month: row.month,
+        workCenterId: row.workCenterId
+      }).then(res => {
+        if (res.data.code === 200) {
+          this.detailData = res.data.data || [];
+        }
+      }).finally(() => {
+        this.detailLoading = false;
+      });
+    },
+    handleCost(){
+      this.costForm.month = this.$dayjs().format('YYYY-MM');
+      this.openShow = true
     },
+    // 批量删除
     handleDelete() {
       if (this.selectionList.length == 0) {
-        this.$message.error('请先选择数据');
+        this.$message.error("请先选择数据");
         return;
       }
-      this.$confirm('确定将选择数据删除?', {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        deleteTable({
+          ids:this.selectionList.map(item=>item.id).join(',')
+        }).then(res =>{
+          if(res.data.code == 200){
+            this.$message.success('删除成功')
+            this.onLoad()
+          }
+        })
+      });
+    },
+    handleExport() {
+      this.$confirm('是否导出数据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => {});
+      }).then(() => {
+        // this.loading = true;
+        exportData({ month: this.query.month }).then(res => {
+          const blob = new Blob([res.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+          const url = window.URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.href = url;
+          link.download = '成本统计.xlsx';
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+          window.URL.revokeObjectURL(url);
+          this.$message.success('导出成功');
+          this.loading = false;
+        }).catch(() => {
+          this.loading = false;
+        });
+      });
     },
-    onLoad() {
-      this.data = [
-        {
-          id: 1,
-          wcName: '作业中心1',
-          month: '2025-3',
-          materialCosts: 99,
-          materialCosts1: 0,
-          unitCost: '89',
-          monthlyOutput: 0,
-          volumeOutput: '9',
-          drainCosts: '99',
-          volumeOutput2: '90',
-          wcCode: '类型1',
-          wcCode1: '4',
-        },
-      ];
+    handleRecalculate(){
+      this.$refs.costForm.validate((valid) =>{
+        if(valid){
+          console.log('1111111111111111')
+          // this.$message.success('保存成功！')
+          verifyTable({
+            month:this.costForm.month
+          }).then(res =>{
+            if(res.data.code == 200){
+              if(res.data.msg != '操作成功'){
+                this.$confirm(res.data.msg, {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning",
+                }).then(() => {
+                  this.disabled = true
+                  calculateTable({
+                    month:this.costForm.month
+                  }).then(res =>{
+                    if(res.data.code == 200){
+                      this.$message.success('计算成功')
+                      this.openShow = false
+                      this.disabled = false
+                      this.onLoad()
+                    }
+                  })
+                })
+              }else{
+                calculateTable({
+                  month:this.costForm.month
+                }).then(res =>{
+                  if(res.data.code == 200){
+                    this.$message.success('计算成功')
+                    this.openShow = false
+                    this.onLoad()
+                  }
+                })
+              }
+            }
+          })
+        }
+      })
     },
-  },
-};
+    searchChange(params, done){
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad()
+      done();
+    },
+    searchReset(){
+      this.query = {}
+      this.onLoad()
+    },
+    selectionChange(list){
+      this.selectionList = list;
+    },
+    currentChange(currentPage){
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize){
+      this.page.pageSize = pageSize;
+    },
+    refreshChange(){
+      this.onLoad()
+    },
+    onLoad(){
+      this.loading = true
+      getList({
+        current:this.page.currentPage,
+        size:this.page.pageSize,
+        ...this.query
+      }).then(res =>{
+        this.data = res.data.data.records
+        this.page.total = res.data.data.total
+        this.loading = false
+
+        // 【关键】数据返回后，再设置高亮
+        this.$nextTick(() => {
+          if (this.data.length > 0 && this.$refs.crud) {
+            this.detailLoading = true
+            getDetail({
+              month:this.data[0].month,
+              workCenterId:this.data[0].workCenterId
+            }).then(res =>{
+              console.log('res---------',res)
+              this.detailData = res.data.data
+              this.$refs.crud.setCurrentRow(this.data[0]);
+              // this.handleCurrentRowChange(this.data[0]);
+              this.detailLoading = false
+            })
+            
+            // this.detailData = [
+            //   {wcCode:"001",wcCode1:32},
+            //   {wcCode:"001",wcCode1:32},
+            // ]
+            // this.detailPage.total = this.detailData.length;
+          }
+        });
+      })
+      // this.data = [
+      //   {
+      //     id: 1,
+      //     wcName: '作业中心1',
+      //     month: '2025-3',
+      //     materialCosts: 99,
+      //     materialCosts1: 0,
+      //     unitCost: '89',
+      //     monthlyOutput: 0,
+      //     volumeOutput: '9',
+      //     drainCosts: '99',
+      //     volumeOutput2: '90',
+      //     wcCode: '类型1',
+      //     wcCode1: '4',
+      //   },
+      //   {
+      //     id: 2,
+      //     wcName: '作业中心2',
+      //     month: '2025-3',
+      //     materialCosts: 99,
+      //     materialCosts1: 0,
+      //     unitCost: '89',
+      //     monthlyOutput: 0,
+      //     volumeOutput: '9',
+      //     drainCosts: '99',
+      //     volumeOutput2: '90',
+      //     wcCode: '类型1',
+      //     wcCode1: '4',
+      //   },
+      // ];
+      // // 【关键】数据返回后，再设置高亮
+      // this.$nextTick(() => {
+      //   if (this.data.length > 0 && this.$refs.crud) {
+      //     this.$refs.crud.setCurrentRow(this.data[0]);
+      //     this.handleCurrentRowChange(this.data[0]);
+      //     this.detailData = [
+      //       {wcCode:"001",wcCode1:32},
+      //       {wcCode:"001",wcCode1:32},
+      //     ]
+      //     this.detailPage.total = this.detailData.length;
+      //   }
+      // });
+      // this.page.total = this.data.length;
+    },
+  }
+}
 </script>
 
-<style></style>
+<style scoped lang="scss">
+  ::v-deep .el-card__body{
+    height: 100% !important;
+  }
+  ::v-deep .el-table__row.current-row {
+    background-color: yellow !important; /* 这里替换为你想要的颜色，例如浅蓝色 */
+  }
+  // 2. (可选) 修改鼠标悬停在当前选中行时的背景色
+  // 防止鼠标移上去时颜色变回默认悬停色，保持高亮一致性
+  ::v-deep .el-table__row.current-row:hover > td {
+    background-color: yellow !important; /* 比选中色稍深一点的颜色 */
+  }
 
+  // 3. (可选) 确保单元格背景也应用颜色（某些主题下可能需要）
+  ::v-deep .el-table__row.current-row td {
+    background-color: yellow !important;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue b/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue
index cc61c87b..8c31e9a5 100644
--- a/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue
+++ b/src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue
@@ -1,7 +1,6 @@
 <template>
   <basic-container>
     <!-- 薪资维护标准 -->
-    <!-- 薪资标准维护 -->
     <avue-crud
       :option="option"
       :table-loading="loading"
@@ -19,25 +18,71 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
       :span-method="spanMethod"
+      :before-open="beforeOpen"
     >
       <template #menu-left>
-        <el-button type="danger" icon="el-icon-delete" @click="handleDelete"
+        <el-button type="danger" @click="handleDelete"
           >删除</el-button
         >
       </template>
       <template #menu-right>
-      <el-button type="primary" icon="el-icon-upload" @click="handleImport"
+      <el-button type="primary"  @click="handleImport"
           >导入
         </el-button>
       </template>
-      <template #militaryProducts="scope">
-        <el-tag v-if="scope.row.militaryProducts == 1" type="success">军品</el-tag>
-        <el-tag v-if="scope.row.militaryProducts == 2" type="danger">非军品</el-tag>
-        <el-tag v-if="scope.row.militaryProducts == 3">通用</el-tag>
+      <template #standardType="scope">
+        <el-tag v-if="scope.row.standardType == 1" type="success">军品</el-tag>
+        <el-tag v-if="scope.row.standardType == 2" type="danger">非军品</el-tag>
+        <el-tag v-if="scope.row.standardType == 3">通用</el-tag>
+      </template>
+      <!-- 工序选择 -->
+      <template #processId-form="{ type, disabled }">
+        <el-select 
+          v-model="form.processId"
+          remote
+          filterable
+          :remote-method="getPpsList"
+          placeholder="请选择工序"
+          @change="changeProcess"
+        >
+          <el-option v-for="item in ppsData" :key="item.id"
+            :label="`${item.code}-${item.name}`"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </template>
+      <!-- 零件号 -->
+      <template #partNo-form="{ type, disabled}">
+        <el-input v-model="form.partNo" placeholder="多个零件号以空格分隔"></el-input>
+      </template>
+      <!-- 阶梯上下限 -->
+      <template #step-form="{type,disabled}">
+        <el-select v-model="form.stepType" style="width:30%;" @change="changeType">
+          <el-option label="无补贴金额" value="1"></el-option>
+          <el-option label="固定补贴金额" value="2"></el-option>
+          <el-option label="阶梯补贴金额" value="3"></el-option>
+        </el-select>
+        <el-input style="width:68%;margin-left:1%;" :disabled="form.stepType != 3" v-model="form.step" placeholder="阶梯以空格分隔，如：10 20 30"></el-input>
+      </template>
+      <!-- 阶梯结算价 -->
+      <template #stepSettlementPrice-form="{type,disabled}">
+        <!-- <el-select></el-select> -->
+        <el-input v-model="form.stepSettlementPrice" :disabled="form.stepType == 1" placeholder="结算价以空格分隔,如:5 10 15 20"></el-input>
+      </template>
+      <!-- 阶梯结算单位 -->
+      <template #stepSettlementUnit-form="{type,disabled}">
+        <el-select v-model="form.stepSettlementUnit" placeholder="请选择阶梯结算单位" :disabled="form.stepType == 1">
+          <el-option label="批" value="1"></el-option>
+          <el-option label="倍" value="2"></el-option>
+        </el-select>
+      </template>
+      <!-- 阶梯单位 -->
+      <template #stepUnit-form="{type,disabled}">
+        <el-select v-model="form.stepUnit" placeholder="请选择阶梯单位" :disabled="form.stepType == 1">
+          <el-option label="件" value="1"></el-option>
+          <el-option label="面积" value="2"></el-option>
+        </el-select>
       </template>
-      <template #ppsName="{ row }">{{
-        row.bsProcedureSet && row.bsProcedureSet.ppsName
-      }}</template>
     </avue-crud>
     <!-- 导入 -->
     <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
@@ -50,6 +95,7 @@
 
 <script>
 import basicImport from '@/components/basic-import/main.vue'
+import {getProcessList,getList,deleteTable,addTable } from "@/api/performanceManagement/salaryManagement"
 export default {
   components: {
     basicImport,
@@ -65,22 +111,22 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      ppsData:[],
       spanArr: [
-        { prop: "militaryProducts", span: [] },
-        { prop: "ppsName", span: [] },
-        { prop: "twlOther", span: [] },
-        { prop: "workerPrice", span: [] },
-        { prop: "twlUnitTitle", span: [] },
+        { prop: "standardType", span: [] },
+        { prop: "processName", span: [] },
+        { prop: "partNo", span: [] },
+        { prop: "settlementPrice", span: [] },
+        { prop: "settlementUnit", span: [] },
       ],
       selectionList: [],
       option: {
         height: "auto",
         calcHeight: 32,
-        rowKey: "twlId",
         tip: false,
         simplePage: true,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 18,
         searchIcon: true,
         searchIndex: 3,
         tree: false,
@@ -98,8 +144,8 @@ export default {
         editBtnIcon: " ",
         viewBtnText: "详情",
         labelWidth: 120,
-        searchLabelWidth: 120,
-        menuWidth: 220,
+        searchLabelWidth: 'auto',
+        menuWidth: 80,
         dialogWidth: 1200,
         dialogClickModal: false,
         searchEnter: true,
@@ -115,19 +161,19 @@ export default {
         searchLabelPosition: "left",
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "left",
+        menuAlign: "center",
         gridBtn: false,
         searchMenuPosition: "right",
         align: "center",
         column: [
           {
             label: "规则类型",
-            prop: "militaryProducts",
+            prop: "standardType",
             type: "select",
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
+            width: 100,
             rules: [
               {
                 required: true,
@@ -141,551 +187,48 @@ export default {
               { label: "通用", value: 3 },
             ],
           },
-          // {
-          //     label: '类别',
-          //     prop: 'twlTypeTitle',
-          //     type: 'select',
-          //     search: false,
-          //     sortable: true,
-          //     overHidden: true,
-          //     width: 200,
-          //     rules: [
-          //         {
-          //             required: true,
-          //             message: '请输入类别',
-          //             trigger: 'blur',
-          //         },
-          //     ],
-          //     dicData: [
-          //         { label: '工序', value: 1 },
-          //         { label: '异性壳体', value: 2 },
-          //         { label: '零件号', value: 3 },
-          //         { label: '产品型号', value: 4 },
-          //         { label: '单位面积以上', value: 5 },
-          //         { label: '单位面积以下', value: 6 }
-          //     ],
-          //     control: (val, form) => {
-          //         let tmp = this.option.column.find(item => item.prop == 'ppsId')
-          //         let tmp1 = this.option.column.find(item => item.prop == 'twlOther')
-          //         form.ppsId = null
-          //         form.twlOther = ''
-          //         if(tmp){
-          //             if(form.twlTypeTitle == 1){
-          //                 tmp.addDisabled = false
-          //             }else{
-          //                 tmp.addDisabled = true
-          //             }
-          //         }
-          //         if(tmp1){
-          //             if(form.twlTypeTitle == 1){
-          //                 tmp1.addDisabled = true
-          //             }else{
-          //                 tmp1.addDisabled = false
-          //             }
-          //         }
-          //     },
-          // },
           {
-            label: "工序名称",
-            prop: "ppsName",
+            label: "工序",
+            prop: "processName",
             search: true,
             sortable: true,
             overHidden: true,
             addDisplay: false,
             editDisplay: false,
-            width: 200,
+            width: 100,
             rules: [
               {
                 required: true,
-                message: "请输入工序名称",
+                message: "请输入工序",
                 trigger: "blur",
               },
             ],
           },
           {
             label: "工序",
-            prop: "ppsId",
-            hide: true,
-            type: "select",
+            prop: "processId",
             search: false,
             sortable: true,
-            width: 200,
-            props: {
-              label: "ppsName",
-              value: "ppsId",
-            },
-            dicData: [
-              {
-                assist: false,
-                assistTitle: "否",
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: "2022-08-31",
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: "总工",
-                  keyValue: 1,
-                  ldapName: "admin",
-                  mail: "13699999999@136.com",
-                  mobile: "13699999999",
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: "2022-08-31",
-                    deleted: false,
-                    deptCode: "001",
-                    deptId: 1,
-                    deptName: "MES开发部",
-                    deptType: 1,
-                    deptTypeTitle: "厂",
-                    keyValue: 1,
-                    memo: null,
-                    orders: "00",
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: "2022-08-31 16:32:46",
-                  },
-                  pinyinIndex: "ADMIN,ADMIN",
-                  ucUserId: null,
-                  updateTime: "2022-08-31 16:32:46",
-                  userCode: "00",
-                  userId: 1,
-                  userName: "admin",
-                  userSex: 1,
-                  userSources: "admin",
-                  userString: "1:A:admin",
-                  userType: "A",
-                },
-                createTime: "2022-11-15 10:30:29",
-                cycle: 0.0,
-                cyropactorControl: false,
-                deleted: false,
-                eleRate: true,
-                eleStream: true,
-                keyValue: 6,
-                mainProcess: true,
-                mainProcessTitle: "是",
-                niValue: false,
-                phValue: false,
-                ppsCode: "002",
-                ppsId: 6,
-                ppsName: "上挂",
-                special: false,
-                specialTitle: "否",
-                team: null,
-                updateTime: "2022-11-15 10:30:29",
-                vSpeed: false,
-              },
-              {
-                assist: false,
-                assistTitle: "否",
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: "2022-08-31",
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: "总工",
-                  keyValue: 1,
-                  ldapName: "admin",
-                  mail: "13699999999@136.com",
-                  mobile: "13699999999",
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: "2022-08-31",
-                    deleted: false,
-                    deptCode: "001",
-                    deptId: 1,
-                    deptName: "MES开发部",
-                    deptType: 1,
-                    deptTypeTitle: "厂",
-                    keyValue: 1,
-                    memo: null,
-                    orders: "00",
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: "2022-08-31 16:32:46",
-                  },
-                  pinyinIndex: "ADMIN,ADMIN",
-                  ucUserId: null,
-                  updateTime: "2022-08-31 16:32:46",
-                  userCode: "00",
-                  userId: 1,
-                  userName: "admin",
-                  userSex: 1,
-                  userSources: "admin",
-                  userString: "1:A:admin",
-                  userType: "A",
-                },
-                createTime: "2022-11-15 10:30:45",
-                cycle: 0.0,
-                cyropactorControl: true,
-                deleted: false,
-                eleRate: true,
-                eleStream: true,
-                keyValue: 7,
-                mainProcess: true,
-                mainProcessTitle: "是",
-                niValue: true,
-                phValue: true,
-                ppsCode: "003",
-                ppsId: 7,
-                ppsName: "化学镀镍",
-                special: false,
-                specialTitle: "否",
-                team: null,
-                updateTime: "2022-11-15 10:30:45",
-                vSpeed: true,
-              },
-              {
-                assist: false,
-                assistTitle: "否",
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: "2022-08-31",
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: "总工",
-                  keyValue: 1,
-                  ldapName: "admin",
-                  mail: "13699999999@136.com",
-                  mobile: "13699999999",
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: "2022-08-31",
-                    deleted: false,
-                    deptCode: "001",
-                    deptId: 1,
-                    deptName: "MES开发部",
-                    deptType: 1,
-                    deptTypeTitle: "厂",
-                    keyValue: 1,
-                    memo: null,
-                    orders: "00",
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: "2022-08-31 16:32:46",
-                  },
-                  pinyinIndex: "ADMIN,ADMIN",
-                  ucUserId: null,
-                  updateTime: "2022-08-31 16:32:46",
-                  userCode: "00",
-                  userId: 1,
-                  userName: "admin",
-                  userSex: 1,
-                  userSources: "admin",
-                  userString: "1:A:admin",
-                  userType: "A",
-                },
-                createTime: "2022-11-15 10:31:00",
-                cycle: 0.0,
-                cyropactorControl: false,
-                deleted: false,
-                eleRate: false,
-                eleStream: false,
-                keyValue: 8,
-                mainProcess: true,
-                mainProcessTitle: "是",
-                niValue: false,
-                phValue: false,
-                ppsCode: "004",
-                ppsId: 8,
-                ppsName: "下挂",
-                special: false,
-                specialTitle: "否",
-                team: null,
-                updateTime: "2022-11-15 10:31:00",
-                vSpeed: false,
-              },
-              {
-                assist: false,
-                assistTitle: "否",
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: "2022-08-31",
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: "总工",
-                  keyValue: 1,
-                  ldapName: "admin",
-                  mail: "13699999999@136.com",
-                  mobile: "13699999999",
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: "2022-08-31",
-                    deleted: false,
-                    deptCode: "001",
-                    deptId: 1,
-                    deptName: "MES开发部",
-                    deptType: 1,
-                    deptTypeTitle: "厂",
-                    keyValue: 1,
-                    memo: null,
-                    orders: "00",
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: "2022-08-31 16:32:46",
-                  },
-                  pinyinIndex: "ADMIN,ADMIN",
-                  ucUserId: null,
-                  updateTime: "2022-08-31 16:32:46",
-                  userCode: "00",
-                  userId: 1,
-                  userName: "admin",
-                  userSex: 1,
-                  userSources: "admin",
-                  userString: "1:A:admin",
-                  userType: "A",
-                },
-                createTime: "2025-02-27 12:22:37",
-                cycle: 0.0,
-                cyropactorControl: false,
-                deleted: false,
-                eleRate: false,
-                eleStream: false,
-                keyValue: 12,
-                mainProcess: true,
-                mainProcessTitle: "是",
-                niValue: false,
-                phValue: false,
-                ppsCode: "008",
-                ppsId: 12,
-                ppsName: "涂色标test",
-                special: true,
-                specialTitle: "是",
-                team: "涂色标班组",
-                updateTime: "2022-11-15 10:33:17",
-                vSpeed: false,
-              },
-              {
-                assist: false,
-                assistTitle: "否",
-                createMan: {
-                  accountId: null,
-                  card: null,
-                  createTime: "2022-08-31",
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: "总工",
-                  keyValue: 1,
-                  ldapName: "admin",
-                  mail: "13699999999@136.com",
-                  mobile: "13699999999",
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: "2022-08-31",
-                    deleted: false,
-                    deptCode: "001",
-                    deptId: 1,
-                    deptName: "MES开发部",
-                    deptType: 1,
-                    deptTypeTitle: "厂",
-                    keyValue: 1,
-                    memo: null,
-                    orders: "00",
-                    parentDeptId: null,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: "2022-08-31 16:32:46",
-                  },
-                  pinyinIndex: "ADMIN,ADMIN",
-                  ucUserId: null,
-                  updateTime: "2022-08-31 16:32:46",
-                  userCode: "00",
-                  userId: 1,
-                  userName: "admin",
-                  userSex: 1,
-                  userSources: "admin",
-                  userString: "1:A:admin",
-                  userType: "A",
-                },
-                createTime: "2023-02-07 18:16:37",
-                cycle: 0.0,
-                cyropactorControl: false,
-                deleted: false,
-                eleRate: false,
-                eleStream: false,
-                keyValue: 112,
-                mainProcess: true,
-                mainProcessTitle: "是",
-                niValue: false,
-                phValue: false,
-                ppsCode: "112",
-                ppsId: 112,
-                ppsName: "热处理",
-                special: false,
-                specialTitle: "否",
-                team: null,
-                updateTime: "2023-02-07 18:16:37",
-                vSpeed: false,
-              },
-              {
-                assist: false,
-                assistTitle: "否",
-                createMan: {
-                  accountId: 365,
-                  card: null,
-                  createTime: "2023-02-08",
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 0,
-                  jobName: "工艺员",
-                  keyValue: 307,
-                  ldapName: "06758",
-                  mail: null,
-                  mobile: null,
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: "2023-02-08",
-                    deleted: false,
-                    deptCode: "32",
-                    deptId: 75,
-                    deptName: "壳体工艺室",
-                    deptType: 1,
-                    deptTypeTitle: "厂",
-                    keyValue: 75,
-                    memo: null,
-                    orders: "32",
-                    parentDeptId: 41,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: "2023-02-08 16:43:31",
-                  },
-                  pinyinIndex: "06758,06758",
-                  ucUserId: null,
-                  updateTime: "2023-02-08 17:25:05",
-                  userCode: "06758",
-                  userId: 307,
-                  userName: "06758",
-                  userSex: 0,
-                  userSources: "06758",
-                  userString: "307:A:06758",
-                  userType: "A",
-                },
-                createTime: "2023-04-08 17:03:14",
-                cycle: 0.0,
-                cyropactorControl: false,
-                deleted: false,
-                eleRate: false,
-                eleStream: false,
-                keyValue: 340,
-                mainProcess: true,
-                mainProcessTitle: "是",
-                niValue: false,
-                phValue: false,
-                ppsCode: "340",
-                ppsId: 340,
-                ppsName: "稳定化处理",
-                special: false,
-                specialTitle: "否",
-                team: null,
-                updateTime: "2023-04-08 17:03:14",
-                vSpeed: false,
-              },
+            hide:true,
+            overHidden: true,
+            addDisplay: true,
+            editDisplay: true,
+            width: 100,
+            rules: [
               {
-                assist: false,
-                assistTitle: "否",
-                createMan: {
-                  accountId: 90,
-                  card: null,
-                  createTime: "2023-02-08",
-                  curStatus: 1,
-                  deleted: false,
-                  deptName: null,
-                  dimissionTime: null,
-                  factoryId: 41,
-                  head: 1,
-                  jobName: "生产调度员",
-                  keyValue: 90,
-                  ldapName: "03891",
-                  mail: null,
-                  mobile: null,
-                  pfDepartment: {
-                    appLink: null,
-                    createTime: "2023-02-08",
-                    deleted: false,
-                    deptCode: "06",
-                    deptId: 47,
-                    deptName: "经营管理室",
-                    deptType: 1,
-                    deptTypeTitle: "厂",
-                    keyValue: 47,
-                    memo: null,
-                    orders: "6",
-                    parentDeptId: 41,
-                    parentPath: null,
-                    ucDeptId: null,
-                    updateTime: "2023-02-08 13:23:30",
-                  },
-                  pinyinIndex: "03891,03891",
-                  ucUserId: null,
-                  updateTime: "2023-02-08 13:20:39",
-                  userCode: "03891",
-                  userId: 90,
-                  userName: "03891",
-                  userSex: 1,
-                  userSources: "03891",
-                  userString: "90:A:03891",
-                  userType: "A",
-                },
-                createTime: "2023-04-12 17:43:55",
-                cycle: 2.0,
-                cyropactorControl: true,
-                deleted: false,
-                eleRate: true,
-                eleStream: true,
-                keyValue: 341,
-                mainProcess: true,
-                mainProcessTitle: "是",
-                niValue: false,
-                phValue: false,
-                ppsCode: "341",
-                ppsId: 341,
-                ppsName: "除镀层",
-                special: true,
-                specialTitle: "是",
-                team: null,
-                updateTime: "2023-04-12 17:43:55",
-                vSpeed: false,
+                required: true,
+                message: "请选择工序",
+                trigger: "blur",
               },
             ],
           },
           {
             label: "零件号",
-            prop: "twlOther",
+            prop: "partNo",
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
+            minWidth: 160,
             // rules: [
             //     {
             //         required: true,
@@ -696,12 +239,12 @@ export default {
           },
           {
             label: "工人结算价",
-            prop: "workerPrice",
+            prop: "settlementPrice",
             type: "number",
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
+            width: 110,
             rules: [
               {
                 required: true,
@@ -712,12 +255,12 @@ export default {
           },
           {
             label: "工人结算单位",
-            prop: "twlUnitTitle",
+            prop: "settlementUnit",
             type: "select",
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
+            width: 120,
             rules: [
               {
                 required: true,
@@ -726,147 +269,177 @@ export default {
               },
             ],
             dicData: [
-              { label: "件(根)", value: 1 },
+              { label: "件", value: 1 },
               { label: "批", value: 2 },
               { label: "面积", value: 3 },
             ],
           },
           {
             label: "阶梯上下限",
-            prop: "bound",
+            prop: "step",
+            hide:true,
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
-            hide: true,
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入最小标准',
-            //         trigger: 'blur',
-            //     },
-            // ],
+            width: 100,
+            addDisplay: true,
+            editDisplay: true,
+            rules: [
+                {
+                    required: false,
+                    message: '请填写阶梯上下限',
+                    trigger: 'blur',
+                },
+            ],
           },
           {
             label: "阶梯下限",
-            prop: "minLevel",
+            prop: "minStep",
             type: "number",
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
+            width: 95,
             addDisplay: false,
             editDisplay: false,
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入最小标准',
-            //         trigger: 'blur',
-            //     },
-            // ],
           },
           {
             label: "阶梯上限",
-            prop: "maxLevel",
+            prop: "maxStep",
             search: false,
             type: "number",
             sortable: true,
             overHidden: true,
             addDisplay: false,
             editDisplay: false,
-            width: 200,
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入最大标准',
-            //         trigger: 'blur',
-            //     },
-            // ],
+            width: 95,
           },
           {
             label: "阶梯单位",
-            prop: "countUnitTitle",
+            prop: "stepUnit",
             type: "select",
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
+            width: 100,
             dicData: [
               { label: "件", value: 1 },
               { label: "面积", value: 2 },
             ],
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入计算单位',
-            //         trigger: 'blur',
-            //     },
-            // ],
+            rules: [
+                {
+                    required: false,
+                    message: '请选择阶梯单位',
+                    trigger: 'blur',
+                },
+            ],
           },
           {
-            label: "小批量结算",
-            prop: "xplSettlements",
+            label: "阶梯结算价",
+            prop:"stepSettlementPrice",
             search: false,
             sortable: true,
             overHidden: true,
             hide: true,
-            width: 200,
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入小批量结算',
-            //         trigger: 'blur',
-            //     },
-            // ],
+            width: 110,
+            addDisplay: true,
+            editDisplay: true,
+            rules: [
+                {
+                    required: false,
+                    message: '请输入阶梯结算价',
+                    trigger: 'blur',
+                },
+            ],
           },
           {
-            label: "小批量结算",
-            prop: "xplSettlement",
+            label: "阶梯结算价",
+            prop: "price",
             type: "number",
             search: false,
             sortable: true,
             overHidden: true,
             addDisplay: false,
             editDisplay: false,
-            width: 200,
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入小批量结算',
-            //         trigger: 'blur',
-            //     },
-            // ],
+            width: 110,
           },
           {
-            label: "结算单位",
-            prop: "settlementUnitTitle",
+            label: "阶梯结算单位",
+            prop: "stepSettlementUnit",
             type: "select",
             search: false,
             sortable: true,
             overHidden: true,
-            width: 200,
+            width: 120,
             dicData: [
               { label: "批", value: 1 },
               { label: "倍", value: 2 },
             ],
-            // rules: [
-            //     {
-            //         required: true,
-            //         message: '请输入结算单位',
-            //         trigger: 'blur',
-            //     },
-            // ],
+            rules: [
+                {
+                    required: false,
+                    message: '请选择阶梯结算单位',
+                    trigger: 'blur',
+                },
+            ],
           },
         ],
       },
     };
   },
   mounted() {
-    this.rowSort();
-    this.rowCalc();
+    
   },
   methods: {
+    getPpsList(query){
+      console.log('form============',this.form)
+      getProcessList({
+        current:1,
+        size:300,
+        name:query
+      }).then(res =>{
+        this.ppsData = res.data.data.records
+        if(this.form.processId){
+          let tmp = this.ppsData.find(item => item.id == this.form.processId)
+          if(!tmp){
+            this.ppsData.unshift({
+              name:this.form.processName,
+              code:this.form.ppsCode,
+              id:this.form.processId
+            })
+          }
+        }
+      })
+    },
+    changeProcess(val){
+      this.form.processName = this.ppsData.find(item => item.id == val).name
+      this.form.ppsCode = this.ppsData.find(item => item.id == val).code
+    },
+    changeType(val){
+      if(val == 1){
+        this.form.step = ''
+        this.form.stepSettlementPrice = ''
+        this.form.stepSettlementUnit = ''
+        this.form.stepUnit = ''
+        this.option.column.find(item => item.prop == "stepUnit").rules[0].required = false
+        this.option.column.find(item => item.prop == "step").rules[0].required = false
+        this.option.column.find(item => item.prop == "stepSettlementPrice").rules[0].required = false
+        this.option.column.find(item => item.prop == "stepSettlementUnit").rules[0].required = false
+      }else if(val == 2){
+        this.form.step = ''
+        this.option.column.find(item => item.prop == "step").rules[0].required = false
+        this.option.column.find(item => item.prop == "stepUnit").rules[0].required = true
+        this.option.column.find(item => item.prop == "stepSettlementPrice").rules[0].required = true
+        this.option.column.find(item => item.prop == "stepSettlementUnit").rules[0].required = true
+      }else{
+        this.option.column.find(item => item.prop == "step").rules[0].required = true
+        this.option.column.find(item => item.prop == "stepUnit").rules[0].required = true
+        this.option.column.find(item => item.prop == "stepSettlementPrice").rules[0].required = true
+        this.option.column.find(item => item.prop == "stepSettlementUnit").rules[0].required = true
+      }
+    },
     rowCalc() {
+      console.log('spanArr===========',this.spanArr)
       this.spanArr.forEach((ele, index) => {
         let parent;
         if (index !== 0) parent = this.spanArr[ele.parent || index - 1].span;
@@ -877,6 +450,7 @@ export default {
       let propList = this.spanArr.map((ele) => ele.prop);
       this.spanArr.forEach((ele, index) => {
         let key = ele.prop;
+        console.log('data------------',this.data)
         this.data = this.data.sort((a, b) => {
           let flag = true;
           for (let i = 0; i < index; i++) {
@@ -949,8 +523,36 @@ export default {
     selectionChange(val) {
       this.selectionList = val;
     },
+    beforeOpen(done, type){
+      if(type == 'add'){
+        this.form = {
+          ...this.form,
+          settlementUnit:1
+        }
+        done()
+      }else{
+        done()
+      }
+    },
     // 新增数据
     rowSave(row, done, loading) {
+      console.log('row---------------',row)
+      if(row.stepType == 2){
+        let stepSettlementPriceArr = row.stepSettlementPrice.split(' ')
+        if(stepSettlementPriceArr.length > 1){
+          this.$message.error('【固定补贴金额】时,阶梯结算价应只有一个')
+          loading()
+          return
+        }
+      }else if(row.stepType == 3){
+        let stepArr = row.step.split(' ')
+        let stepSettlementPriceArr = row.stepSettlementPrice.split(' ')
+        if(stepArr.length > 0 && stepSettlementPriceArr.length > 0 && stepSettlementPriceArr.length - stepArr.length != 1){
+          this.$message.error('【阶梯补贴金额】时,阶梯结算价应比阶梯上下限数量多一个')
+          loading()
+          return
+        }
+      }
       done();
     },
     // 修改数据
@@ -967,7 +569,16 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      }).then(() => {});
+      }).then(() => {
+        deleteTable({
+          ids:this.selectionList.map(item => item.id).join(",")
+        }).then(res =>{
+          if(res.data.code == 200){
+            this.$message.success('删除成功')
+            this.onLoad()
+          }
+        })
+      });
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
@@ -1001,460 +612,127 @@ export default {
       this.isShowImport = true
     },
     onLoad() {
-      this.data = [
-        {
-          bsProcedureSet: null,
-          countUnit: 1,
-          countUnitTitle: "件",
-          createMan: {
-            accountId: 541,
-            card: null,
-            createTime: "2023-05-04",
-            curStatus: 1,
-            deleted: false,
-            deptName: null,
-            dimissionTime: null,
-            factoryId: 102,
-            head: 0,
-            jobName: "MES开发",
-            keyValue: 541,
-            ldapName: "cdl",
-            mail: null,
-            mobile: null,
-            pfDepartment: {
-              appLink: null,
-              createTime: "2022-08-31",
-              deleted: false,
-              deptCode: "001",
-              deptId: 1,
-              deptName: "MES开发部",
-              deptType: 1,
-              deptTypeTitle: "厂",
-              keyValue: 1,
-              memo: null,
-              orders: "00",
-              parentDeptId: null,
-              parentPath: null,
-              ucDeptId: null,
-              updateTime: "2022-08-31 16:32:46",
-            },
-            pinyinIndex: "CUIDIANLONG,CDL",
-            ucUserId: null,
-            updateTime: "2023-05-04 09:16:54",
-            userCode: "cdl",
-            userId: 541,
-            userName: "崔殿龙",
-            userSex: 1,
-            userSources: "崔殿龙",
-            userString: "541:A:崔殿龙",
-            userType: "A",
-          },
-          createTime: "2023-12-07 20:57:12",
-          keyValue: 2,
-          maxLevel: 10,
-          militaryProducts: 1,
-          minLevel: 0,
-          settlementUnit: 1,
-          settlementUnitTitle: "批",
-          bound: "10,20",
-          xplSettlements: "10,20,30",
-          twlId: 2,
-          twlOther: "21E8-0041",
-          twlType: 2,
-          twlTypeTitle: "异性壳体",
-          twlUnit: 1,
-          twlUnitTitle: "件(根)",
-          workerPrice: 3.0,
-          xplSettlement: 10.0,
-        },
-        {
-          bsProcedureSet: null,
-          countUnit: 1,
-          countUnitTitle: "件",
-          createMan: {
-            accountId: 541,
-            card: null,
-            createTime: "2023-05-04",
-            curStatus: 1,
-            deleted: false,
-            deptName: null,
-            dimissionTime: null,
-            factoryId: 102,
-            head: 0,
-            jobName: "MES开发",
-            keyValue: 541,
-            ldapName: "cdl",
-            mail: null,
-            mobile: null,
-            pfDepartment: {
-              appLink: null,
-              createTime: "2022-08-31",
-              deleted: false,
-              deptCode: "001",
-              deptId: 1,
-              deptName: "MES开发部",
-              deptType: 1,
-              deptTypeTitle: "厂",
-              keyValue: 1,
-              memo: null,
-              orders: "00",
-              parentDeptId: null,
-              parentPath: null,
-              ucDeptId: null,
-              updateTime: "2022-08-31 16:32:46",
-            },
-            pinyinIndex: "CUIDIANLONG,CDL",
-            ucUserId: null,
-            updateTime: "2023-05-04 09:16:54",
-            userCode: "cdl",
-            userId: 541,
-            userName: "崔殿龙",
-            userSex: 1,
-            userSources: "崔殿龙",
-            userString: "541:A:崔殿龙",
-            userType: "A",
-          },
-          createTime: "2023-12-07 20:57:12",
-          keyValue: 2,
-          maxLevel: 20,
-          militaryProducts: 1,
-          minLevel: 10,
-          settlementUnit: 1,
-          settlementUnitTitle: "批",
-          twlId: 2,
-          twlOther: "21E8-0041",
-          twlType: 2,
-          bound: "10,20",
-          xplSettlements: "10,20,30",
-          twlTypeTitle: "异性壳体",
-          twlUnit: 1,
-          twlUnitTitle: "件(根)",
-          workerPrice: 3.0,
-          xplSettlement: 20.0,
-        },
-        {
-          bsProcedureSet: null,
-          countUnit: 1,
-          countUnitTitle: "件",
-          createMan: {
-            accountId: 541,
-            card: null,
-            createTime: "2023-05-04",
-            curStatus: 1,
-            deleted: false,
-            deptName: null,
-            dimissionTime: null,
-            factoryId: 102,
-            head: 0,
-            jobName: "MES开发",
-            keyValue: 541,
-            ldapName: "cdl",
-            mail: null,
-            mobile: null,
-            pfDepartment: {
-              appLink: null,
-              createTime: "2022-08-31",
-              deleted: false,
-              deptCode: "001",
-              deptId: 1,
-              deptName: "MES开发部",
-              deptType: 1,
-              deptTypeTitle: "厂",
-              keyValue: 1,
-              memo: null,
-              orders: "00",
-              parentDeptId: null,
-              parentPath: null,
-              ucDeptId: null,
-              updateTime: "2022-08-31 16:32:46",
-            },
-            pinyinIndex: "CUIDIANLONG,CDL",
-            ucUserId: null,
-            updateTime: "2023-05-04 09:16:54",
-            userCode: "cdl",
-            userId: 541,
-            userName: "崔殿龙",
-            userSex: 1,
-            userSources: "崔殿龙",
-            userString: "541:A:崔殿龙",
-            userType: "A",
-          },
-          createTime: "2023-12-07 20:57:12",
-          keyValue: 2,
-          maxLevel: null,
-          militaryProducts: 1,
-          minLevel: 20,
-          settlementUnit: 1,
-          settlementUnitTitle: "批",
-          twlId: 2,
-          twlOther: "21E8-0041",
-          bound: "10,20",
-          xplSettlements: "10,20,30",
-          twlType: 2,
-          twlTypeTitle: "异性壳体",
-          twlUnit: 1,
-          twlUnitTitle: "件(根)",
-          workerPrice: 3.0,
-          xplSettlement: 30.0,
-        },
-        {
-          bsProcedureSet: {
-            assist: false,
-            assistTitle: "否",
-            createMan: {
-              accountId: null,
-              card: null,
-              createTime: "2022-08-31",
-              curStatus: 1,
-              deleted: false,
-              deptName: null,
-              dimissionTime: null,
-              factoryId: 41,
-              head: 0,
-              jobName: "总工",
-              keyValue: 1,
-              ldapName: "admin",
-              mail: "13699999999@136.com",
-              mobile: "13699999999",
-              pfDepartment: {
-                appLink: null,
-                createTime: "2022-08-31",
-                deleted: false,
-                deptCode: "001",
-                deptId: 1,
-                deptName: "MES开发部",
-                deptType: 1,
-                deptTypeTitle: "厂",
-                keyValue: 1,
-                memo: null,
-                orders: "00",
-                parentDeptId: null,
-                parentPath: null,
-                ucDeptId: null,
-                updateTime: "2022-08-31 16:32:46",
-              },
-              pinyinIndex: "ADMIN,ADMIN",
-              ucUserId: null,
-              updateTime: "2022-08-31 16:32:46",
-              userCode: "00",
-              userId: 1,
-              userName: "admin",
-              userSex: 1,
-              userSources: "admin",
-              userString: "1:A:admin",
-              userType: "A",
-            },
-            createTime: "2022-11-15 10:30:29",
-            cycle: 0.0,
-            cyropactorControl: false,
-            deleted: false,
-            eleRate: true,
-            eleStream: true,
-            keyValue: 6,
-            mainProcess: true,
-            mainProcessTitle: "是",
-            niValue: false,
-            phValue: false,
-            ppsCode: "002",
-            ppsId: 6,
-            ppsName: "上挂",
-            special: false,
-            specialTitle: "否",
-            team: null,
-            updateTime: "2022-11-15 10:30:29",
-            vSpeed: false,
-          },
-          countUnit: null,
-          countUnitTitle: null,
-          createMan: {
-            accountId: 541,
-            card: null,
-            createTime: "2023-05-04",
-            curStatus: 1,
-            deleted: false,
-            deptName: null,
-            dimissionTime: null,
-            factoryId: 102,
-            head: 0,
-            jobName: "MES开发",
-            keyValue: 541,
-            ldapName: "cdl",
-            mail: null,
-            mobile: null,
-            pfDepartment: {
-              appLink: null,
-              createTime: "2022-08-31",
-              deleted: false,
-              deptCode: "001",
-              deptId: 1,
-              deptName: "MES开发部",
-              deptType: 1,
-              deptTypeTitle: "厂",
-              keyValue: 1,
-              memo: null,
-              orders: "00",
-              parentDeptId: null,
-              parentPath: null,
-              ucDeptId: null,
-              updateTime: "2022-08-31 16:32:46",
-            },
-            pinyinIndex: "CUIDIANLONG,CDL",
-            ucUserId: null,
-            updateTime: "2023-05-04 09:16:54",
-            userCode: "cdl",
-            userId: 541,
-            userName: "崔殿龙",
-            userSex: 1,
-            userSources: "崔殿龙",
-            userString: "541:A:崔殿龙",
-            userType: "A",
-          },
-          createTime: "2023-12-07 20:23:57",
-          keyValue: 3,
-          maxLevel: null,
-          militaryProducts: 2,
-          minLevel: null,
-          settlementUnit: null,
-          settlementUnitTitle: null,
-          twlId: 3,
-          twlOther: null,
-          twlType: 1,
-          twlTypeTitle: "工序",
-          twlUnit: 2,
-          twlUnitTitle: "批",
-          workerPrice: 22.0,
-          xplSettlement: null,
-        },
-        {
-          bsProcedureSet: {
-            assist: false,
-            assistTitle: "否",
-            createMan: {
-              accountId: null,
-              card: null,
-              createTime: "2022-08-31",
-              curStatus: 1,
-              deleted: false,
-              deptName: null,
-              dimissionTime: null,
-              factoryId: 41,
-              head: 0,
-              jobName: "总工",
-              keyValue: 1,
-              ldapName: "admin",
-              mail: "13699999999@136.com",
-              mobile: "13699999999",
-              pfDepartment: {
-                appLink: null,
-                createTime: "2022-08-31",
-                deleted: false,
-                deptCode: "001",
-                deptId: 1,
-                deptName: "MES开发部",
-                deptType: 1,
-                deptTypeTitle: "厂",
-                keyValue: 1,
-                memo: null,
-                orders: "00",
-                parentDeptId: null,
-                parentPath: null,
-                ucDeptId: null,
-                updateTime: "2022-08-31 16:32:46",
-              },
-              pinyinIndex: "ADMIN,ADMIN",
-              ucUserId: null,
-              updateTime: "2022-08-31 16:32:46",
-              userCode: "00",
-              userId: 1,
-              userName: "admin",
-              userSex: 1,
-              userSources: "admin",
-              userString: "1:A:admin",
-              userType: "A",
-            },
-            createTime: "2022-11-15 10:30:29",
-            cycle: 0.0,
-            cyropactorControl: false,
-            deleted: false,
-            eleRate: true,
-            eleStream: true,
-            keyValue: 6,
-            mainProcess: true,
-            mainProcessTitle: "是",
-            niValue: false,
-            phValue: false,
-            ppsCode: "002",
-            ppsId: 6,
-            ppsName: "上挂",
-            special: false,
-            specialTitle: "否",
-            team: null,
-            updateTime: "2022-11-15 10:30:29",
-            vSpeed: false,
-          },
-          countUnit: null,
-          countUnitTitle: null,
-          createMan: {
-            accountId: 541,
-            card: null,
-            createTime: "2023-05-04",
-            curStatus: 1,
-            deleted: false,
-            deptName: null,
-            dimissionTime: null,
-            factoryId: 102,
-            head: 0,
-            jobName: "MES开发",
-            keyValue: 541,
-            ldapName: "cdl",
-            mail: null,
-            mobile: null,
-            pfDepartment: {
-              appLink: null,
-              createTime: "2022-08-31",
-              deleted: false,
-              deptCode: "001",
-              deptId: 1,
-              deptName: "MES开发部",
-              deptType: 1,
-              deptTypeTitle: "厂",
-              keyValue: 1,
-              memo: null,
-              orders: "00",
-              parentDeptId: null,
-              parentPath: null,
-              ucDeptId: null,
-              updateTime: "2022-08-31 16:32:46",
-            },
-            pinyinIndex: "CUIDIANLONG,CDL",
-            ucUserId: null,
-            updateTime: "2023-05-04 09:16:54",
-            userCode: "cdl",
-            userId: 541,
-            userName: "崔殿龙",
-            userSex: 1,
-            userSources: "崔殿龙",
-            userString: "541:A:崔殿龙",
-            userType: "A",
-          },
-          createTime: "2023-12-07 20:23:57",
-          keyValue: 3,
-          maxLevel: null,
-          militaryProducts: 3,
-          minLevel: null,
-          settlementUnit: null,
-          settlementUnitTitle: null,
-          twlId: 4,
-          twlOther: null,
-          twlType: 1,
-          twlTypeTitle: "工序",
-          twlUnit: 2,
-          twlUnitTitle: "批",
-          workerPrice: 22.0,
-          xplSettlement: null,
-        },
-      ];
-      this.page.total = this.data.length;
+      this.loading = true
+      getList({
+        curremt:this.page.currentPage,
+        size:this.page.pageSize,
+        ...this.query
+      }).then(res =>{
+        this.data = res.data.data.records
+        this.page.total = res.data.data.total
+        // this.$nextTick(() =>{
+          this.rowSort();
+          this.rowCalc();
+        // })
+        this.loading = false
+      })
+
+      // this.data = [
+      //   {
+      //     countUnit: 1,
+      //     stepUnit: "件",
+      //     createTime: "2023-12-07 20:57:12",
+      //     keyValue: 2,
+      //     maxStep: 10,
+      //     standardType: 1,
+      //     minStep: 0,
+      //     settlementUnit: 1,
+      //     stepSettlementUnit: "批",
+      //     bound: "10,20",
+      //     stepSettlementPrice: "10,20,30",
+      //     twlId: 2,
+      //     partNo: "21E8-0041",
+      //     twlType: 2,
+      //     twlTypeTitle: "异性壳体",
+      //     twlUnit: 1,
+      //     settlementUnit: "件(根)",
+      //     settlementPrice: 3.0,
+      //     xplSettlement: 10.0,
+      //   },
+      //   {
+      //     bsProcedureSet: null,
+      //     countUnit: 1,
+      //     stepUnit: "件",
+      //     createTime: "2023-12-07 20:57:12",
+      //     keyValue: 2,
+      //     maxStep: 20,
+      //     standardType: 1,
+      //     minStep: 10,
+      //     settlementUnit: 1,
+      //     stepSettlementUnit: "批",
+      //     twlId: 2,
+      //     partNo: "21E8-0041",
+      //     twlType: 2,
+      //     bound: "10,20",
+      //     stepSettlementPrice: "10,20,30",
+      //     twlTypeTitle: "异性壳体",
+      //     twlUnit: 1,
+      //     settlementUnit: "件(根)",
+      //     settlementPrice: 3.0,
+      //     xplSettlement: 20.0,
+      //   },
+      //   {
+      //     bsProcedureSet: null,
+      //     countUnit: 1,
+      //     stepUnit: "件",
+      //     createTime: "2023-12-07 20:57:12",
+      //     keyValue: 2,
+      //     maxStep: null,
+      //     standardType: 1,
+      //     minStep: 20,
+      //     settlementUnit: 1,
+      //     stepSettlementUnit: "批",
+      //     twlId: 2,
+      //     partNo: "21E8-0041",
+      //     bound: "10,20",
+      //     stepSettlementPrice: "10,20,30",
+      //     twlType: 2,
+      //     twlTypeTitle: "异性壳体",
+      //     twlUnit: 1,
+      //     settlementUnit: "件(根)",
+      //     settlementPrice: 3.0,
+      //     xplSettlement: 30.0,
+      //   },
+      //   {
+      //     countUnit: null,
+      //     stepUnit: null,
+      //     createTime: "2023-12-07 20:23:57",
+      //     keyValue: 3,
+      //     maxStep: null,
+      //     standardType: 2,
+      //     minStep: null,
+      //     settlementUnit: null,
+      //     stepSettlementUnit: null,
+      //     twlId: 3,
+      //     partNo: null,
+      //     twlType: 1,
+      //     twlTypeTitle: "工序",
+      //     twlUnit: 2,
+      //     settlementUnit: "批",
+      //     settlementPrice: 22.0,
+      //     xplSettlement: null,
+      //   },
+      //   {
+      //     countUnit: null,
+      //     stepUnit: null,
+      //     createTime: "2023-12-07 20:23:57",
+      //     keyValue: 3,
+      //     maxStep: null,
+      //     standardType: 3,
+      //     minStep: null,
+      //     settlementUnit: null,
+      //     stepSettlementUnit: null,
+      //     twlId: 4,
+      //     partNo: null,
+      //     twlType: 1,
+      //     twlTypeTitle: "工序",
+      //     twlUnit: 2,
+      //     settlementUnit: "批",
+      //     settlementPrice: 22.0,
+      //     xplSettlement: null,
+      //   },
+      // ];
+      // this.page.total = this.data.length;
     },
   },
 };