loulijun2021
2023-07-19 5cf009d5ee7cd782a360848d5c2d7b71aec4d8af
1.接入signalR 消息推送功能
已添加1个文件
已修改9个文件
991 ■■■■ 文件已修改
package.json 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Navbar.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Sidebar/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/settings.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/settings.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/signalR.js 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchasesManager/InventoryLedgerList.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchasesManager/goodsStatisticsList.vue 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchasesManager/salesStatisticsList.vue 788 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json
@@ -14,6 +14,7 @@
    "test:ci": "npm run lint && npm run test:unit"
  },
  "dependencies": {
    "@microsoft/signalr": "^7.0.9",
    "axios": "0.18.1",
    "core-js": "3.6.5",
    "cronstrue": "^2.28.0",
@@ -41,6 +42,7 @@
    "vuedraggable": "^2.24.3"
  },
  "devDependencies": {
    "@aspnet/signalr": "^1.0.27",
    "@vue/cli-plugin-babel": "4.4.4",
    "@vue/cli-plugin-eslint": "4.4.4",
    "@vue/cli-plugin-unit-jest": "4.4.4",
src/layout/components/Navbar.vue
@@ -64,6 +64,13 @@
          <el-tooltip class="item" effect="dark" content="全屏" placement="bottom">
            <screenfull id="screenfull" class="right-menu-item hover-effect" />
          </el-tooltip>
          <el-tooltip class="item" effect="dark" content="我的消息" placement="bottom">
            <el-badge :is-dot="$store.state.settings.isDot" class="item right-menu-item hover-effect">
              <i class="el-icon-bell" @click="$message('点击了我的消息!');$store.state.settings.isDot=false" />
            </el-badge>
          </el-tooltip>
          <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA;padding:0 8px;cursor: pointer">
            {{ stu_torgname }}
          </div>
@@ -228,6 +235,18 @@
    this.username = getCookie('username')
    this.stu_torgname = getCookie('stu_torgname') === '' ? '系统管理员' : getCookie('stu_torgname')
  },
  mounted() {
    this.$signalr.off('SendAll')
    this.$signalr.on('SendAll', (res) => {
      this.$notify({
        offset: 80,
        type: 'warning',
        title: '消息提醒',
        message: res
      })
      this.$store.state.settings.isDot = true
    })
  },
  computed: {
    ...mapGetters([
      'sidebar',
@@ -285,6 +304,7 @@
      this.$store.dispatch('app/toggleSideBar')
    },
    async logout() {
      this.$signalr.off('SendAll')
      await this.$store.dispatch('user/logout')
      this.$message.success('退出成功!')
      this.$router.push(`/login`)
@@ -322,6 +342,12 @@
}
</script>
<style lang="scss" scoped>
::v-deep .el-badge__content {
  position: absolute !important;
  top: 12px !important;
  right: 10px !important;
}
.display_btw {
  display: flex;
  justify-content: space-between;
src/layout/components/Sidebar/index.vue
@@ -42,7 +42,7 @@
    <div v-if="!$store.state.settings.menuIsHorizontal" style="position: absolute;bottom: 20px;left: 30px;">
      <div>
        <el-button v-if="$store.state.app.sidebar.opened" type="text" style="font-size: 14px;cursor: pointer">
          æ–°å‡¯è¿ªåˆ¶é€ V1.6.52
          æ–°å‡¯è¿ªåˆ¶é€ V1.6.53
        </el-button>
        <!--        <el-button type="text"><a href="http://www.ykxkd.com/" target="_blank">新凯迪制造V1.0.01</a></el-button>-->
      </div>
src/main.js
@@ -70,6 +70,9 @@
// å¼•用修改过的gantt
Vue.use(vGanttChart)
import signalr from './utils/signalR'
Vue.prototype.$signalr = signalr.signal
import { setCookie } from '@/utils/auth' // å¼•用修改过的gantt
// åˆ¤æ–­æ˜¯å¦èµ°åŽŸå¹³å°è¿‡æ¥
if (window.location.hash.indexOf('guid') !== -1) {
src/settings.js
@@ -34,6 +34,8 @@
  animationType: 'fade-transform', // åŠ¨ç”»ç±»åž‹     åˆå§‹ç±»åž‹:fade-transform
  orgType: ''// ç»„织类型  D éƒ¨é—¨   W è½¦é—´  '' ç®¡ç†å‘˜
  orgType: '', // ç»„织类型  D éƒ¨é—¨   W è½¦é—´  '' ç®¡ç†å‘˜
  isDot: false// æˆ‘的消息右上角小红点  true æ˜¾ç¤º   false éšè—
}
src/store/modules/settings.js
@@ -9,7 +9,8 @@
  headBackgroundColorValue,
  menuIsHorizontal,
  leftBackgroundColorValue,
  animationType
  animationType,
  isDot
} = defaultSettings
const state = {
@@ -17,6 +18,7 @@
  leftBackgroundColorValue: leftBackgroundColorValue, // å·¦è¾¹èƒŒæ™¯é¢œè‰²
  headBackgroundColorValue: headBackgroundColorValue, // å¤´éƒ¨èƒŒæ™¯é¢œè‰²
  menuIsHorizontal: menuIsHorizontal, // èœå•是否是横屏
  isDot: isDot,
  theme: variables.theme,
  showSettings: showSettings,
  fixedHeader: fixedHeader,
src/utils/signalR.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
import * as signalR from '@aspnet/signalr'
const url = 'http://121.196.36.24:8019/chatHub'
const signal = new signalR.HubConnectionBuilder()
  .withUrl(url, {
    // skipNegotiation: true,
    // transport: signalR.HttpTransportType.WebSockets
  })
  .configureLogging(signalR.LogLevel.Information)
  .build()
// signal.on('SendAll', (res) => {
//   console.log(res, '收到消息了')
// })
signal.start().then(() => {
  if (window.Notification) {
    if (Notification.permission === 'granted') {
      console.log('允许通知')
    } else if (Notification.permission !== 'denied') {
      console.log('需要通知权限')
      Notification.requestPermission((permission) => {
        console.log('权限通知', permission)
      })
    } else if (Notification.permission === 'denied') {
      console.log('拒绝通知')
    }
  } else {
    console.error('浏览器不支持Notification')
  }
  console.log('连接成功')
})
// signal.onclose((err) => {
//   console.log('连接已经断开 æ‰§è¡Œå‡½æ•°onclose', err)
// })
export default {
  signal
}
src/views/purchasesManager/InventoryLedgerList.vue
@@ -410,6 +410,7 @@
      },
      dialogVisible2: false,
      OrgTypeArrxx: [],
      recordData: []// æŸ¥çœ‹è®°å½•数组
    }
@@ -637,7 +638,7 @@
::v-deep .pop_btn {
  .el-button--primary {
  float: right;
    float: right;
  }
}
src/views/purchasesManager/goodsStatisticsList.vue
@@ -1,41 +1,84 @@
<template>
  <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 title="生成 cron" :visible.sync="showCron">
      <vcrontab :expression="expression" @hide="showCron=false" @fill="crontabFill" />
    </el-dialog>
  </div>
</template>
<script>
import vcrontab from 'vcrontab'
<!--<template>-->
<!--  <div class="home">-->
<!--    <h1>前端演示SignalR</h1>-->
<!--    <input v-model="user" type="text">-->
<!--    <input v-model="message" type="text">-->
<!--    <button @click="sendAll">发送全部</button>-->
<!--    <button @click="sendOwn">对自己发送</button>-->
<!--    <button @click="sendOther">对其他发送</button>-->
<!--    <div>-->
<!--      <ul v-for="(item, index) in messages" :key="index + 'itemMessage'">-->
<!--        <li>{{ item.user }} says {{ item.message }}</li>-->
<!--      </ul>-->
<!--    </div>-->
<!--  </div>-->
<!--</template>-->
export default {
  components: { vcrontab },
  data() {
    return {
      input: '',
      expression: '',
      showCron: false,
      cronExpression: '*/1 * * * *',
      form: {},
      formLabelWidth: '120px'
      // showCron: false
    }
  },
  methods: {
    crontabFill(value) {
      // ç¡®å®šåŽå›žä¼ çš„值
      this.input = value
    },
    showDialog() {
      this.expression = this.input
      // ä¼ å…¥çš„ cron è¡¨è¾¾å¼ï¼Œå¯ä»¥åè§£æžåˆ° UI ä¸Š
      this.showCron = true
    }
  }
}
</script>
}
<!--<script>-->
<!--// @ is an alias to /src-->
<!--import * as signalR from '@aspnet/signalr'-->
<!--export default {-->
<!--  name: 'Home',-->
<!--  components: {},-->
<!--  data() {-->
<!--    return {-->
<!--      user: 's2', // ç”¨æˆ·-->
<!--      message: '22222', // æ¶ˆæ¯-->
<!--      connection: '', // signalr连接-->
<!--      messages: [] // è¿”回消息-->
<!--    }-->
<!--  },-->
<!--  created: function() {-->
<!--    const thisVue = this-->
<!--    this.connection = new signalR.HubConnectionBuilder()-->
<!--      .withUrl('http://121.196.36.24:8019/chatHub', {-->
<!--        // skipNegotiation: true,-->
<!--        // transport: signalR.HttpTransportType.WebSockets-->
<!--      })-->
<!--      .configureLogging(signalR.LogLevel.Information)-->
<!--      .build()-->
<!--    console.log(this.connection, 1)-->
<!--    this.connection.on('ReceiveMessage', function(user, message) {-->
<!--      debugger-->
<!--      thisVue.messages.push({ user, message })-->
<!--      console.log({ user, message })-->
<!--    })-->
<!--    this.connection.on('ReceiveCaller', function(message) {-->
<!--      debugger-->
<!--      const user = '自己' // è¿™é‡Œä¸ºäº†push不报错,我就弄了一个默认值。-->
<!--      thisVue.messages.push({ user, message })-->
<!--      console.log({ user, message })-->
<!--    })-->
<!--    this.connection.start()-->
<!--  },-->
<!--  methods: {-->
<!--    // ç»™å…¨éƒ¨å‘送消息-->
<!--    sendAll: function() {-->
<!--      this.connection-->
<!--        .invoke('SendMessage', this.user, this.message)-->
<!--        .catch(function(err) {-->
<!--          return console.error(err)-->
<!--        })-->
<!--    },-->
<!--    // åªç»™è‡ªå·±å‘送消息-->
<!--    sendOwn: function() {-->
<!--      this.connection-->
<!--        .invoke('SendMessageCaller', this.message)-->
<!--        .catch(function(err) {-->
<!--          return console.error(err)-->
<!--        })-->
<!--    },-->
<!--    // ç»™å…¶ä»–人员发送消息-->
<!--    sendOther: function() {-->
<!--      this.connection-->
<!--        .invoke('SendMessageOther', this.user, this.message)-->
<!--        .catch(function(err) {-->
<!--          return console.error(err)-->
<!--        })-->
<!--    }-->
<!--  }-->
<!--}-->
<!--</script>-->
src/views/purchasesManager/salesStatisticsList.vue
@@ -1,746 +1,94 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
    <!--    <input v-model="user" type="text">-->
    <!--    <input v-model="message" type="text"><br>-->
    <!--    <button @click="SendAll">发送</button>-->
    <!--    <hr>-->
    <!--    <ul>-->
    <!--      <li v-for="(item, index) in msgList" :key="index">-->
    <!--        {{ item.user }}:&nbsp;&nbsp;&nbsp;&nbsp;{{ item.msg }}-->
    <!--      </li>-->
    <!--    </ul>-->
      <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"-->
    <button @click="onClickButton">
      æ‰‹åŠ¨å‘é€
    </button>
          <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>
    <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>
    <div style="margin: 200px">{{ msg }}</div>
  </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 * as signalR from '@microsoft/signalr'
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
// const SER_HZ = /^[a-zA-Z0-9_;,.<>() ]{0,}$/
export default {
  name: 'ZZJG',
  components: {
    Pagination, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  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'] }
        ]
      }
      // connection: '',
      // user: '',
      // message: '',
      // msgList: []
      msg: ''
    }
  },
  // 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.init()
  },
  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()
    },
    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()
          }
    onClickButton() {
      this.$signalr.invoke('SendMessage', 'xx')// ç”¨äºŽæ‰‹åŠ¨å‘é€æ¶ˆæ¯çš„æ–¹å¼
        .catch(function(err) {
          return console.error(err)
        })
      }).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'
    }
    //
    // init() {
    //   this.connection = new signalR.HubConnectionBuilder()
    //     .withUrl('http://121.196.36.24:8019/chatHub', {})
    //     .configureLogging(signalR.LogLevel.Error)
    //     .build()
    //   this.connection.on('ReceiveMessage', data => {
    //     this.msgList.push(data)
    //   })
    //
    //   this.connection.start().then(() => {
    //     if (window.Notification) {
    //       if (Notification.permission === 'granted') {
    //         console.log('允许通知')
    //       } else if (Notification.permission !== 'denied') {
    //         console.log('需要通知权限')
    //         Notification.requestPermission((permission) => {
    //           console.log('权限通知', permission)
    //         })
    //       } else if (Notification.permission === 'denied') {
    //         console.log('拒绝通知')
    //       }
    //     } else {
    //       console.error('浏览器不支持Notification')
    //     }
    //     console.log('连接成功')
    //   })
    //
    //   this.connection.on('SendAll', (res) => {
    //     console.log(res, '收到消息')
    //   })
    //
    //   // this.connection.start().then(() => {
    //   //   this.connection.invoke('SendAll', '123', '我连上啦')
    //   // })
    // },
    // SendAll() {
    //   const params = {
    //     user: this.user,
    //     message: this.message
    //   }
    //   this.connection.invoke('SendAll', params)
    // }
  }
}
</script>
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
<style></style>
.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>