修改页面

src/api/daka/attendance-group.js

@@ -48,7 +48,7 @@ export function del(id) {
 // 
 export function test(query) {
   return request({
-    url: '/dk/app/getCurrentDayRecord',
+    url: '/dk/app/queryAttendanceGroupByUserId',
     method: 'get',
     params: query
   })

src/views/daka/attendanceteam/index.vue

@@ -456,7 +456,7 @@ export default {
   methods: {
     test(){
       test({userId:1}).then((res) => {
-        // console.log(res)
+        console.log(res)
       })
     },
 

src/views/daka/record/index.vue

@@ -71,26 +71,40 @@
       </el-col>
       <el-col :span="8.5">
         <div class="block">
-        <span class="demonstration">按日</span>
-        <el-date-picker
-          type="date"
-          v-model="queryParams.strDay"
-          size="mini"
-          format="yyyy 年 MM 月 dd 日"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日">
-        </el-date-picker>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <span class="demonstration">按月</span>
-        <el-date-picker
-          v-model="queryParams.strMonth"
-          type="month"
-          size="mini"
-          format="yyyy 年 MM 月"
-          value-format="yyyy-MM"
-          placeholder="选择月">
-        </el-date-picker>
-      </div>
+          <span class="demonstration">按日</span>
+          <el-date-picker
+            type="date"
+            v-model="queryParams.strDay"
+            size="mini"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日">
+          </el-date-picker>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <span class="demonstration">按月</span>
+          <el-date-picker
+            v-model="queryParams.strMonth"
+            type="month"
+            size="mini"
+            format="yyyy 年 MM 月"
+            value-format="yyyy-MM"
+            placeholder="选择月">
+          </el-date-picker>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <el-select
+            v-model="queryParams.modelType"
+            placeholder="请选择导出模版"
+            size="mini"
+            clearable
+          >
+            <el-option
+              v-for="dict in modelTypeDate"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </div>
       </el-col>
       <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
     </el-row>
@@ -263,7 +277,9 @@ export default {
         exportRange: undefined,
         strDay: undefined,
         strMonth: undefined,
+        modelType: undefined
       },
+      modelTypeDate: [{label: '国内', value: 'guonei'},{label: '日本', value: 'riben'}],
       // 表单参数
       form: {},
       // 结果
@@ -429,6 +445,10 @@ export default {
         this.$modal.msgError('日，月必须选择一个')
         return
       }
+      if(!this.queryParams.modelType){
+        this.$modal.msgError('必须选择模版!')
+        return
+      }
       this.download(
         'dk/record/exportNew',
         {