loulijun2021
2023-07-12 5d5e4a13c4a7c29d6c19c79fdff54f1825fd6af7
1.实现周期任务demo
已添加1个文件
已修改6个文件
1795 ■■■■■ 文件已修改
.env.development 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.production 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/TaskBackGround.js 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchasesManager/InventoryLedgerList.vue 956 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchasesManager/goodsStatisticsList.vue 749 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -4,6 +4,7 @@
# base api
VUE_APP_BASE_API = '/api/'
VUE_APP_BASE_API_BASE = '/base/'
# æ–‡ä»¶ä¸‹è½½åœ°å€   ä¸‹è½½æ•°æ®æ¨¡æ¿åœ°å€
VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'
.env.production
@@ -4,6 +4,7 @@
# base api
VUE_APP_BASE_API = '/apis/'
VUE_APP_BASE_API_BASE = '/base/'
# æ–‡ä»¶ä¸‹è½½åœ°å€   ä¸‹è½½æ•°æ®æ¨¡æ¿åœ°å€
VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'
package.json
@@ -16,6 +16,7 @@
  "dependencies": {
    "axios": "0.18.1",
    "core-js": "3.6.5",
    "cronstrue": "^2.28.0",
    "dayjs": "^1.11.5",
    "echarts": "^5.3.2",
    "element-ui": "^2.15.6",
@@ -29,8 +30,11 @@
    "postcss-px2rem": "^0.3.0",
    "qrcode": "^1.5.0",
    "qrcodejs2": "0.0.2",
    "vcrontab": "^0.3.5",
    "vue": "2.6.10",
    "vue-count-to": "^1.0.13",
    "vue-cron": "^1.0.9",
    "vue-cron-editor-buefy": "^0.2.17",
    "vue-easy-print": "0.0.8",
    "vue-print-nb": "^1.7.5",
    "vue-router": "3.0.6",
src/api/TaskBackGround.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,76 @@
import request from '@/utils/request'
const baseURL = process.env.VUE_APP_BASE_API_BASE
// èŽ·å–æ‰€æœ‰çš„ä½œä¸š
export function TaskBackGroundGetJobs() {
  return request({
    baseURL,
    url: 'TaskBackGround/GetJobs',
    method: 'get'
  })
}
// èŽ·å–ä½œä¸šè¿è¡Œæ—¥å¿—
export function TaskBackGroundGetRunLog(data) {
  return request({
    baseURL,
    url: 'TaskBackGround/GetRunLog',
    method: 'get',
    params: data
  })
}
// æ·»åŠ ä»»åŠ¡
export function TaskBackGroundAdd(data) {
  return request({
    baseURL,
    url: 'TaskBackGround/Add',
    method: 'post',
    data
  })
}
//
export function TaskBackGroundRemove(data) {
  return request({
    baseURL,
    url: 'TaskBackGround/Remove',
    method: 'post',
    data
  })
}
//
export function TaskBackGroundUpdate(data) {
  return request({
    baseURL,
    url: 'TaskBackGround/Update',
    method: 'post',
    data
  })
}
//
export function TaskBackGroundPause(data) {
  return request({
    baseURL,
    url: 'TaskBackGround/Pause',
    method: 'post',
    data
  })
}
//
export function TaskBackGroundStart(data) {
  return request({
    baseURL,
    url: 'TaskBackGround/Start',
    method: 'post',
    data
  })
}
//
export function TaskBackGroundRun(data) {
  return request({
    baseURL,
    url: 'TaskBackGround/Run',
    method: 'post',
    data
  })
}
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>-->
          <!--                &lt;!&ndash;                <el-button type="primary" size="mini" />&ndash;&gt;-->
          <!--                &lt;!&ndash;                <el-button type="danger" size="mini">删除</el-button>&ndash;&gt;-->
            <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隐藏,true显示
        // { 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: '请输入cron表达式', trigger: ['blur', 'change'] }
        ],
        apiUrl: [
          { required: true, message: '请输入ApiUrl', trigger: ['blur', 'change'] }
        ],
        requestType: [
          { required: true, message: '请输入请求方式', trigger: ['blur', 'change'] }
        ],
        describe: [
          { required: true, message: '请输入请求描述', trigger: ['blur', 'change'] }
        ]
        // authKey: [
        //   { required: true, message: '请输入authKey', trigger: ['blur', 'change'] }
        // ],
        // authValue: [
        //   { required: true, message: '请输入authValue', 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;
src/views/purchasesManager/goodsStatisticsList.vue
@@ -1,746 +1,41 @@
<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>
      </div>
      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm">
            <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-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>-->
          </div>
          <div
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
          class="bodyTopFormExpand"
        />
      </div>
      <div class="elTableDiv">
        <!--        <TableColumnSettings-->
        <!--          :list1="tableColumnSettingsArray"-->
        <!--          @tableColumnUpdate="tableColumnUpdate"-->
        <!--        />-->
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          class="tableFixed"
          :data="tableData"
          border
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:tableHeight+'px'}"
          highlight-current-row
          :height="tableHeight+'px'"
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
        >
          <!--          @sort-change="sortChange"-->
          <el-table-column
            type="index"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            v-for="item in tableColumnSettingsArray"
            v-if="item.show"
            :key="item.id"
            :sortable="item.sortable"
            :prop="item.prop"
            :min-width="item.minWidth"
            :label="item.label"
            :width="item.width"
            show-tooltip-when-overflow
            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
          >
            <template slot-scope="{row}">
              <div v-if="!row[item.prop]">/</div>
              <div v-else>{{ row[item.prop] }}</div>
            </template>
          </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>-->
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <!--分页-->
      <pagination
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="total ,prev, pager, next,sizes,jumper"
        popper-class="select_bottom"
        @pagination="getOrganizationSearch"
      />
  <div id="app">
    <div class="box">
      <el-input v-model="input" placeholder class="inp" />
      <el-button type="primary" @click="showDialog">生成 cron</el-button>
    </div>
    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="900px"
      top="15vh"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="100px">
        <el-form-item label="存货编码" prop="partcode">
          <el-input v-model="dialogForm.partcode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="存货名称" prop="partname">
          <el-input v-model="dialogForm.partname" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="规格型号" prop="partspec">
          <el-input v-model="dialogForm.partspec" style="width: 200px" />
        </el-form-item>
        <el-form-item label="销售单位" prop="saleUnit">
          <el-input v-model="dialogForm.saleUnit" style="width: 200px" />
        </el-form-item>
        <el-form-item label="数量" prop="sum">
          <el-input v-model="dialogForm.sum" style="width: 200px" />
        </el-form-item>
        <el-form-item label="最新含税售价" prop="newSale">
          <el-input v-model="dialogForm.newSale" style="width: 200px" />
        </el-form-item>
        <el-form-item label="税率%" prop="taxPercent">
          <el-input v-model="dialogForm.taxPercent" style="width: 200px" />
        </el-form-item>
        <el-form-item label="含税单价" prop="newTaxPrice">
          <el-input v-model="dialogForm.newTaxPrice" style="width: 200px" />
        </el-form-item>
        <el-form-item label="金额" prop="money">
          <el-input v-model="dialogForm.money" style="width: 200px" />
        </el-form-item>
        <el-form-item label="含税金额" prop="taxMoney">
          <el-input v-model="dialogForm.taxMoney" style="width: 200px" />
        </el-form-item>
        <el-form-item label="预计交货日期" prop="expectedDate" style="width: 200px" />
        <el-date-picker
          v-model="dialogForm.expectedDate"
          type="date"
          placeholder="选择日期"
        />
        <!--          <el-input v-model="dialogForm.expectedDate" style="width: 200px" />-->
        </el-form-item>
        <el-form-item label="现存量" prop="stockCount">
          <el-input v-model="dialogForm.stockCount" style="width: 200px" />
        </el-form-item>
        <el-form-item label="现存量说明" prop="stockDesc">
          <el-input v-model="dialogForm.stockDesc" type="textarea" style="width: 200px" />
        </el-form-item>
        <el-form-item label="备注" prop="notes">
          <el-input v-model="dialogForm.notes" type="textarea" style="width: 200px" />
        </el-form-item>
        <el-form-item label="退货原因" prop="returnReason">
          <el-input v-model="dialogForm.returnReason" type="textarea" style="width: 200px" />
        </el-form-item>
      </el-form>
      <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>
        </div>
      </span>
    <el-dialog title="生成 cron" :visible.sync="showCron">
      <vcrontab :expression="expression" @hide="showCron=false" @fill="crontabFill" />
    </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 vcrontab from 'vcrontab'
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
// const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
export default {
  name: 'ZZJG',
  components: {
    Pagination, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  components: { vcrontab },
  data() {
    const validateTypeCode = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择上级'))
      } else {
        callback()
      }
    }
    return {
      windowHeight: 0,
      windowWidth: 0,
      mainHeight: 0,
      tableHeight: 0,
      numvalue: 0,
      form: {
        OrgCode: '', // ç»„织架构代码
        OrgName: '', // ç»„织架构名称
        orderdate: '', // å•据日期
        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隐藏,true显示
        // { 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, partcode: 201, partname: '主机', partspec: '', saleUnit: '个', sum: 1000, newScale: 200000, taxPercent: '', newTaxPrice: 200000, money: 200000, taxMoney: 200000, expectedDate: '2023-04-04', stockCount: 300, stockDesc: '', notes: '', returnReason: '' },
        { id: 1002, partcode: 114, partname: '主板2', partspec: '#333', saleUnit: '个', sum: 1000, newScale: 100000, taxPercent: '', newTaxPrice: 100000, money: 100000, taxMoney: 100000, expectedDate: '2023-04-05', stockCount: 500, stockDesc: '', notes: '', returnReason: '' },
        { id: 1003, partcode: 108, partname: '显示器', partspec: '', saleUnit: '个', sum: 2000, newScale: 100000, taxPercent: '', newTaxPrice: 100000, money: 100000, taxMoney: 100000, expectedDate: '2023-04-05', stockCount: 600, stockDesc: '', notes: '', returnReason: '' },
        { id: 1004, partcode: 105, partname: '机箱', partspec: '', saleUnit: '个', sum: 1000, newScale: 20000, taxPercent: '', newTaxPrice: 20000, money: 20000, taxMoney: 20000, expectedDate: '2023-04-06', stockCount: 300, stockDesc: '', notes: '', returnReason: '' },
        { id: 1005, partcode: 103, partname: '硬盘', partspec: '', saleUnit: '个', sum: 1000, newScale: 60000, taxPercent: '', newTaxPrice: 60000, money: 60000, taxMoney: 60000, expectedDate: '2023-04-07', stockCount: 300, stockDesc: '', notes: '', returnReason: '' }
      ],
      dialogVisible: false,
      dialogForm: {
        partcode: '',
        partname: '',
        partspec: '',
        saleUnit: '',
        sum: '',
        newSale: '',
        taxPercent: '',
        newTaxPrice: '',
        money: '',
        taxMoney: '',
        expectedDate: '',
        stockCount: '',
        stockDesc: '',
        notes: '',
        returnReason: ''
      },
      operation: '',
      dialogFormRules: {
        partcode: [
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        partname: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ]
      }
      input: '',
      expression: '',
      showCron: false,
      cronExpression: '*/1 * * * *',
      form: {},
      formLabelWidth: '120px'
      // showCron: false
    }
  },
  // 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()
  },
  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(value) {
      // ç¡®å®šåŽå›žä¼ çš„值
      this.input = value
    },
    async getOrganizationSearch() {
      const res = await OrganizationSearch(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    // æŽ’序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getOrganizationSearch()
    },
    // æŸ¥è¯¢
    search() {
      // this.getOrganizationSearch()
    },
    // é‡ç½®
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      // this.form.OrgType = ''
      // this.form.UserName = ''
      // this.getOrganizationSearch()
    },
    // å•选框改变时
    // æ–°å¢žæŒ‰é’®
    async 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
      })
    },
    // åˆ é™¤æŒ‰é’®
    async del(id) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: id }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getOrganizationSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶
    handleClose() {
      this.dialogForm.OrgType = '部门'
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // å¯¹è¯æ¡†ç¡®è®¤
    dialogVisibleConfirm() {
      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')
          }
          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
            }
          })
        }
      })
    },
    // èŽ·å–é¡µé¢é«˜åº¦
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 195
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    showDialog() {
      this.expression = this.input
      // ä¼ å…¥çš„ cron è¡¨è¾¾å¼ï¼Œå¯ä»¥åè§£æžåˆ° UI ä¸Š
      this.showCron = true
    }
  }
}
</script>
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline {
  margin-right: 15px;
}
::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}
::v-deep .el-button--primary {
  //background-color: $main_color !important;
}
::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}
::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}
::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}
::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}
::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}
::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}
::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}
::v-deep .cell {
  display: flex;
  align-items: center;
  justify-content: space-between;
}
::v-deep .el-table::before {
  height: 0;
}
::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}
::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}
.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}
.tableFixed {
  ::v-deep .el-table__fixed-right {
    height: 100% !important;
  }
  ::v-deep .el-table__fixed {
    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;
}
</style>
vue.config.js
@@ -58,6 +58,14 @@
          ['^' + process.env.VUE_APP_BASE_API]: '/api/'
        }
        // ws: true;//开启ws, å¦‚果是http代理此处可以不用设置
      },
      [process.env.VUE_APP_BASE_API_BASE]: {
        target: 'http://121.196.36.24:8019', // è¯·æ±‚的第三⽅接⼝地址       æœ¬åœ°å¼€å‘服务器
        changeOrigin: true, // è¯·æ±‚跨域时,需 é…ç½®æ­¤é¡¹
        pathRewrite: { // è·¯å¾„重写,替换target中的请求地址
          ['^' + process.env.VUE_APP_BASE_API_BASE]: '/base/'
        }
        // ws: true;//开启ws, å¦‚果是http代理此处可以不用设置
      }
    }
    // before: require('./mock/mock-server.js')