ly hace 1 año
padre
commit
57126de7d4
Se han modificado 1 ficheros con 6 adiciones y 6 borrados
  1. 6 6
      src/views/business/production/salary/index.vue

+ 6 - 6
src/views/business/production/salary/index.vue

@@ -51,11 +51,11 @@
     </el-form>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="flag">
       <el-tab-pane label="全部" name="first">
-      
-       
+
+
       </el-tab-pane>
       <el-tab-pane label="我的" name="second">
-       
+
       </el-tab-pane>
     </el-tabs>
     <!-- 列表区 -->
@@ -91,7 +91,7 @@
           ? scope.row.currentDate
           : scope.row.checkoutDate
         }} -->
-          {{ moment().subtract(1, "month").format("YYYY年MM月") }}
+          {{ proxy.moment().subtract(1, "month").format("yyyy")+"-"+queryParams.month}}
         </template>
       </el-table-column>
       <el-table-column align="center">
@@ -144,7 +144,7 @@
     <!-- 分页 -->
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" @pagination="getList" />
-    <form-dialog ref="formDialogRef" :get-list="getList"  @getList = "getList"/>
+    <form-dialog ref="formDialogRef" :get-list="getList" @getList="getList" />
     <import-excel-dialog ref="importExcelDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
@@ -423,7 +423,7 @@
       companyName: "",
     };
     if (activeName.value != null && activeName.value === 'second') {
-        queryParams.value.principal = useUserStore().user.userId;
+      queryParams.value.principal = useUserStore().user.userId;
     }
     handleQuery();
   }