周报

src/views/system/daily-manage/detail.vue

@@ -65,7 +65,6 @@ import {
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
 import {ElMessage, ElMessageBox} from "element-plus";
-import {addDailyReportSave, editDailyReportEdit, getDailyReport, getDailyReportSearch} from "@/api/modules/daily";
 
 export default defineComponent({
   name: '',

src/views/system/daily-manage/index.vue

@@ -89,7 +89,6 @@ import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
 import DetailCom from './detail.vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
-import {delDailyReportDelete, getDailyReportList} from "@/api/modules/daily";
 
 export default defineComponent({
   name: '',

src/views/system/operation-records/index.vue

@@ -88,8 +88,6 @@ import {
 } from 'vue'
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
-import {getOperationLogList, operLogExport} from "@/api/modules/oper-log";
-import {getDeptList} from "@/api/modules/dept";
 import {ElMessage} from "element-plus";
 import {downLoadBlob} from "@/utils/downLoadUrl";
 

src/views/system/public-configuration/index.vue

@@ -136,7 +136,6 @@ import {
 } from 'vue'
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
-import {editConfigEditConfigKey, getConfigConfigKey} from "@/api/modules/config";
 import { ElMessage } from 'element-plus';
 
 export default defineComponent({

src/views/system/seat-manage/index.vue

@@ -157,12 +157,6 @@ import {
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
 import PeopleCom from './people.vue'
-import {
-  editSeatDutyUnitEdit,
-  getSeatDutyPersonEdit,
-  getSeatDutyUnitById,
-  getSeatDutyUnitList
-} from "@/api/modules/seat";
 import {ElMessage, ElMessageBox} from "element-plus";
 
 export default defineComponent({

src/views/system/seat-manage/people.vue

@@ -51,9 +51,7 @@ import {
 } from 'vue'
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
-import {getAccountListByDeptId} from "@/api/modules/account";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {getSeatDutyUnitPersonList} from "@/api/modules/seat";
 
 export default defineComponent({
   name: '',

src/views/system/weekly-manage/detail.vue

@@ -19,10 +19,14 @@
         <CusFormColumn
             :span="24"
             required
-            label="周期日期:"
-            link="date"
             :disabled="true"
-            v-model:param="cusDetail.dutyTime"/>
+            label="周报日期:"
+            link="select"
+            static
+            v-model:param="weeklyDate"
+            labelKey="yearWeekSelectValue"
+            valueKey="id"
+            :options="$store.getters['app/yearWeeks'].list"/>
         <CusFormColumn
             :span="24"
             required
@@ -32,7 +36,7 @@
         <CusFormColumn
             :span="24"
             required
-            label="日志记录:"
+            label="周报记录:"
             type="textarea"
             :rows="4"
             show-word-limit
@@ -65,7 +69,6 @@ import {
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
 import {ElMessage, ElMessageBox} from "element-plus";
-import {addDailyReportSave, editDailyReportEdit, getDailyReport, getDailyReportSearch} from "@/api/modules/daily";
 
 export default defineComponent({
   name: '',
@@ -82,15 +85,17 @@ export default defineComponent({
     const state = reactive({
       loading: false,
       cusDetail: <any>{},
-      fileList: <any>[]
+      fileList: <any>[],
+      weeklyDate: ''
     })
     watch(() => props.show, (n) => {
       if (n) {
         state.loading = false
         state.fileList = []
+        state.weeklyDate = ''
         if (props.transfer.method !== 'add') {
           state.loading = true
-          that.$api.getDailyReport(props.transfer.detail.id).then((res) => {
+          that.$api.getWeekReport(props.transfer.detail.id).then((res) => {
             if (res.code === 200 && res.data?.id) {
               setFormByInfo(res.data)
             } else {
@@ -103,16 +108,15 @@ export default defineComponent({
           })
         } else {
           state.loading = true
-          that.$api.getDailyReportSearch().then((res) => {
+          that.$api.getWeekReportSearch().then((res) => {
             if (res.code === 200) {
               if (res.data?.id) {
                 setFormByInfo(res.data)
               } else {
-                const diff = new Date(store.state.app.timestamp).getHours() < 12 ? (1000 * 60 * 60 * 24) : 0
                 state.cusDetail = {
-                  dutyTime: that.$util.YMD(new Date(store.state.app.timestamp).getTime() - diff),
                   submitter: store.state.app.userInfo.displayName,
                 }
+                state.weeklyDate = store.getters['app/yearWeeks'].list[store.getters['app/yearWeeks'].list.length - 1].id
               }
               state.loading = false
             } else {
@@ -134,6 +138,7 @@ export default defineComponent({
     })
     const setFormByInfo = (data) => {
       state.cusDetail = data
+      state.weeklyDate = `${state.cusDetail.year}_${state.cusDetail.weekTime}`
       if (state.cusDetail.fileUrl) {
         const urlArr = state.cusDetail.fileUrl.split(',')
         const nameArr = state.cusDetail.fileName.split(',')
@@ -161,7 +166,11 @@ export default defineComponent({
             params.fileName = ''
             params.fileUrl = ''
           }
-          const apiHandle = params.id ? that.$api.editDailyReportEdit(params) : that.$api.addDailyReportSave(params)
+          if (!params.id) {
+            params.year = state.weeklyDate.split('_')[0]
+            params.weekTime = state.weeklyDate.split('_')[1]
+          }
+          const apiHandle = params.id ? that.$api.editWeekReportEdit(params) : that.$api.addWeekReportSave(params)
           apiHandle.then(res => {
             if (res.code === 200) {
               ElMessage.success(res.message)

src/views/system/weekly-manage/index.vue

@@ -20,10 +20,13 @@
                 label="提交人员:"
                 v-model:param="queryForm.submitter"/>
             <CusFormColumn
-                label="日志日期:"
-                link="date"
-                type="daterange"
-                v-model:param="queryForm.dutyDate"/>
+                label="周报日期:"
+                link="select"
+                static
+                v-model:param="queryForm.weeklyDate"
+                labelKey="yearWeekSelectValue"
+                valueKey="id"
+                :options="$store.getters['app/yearWeeks'].list"/>
             <CusFormColumn
                 label="提交时间:"
                 link="datetime"
@@ -51,6 +54,9 @@
               :pageSize="queryPage.pageSize"
               @handlePage="handlePage"
           >
+            <template #weeklyDate-column-value="{ scope }">
+              {{$store.getters['app/yearWeeks'].map.get(`${scope.row.year}_${scope.row.weekTime}`).yearWeekSelectValue}}
+            </template>
             <template #do-column-value="{ scope }">
               <div class="__cus-table_do">
                 <div class="__cus-table_do-green __hover" @click="onView(scope.row)">
@@ -89,7 +95,6 @@ import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
 import DetailCom from './detail.vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
-import {delDailyReportDelete, getDailyReportList} from "@/api/modules/daily";
 
 export default defineComponent({
   name: '',
@@ -120,12 +125,12 @@ export default defineComponent({
       back_queryForm: {},
       //  表格表头
       tableHead: [
-        {value: "title", label: "日志标题", show: true},
+        {value: "title", label: "周报标题", show: true},
         {value: "seatSerialNumber", label: "席位编号", show: true},
         {value: "unitName", label: "单位", show: true},
         {value: "submitter", label: "提交人员", show: true},
-        {value: "dutyTime", label: "日志日期", show: true},
-        {value: "submitTime", label: "提交时间", show: true},
+        {value: "weeklyDate", label: "周报日期", show: true, width: 320},
+        {value: "submitTime", label: "提交时间", show: true, width: 180},
         {value: "do", label: "操作", show: true, popover: true, width: 260},
       ],
       showDetail: false,
@@ -159,9 +164,9 @@ export default defineComponent({
         if (that.$util.isValue(v)) {
           if (k === 'unitId') {
             queryParams['unitName'] = store.state.dictionary.deptMap.get(v).organizationName
-          } else if (k === 'dutyDate') {
-            queryParams['beginDutyTime'] = v[0]
-            queryParams['endDutyTime'] = v[1]
+          } else if (k === 'weeklyDate') {
+            queryParams['year'] = store.getters['app/yearWeeks'].map.get(v).year
+            queryParams['weekTime'] = store.getters['app/yearWeeks'].map.get(v).week
           } else if (k === 'submitDate') {
             queryParams['beginTime'] = v[0]
             queryParams['endTime'] = v[1]
@@ -171,7 +176,7 @@ export default defineComponent({
         }
       }
       state.loading = true
-      that.$api.getDailyReportList(queryParams).then((res: any) => {
+      that.$api.getWeekReportList(queryParams).then((res: any) => {
         if (res.code === 200) {
           state.queryResult.tableData = res.rows
           state.queryResult.total = res.total
@@ -217,7 +222,7 @@ export default defineComponent({
         type: "warning",
       }).then(() => {
         state.loading = true
-        that.$api.delDailyReportDelete({id: val.id}).then(res => {
+        that.$api.delWeekReportDelete({id: val.id}).then(res => {
           if (res.code === 200) {
             ElMessage.success(res.message)
             handleSearch()