From 5d5e4a13c4a7c29d6c19c79fdff54f1825fd6af7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 12 七月 2023 17:04:30 +0800
Subject: [PATCH] 1.实现周期任务demo
---
src/views/purchasesManager/InventoryLedgerList.vue | 956 +++++++++++++++++++++++++++-------------------------------
1 files changed, 445 insertions(+), 511 deletions(-)
diff --git a/src/views/purchasesManager/InventoryLedgerList.vue b/src/views/purchasesManager/InventoryLedgerList.vue
index 51e8dc5..e62c5d9 100644
--- a/src/views/purchasesManager/InventoryLedgerList.vue
+++ b/src/views/purchasesManager/InventoryLedgerList.vue
@@ -1,11 +1,14 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板浠诲姟</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-switch-button" @click="">鏆傚仠浠诲姟</el-button>-->
+ <!-- <el-button v-waves type="primary" icon="el-icon-caret-right " @click="">寮�鍚换鍔�</el-button>-->
+ <!-- <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="">绔嬪嵆鎵ц</el-button>-->
+ </div>
- <!-- <div class="bodyTopButtonGroup">-->
- <!-- <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- </div>-->
- <div class="bodyTopFormGroup" style="margin-top: 10px">
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -14,42 +17,39 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鍗曟嵁鏃ユ湡" style="display: flex;font-size: 14px;align-items: center">
- <el-date-picker
- v-model="form.orderdate"
- type="daterange"
- range-separator="~"
- class="timeMini"
- size="mini"
- style="width: 200px;display: flex;line-height: 34px;height: 34px;"
- :clearable="false"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- />
- </el-form-item>
-
- <el-form-item label="鍗曟嵁缂栧彿" style=" display: flex;">
+ <el-form-item label="姣嶄欢缂栫爜" style=" display: flex;">
<el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="寰�鏉ュ崟浣�" style=" display: flex;">
+ <el-form-item label="姣嶄欢鍚嶇О" style=" display: flex;">
<el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <!-- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">-->
- <!-- <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />-->
- <!-- </el-form-item>-->
- <!-- <el-form-item label="棰勮浜よ揣鏃ユ湡" style="display: flex;font-size: 14px;align-items: center">-->
- <!-- <el-date-picker-->
- <!-- v-model="form.orderdate"-->
- <!-- type="daterange"-->
- <!-- range-separator="~"-->
- <!-- class="timeMini"-->
- <!-- size="mini"-->
- <!-- style="width: 200px;display: flex;line-height: 34px;height: 34px;"-->
- <!-- :clearable="false"-->
- <!-- start-placeholder="寮�濮嬫棩鏈�"-->
- <!-- end-placeholder="缁撴潫鏃ユ湡"-->
- <!-- />-->
- <!-- </el-form-item>-->
+ <el-form-item label="姣嶄欢瑙勬牸" style=" display: flex;">
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鍚敤鐘舵��" style=" display: flex;">
+ <el-select v-model="form.OrgType" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in OrgTypeArrxx"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鐗堟湰缂栧彿" style=" display: flex;">
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍒涘缓鏃ユ湡" style=" display: flex;">
+ <el-date-picker
+ v-model="form.createdate"
+ style="width: 200px"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ />
+ </el-form-item>
</div>
<div
class="bodySearchReset"
@@ -61,157 +61,137 @@
</el-form>
<div
class="bodyTopFormExpand"
- />
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
+
<div class="elTableDiv">
- <!-- <TableColumnSettings-->
- <!-- :list1="tableColumnSettingsArray"-->
- <!-- @tableColumnUpdate="tableColumnUpdate"-->
- <!-- />-->
<el-table
ref="tableDataRef"
- :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px'}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
- :height="tableHeight+'px'"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ @sort-change="sortChange"
>
- <!-- @sort-change="sortChange"-->
-
<el-table-column
type="index"
width="50"
- label="搴忓彿"
fixed
+ label="搴忓彿"
/>
<el-table-column
- prop="doc_date"
- label="鍗曟嵁鏃ユ湡"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="110"
- />
- <el-table-column
- prop="doc_type"
- label="鍗曟嵁绫诲瀷"
- sortable="custom"
- show-tooltip-when-overflow
- width="110"
- />
- <el-table-column
- prop="doc_code"
- label="鍗曟嵁缂栧彿"
- width="160"
- show-tooltip-when-overflow
+ prop="taskName"
+ label="浣滀笟鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="businessType"
- label="涓氬姟绫诲瀷"
- sortable="custom"
- show-tooltip-when-overflow
- width="110"
- />
- <el-table-column
- prop="commUnit"
- label="寰�鏉ュ崟浣�"
- width="220"
- show-tooltip-when-overflow
+ prop="groupName"
+ label="鍒嗙粍"
sortable="custom"
/>
<el-table-column
- prop="item"
- label="椤圭洰"
- width="110"
- show-tooltip-when-overflow
+ prop="lastRunTime"
+ label="鏈�鍚庢墽琛屾椂闂�"
+ sortable="custom"
+ min-width="120"
+ />
+ <el-table-column
+ prop="interval"
+ label="闂撮殧"
sortable="custom"
/>
<el-table-column
- label="鏀跺叆"
+ prop="status"
+ label="鐘舵��"
+ width="75"
+ sortable="custom"
>
- <el-table-column
- prop="in_sum"
- label="鏁伴噺(涓�)"
- width="160"
- />
- <el-table-column
- prop="in_price"
- label="鍗曚环"
- width="160"
- />
- <el-table-column
- prop="in_money"
- label="閲戦"
- width="160"
- />
+ <template slot-scope="{row}">
+ <el-tag v-if="row.status===0" size="medium" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status===1" size="medium" type="danger">鏆傚仠</el-tag>
+ </template>
</el-table-column>
<el-table-column
- label="鍙戝嚭"
- >
- <el-table-column
- prop="out_sum"
- label="鏁伴噺(涓�)"
- width="160"
- />
- <el-table-column
- prop="out_price"
- label="鍗曚环"
- width="160"
- />
- <el-table-column
- prop="out_money"
- label="閲戦"
- width="160"
- />
- </el-table-column>
+ prop="describe"
+ label="鎻忚堪"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="apiUrl"
+ label="ApiUrl"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="requestType"
+ label="璇锋眰鏂瑰紡"
+ sortable="custom"
+ />
<el-table-column
- label="鏀跺叆"
+ label="鎿嶄綔"
+ width="200"
+ fixed="right"
>
- <el-table-column
- prop="balance_sum"
- label="鏁伴噺(涓�)"
- width="160"
- />
- <el-table-column
- prop="balance_price"
- label="鍗曚环"
- width="160"
- />
- <el-table-column
- prop="balance_money"
- label="閲戦"
- width="160"
- />
- </el-table-column>
- <!-- <el-table-column-->
- <!-- fixed="right"-->
- <!-- label="鎿嶄綔"-->
- <!-- width="120"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="operationClass">-->
- <!-- <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
- <!-- <i-->
- <!-- :style="{color:$store.state.settings.theme}"-->
- <!-- class="el-icon-edit-outline"-->
- <!-- @click="edit('edit',row)"-->
- <!-- />-->
- <!-- </el-tooltip>-->
- <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
- <!-- <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />-->
- <!-- </el-tooltip>-->
- <!-- <!– <el-button type="primary" size="mini" />–>-->
- <!-- <!– <el-button type="danger" size="mini">鍒犻櫎</el-button>–>-->
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="鏆傚仠浠诲姟" placement="top">
+ <i
+ class="el-icon-switch-button"
+ style="margin-right: 15px;color: #42B983;cursor: pointer"
+ @click="pauseTask(row)"
+ />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="寮�鍚换鍔�" placement="top">
+ <i
+ class="el-icon-caret-right"
+ style="margin-right: 15px;color: #42B983;cursor: pointer"
+ @click="startTask(row)"
+ />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="绔嬪嵆鎵ц" placement="top">
+ <i
+ class="el-icon-d-arrow-right"
+ style="margin-right: 15px;color: #42B983;cursor: pointer"
+ @click="runTask(row)"
+ />
+ </el-tooltip>
- <!-- </div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-tooltip class="item" effect="dark" content="鏌ョ湅璁板綍" placement="top">
+ <i
+ class="el-icon-document"
+ style="margin-right: 15px;color: #42B983;cursor: pointer"
+ @click="check(row)"
+ />
+ </el-tooltip>
+
+ <el-tooltip class="item" effect="dark" content="缂栬緫浠诲姟" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎浠诲姟" placement="top">
+ <i class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
</el-table>
</div>
<!--鍒嗛〉-->
@@ -220,9 +200,9 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total ,prev, pager, next,sizes,jumper"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
- @pagination="getOrganizationSearch"
+ @pagination="getTaskBackGroundGetJobs"
/>
</div>
@@ -230,333 +210,238 @@
v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="800px"
- top="15vh"
+ width="900px"
:close-on-click-modal="false"
+ top="15vh"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
- <el-radio-group
- v-model="dialogForm.OrgType"
- :disabled="operation==='edit'"
- @change="changeRadio"
+
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
+ <el-form-item label="浣滀笟鍚嶇О" prop="taskName">
+ <el-input v-model="dialogForm.taskName" :disabled="operation!=='add'" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鍒嗙粍" prop="groupName">
+ <el-input v-model="dialogForm.groupName" style="width: 200px" />
+ </el-form-item>
+
+ <!-- <el-popover v-model="cronPopover">-->
+ <!-- <cron i18n="cn" @change="changeCron" @close="cronPopover=false" />-->
+ <!-- <el-form-item slot="reference" label="cron琛ㄨ揪寮�" prop="interval">-->
+ <!-- <el-input-->
+ <!-- v-model="dialogForm.interval"-->
+ <!-- placeholder="璇疯緭鍏ュ畾鏃剁瓥鐣�"-->
+ <!-- style="width:200px"-->
+ <!-- @click="cronPopover=true"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- </el-popover>-->
+
+ <el-form-item label="cron琛ㄨ揪寮�" prop="interval">
+ <el-input
+ v-model="dialogForm.interval"
+ placeholder="璇疯緭鍏ュ畾鏃剁瓥鐣�"
+ style="width:200px"
+ readonly
>
- <el-radio
- v-for="item in OrgTypeArr"
- :key="item.value"
- :value="item.value"
- :label="item.label"
- />
- </el-radio-group>
+ <el-button slot="append" icon="el-icon-thumb" @click="showDialog" />
+ </el-input>
</el-form-item>
- <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
+
+ <el-form-item label="ApiUrl" prop="apiUrl">
+ <el-input v-model="dialogForm.apiUrl" style="width: 200px" />
</el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 200px" />
+ <el-form-item label="header(Key)" prop="authKey">
+ <el-input v-model="dialogForm.authKey" style="width: 200px" />
</el-form-item>
- <el-form-item v-if="dialogForm.OrgType!=='閮ㄩ棬'" prop="SupUnit" label="涓婄骇鍗曚綅">
- <el-select
- v-model="dialogForm.SupUnit"
- style="width: 200px"
- filterable
- :popper-append-to-body="false"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in SupUnitArr"
- :key="item.id"
- :label="item.org_name"
- :value="item.id"
- />
- </el-select>
+ <el-form-item label="header(value)" prop="authValue">
+ <el-input v-model="dialogForm.authValue" style="width: 200px" />
</el-form-item>
+
+ <!-- <el-form-item label="璇锋眰鏂瑰紡" prop="requestType">-->
+ <!-- <el-input v-model="dialogForm.requestType" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <el-form-item label="鎻忚堪" prop="describe">
+ <el-input v-model="dialogForm.describe" type="textarea" style="width: 200px" />
+ </el-form-item>
+
</el-form>
+
+ <el-dialog
+ v-el-drag-dialog
+ :close-on-click-modal="false"
+ top="8vh"
+ width="900px"
+ title="鐢熸垚 cron"
+ :visible.sync="showCron"
+ append-to-body
+ >
+ <vcrontab :expression="expression" @hide="showCron=false" @fill="crontabFill" />
+ </el-dialog>
+
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button
- v-waves
- type="primary"
- :loading="$store.state.app.buttonIsDisabled"
- :disabled="$store.state.app.buttonIsDisabled"
- @click="dialogVisibleConfirm"
- >纭� 瀹�</el-button>
+ <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
+
+ <el-dialog
+ v-el-drag-dialog
+ title="cron 鎵ц璁板綍"
+ :visible.sync="dialogVisible2"
+ width="900px"
+
+ top="15vh"
+ @closed="handleClose2"
+ @close="handleClose2"
+ >
+ <!-- :close-on-click-modal="false"-->
+ <!-- {{ recordData }}-->
+
+ <el-timeline :reverse="false">
+ <el-timeline-item
+ v-for="(item, index) in recordData"
+ :key="item.beginDate"
+ :timestamp="item.msg"
+ >
+ {{ item.beginDate }}
+ </el-timeline-item>
+ </el-timeline>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisible2=false">杩� 鍥�</el-button>
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/basicSettings'
-import { getCookie } from '@/utils/auth'
-import { validateCode } from '@/utils/global'
-import TableColumnSettings from '@/components/TableColumnSettings'
-import elDragDialog from '@/directive/el-drag-dialog' // base on element-ui
-import waves from '@/directive/waves/index.js' // 姘存尝绾规寚浠�
+import {
+ TaskBackGroundAdd,
+ TaskBackGroundGetJobs,
+ TaskBackGroundGetRunLog,
+ TaskBackGroundPause,
+ TaskBackGroundRemove, TaskBackGroundRun,
+ TaskBackGroundStart, TaskBackGroundUpdate
+} from '@/api/TaskBackGround'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { cron } from 'vue-cron'
+import cronstrue from 'cronstrue/i18n'
+import vcrontab from 'vcrontab'
-// const SER_HZ = /^[\u4e00-\u9fa5]+$/
-// const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
export default {
- name: 'ZZJG',
+ name: 'Zzjg',
components: {
- Pagination, TableColumnSettings
+ Pagination, cron, vcrontab
},
directives: { elDragDialog, waves },
data() {
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
- windowHeight: 0,
- windowWidth: 0,
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
- numvalue: 0,
form: {
OrgCode: '', // 缁勭粐鏋舵瀯浠ｇ爜
OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
- orderdate: '', // 鍗曟嵁鏃ユ湡
+ OrgType: '', // 缁勭粐绫诲瀷
+ UserName: '', // 鍒涘缓浜哄憳
+ createdate: '',
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
- tableColumnSettingsArray: [
- { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
- // { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
- {
- minWidth: 110,
- width: false,
- prop: 'partcode',
- label: '瀛樿揣缂栫爜',
- id: 2,
- show: true,
- fixed: false,
- sortable: true
- }, {
- minWidth: 110,
- width: false,
- prop: 'partname',
- label: '瀛樿揣鍚嶇О',
- id: 3,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'partspec',
- label: '瑙勬牸鍨嬪彿',
- id: 4,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'saleUnit',
- label: '閿�鍞崟浣�',
- id: 5,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'sum',
- label: '鏁伴噺',
- id: 6,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 130,
- width: false,
- prop: 'newSale',
- label: '鏈�鏂板惈绋庡敭浠�',
- id: 7,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'taxPercent',
- label: '绋庣巼%',
- id: 8,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'newTaxPrice',
- label: '鍚◣鍗曚环',
- id: 9,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'money',
- label: '閲戦',
- id: 10,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'taxMoney',
- label: '鍚◣閲戦',
- id: 11,
- show: true,
- fixed: false,
- sortable: true
- },
- // {
- // minWidth: 130,
- // width: false,
- // prop: 'expectedDate',
- // label: '棰勮浜よ揣鏃ユ湡',
- // id: 12,
- // show: true,
- // fixed: false,
- // sortable: true
- // },
- {
- minWidth: 110,
- width: false,
- prop: 'stockCount',
- label: '鐜板瓨閲�',
- id: 13,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 120,
- width: false,
- prop: 'stockDesc',
- label: '鐜板瓨閲忚鏄�',
- id: 13,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'notes',
- label: '澶囨敞',
- id: 13,
- show: true,
- fixed: false,
- sortable: true
- },
- {
- minWidth: 110,
- width: false,
- prop: 'returnReason',
- label: '閫�璐у師鍥�',
- id: 13,
- show: true,
- fixed: false,
- sortable: true
- }
- ],
- tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
-
total: 10,
- tableData: [
- {
- id: 1001,
- doc_date: '2023-04-05',
- doc_type: '鏈熷垵缁撳瓨',
- doc_code: 'K202304050001',
- businessType: '',
- commUnit: '鐜夌幆瀹濅俊閽㈢鏈夐檺鍏徃',
- item: '',
- in_sum: '1000',
- in_price: '5',
- in_money: '5000',
- out_sum: '300',
- out_price: '5',
- out_money: '1500',
- balance_sum: '0',
- balance_price: '0',
- balance_money: '0'
- }
- ],
-
+ tableData: [],
dialogVisible: false,
dialogForm: {
- OrgType: '閮ㄩ棬',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ taskName: '', // 浣滀笟鍚嶇О
+ groupName: '', // 鍒嗙粍
+ interval: '', // 闂撮殧
+ apiUrl: '', // apiUrl
+ authKey: '', // authKey
+ authValue: '', // authValue
+ describe: '', // 鎻忚堪
+ requestType: 'POST', // 璇锋眰绫诲瀷
+ lastRunTime: '', // 鏈�鍚庢墽琛屾椂闂�
+ status: 0// 鐘舵��
},
- SupUnitArr: [],
- operation: ''
+ cronPopover: false,
+
+ showCron: false,
+ expression: '',
+
+ operation: '',
+ dialogFormRules: {
+ taskName: [
+ { required: true, message: '璇疯緭鍏ヤ綔涓氫换鍔�', trigger: ['blur', 'change'] }
+ ],
+ groupName: [
+ { required: true, message: '璇疯緭鍏ュ垎缁�', trigger: ['blur', 'change'] }
+ ],
+ interval: [
+ { required: true, message: '璇疯緭鍏ron琛ㄨ揪寮�', trigger: ['blur', 'change'] }
+ ],
+ apiUrl: [
+ { required: true, message: '璇疯緭鍏piUrl', trigger: ['blur', 'change'] }
+ ],
+ requestType: [
+ { required: true, message: '璇疯緭鍏ヨ姹傛柟寮�', trigger: ['blur', 'change'] }
+ ],
+ describe: [
+ { required: true, message: '璇疯緭鍏ヨ姹傛弿杩�', trigger: ['blur', 'change'] }
+ ]
+ // authKey: [
+ // { required: true, message: '璇疯緭鍏uthKey', trigger: ['blur', 'change'] }
+ // ],
+ // authValue: [
+ // { required: true, message: '璇疯緭鍏uthValue', trigger: ['blur', 'change'] }
+ // ]
+
+ },
+ dialogVisible2: false,
+ recordData: []// 鏌ョ湅璁板綍鏁扮粍
}
},
- // watch: {
- // windowHeight(val) {
- // console.log('瀹炴椂灞忓箷楂樺害锛�', val, this.windowHeight)
- // },
- // windowWidth(val) {
- // if (val < 768) {
- // this.dialogWidth = '100%'
- // } else {
- // this.dialogWidth = '75%'
- // }
- // console.log('瀹炴椂灞忓箷瀹藉害锛�', val, this.windowHeight)
- // }
- // },
created() {
- // this.getOrganizationSearch()
+ this.getTaskBackGroundGetJobs()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
-
- this.total = this.tableData.length
- },
- destroyed() {
-
},
methods: {
- tableColumnUpdate(val, isCopyTrue) {
- if (isCopyTrue) {
- this.tableColumnSettingsArray = val
- }
- this.tableTimeStampKey = new Date().getTime()
- this.$refs.tableDataRef.doLayout()
+ crontabFill(val) {
+ this.dialogForm.interval = val
+ // const t = cronstrue.toString(this.dialogForm.interval, { locale: 'zh_CN' })
+ // console.log(t)
},
- async getOrganizationSearch() {
- const res = await OrganizationSearch(this.form)
+ showDialog() {
+ this.expression = this.dialogForm.interval
+ // 浼犲叆鐨� cron 琛ㄨ揪寮忥紝鍙互鍙嶈В鏋愬埌 UI 涓�
+ this.showCron = true
+ },
+ changeCron(val) {
+ this.dialogForm.interval = val
+ // cronstrue 鏄竴涓� JavaScript 搴擄紝瑙ｆ瀽 cron 琛ㄨ揪寮忓苟杈撳嚭鍙鐨� cron 鎻忚堪銆�
+ // const t = cronstrue.toString(this.dialogForm.interval, { locale: 'zh_CN' })
+ // console.log(t)
+ },
+ async getTaskBackGroundGetJobs() {
+ const res = await TaskBackGroundGetJobs()
this.tableData = res.data
- this.total = res.count
+ this.total = res.data.length
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -569,87 +454,109 @@
}
this.form.order = order
this.form.prop = prop
- this.getOrganizationSearch()
+ this.getTaskBackGroundGetJobs()
},
// 鏌ヨ
search() {
- // this.getOrganizationSearch()
-
+ this.getTaskBackGroundGetJobs()
},
// 閲嶇疆
reset() {
this.form.OrgCode = ''
this.form.OrgName = ''
- // this.form.OrgType = ''
- // this.form.UserName = ''
- // this.getOrganizationSearch()
- },
- // 鍗曢�夋鏀瑰彉鏃�
- async changeRadio(val) {
- if (this.dialogForm.OrgType !== '閮ㄩ棬') {
- const { data: res } = await PrentOrganization({ orgcode: this.OrgTypeArr.find(item => item.label === this.dialogForm.OrgType).value })
- this.SupUnitArr = res
- }
+ this.form.OrgType = ''
+ this.form.UserName = ''
+ this.getTaskBackGroundGetJobs()
},
// 鏂板鎸夐挳
- async add(operation) {
+ add(operation) {
this.operation = operation
this.dialogVisible = true
-
- // const res = await getNewEncodingRules(getCookie('ruleCode'))
- // this.dialogForm.OrgCode = res.RightCode
- // this.numvalue = res.numvalue
},
// 淇敼鎸夐挳
edit(operation, row) {
this.operation = operation
this.dialogVisible = true
- // if (row.description === 'F') {
- // this.dialogForm.OrgType = '宸ュ巶'
- // } else
- if (row.description === 'D') {
- this.dialogForm.OrgType = '閮ㄩ棬'
- } else if (row.description === 'W') {
- this.dialogForm.OrgType = '杞﹂棿'
- }
- // else if (row.description === 'K') {
- // this.dialogForm.OrgType = '绉戝'
- // } else if (row.description === 'L') {
- // this.dialogForm.OrgType = '鐢熶骇绾�'
- // }
this.$nextTick(() => {
- this.changeRadio(this.dialogForm.OrgType)
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.taskName = row.taskName
+ this.dialogForm.groupName = row.groupName
+ this.dialogForm.interval = row.interval
+ this.dialogForm.apiUrl = row.apiUrl
+ this.dialogForm.authKey = row.authKey
+ this.dialogForm.authValue = row.authValue
+ this.dialogForm.describe = row.describe
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: id }).then(res => {
+ TaskBackGroundRemove(row).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
this.form.page--
}
- this.getOrganizationSearch()
+ this.getTaskBackGroundGetJobs()
}
})
}).catch(() => {
this.$message.info('宸插彇娑堝垹闄�')
})
},
+ // 鏆傚仠浠诲姟
+ async pauseTask(row) {
+ const res = await TaskBackGroundPause(row)
+ if (res.code === '200') {
+ await this.getTaskBackGroundGetJobs()
+ return this.$message.success(res.message)
+ }
+ },
+ // 寮�鍚换鍔�
+ async startTask(row) {
+ const res = await TaskBackGroundStart(row)
+ if (res.code === '200') {
+ await this.getTaskBackGroundGetJobs()
+ return this.$message.success(res.message)
+ }
+ },
+ // 绔嬪嵆鎵ц
+ async runTask(row) {
+ const res = await TaskBackGroundRun(row)
+ if (res.code === '200') {
+ await this.getTaskBackGroundGetJobs()
+ this.$message.success(res.message)
+ }
+ },
+ // 鏌ョ湅璁板綍
+ async check(row) {
+ const data = {
+ taskName: row.taskName,
+ groupName: row.groupName,
+ page: 1
+ }
+ const res = await TaskBackGroundGetRunLog(data)
+
+ if (res.code === '200') {
+ this.recordData = res.data
+ this.dialogVisible2 = true
+ }
+ },
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = '閮ㄩ棬'
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.taskName = ''
+ this.dialogForm.groupName = ''
+ this.dialogForm.interval = ''
+ this.dialogForm.apiUrl = ''
+ this.dialogForm.authKey = ''
+ this.dialogForm.authValue = ''
+ this.dialogForm.describe = ''
+ this.dialogForm.requestType = 'POST'
+ this.dialogForm.lastRunTime = ''
+ this.dialogForm.status = 0
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -658,45 +565,51 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ console.log(this.dialogForm)
+
+ // console.log(new Date().getUTCDate())
+
this.$refs.dialogForm.validate(valid => {
if (valid) {
- this.$store.state.app.buttonIsDisabled = true
- const data = {
- OrganType: this.dialogForm.OrgType === '閮ㄩ棬' ? 'D' : 'W',
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- RightCode: '',
- numvalue: '',
- // RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
- // numvalue: this.operation === 'add' ? this.numvalue : '',
- SupUnit: this.dialogForm.OrgType === '閮ㄩ棬' ? '0' : this.dialogForm.SupUnit,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
+ // const data = {
+ // OrganCode: this.dialogForm.OrgCode,
+ // OrganName: this.dialogForm.OrgName,
+ // OperType: this.operation === 'add' ? 'Add' : 'Update',
+ // Operator: getCookie('admin')
+ // }
- AddUpdateOrganization(data).then(res => {
- if (res.code === '200') {
- this.dialogVisible = false
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.getOrganizationSearch()
- this.$store.state.app.buttonIsDisabled = false
- } else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- this.$store.state.app.buttonIsDisabled = false
- }
- })
+ if (this.operation === 'add') {
+ TaskBackGroundAdd(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getTaskBackGroundGetJobs()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ } else {
+ TaskBackGroundUpdate(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getTaskBackGroundGetJobs()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
}
})
+ },
+ handleClose2() {
+ this.recordData = []
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 145
- if (window.innerHeight < 769) {
- this.tableHeight = this.tableHeight - 40
- }
- this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.tableHeight = this.mainHeight - 255
this.$refs.tableDataRef.doLayout()
})
},
@@ -709,7 +622,31 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
+//::v-deep .language {
+// display: none !important;
+//}
+//
+//::v-deep .bottom {
+// display: flex !important;
+// justify-content: center !important;
+//
+// .value {
+// margin-right: 20px;
+// }
+//}
+
+::v-deep .pop_btn {
+ .el-button--primary {
+ float: right;
+ }
+}
+
$main_color: #42b983;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
@@ -794,6 +731,16 @@
margin-bottom: 0;
}
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
.tableFixed {
::v-deep .el-table__fixed-right {
height: 100% !important;
@@ -803,21 +750,8 @@
height: 100% !important;
}
}
-
-//::v-deep .cell {
-// display: flex;
-// flex-wrap: nowrap;
-//}
-//
-//::v-deep .has-gutter .cell {
-// display: flex;
-// flex-wrap: nowrap;
-//}
</style>
<style>
-.osloading {
- font-size: 30px;
-}
.el-table .custom-row {
background: #f8f8fa;
--
Gitblit v1.9.3