From c04fb8e2b4f890f89ac38bc884f5af8027c45982 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Mon, 11 May 2026 18:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../costManagement/subjectFeeMaintenance.vue  | 30 ++++++++++++++++---
 src/views/costStatistics/index.vue            |  7 +++--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/views/costManagement/subjectFeeMaintenance.vue b/src/views/costManagement/subjectFeeMaintenance.vue
index ba410031..70da9b8a 100644
--- a/src/views/costManagement/subjectFeeMaintenance.vue
+++ b/src/views/costManagement/subjectFeeMaintenance.vue
@@ -39,10 +39,16 @@
       @update:model-value="val => (showAdd = val)"
       width="25%"
     >
-      <el-form ref="addForm" :model="addForm" :rules="addRules">
+      <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="70px">
         <el-form-item label="费用科目" prop="expenseAccount">
           <el-input v-model="addForm.expenseAccount" placeholder="请输入费用科目"></el-input>
         </el-form-item>
+        <el-form-item label="类型" prop="subjectType">
+          <el-radio-group v-model="addForm.subjectType">
+            <el-radio label="0">制造费用</el-radio>
+            <el-radio label="1">作业中心材料费用</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
@@ -182,7 +188,9 @@ export default {
       isShowImport: false,
       data: [],
       form: {},
-      query:{},
+      query:{
+        descs:'update_time',
+      },
       distributeType: '',
       loading: false,
       showAdd: false,
@@ -282,6 +290,17 @@ export default {
             ],
             minWidth:100
           },
+          {
+            label:"类型",
+            prop:"subjectType",
+            sortable: 'custom',
+            overHidden:true,
+            type:"select",
+            dicData: [
+              { label: '制造费用', value: '0' },
+              { label: '作业中心材料费用', value: '1' },
+            ],
+          },
           {
             label:"费用时间",
             prop: 'month',
@@ -449,7 +468,9 @@ export default {
     },
     // 点击新增按钮
     handleAdd() {
-      this.addForm = {}
+      this.addForm = {
+        subjectType:'0'
+      }
       this.showAdd = true;
     },
     // 新增提交
@@ -458,7 +479,8 @@ export default {
         if (valid) {
           // this.showAdd = false;
           addSubjectFee({
-            subjectName:this.addForm.expenseAccount
+            subjectName:this.addForm.expenseAccount,
+            subjectType:this.addForm.subjectType,
           }).then(res =>{
             if(res.data.code == 200){
               this.$message.success('新增成功')
diff --git a/src/views/costStatistics/index.vue b/src/views/costStatistics/index.vue
index ff0b883e..8e5a2143 100644
--- a/src/views/costStatistics/index.vue
+++ b/src/views/costStatistics/index.vue
@@ -86,10 +86,11 @@ export default {
       data:[],
       form:{},
       query:{
-        ascs:'work_center_code'
+        ascs:'work_center_code',
+        month:this.$dayjs().subtract(1, 'month').format('YYYY-MM')
       },
       searchForm:{
-        // month:
+        month:this.$dayjs().subtract(1, 'month').format('YYYY-MM')
       },
       page:{
         pageSize: 10,
@@ -460,7 +461,7 @@ export default {
       });
     },
     handleCost(){
-      this.costForm.month = this.$dayjs().format('YYYY-MM');
+      this.costForm.month = this.$dayjs().subtract(1, 'month').format('YYYY-MM');
       this.openShow = true
     },
     // 批量删除