From 38d11c5d99a78a7c65ccb2b24d6f49b97f9c0fdd Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 17 六月 2022 17:27:15 +0800
Subject: [PATCH] 1..完成基础设置：用户清单列表查询、新增、编辑、删除 功能开发

---
 src/views/jcsz/zzjg.vue                 |  130 ++++---
 src/views/jcsz/yhqd.vue                 |  688 +++++++++++++++++++++++++++++++++++++++++++++
 src/views/login/index.vue               |   10 
 src/api/jcsz.js                         |   44 ++
 src/layout/components/Sidebar/index.vue |    1 
 5 files changed, 806 insertions(+), 67 deletions(-)

diff --git a/src/api/jcsz.js b/src/api/jcsz.js
index 3f0a56e..bb43626 100644
--- a/src/api/jcsz.js
+++ b/src/api/jcsz.js
@@ -32,3 +32,47 @@
     params: data
   })
 }
+
+// 鐢ㄦ埛娓呭崟鏌ヨ
+export function UserSearch(data) {
+  return request({
+    url: 'BasicSetting/UserSearch',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐢ㄦ埛鎵�灞炵粍缁囨煡璇�
+export function UserOrganization(data) {
+  return request({
+    url: 'BasicSetting/UserOrganization',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐢ㄦ埛娓呭崟鏂板缂栬緫
+export function AddUpdateUser(data) {
+  return request({
+    url: 'BasicSetting/AddUpdateUser',
+    method: 'post',
+    data
+  })
+}
+
+// 鐢ㄦ埛鍒犻櫎
+export function DeleteUser(data) {
+  return request({
+    url: 'BasicSetting/DeleteUser',
+    method: 'post',
+    params: data
+  })
+}
+// 鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊鏌ヨ
+export function UserAssociationRole(data) {
+  return request({
+    url: 'BasicSetting/UserAssociationRole',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 857b930..6674620 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -39,7 +39,6 @@
 import SidebarItem from './SidebarItem'
 import variables from '@/styles/variables.scss'
 import { LoginMenu } from '@/api/user'
-import axios from 'axios'
 
 export default {
   components: { SidebarItem, Logo },
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 654cc72..d2bcd76 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,13 +1,697 @@
 <template>
+  <div>
+    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
+      <div style="height: 50px;">
+        <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;width: 85%">
+            <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">
+              <el-input v-model="form.UserCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+            </el-form-item>
+            <el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
+              <el-input v-model="form.UserName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+            </el-form-item>
+            <el-form-item label="鎵�灞炵粍缁�" style=" display: flex;">
+              <el-cascader
+                ref="cascader"
+                :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-option
+                  v-for="item in wagetypeArr"
+                  :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.Enable" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="item in EnableArr"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </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-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="usercode"
+            label="鐢ㄦ埛缂栫爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="username"
+            label="鐢ㄦ埛鍚嶇О"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="password"
+            label="鐢ㄦ埛瀵嗙爜"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="org_name"
+            label="鎵�灞炵粍缁�"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="wagetype"
+            label="鎵�灞炵粍缁�"
+            sortable="custom"
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.wagetype==='1'">璁℃椂鍒�</div>
+              <div v-if="row.wagetype==='2'">璁′欢鍒�</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="mobile"
+            label="鑱旂郴鏂瑰紡"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="email"
+            label="鐢靛瓙閭"
+            sortable="custom"
+          />
+          <el-table-column
+            prop=""
+            label="鍦ㄨ亴鐘舵��"
+            sortable="custom"
+          >
+            <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="lm_user"
+            label="鍒涘缓浜哄憳"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="lm_date"
+            label="鍒涘缓鏃堕棿"
+            width="200"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="is_role"
+            label="鍏宠仈瑙掕壊"
+          >
+            <template slot-scope="{row}">
+              <i class="el-icon-share" @click="roleClick({row})" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="鎿嶄綔"
+          >
+            <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="getUserSearch"
+      />
+    </div>
+
+    <!--    鐢ㄦ埛娓呭崟鏂板銆佷慨鏀�-->
+    <el-dialog
+      :title="operation==='add'?'娣诲姞':'淇敼'"
+      :visible.sync="dialogVisible"
+      width="50%"
+      top="15vh"
+      @closed="handleClose"
+    >
+      <el-form ref="dialogForm" :rules="dialogFormRules" inline :model="dialogForm" label-width="80px">
+        <el-form-item label="鐢ㄦ埛缂栫爜" prop="UserCode">
+          <el-input v-model="dialogForm.UserCode" :disabled="operation!=='add'" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="鐢ㄦ埛鍚嶇О" prop="UserName">
+          <el-input v-model="dialogForm.UserName" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="鐢ㄦ埛瀵嗙爜" prop="Password">
+          <el-input v-model="dialogForm.Password" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="鍦ㄨ亴鐘舵��" prop="Enable">
+          <el-select
+            v-model="dialogForm.Enable"
+            style="width: 220px"
+            placeholder="璇烽�夋嫨"
+          >
+            <el-option
+              v-for="item in EnableArr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <div style="display: flex">
+          <el-form-item label="鎵�灞炵粍缁�" prop="StuOrg" style="display: flex">
+            <el-cascader
+              ref="dialogCascader"
+              key="cascaderKey"
+              :options="StuOrgArr"
+              :props="defaultProps"
+              style="width: 220px;"
+              @change="dialogCascaderChange"
+            />
+          </el-form-item>
+          <el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
+            <el-select
+              v-model="dialogForm.wagetype"
+              style="width: 220px"
+              placeholder="璇烽�夋嫨"
+            >
+              <el-option
+                v-for="item in wagetypeArr"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-form-item label="鑱旂郴鏂瑰紡">
+          <el-input v-model="dialogForm.Mobile" style="width: 220px" />
+        </el-form-item>
+        <el-form-item label="鐢靛瓙閭">
+          <el-input v-model="dialogForm.Email" 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="dialogVisibleRoles"
+      width="50%"
+      top="15vh"
+      @closed="handleCloseRoles"
+    >
+
+      <div>
+        <i class="el-icon-s-comment" style="color:#42b983;" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
+      </div>
+      <el-divider />
+      <div>
+        <div style="margin-bottom:20px">
+          <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊绫诲瀷闆嗗悎锛�
+        </div>
+        <el-checkbox-group v-model="dialogFormRoles.rolesArrSelectedArr" @change="dialogCheckboxChange">
+          <el-checkbox
+            v-for="item in dialogFormRoles.rolesArr"
+            :key="item.code"
+            :label="item.name"
+            border
+            size="medium"
+          />
+        </el-checkbox-group>
+      </div>
+      <el-divider />
+      <div>
+        <div style="margin-bottom:20px">
+          <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊锛�
+        </div>
+        <el-tree
+          ref="roleTree"
+          :data="dialogFormRoles.roleTree"
+          show-checkbox
+          node-key="code"
+          default-expand-all
+          :props="defaultPropsOfRoleTree"
+        />
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <div class="footerButton">
+          <el-button @click="rolesDialogVisibleCancel">鍙� 娑�</el-button>
+          <el-button type="primary" @click="rolesDialogVisibleConfirm">纭� 瀹�</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
+import Pagination from '@/components/Pagination'
+import {
+  AddUpdateUser,
+  DeleteUser, UserAssociationRole,
+  UserOrganization,
+  UserSearch
+} from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: "yhqd"
+  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()
+        }
+      }
+    }
+    return {
+      mainHeight: 0,
+      tableHeight: 0,
+      form: {
+        UserCode: '', // 鐢ㄦ埛缂栫爜
+        UserName: '', // 鐢ㄦ埛鍚嶇О
+        StuOrg: '', // 鎵�灞炵粍缁�
+        wagetype: '', // 宸ヨ祫绫诲瀷
+        Enable: '', // 鍦ㄨ亴鐘舵��
+        prop: 'lm_date', // 鎺掑簭瀛楁
+        order: 'desc', // 鎺掑簭瀛楁
+        page: 1, // 绗嚑椤�
+        rows: 10 // 姣忛〉澶氬皯鏉�
+      },
+      StuOrgArr: [], // 鎵�灞炵粍缁囨暟缁�
+      defaultProps: {
+        checkStrictly: true,
+        value: 'code',
+        label: 'name',
+        children: 'children'
+      },
+      EnableArr: [
+        { value: 'Y', label: '鍦ㄨ亴' },
+        { value: 'N', label: '绂昏亴' }
+      ], // 鍦ㄨ亴鐘舵��
+      total: 10,
+      tableData: [],
+      dialogVisible: false,
+      dialogForm: {
+        id: '',
+        UserCode: '',
+        UserName: '',
+        Password: '',
+        Enable: '',
+        StuOrg: '',
+        Mobile: '',
+        Email: '',
+        Operator: '',
+        OperType: '',
+        wagetype: ''
+      },
+      wagetypeArr: [
+        { value: '1', label: '璁′欢鍒�' },
+        { value: '2', label: '璁℃椂鍒�' }
+      ],
+      operation: '',
+      dialogFormRules: {
+        UserCode: [
+          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+        ],
+        UserName: [
+          { required: true, message: '璇疯緭鍏ョ敤鎴峰悕绉�', trigger: ['blur', 'change'] }
+        ],
+        Password: [
+          { required: true, message: '璇疯緭鍏ョ敤鎴峰瘑鐮�', trigger: ['blur', 'change'] }
+        ],
+        Enable: [
+          { required: true, message: '璇烽�夋嫨鍦ㄨ亴鐘舵��', trigger: ['blur', 'change'] }
+        ],
+        StuOrg: [
+          { required: true, message: '璇烽�夋嫨鎵�灞炵粍缁�', trigger: ['blur', 'change'] }
+        ],
+        wagetype: [
+          { required: true, message: '璇烽�夋嫨宸ヨ祫绫诲瀷', trigger: ['blur', 'change'] }
+        ]
+      },
+      // cascaderKey: 0, // 绾ц仈閫夋嫨鍣╧ey
+      dialogVisibleRoles: false,
+      dialogFormRoles: {
+        username: '', // 鐢ㄦ埛鍚嶇О
+        rolesArrSelectedArr: [], // 瑙掕壊绫诲瀷鏁扮粍閫変腑
+        rolesArrSelected: [], // 瑙掕壊绫诲瀷閫変腑
+        rolesArr: [], // 瑙掕壊绫诲瀷闆嗗悎
+        roleTree: [], // 瑙掕壊鏍�
+        rolesAll: []// 瑙掕壊鎵�鏈�
+      },
+
+      defaultPropsOfRoleTree: {
+        value: 'code',
+        label: 'name',
+        children: 'children'
+      }
+
+    }
+  },
+  created() {
+    this.getUserSearch()
+    this.getUserOrganization()
+  },
+  mounted() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods: {
+    // 鑾峰彇鐢ㄦ埛娓呭崟
+    async getUserSearch() {
+      const res = await UserSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
+    },
+    // 鑾峰彇鎵�灞炵粍缁�
+    async getUserOrganization() {
+      const { data: res } = await UserOrganization()
+      this.StuOrgArr = res
+    },
+    // 瀵煎叆鎸夐挳
+    upload() {
+
+    },
+    // 鎺掑簭鏀瑰彉鏃�
+    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.getUserSearch()
+    },
+    // 鏌ヨ
+    search() {
+      this.getUserSearch()
+    },
+    // 閲嶇疆
+    reset() {
+      this.form.UserCode = ''
+      this.form.UserName = ''
+      this.form.StuOrg = ''
+      this.form.Enable = ''
+      this.form.wagetype = ''
+      this.$refs.cascader.checkedValue = ''// 绾ц仈閫夋嫨鍣ㄧ殑娓呯┖
+      this.getUserSearch()
+    },
+    // 绾ц仈閫夋嫨鍣ㄦ敼鍙樹簨浠�
+    cascaderChange(val) {
+      this.form.StuOrg = val[val.length - 1]
+    },
+    dialogCascaderChange(val) {
+      this.dialogForm.StuOrg = val[val.length - 1]
+    },
+    // 鏂板鎸夐挳
+    add(operation) {
+      this.operation = operation
+      this.dialogVisible = true
+    },
+    // 淇敼鎸夐挳
+    edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+      console.log(row)
+
+      this.$nextTick(() => {
+        this.dialogForm.id = row.id
+        this.dialogForm.UserCode = row.usercode
+        this.dialogForm.UserName = row.username
+        this.dialogForm.Password = row.password
+        this.dialogForm.Enable = row.enable
+        this.dialogForm.StuOrg = row.stu_torgcode
+        this.$refs.dialogCascader.checkedValue = row.stu_torgcode
+        this.dialogForm.Mobile = row.mobile
+        this.dialogForm.Email = row.email
+        this.dialogForm.wagetype = row.wagetype
+      })
+    },
+    // 鍒犻櫎鎸夐挳
+    async del(id) {
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        DeleteUser({ Userid: id }).then(res => {
+          if (res.code === '200') {
+            this.$message.success('鍒犻櫎鎴愬姛!')
+            this.getUserSearch()
+          }
+        })
+      }).catch(() => {
+        this.$message.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瀵硅瘽妗嗗叧闂簨浠�
+    handleClose() {
+      this.dialogForm.UserCode = ''
+      this.dialogForm.UserCode = ''
+      this.dialogForm.UserName = ''
+      this.dialogForm.Password = ''
+      this.dialogForm.Enable = ''
+      this.$refs.dialogCascader.checkedValue = ''
+      this.dialogForm.StuOrg = ''
+      this.dialogForm.Mobile = ''
+      this.dialogForm.Email = ''
+      this.dialogForm.wagetype = ''
+      this.$refs.dialogForm.clearValidate()
+    },
+    // 瀵硅瘽妗嗗彇娑�
+    dialogVisibleCancel() {
+      this.dialogVisible = false
+    },
+    // 瀵硅瘽妗嗙‘璁�
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            id: this.dialogForm.id,
+            UserCode: this.dialogForm.UserCode,
+            UserName: this.dialogForm.UserName,
+            Password: this.dialogForm.Password,
+            Enable: this.dialogForm.Enable,
+            // StuOrg: this.dialogForm.StuOrg,
+            StuOrg: this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1].length === 4 ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
+            Mobile: this.dialogForm.Mobile,
+            Email: this.dialogForm.Email,
+            wagetype: this.dialogForm.wagetype,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+          AddUpdateUser(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.getUserSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+            this.dialogVisible = false
+          })
+        }
+      })
+    },
+    // 鑾峰彇椤甸潰楂樺害
+    getHeight() {
+      this.$nextTick(() => {
+        this.mainHeight = window.innerHeight - 200
+        this.tableHeight = this.mainHeight - 100
+      })
+    },
+    // 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
+    async roleClick({ row }) {
+      this.dialogFormRoles.rolesArr = []
+      this.dialogVisibleRoles = true
+      this.dialogFormRoles.username = row.username
+      const { data: res } = await UserAssociationRole({ usercode: row.usercode })
+      this.rolesAll = res
+      res.forEach(item => {
+        this.dialogFormRoles.rolesArr.push({ code: item.code, name: item.name, flag: item.flag })
+      })
+    },
+    dialogCheckboxChange(val, aa) {
+      // this.dialogFormRoles.rolesArrSelectedArr = ['绠＄悊浜哄憳']
+      this.dialogFormRoles.rolesArrSelected = val[val.length - 1]
+      this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.name === this.dialogFormRoles.rolesArrSelected)
+    },
+    // 澶勭悊鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗叧闂簨浠�
+    handleCloseRoles() {
+
+    },
+    // 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗彇娑堜簨浠�
+    rolesDialogVisibleCancel() {
+      this.dialogVisibleRoles = false
+    },
+    // 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗙‘璁や簨浠�
+    rolesDialogVisibleConfirm() {
+      this.dialogVisibleRoles = false
+    }
+  }
 }
 </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;
+}
+
+::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
+}
+
+::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;
+}
 </style>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index beb7b7d..cf1f0fb 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -46,6 +46,7 @@
         <el-table
           :data="tableData"
           border
+          highlight-current-row
           :style="{width: 100+'%',height:tableHeight+'px'}"
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
@@ -130,8 +131,8 @@
       top="15vh"
       @closed="handleClose"
     >
-      <el-form ref="dialogForm" :model="dialogForm" label-width="80px">
-        <el-form-item label="缁勭粐绫诲瀷" required>
+      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+        <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
           <el-radio-group
             v-model="dialogForm.OrgType"
             style="display: flex;align-items: end;height: 29px;"
@@ -145,13 +146,13 @@
             />
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="缁勭粐缂栫爜" required>
-          <el-input v-model="dialogForm.OrgCode" style="width: 220px" />
+        <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="缁勭粐鍚嶇О" required>
+        <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
           <el-input v-model="dialogForm.OrgName" style="width: 220px" />
         </el-form-item>
-        <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" label="涓婄骇鍗曚綅" required>
+        <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
           <el-select
             v-model="dialogForm.SupUnit"
             style="width: 220px"
@@ -159,7 +160,6 @@
           >
             <el-option
               v-for="item in SupUnitArr"
-              :key="item.id"
               :label="item.org_name"
               :value="item.id"
             />
@@ -181,12 +181,31 @@
 import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
 import { getCookie } from '@/utils/auth'
 
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   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,
@@ -219,21 +238,21 @@
       },
       SupUnitArr: [],
       dialogFormOrgTypeSelected: '',
-      operation: ''
-      // dialogFormRules: {
-      //   // OrgType: [
-      //   //   { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }
-      //   // ],
-      //   OrgCode: [
-      //     { required: true, message: '璇疯緭鍏ョ粍缁囩紪鐮�', trigger: 'blur' }
-      //   ],
-      //   OrgName: [
-      //     { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: 'blur' }
-      //   ]
-      //   // SupUnit: [
-      //   //   { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }
-      //   // ]
-      // }
+      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'] }
+        ]
+      }
 
     }
   },
@@ -246,8 +265,9 @@
   },
   methods: {
     async getOrganizationSearch() {
-      const { data: res } = await OrganizationSearch(this.form)
-      this.tableData = res
+      const res = await OrganizationSearch(this.form)
+      this.tableData = res.data
+      this.total = res.count
     },
     // 鎺掑簭鏀瑰彉鏃�
     sortChange({ column, prop, order }) {
@@ -312,10 +332,12 @@
       } else if (row.description === 'L') {
         this.dialogForm.OrgType = '鐢熶骇绾�'
       }
-      this.changeRadio(this.dialogForm.OrgType)
-      this.dialogForm.OrgCode = row.org_code
-      this.dialogForm.OrgName = row.org_name
-      this.dialogForm.SupUnit = row.parent_id
+      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) {
@@ -340,42 +362,36 @@
       this.dialogForm.OrgCode = ''
       this.dialogForm.OrgName = ''
       this.dialogForm.SupUnit = ''
+      this.$refs.dialogForm.clearValidate()
     },
     // 瀵硅瘽妗嗗彇娑�
     dialogVisibleCancel() {
       this.dialogVisible = false
     },
     // 瀵硅瘽妗嗙‘璁�
-    async dialogVisibleConfirm() {
-      if (this.dialogFormOrgTypeSelected.length < 1) {
-        return this.$message.info('缁勭粐绫诲瀷鏈�夛紒')
-      }
-      if (this.dialogForm.OrgCode < 1) {
-        return this.$message.info('缁勭粐缂栫爜鏈～锛�')
-      }
-      if (this.dialogForm.OrgName < 1) {
-        return this.$message.info('缁勭粐鍚嶇О鏈～锛�')
-      }
-      if (this.dialogForm.SupUnit < 1) {
-        return this.$message.info('涓婄骇鍗曚綅鏈�夛紒')
-      }
+    dialogVisibleConfirm() {
+      this.$refs.dialogForm.validate(valid => {
+        if (valid) {
+          const data = {
+            OrganType: this.dialogFormOrgTypeSelected,
+            OrganCode: this.dialogForm.OrgCode,
+            OrganName: this.dialogForm.OrgName,
+            SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+            OperType: this.operation === 'add' ? 'Add' : 'Update',
+            Operator: getCookie('admin')
+          }
+          AddUpdateOrganization(data).then(res => {
+            if (res.code === '200') {
+              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+              this.getOrganizationSearch()
+            } else {
+              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+            }
+          })
 
-      const data = {
-        OrganType: this.dialogFormOrgTypeSelected,
-        OrganCode: this.dialogForm.OrgCode,
-        OrganName: this.dialogForm.OrgName,
-        SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
-        OperType: this.operation === 'add' ? 'Add' : 'Update',
-        Operator: getCookie('admin')
-      }
-      const res = await AddUpdateOrganization(data)
-      if (res.code === '200') {
-        this.$message.success('娣诲姞鎴愬姛锛�')
-        await this.getOrganizationSearch()
-      } else {
-        this.$message.error('娣诲姞澶辫触锛�')
-      }
-      this.dialogVisible = false
+          this.dialogVisible = false
+        }
+      })
     },
     // 鑾峰彇椤甸潰楂樺害
     getHeight() {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f94c563..1c94a2b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -132,6 +132,7 @@
       //   callback()
       // }
       const mPattern = /^\w+$/ // 姝ｅ垯 绛変环浜嶽A-Za-z0-9_]
+
       if (value.length < 5) {
         callback(new Error('璐﹀彿闀垮害涓嶅皯浜庝簲浣嶏紒'))
       } else if (!mPattern.test(value)) {
@@ -153,17 +154,12 @@
         password: '123456'
       },
       loginRules: {
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
+        username: [{ required: true, trigger: ['blur', 'change'], validator: validateUsername }],
+        password: [{ required: true, trigger: ['blur', 'change'], validator: validatePassword }]
       },
       loading: false,
       passwordType: 'password',
       redirect: undefined,
-      // carouselArr: [
-      //   { url: '@/assets/images/img1.png', title: '鏅烘収鐗╄仈', content: '鐢熶骇鐜板満鏁版嵁瀹炴椂閲囬泦銆佷紶杈俱�佸缁村害鍙鍖栧憟鐜�' }
-      //   // { url: 'yellow', title: '鏅烘収鐗╄仈2', content: '鐢熶骇鐜板満鏁版嵁瀹炴椂閲囬泦銆佷紶杈俱�佸缁村害鍙鍖栧憟鐜�2' },
-      //   // { url: 'blue', title: '鏅烘収鐗╄仈3', content: '鐢熶骇鐜板満鏁版嵁瀹炴椂閲囬泦銆佷紶杈俱�佸缁村害鍙鍖栧憟鐜�3' }
-      // ],
       focus1: false,
       focus2: false
     }

--
Gitblit v1.9.3