From fd59571a8536d48d4029eb7b09a717393f19e210 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 22 六月 2022 17:29:46 +0800
Subject: [PATCH] 1.角色关联功能勾选提交功能 2.供方清单(新增、编辑、删除) 功能开发

---
 src/views/jcsz/zzjg.vue |   12 
 src/views/jcsz/wldw.vue |   74 ++-
 src/views/jcsz/yhqd.vue |   17 
 src/views/jcsz/jsqd.vue |   25 
 src/views/sbgl/sbqd.vue |  769 +++++++++++++++++++++++++++++++++++++++++++++
 src/api/jcsz.js         |   10 
 src/api/sbgl.js         |   96 +++++
 src/views/template.vue  |    6 
 8 files changed, 943 insertions(+), 66 deletions(-)

diff --git a/src/api/jcsz.js b/src/api/jcsz.js
index 2542b54..e7443e4 100644
--- a/src/api/jcsz.js
+++ b/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'
+  })
+}
diff --git a/src/api/sbgl.js b/src/api/sbgl.js
new file mode 100644
index 0000000..7e1013e
--- /dev/null
+++ b/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'
+  })
+}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0eaa63c..8ed5b4e 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/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() {
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 2dbf1d1..54529c5 100644
--- a/src/views/jcsz/wldw.vue
+++ b/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;
 
 }
 
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 0583958..fa4d2b0 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/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: {
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 248f1ea..5db2047 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/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' },
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index cb05b35..f35e4a2 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/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>
diff --git a/src/views/template.vue b/src/views/template.vue
index 90f08f0..2b60672 100644
--- a/src/views/template.vue
+++ b/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="搴忓彿"
           />

--
Gitblit v1.9.3