1.角色关联功能勾选提交功能 2.供方清单(新增、编辑、删除) 功能开发

loulijun2021

2022-06-22 fd59571a8536d48d4029eb7b09a717393f19e210

1.角色关联功能勾选提交功能 2.供方清单(新增、编辑、删除) 功能开发

 src/api/jcsz.js

@@ -186,7 +186,15 @@
export function DeleteCurrentUnit(data) {
  return request({
    url: 'BasicSetting/DeleteCurrentUnit',
    method: 'get',
    method: 'post',
    params: data
  })
}

// è§’色类型下拉接口
export function RoleTypeSelect() {
  return request({
    url: 'BasicSetting/RoleTypeSelect',
    method: 'get'
  })
}

 src/api/sbgl.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
import request from '@/utils/request'

// è®¾å¤‡ç±»åž‹æŸ¥è¯¢
export function DeviceTypeSearch(data) {
  return request({
    url: 'BasicSetting/DeviceTypeSearch',
    method: 'get',
    params: data
  })
}
// è®¾å¤‡ç±»åž‹æ–°å¢ž
export function AddUpdateDeviceType(data) {
  return request({
    url: 'BasicSetting/AddUpdateDeviceType',
    method: 'post',
    data
  })
}
// è®¾å¤‡ç±»åž‹åˆ é™¤
export function DeleteDeviceType(data) {
  return request({
    url: 'BasicSetting/DeleteDeviceType',
    method: 'post',
    params: data
  })
}
// è®¾å¤‡ç±»åž‹ä¸‹æ‹‰æ¡†æŽ¥å£
export function DeviceTypeSelect() {
  return request({
    url: 'BasicSetting/DeviceTypeSelect',
    method: 'get'
  })
}
// è®¾å¤‡ç»„查询
export function DeviceGroupSearch(data) {
  return request({
    url: 'BasicSetting/DeviceGroupSearch',
    method: 'get',
    params: data
  })
}
// è®¾å¤‡ç»„新增
export function AddUpdateDeviceGroup(data) {
  return request({
    url: 'BasicSetting/AddUpdateDeviceGroup',
    method: 'post',
    data
  })
}
// è®¾å¤‡ç»„删除
export function DeleteDeviceGroup(data) {
  return request({
    url: 'BasicSetting/DeleteDeviceGroup',
    method: 'post',
    params: data
  })
}
// è®¾å¤‡ç±»åž‹æŸ¥æ‰¾è®¾å¤‡ç»„
export function DeviceTypeSelectGroup(data) {
  return request({
    url: 'BasicSetting/DeviceTypeSelectGroup',
    method: 'get',
    params: data
  })
}
// è®¾å¤‡æ¸…单查询
export function DeviceMangerSearch(data) {
  return request({
    url: 'BasicSetting/DeviceMangerSearch',
    method: 'get',
    params: data
  })
}
// è®¾å¤‡æ¸…单新增编辑
export function AddUpdateDeviceManger(data) {
  return request({
    url: 'BasicSetting/AddUpdateDeviceManger',
    method: 'post',
    data
  })
}
// è®¾å¤‡æ¸…单删除
export function DeleteDeviceManger(data) {
  return request({
    url: 'BasicSetting/DeleteDeviceManger',
    method: 'post',
    params: data
  })
}
// æ‰€å±žè½¦é—´ä¸‹æ‹‰æŽ¥å£
export function WorkShopSelect() {
  return request({
    url: 'BasicSetting/WorkShopSelect',
    method: 'get'
  })
}

 src/views/jcsz/jsqd.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">
      <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">-->
    <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">-->
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div>
        <el-form
          ref="form"
@@ -18,7 +18,7 @@
              <el-input v-model="form.RoleName" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="角色类型" style=" display: flex;">
              <el-select v-model="form.RoleTypeCode" style="width: calc(100%-30px)" placeholder="请选择">
              <el-select v-model="form.RoleTypeCode" filterable style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in RoleTypeCodeArr2"
                  :key="item.roletype_code"
@@ -47,12 +47,12 @@
        <el-table
          :data="tableData"
          border
          :style="{width: 100+'%',height:tableHeight+'px'}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <!--          :style="{width: 100+'%',height:tableHeight+'px'}"-->

          <!--          <el-table-column-->
          <!--            type="selection"-->
@@ -159,6 +159,7 @@
        <el-form-item prop="RoleTypeCode" label="角色类型">
          <el-select
            v-model="dialogForm.RoleTypeCode"
            filterable
            style="width: 220px"
            placeholder="请选择"
          >
@@ -233,7 +234,7 @@
            <div v-else> {{ row.roletype_name }}</div>
          </template>
        </el-table-column>
        <el-table-column>
        <el-table-column label="操作">

          <template slot-scope="{row}">
            <div class="operationClass">
@@ -297,6 +298,7 @@
            <el-cascader
              ref="dialogCascaderUser"
              key="cascaderKey"
              filterable
              :options="StuOrgArr"
              :props="defaultProps"
              class="userDialogVisibleInput"
@@ -308,6 +310,7 @@
          <el-form-item label="关联角色">
            <el-select
              v-model="dialogFormUser.isrole"
              filterable
              style="width: 220px"
              placeholder="请选择"
              class="userDialogVisibleInput"
@@ -491,7 +494,7 @@
  DeleteRole, RoleAssociationRight,
  RoleAssociationUser,
  RoleSearch, RoleTypeAdd,
  RoleTypeDelete, RoleTypeSearch, SaveRoleAssoctUser, SaveUserAssoctRight, UserOrganization
  RoleTypeDelete, RoleTypeSearch, RoleTypeSelect, SaveRoleAssoctUser, SaveUserAssoctRight, UserOrganization
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
@@ -532,7 +535,7 @@
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 10 // æ¯é¡µå¤šå°‘条
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      total: 10,
      RoleTypeCodeArr: [], // è§’色类型编码数组
@@ -644,13 +647,7 @@
      })
    },
    async getRoleTypeSearch2() { // æœç´¢å±•ç¤ºçš„内容
      const data = {
        page: 1,
        rows: 1000000,
        prop: 'roletype_code',
        order: 'desc'
      }
      const res = await RoleTypeSearch(data)
      const res = await RoleTypeSelect()
      this.RoleTypeCodeArr2 = res.data
    },
    settingButton() {

 src/views/jcsz/wldw.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div style="height: 50px;">
        <el-form
          ref="form"
@@ -17,7 +17,7 @@
              <el-input v-model="form.CuntUnitName" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="单位属性" style=" display: flex;">
              <el-select v-model="form.UnitAttr" style="width: calc(100%-30px)" placeholder="请选择">
              <el-select v-model="form.UnitAttr" filterable style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in UnitAttrArr"
                  :key="item.value"
@@ -30,7 +30,7 @@
              <el-input v-model="form.CreateUser" style="width: calc(100%-30px)" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
@@ -48,6 +48,7 @@
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          :style="{width: 100+'%',height:tableHeight+'px'}"
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
@@ -104,11 +105,6 @@
                <div v-else>/</div>
              </template>
            </el-table-column>
            <!--            <template slot-scope="{row}">-->
            <!--              <div v-if="row.unitattribute==='WG'">外购</div>-->
            <!--              <div v-if="row.unitattribute==='WX'">外协</div>-->
            <!--              <div v-if="row.unitattribute==='KH'">客户</div>-->
            <!--            </template>-->
          </el-table-column>
          <el-table-column
            prop="conttacts"
@@ -171,7 +167,6 @@
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">

        <el-form-item label="供方编码" prop="unitcode">
          <el-input v-model="dialogForm.unitcode" :disabled="operation!=='add'" style="width: 220px" />
        </el-form-item>
@@ -180,9 +175,9 @@
        </el-form-item>
        <el-form-item style="width: 100%" label="供方属性" prop="checkboxIsSelected">
          <el-checkbox-group v-model="dialogForm.checkboxIsSelected" @change="checkboxGroupChange">
            <el-checkbox label="外购供方" />
            <el-checkbox label="外协供方" />
            <el-checkbox label="客户" />
            <el-checkbox key="WG" value="WG" label="外购供方" />
            <el-checkbox key="WX" value="WX" label="外协供方" />
            <el-checkbox key="KH" value="KH" label="客户" />
          </el-checkbox-group>
        </el-form-item>
        <el-form-item label="联系人" prop="person">
@@ -208,14 +203,8 @@
<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateCurrentUnit,
  AddUpdateOrganization,
  CurrentUnitSearch,
  DeleteOrganization,
  OrganizationSearch,
  PrentOrganization
  AddUpdateCurrentUnit, CurrentUnitSearch, DeleteCurrentUnit
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -247,7 +236,7 @@
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 10 // æ¯é¡µå¤šå°‘条
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      UnitAttrArr: [
        { label: '外购供方', value: 'WG' },
@@ -341,7 +330,8 @@
    },
    // å¤é€‰æ¡†æ”¹å˜äº‹ä»¶
    checkboxGroupChange(val) {
      console.log(val)
      this.dialogForm.checkboxIsSelected = val
      this.dialogForm.checkboxIsSelected = this.dialogForm.checkboxIsSelected.filter(item => item !== null)
    },
    // æ–°å¢žæŒ‰é’®
    add(operation) {
@@ -353,10 +343,28 @@
      this.operation = operation
      this.dialogVisible = true

      this.dialogForm.id = row.id
      let mtype = null
      let btype = null
      let htype = null

      if (row.mtype === 'WG') {
        mtype = '外购供方'
      }
      if (row.btype === 'WX') {
        btype = '外协供方'
      }
      if (row.htype === 'KH') {
        htype = '客户'
      }

      this.$nextTick(() => {
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
        this.dialogForm.checkboxIsSelected = [btype, htype, mtype]
        this.dialogForm.unitcode = row.code
        this.dialogForm.unitname = row.name
        this.dialogForm.person = row.conttacts
        this.dialogForm.contact = row.conttphone
        this.dialogForm.description = row.addr
      })
    },
    // åˆ é™¤æŒ‰é’®
@@ -366,12 +374,12 @@
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        // DeleteOrganization({ orgid: id }).then(res => {
        //   if (res.code === '200') {
        //     this.$message.success('删除成功!')
        //     this.getCurrentUnitSearch()
        //   }
        // })
        DeleteCurrentUnit({ unitid: id }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getCurrentUnitSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
@@ -383,6 +391,7 @@
      this.dialogForm.person = ''
      this.dialogForm.contact = ''
      this.dialogForm.description = ''
      this.dialogForm.checkboxIsSelected = []
      this.$refs.dialogForm.clearValidate()
    },
    // å¯¹è¯æ¡†å–消
@@ -417,9 +426,8 @@
            contact: this.dialogForm.contact,
            description: this.dialogForm.description,
            OperType: this.operation === 'add' ? 'Add' : 'Update'
            // Operator: getCookie('admin')
          }
          console.log(data)
          // console.log(data, 2)
          AddUpdateCurrentUnit(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
@@ -499,7 +507,7 @@

::v-deep .el-input__inner {
  height: 30px;
  line-height:30px;
  line-height: 30px;

}


 src/views/jcsz/yhqd.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">
      <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">-->
    <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">-->
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div>
        <el-form
          ref="form"
@@ -20,13 +20,14 @@
            <el-form-item label="所属组织" style=" display: flex;">
              <el-cascader
                ref="cascader"
                filterable
                :options="StuOrgArr"
                :props="defaultProps"
                @change="cascaderChange"
              />
            </el-form-item>
            <el-form-item label="工资类型" style=" display: flex;">
              <el-select v-model="form.wagetype" style="width: calc(100%-30px)" placeholder="请选择">
              <el-select v-model="form.wagetype" filterable style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in wagetypeArr"
                  :key="item.value"
@@ -36,7 +37,7 @@
              </el-select>
            </el-form-item>
            <el-form-item label="在职状态" style=" display: flex;">
              <el-select v-model="form.Enable" style="width: calc(100%-30px)" placeholder="请选择">
              <el-select v-model="form.Enable" filterable style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in EnableArr"
                  :key="item.value"
@@ -56,13 +57,12 @@
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
      </div>
      <!--      :style="{width: 100+'%',height:tableHeight+'px'}"-->
      <div style="display: flex;border: 1px solid #eee">
        <el-table
          :data="tableData"
          border
          highlight-current-row

          :style="{width: 100+'%',height:tableHeight+'px'}"
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
@@ -193,6 +193,7 @@
        <el-form-item label="在职状态" prop="Enable">
          <el-select
            v-model="dialogForm.Enable"
            filterable
            style="width: 220px"
            placeholder="请选择"
          >
@@ -209,6 +210,7 @@
            <el-cascader
              ref="dialogCascader"
              key="cascaderKey"
              filterable
              :options="StuOrgArr"
              :props="defaultProps"
              style="width: 220px;"
@@ -218,6 +220,7 @@
          <el-form-item label="工资类型" prop="wagetype">
            <el-select
              v-model="dialogForm.wagetype"
              filterable
              style="width: 220px"
              placeholder="请选择"
            >
@@ -354,7 +357,7 @@
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 10 // æ¯é¡µå¤šå°‘条
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      StuOrgArr: [], // æ‰€å±žç»„织数组
      defaultProps: {

 src/views/jcsz/zzjg.vue

@@ -1,7 +1,7 @@
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">
      <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">-->
    <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">-->
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div>
        <el-form
          ref="form"
@@ -18,7 +18,7 @@
              <el-input v-model="form.OrgName" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="组织类型" style=" display: flex;">
              <el-select v-model="form.OrgType" style="width: calc(100%-30px)" placeholder="请选择">
              <el-select v-model="form.OrgType" filterable style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  :key="item.value"
@@ -43,11 +43,11 @@
        <!--        <el-button type="primary" icon="el-icon-delete" @click="del">批量删除</el-button>-->
      </div>

      <!--      :style="{width: 100+'%',height:tableHeight+'px'}"-->
      <div style="display: flex;border: 1px solid #eee">
        <el-table
          :data="tableData"
          border
          :style="{width: 100+'%',height:tableHeight+'px'}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -159,10 +159,12 @@
          <el-select
            v-model="dialogForm.SupUnit"
            style="width: 220px"
            filterable
            placeholder="请选择"
          >
            <el-option
              v-for="item in SupUnitArr"
              :key="item.id"
              :label="item.org_name"
              :value="item.id"
            />
@@ -220,7 +222,7 @@
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 10 // æ¯é¡µå¤šå°‘条
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      OrgTypeArr: [
        { label: '工厂', value: 'F' },

 src/views/sbgl/sbqd.vue

@@ -1,11 +1,774 @@
<template />
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div>
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div style="display: flex;justify-content: space-around;">
            <el-form-item label="设备编码" style=" display: flex;">
              <el-input v-model="form.DeviceCode" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.DeviceName" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="使用状态" style=" display: flex;">
              <el-select v-model="form.Status" filterable style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in StatusArr"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="所属车间" style=" display: flex;">
              <el-select v-model="form.WorkShop" filterable style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in WorkShopArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item filterable label="设备类型" style="display: flex;">
              <el-select v-model="form.DeviceType" style="width: calc(100%-30px)" placeholder="请选择" @change="deviceTypeChange">
                <el-option
                  v-for="item in DeviceTypeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="设备组" style=" display: flex;">
              <el-select v-model="form.DeviceGroup" :disabled="form.DeviceType===''" style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in DeviceGroupArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
      </div>
      <div style="margin-bottom: 20px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">设备类型</el-button>
        <el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">设备组</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
      </div>

      <div style="display: flex;border: 1px solid #eee">
        <el-table
          :data="tableData"
          border
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
          <!--          />-->
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
          />
          <el-table-column
            prop="code"
            label="设备编码"
            sortable="custom"
          />
          <el-table-column
            prop="name"
            label="设备名称"
            sortable="custom"
          />
          <el-table-column
            prop="eqptype_name"
            label="设备类型"
            sortable="custom"
          />
          <el-table-column
            prop="eqpgroup_name"
            label="设备组"
            sortable="custom"
          />
          <el-table-column
            prop="enable"
            label="使用状态"
            sortable="custom"
            width="120"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">是</div>
              <div v-if="row.enable==='N'">否</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="input_date"
            label="投入时间"
            sortable="custom"
            width="120"
          >
            <template slot-scope="{row}">
              <div>{{ row.input_date.substring(0, 10) }}</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wksp_name"
            label="生产车间"
            sortable="custom"
          />
          <el-table-column
            prop="Line_name"
            label="所属产线"
            sortable="custom"
          />
          <el-table-column
            prop="operation_ration"
            label="稼动率"
            sortable="custom"
            width="100"
          >
            <template slot-scope="{row}">
              <div>{{ row.operation_ration }}%</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="创建人员"
            sortable="custom"
            width="120"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            sortable="custom"
          />
          <el-table-column
            label="操作"
            width="100"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getDeviceMangerSearch"
      />
    </div>
    <!--设备清单新增编辑-->
    <el-dialog
      :title="operation==='add'?'添加':'修改'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="设备编码" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
        </el-form-item>
        <el-form-item label="设备名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="设备类型" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="设备组" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="投入日期" prop="OrgName">
          <el-date-picker
            v-model="dialogForm.OrgCode"
            type="date"
            placeholder="选择日期"
          />
        </el-form-item>
        <el-form-item label="所属车间" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="所属产线" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item label="使用状态" prop="OrgName">
          <el-select v-model="form.Status" placeholder="请选择">
            <el-option
              v-for="item in StatusArr"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="稼动率" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>

      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 æ¶ˆ</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">ç¡® å®š</el-button>
        </div>
      </span>
    </el-dialog>

    <!--设备类型-->
    <el-dialog
      title="角色类型"
      :visible.sync="DeviceTypeDialogVisible"
      width="50%"
      top="15vh"
      class="DeviceTypeDialogVisible"
      @closed="handleCloseDeviceType"
      @close="handleCloseDeviceType"
    >
      <div style="margin-bottom: 20px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceType">新增</el-button>
        <!--        <el-button type="primary" icon="el-icon-delete" @click="delSetting">删除</el-button>-->
      </div>
      <el-table
        :data="DeviceTypeArray"
        border
        highlight-current-row
        :style="{width: 100+'%',height:tableHeight-300+'px'}"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfDeviceType"
      >
        <el-table-column
          width="50"
          label="序号"
          prop="RowNum"
        />
        <el-table-column
          prop="code"
          label="类型编码"
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="请输入" />
            <div v-else> {{ row.code }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="name"
          label="类型名称"
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.name" placeholder="请输入" />
            <div v-else> {{ row.name }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="remark"
          label="类型描述"
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.remark" placeholder="请输入" />
            <div v-else> {{ row.remark }}</div>
          </template>
        </el-table-column>
        <el-table-column label="操作">
          <template slot-scope="{row}">
            <div class="operationClass">
              <el-button v-if="row.isVisible===0" type="text" @click="DeviceTypeDel(row)">删除</el-button>
              <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeSave(row)">保存</el-button>
              <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeCancel(row)">取消</el-button>
            </div>
          </template>
          <!--          <template v-for="item in RoleTypeCodeArr" slot-scope="{row}">-->
          <!--            <div :key="item.roletype_code" class="operationClass">-->
          <!--              <el-button v-if="item.isVisible" type="text" @click="formSettingSave(row)">保存</el-button>-->
          <!--              <el-button v-if="item.isVisible" type="text" @click="formSettingCancel(row)">取消</el-button>-->
          <!--            </div>-->
          <!--          </template>-->
        </el-table-column>
      </el-table>
      <!--分页-->
      <pagination
        v-show="DeviceTypeTotal>0"
        :total="DeviceTypeTotal"
        :page.sync="formDeviceType.page"
        :limit.sync="formDeviceType.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getDeviceTypeSearchDialog"
      />
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="DeviceTypeDialogVisibleCancel">返回</el-button>
          <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">ç¡® å®š</el-button>-->
        </div>
      </span>
    </el-dialog>

    <!--设备组-->

    <!--导入-->
  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import {
  DeviceGroupSearch,
  DeviceMangerSearch,
  DeviceTypeSearch,
  DeviceTypeSelect,
  DeviceTypeSelectGroup,
  WorkShopSelect
} from '@/api/sbgl'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Sbqd'
  name: 'Zzjg',
  components: {
    Pagination
  },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
          callback()
        }
      }
    }
    const validateTypeCode = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择上级'))
      } else {
        callback()
      }
    }
    return {
      mainHeight: 0,
      tableHeight: 0,
      form: {
        DeviceCode: '', // è®¾å¤‡ç¼–码
        DeviceName: '', // è®¾å¤‡åç§°
        Status: '', // ä½¿ç”¨çŠ¶æ€
        WorkShop: '', // æ‰€å±žè½¦é—´
        DeviceType: '', // è®¾å¤‡ç±»åž‹
        DeviceGroup: '', // è®¾å¤‡ç»„
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 10 // æ¯é¡µå¤šå°‘条
      },
      DeviceTypeArr: [], // è®¾å¤‡ç±»åž‹ä¸‹æ‹‰æ•°ç»„
      StatusArr: [
        { value: 'Y', label: '是' },
        { value: 'N', label: '否' }
      ], // ä½¿ç”¨çŠ¶æ€ä¸‹æ‹‰æ•°ç»„
      WorkShopArr: [], // æ‰€å±žè½¦é—´æ•°ç»„
      DeviceGroupArr: [], // è®¾å¤‡ç»„数组
      total: 10,
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// ä¸Šçº§å•ä½
      },
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ],
        SupUnit: [
          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
        ]
      },
      DeviceTypeDialogVisible: false,
      DeviceTypeArray: [], // è®¾å¤‡ç±»åž‹å¯¹è¯æ¡†å†…的数组
      formDeviceType: {
        // code: '',
        // name: '',
        // group: '',
        // description: '',
        rows: 1,
        row: 10,
        prop: 'code',
        order: 'desc'
      },
      DeviceTypeTotal: 0

    }
  },
  created() {
    // èŽ·å–设备清单列表
    this.getDeviceMangerSearch()
    // èŽ·å–设备类型下拉
    this.getDeviceTypeSelect()
    // èŽ·å–所属车间下拉
    this.getWorkShopSelect()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    // èŽ·å–设备清单列表
    async getDeviceMangerSearch() {
      const res = await DeviceMangerSearch(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    // èŽ·å–所属车间下拉
    async  getWorkShopSelect() {
      const { data: res } = await WorkShopSelect()
      this.WorkShopArr = res
    },
    // èŽ·å–设备类型下拉
    async getDeviceTypeSelect() {
      const { data: res } = await DeviceTypeSelect()
      this.DeviceTypeArr = res
    },
    // è®¾å¤‡ç±»åž‹æ”¹å˜æ—¶
    async  deviceTypeChange(val) {
      this.form.DeviceType = val
      const { data: res } = await DeviceTypeSelectGroup({ eqptypecode: val })
      this.DeviceGroupArr = res
    },

    // æŽ’序改变时
    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.getDeviceMangerSearch()
    },
    // æŸ¥è¯¢
    search() {
      this.getDeviceMangerSearch()
    },
    // å¯¼å…¥
    upload() {

    },

    // é‡ç½®
    reset() {
      this.form.DeviceCode = ''
      this.form.DeviceName = ''
      this.form.Status = ''
      this.form.WorkShop = ''
      this.form.DeviceType = ''
      this.form.DeviceGroup = ''
      this.getDeviceMangerSearch()
    },

    // æ–°å¢žæŒ‰é’®
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // ä¿®æ”¹æŒ‰é’®
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

      this.$nextTick(() => {
        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('删除成功!')
        //     this.getDeviceMangerSearch()
        //   }
        // })
      }).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) {
          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.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
              this.dialogVisible = false
              this.getDeviceMangerSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
            }
          })
        }
      })
    },
    // èŽ·å–页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 200
        this.tableHeight = this.mainHeight - 100
      })
    },

    /* è®¾å¤‡ç±»åž‹æ¨¡å—*/
    // ç‚¹å‡»è®¾å¤‡ç±»åž‹æŒ‰é’®
    deviceTypeButton() {
      this.DeviceTypeDialogVisible = true
      this.getDeviceTypeSearchDialog()
    },
    async getDeviceTypeSearchDialog() {
      const res = await DeviceTypeSearch(this.formDeviceType)
      this.DeviceTypeArray = res.data
      this.DeviceTypeTotal = res.count
      this.DeviceTypeArray.forEach(item => {
        item.isVisible = 0
      })
    },
    // å¤„理对话框关闭
    handleCloseDeviceType() {
      // this.DeviceTypeDialogVisible = false
    },
    // è®¾å¤‡ç±»åž‹è¡¨å•ç‚¹å‡»æŽ’序
    sortChangeOfDeviceType({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.formDeviceType.order = order
      this.formDeviceType.prop = prop
      this.getDeviceTypeSearchDialog()
    },
    // æ–°å¢žæŒ‰é’®
    addDeviceType() {
      this.DeviceTypeArray.unshift({ code: '', name: '', group: '', description: '', isVisible: 1 })
    },
    // åˆ é™¤
    DeviceTypeDel(row) {

    },
    // ä¿å­˜
    DeviceTypeSave(row) {

    },
    // å–消
    DeviceTypeCancel(row) {

    },
    // è¿”回按钮
    DeviceTypeDialogVisibleCancel() {
      this.DeviceTypeDialogVisible = false
    },

    /* è®¾å¤‡ç»„模块*/
    // ç‚¹å‡»è®¾å¤‡ç»„按钮
    deviceGroupButton() {

    }
  }
}
</script>

<style scoped>
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-button--primary {
  background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}

::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}

::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
}

.footerButton {
  display: flex;
  justify-content: end;
}

::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
}

::v-deep .el-button--default:hover {
  color: #606266;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

.DeviceTypeDialogVisible {
  ::v-deep .el-dialog__body {
    padding: 20px 20px !important;
  }
}

::v-deep .el-radio__input.is-checked .el-radio__inner {
  background-color: $main_color;
  border-color: $main_color;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color !important;
}

::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
  border-color: $main_color;
  background-color: $main_color;
}

::v-deep .el-input__inner {
  height: 30px;
  line-height: 30px;
}

::v-deep .el-table .caret-wrapper {
  //float: right;
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex !important;
  align-items: center !important;
  justify-content: space-between !important;
}

::v-deep .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}

.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
}

.el-icon-share {
  color: $main_color;
  cursor: pointer;
}

.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
}

::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
}

::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
  border-color: $main_color;
  background: $main_color;
}

::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
}

::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
  margin: 10px 30px 0px 0;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
}

::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}
</style>

 src/views/template.vue

@@ -30,7 +30,7 @@
              <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
@@ -42,11 +42,11 @@
        <!--        <el-button type="primary" icon="el-icon-delete" @click="del">批量删除</el-button>-->
      </div>

      <!--      :style="{width: 100+'%',height:tableHeight+'px',}"-->
      <div style="display: flex;border: 1px solid #eee">
        <el-table
          :data="tableData"
          border
          :style="{width: 100+'%',height:tableHeight+'px',}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -57,7 +57,7 @@
          <!--            width="50"-->
          <!--          />-->
          <el-table-column
            prop="id"
            prop="RowNum"
            width="50"
            label="序号"
          />