104模块

src/api/remote/degree-log.js

@@ -8,13 +8,13 @@ import { stringify } from 'qs'
  * @returns {*}
  */
 export function getRemoteDegreeLogPage (parameter) {
-    return axios({
-        url: '/remote/degree-logs/page?' + stringify(parameter),
-        method: 'get',
-        headers: {
-            'Content-Type': 'application/json;charset=UTF-8'
-        }
-    })
+  return axios({
+    url: '/remote/degree-logs/page?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
 }
 
 /**
@@ -24,15 +24,15 @@ export function getRemoteDegreeLogPage (parameter) {
  * @returns {*}
  */
 export function addRemoteDegreeLog (parameter) {
-    return axios({
-        url: '/remote/degree-logs',
-        method: 'POST',
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json;charset=UTF-8'
-        },
-        data: parameter
-    })
+  return axios({
+    url: '/remote/degree-logs',
+    method: 'POST',
+    headers: {
+      'Accept': 'application/json',
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    data: parameter
+  })
 }
 
 /**
@@ -42,14 +42,13 @@ export function addRemoteDegreeLog (parameter) {
  * @returns {*}
  */
 export function updateRemoteDegreeLog (parameter) {
-    return axios({
-        url: '/remote/degree-logs/' + parameter.id,
-        method: 'PUT',
-        data: parameter
-    })
+  return axios({
+    url: '/remote/degree-logs/' + parameter.id,
+    method: 'PUT',
+    data: parameter
+  })
 }
 
-                                                        
 /**
  * fetch single func
  * parameter: { }
@@ -57,13 +56,13 @@ export function updateRemoteDegreeLog (parameter) {
  * @returns {*}
  */
 export function fetchRemoteDegreeLog (parameter) {
-    return axios({
-        url: '/remote/degree-logs/' + parameter.id,
-        method: 'get',
-        headers: {
-            'Content-Type': 'application/json;charset=UTF-8'
-        }
-    })
+  return axios({
+    url: '/remote/degree-logs/' + parameter.id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
 }
 
 /**
@@ -73,13 +72,29 @@ export function fetchRemoteDegreeLog (parameter) {
  * @returns {*}
  */
 export function queryRemoteDegreeLog (parameter) {
-    return axios({
-        url: '/remote/degree-logs?' + stringify(parameter),
-        method: 'get',
-        headers: {
-            'Content-Type': 'application/json;charset=UTF-8'
-        }
-    })
+  return axios({
+    url: '/remote/degree-logs?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+/**
+ * query list func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function queryRemoteDegreeLogMonthOrDayReport (parameter) {
+  return axios({
+    url: '/remote/degree-logs/report/' + parameter.isDay + '?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
 }
 
 /**
@@ -89,11 +104,11 @@ export function queryRemoteDegreeLog (parameter) {
  * @returns {*}
  */
 export function deleteRemoteDegreeLogs (parameter) {
-    return axios({
-        url: '/remote/degree-logs',
-        method: 'DELETE',
-        data: parameter
-    })
+  return axios({
+    url: '/remote/degree-logs',
+    method: 'DELETE',
+    data: parameter
+  })
 }
 
 /**
@@ -103,14 +118,13 @@ export function deleteRemoteDegreeLogs (parameter) {
  * @returns {*}
  */
 export function deleteRemoteDegreeLog (parameter) {
-    return axios({
-        url: '/remote/degree-logs/' + parameter.id,
-        method: 'DELETE',
-        data: parameter
-    })
+  return axios({
+    url: '/remote/degree-logs/' + parameter.id,
+    method: 'DELETE',
+    data: parameter
+  })
 }
 
-
 /**
  * export file
  * parameter: { }
@@ -118,12 +132,12 @@ export function deleteRemoteDegreeLog (parameter) {
  * @returns {*}
  */
 export function exportRemoteDegreeLog (parameter) {
-    return axios({
-        url: '/remote/degree-logs/export?' + stringify(parameter),
-        method: 'get',
-        headers: {
-            'Content-Type': 'application/json;charset=UTF-8'
-        },
-        responseType: 'blob'
-    })
+  return axios({
+    url: '/remote/degree-logs/export?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
 }

src/views/remote/degree-log/RemoteDegreeLog.vue

@@ -37,6 +37,18 @@
               icon="download"
               @click="doExport">导出
             </a-button>
+            <a-button
+              style="margin-left: 8px"
+              type="primary"
+              icon="download"
+              @click="testDay(0)">测试月报表
+            </a-button>
+            <a-button
+              style="margin-left: 8px"
+              type="primary"
+              icon="download"
+              @click="testDay(1)">测试日报表
+            </a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('remote-degree-logs-del')">
               <a-menu slot="overlay">
                 <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
@@ -93,7 +105,8 @@ import {
   getRemoteDegreeLogPage,
   deleteRemoteDegreeLogs,
   fetchRemoteDegreeLog,
-  exportRemoteDegreeLog
+  exportRemoteDegreeLog,
+  queryRemoteDegreeLogMonthOrDayReport
 } from '@/api/remote/degree-log'
 
 export default {
@@ -291,6 +304,11 @@ export default {
         modal.base(res.data)
       })
     },
+    testDay (isDay) {
+      queryRemoteDegreeLogMonthOrDayReport({ isDay: isDay, year: 2022, month: 10, day: 1 }).then(res => {
+        console.log(res.data)
+      })
+    },
     handleOk (values) {
       this.visible = true
       this.$refs.table.refresh()

src/views/remote/degree-log/modules/BaseForm.vue

@@ -276,7 +276,7 @@ export default {
       console.log(keys, rows)
       this.$nextTick(() => {
         setFieldsValue(Object.assign({
-          'sbId': key,
+          'sbId': row.sbId,
           'positionNum': row.positionNum,
           'sbName': row.sbName,
           'description': row.description,

src/views/sb/info/modules/BaseForm.vue

@@ -281,7 +281,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="handleChange" v-decorator="['zjm', {rules: [{required: false, message: '自定义类型不能为空'}]}]" placeholder="请选择">
+            <a-select @change="handleChange" v-decorator="['baoyangTimes', {rules: [{required: false, message: '不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in lineMap"
                 :key="value"
@@ -1139,6 +1139,7 @@ export default {
           'financingNoFour',
           'financingNoFive',
           'name',
+          'baoyangTimes',
           'model',
           'cph',
           'positionId',