Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

src/api/caseAccess/caseEntry.js

@@ -73,3 +73,11 @@ export function updateCaseLockStatus(data) {
     data: data,
   });
 }
+// 获取证据目录
+export function evidenceTree(data) {
+  return request({
+    url: "/evidence/evidenceTree",
+    method: "get",
+    params: data,
+  });
+}

src/api/deliveryRecord/deliveryRecord.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询邮件列表
+export function emailList(data) {
+    return request({
+        url: '/sendMailRecord/list',
+        method: 'get',
+        params: data
+    })
+}
+
+// 查询短信列表
+export function smsList(data) {
+    return request({
+        url: '/caseApplication/smsRecord',
+        method: 'post',
+        data: data
+    })
+}

src/views/caseManagement/caseList.vue

@@ -132,7 +132,7 @@
           <el-button size="mini" type="text" icon="el-icon-unlock"
             v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1"
             @click="ulockClick(scope.row)">解锁</el-button>
-          <el-button size="mini" type="text" icon="el-icon-upload" @click="uploadCase(scope.row)">上传证据目录</el-button>
+          <el-button  v-if="checkPermi(['caseManagement:list:listEvidence']) && scope.row.caseStatus <= 1" size="mini" type="text" icon="el-icon-upload" @click="uploadCase(scope.row)">上传证据目录</el-button>
           <!-- <el-button
             size="mini"
             type="text"

src/views/caseManagement/components/evidenceDialog.vue

@@ -78,6 +78,7 @@ export default {
         // },
         // 文件上传之前处理
         beforeAvatarUpload(file) {
+            this.uploadFiles = [];
             this.uploadFiles.push(file)
         },
         // 用户点击上传调用

src/views/caseManagement/components/formateCourtDialog.vue

@@ -4,8 +4,9 @@
     <el-dialog
       title="组庭审核"
       :visible="showformateCourt"
+      v-if="showformateCourt"
       @close="cancel"
-      :destroy-on-close="true"
+      destroy-on-close
       center
     >
       <el-form label-width="150px" v-if="!noArbitrator">
@@ -36,7 +37,7 @@
           {{ formateCourtData.arbitratorName }}
         </el-tag>
       </div>
-      <div v-if="isAgreePendTral !== 1">
+      <div v-if="noArbitrator || isAgreePendTral == 0">
         <el-table
           :data="dataList"
           style="width: 100%"
@@ -46,7 +47,7 @@
           <el-table-column
             type="selection"
             width="55"
-            v-if="isAgreePendTral == 0"
+            v-if="noArbitrator || isAgreePendTral == 0"
           >
           </el-table-column>
           <el-table-column
@@ -122,6 +123,11 @@ export default {
     this.getarbitrAtor();
   },
   watch: {
+    showformateCourt(val){
+      if(val){
+        this.isAgreePendTral = 1;
+      }
+    },
     formateCourtData: {
       handler(val) {
         if (val.arbitratorName == null) {

src/views/caseManagement/components/uploadCaseDialog.vue

@@ -1,10 +1,13 @@
 <template>
     <div>
         <el-dialog title="上传证据目录" :visible="uploadCaseVisable" @close="cancel" center :distroy-on-close="true">
-            <el-upload class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
-                :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
-                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+            <el-upload class="upload-demo" :before-upload="beforeUpload" ref="upload" accept=".zip"
+                action="https://jsonplaceholder.typicode.com/posts/" :action="UploadUrl()" :headers="headers"
+                :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove"  :on-success="handleSuccess" :file-list="fileList"
+                :auto-upload="false">
+                <el-button slot="trigger" size="small" type="primary" :disabled="flagBtn">选取文件</el-button>
+                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload" :disabled="flagBtn">上传压缩包</el-button>
+                <div slot="tip" class="el-upload__tip">只能上传zip文件，并且格式为一级目录上传申请书证据材料，二级目录为申请书和证据材料</div>
             </el-upload>
             <div class="title">证据目录结构</div>
             <el-tree :data="data" @node-click="handleNodeClick"></el-tree>
@@ -13,71 +16,42 @@
 </template>
 <!-- hearDate -->
 <script>
-// import { updateHeardate } from '@/api/caseManagement/caseManagement'
+import { evidenceTree } from '@/api/caseAccess/caseEntry.js'
+import { getToken } from "@/utils/auth";
 export default {
     props: ["uploadCaseVisable", "uploadCaseData"],
     data() {
         return {
             fileList: [],
-            data: [{
-                label: '寓件编号_中请人名称 / 中请人',
-                children: [
-                    {
-                        label: '1_货款申调表pdf',
-                    },
-                    {
-                        label: '2_款白同pdf',
-                    },
-                    {
-                        label: '3_抵押证明材林pdt',
-                    },
-                    {
-                        label: '5.贷款利期罚息计算表pdf',
-                    },
-                    {
-                        label: '6.数字签名验证报告.pdl',
-                    },
-                    {
-                        label: '7_律师费明妞报售.pdt',
-                    },
-                ]
+            data: [],
+            headers: {
+                Authorization: "Bearer " + getToken(),
             },
-            {
-                label: '寓件编号_中请人名称 / 中请人',
-                children: [
-                    {
-                        label: '1_货款申调表pdf',
-                    },
-                    {
-                        label: '2_款白同pdf',
-                    },
-                    {
-                        label: '3_抵押证明材林pdt',
-                    },
-                    {
-                        label: '5.贷款利期罚息计算表pdf',
-                    },
-                    {
-                        label: '6.数字签名验证报告.pdl',
-                    },
-                    {
-                        label: '7_律师费明妞报售.pdt',
-                    },
-                ]
-            }],
+            filedata: {
+                id:this.uploadCaseData.id
+            },
+            flagBtn:false
         };
     },
     watch: {
-
+        uploadCaseVisable(val) {
+            if (val) {
+                this.evidenceTreeFn({ caseId: this.uploadCaseData.id })
+            }
+        }
     },
     created() {
 
     },
     methods: {
+        UploadUrl() {
+            return window.location.origin + "/API/caseApplication/uploadZipFile";
+        },
         cancel() {
             this.$emit("uploadCaseCancel");
         },
         submitUpload() {
+            this.filedata.id = this.uploadCaseData.id
             this.$refs.upload.submit();
         },
         handleRemove(file, fileList) {
@@ -88,6 +62,36 @@ export default {
         },
         handleNodeClick(data) {
             console.log(data);
+        },
+        // 递归替换key
+        setData(data) {
+            data.forEach((val, i) => {
+                val.label = val.evidenceName
+                this.setData(val.children)
+            })
+        },
+        // 获取证据目录
+        evidenceTreeFn(data) {
+            evidenceTree(data).then(res => {
+                this.setData(res.data);
+                this.data = res.data;
+                if(this.data.length > 0){
+                    this.flagBtn = true;
+                }else{
+                    this.flagBtn = false;
+                }
+            })
+        },
+        handleSuccess(){
+            this.evidenceTreeFn({ caseId: this.uploadCaseData.id })
+        },
+        beforeUpload(file) {
+            console.log(file.type);
+            const isZip = file.type === 'application/x-zip-compressed'
+            if (!isZip) {
+                this.$message.error('只能上传zip格式的文件')
+            }
+            return isZip
         }
     },
 };
@@ -100,4 +104,8 @@ export default {
     font-size: 18px;
     font-weight: 600;
 }
+
+.el-upload__tip {
+    color: red;
+}
 </style>

src/views/deliveryRecord/emailRecord.vue

@@ -0,0 +1,94 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+            <el-form-item label="案件编号" prop="caseNum">
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="dataList" style="width: 100%">
+            <el-table-column label="序号" type="index" align="center">
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
+            <el-table-column label="名称" align="center" prop="mailName" :show-overflow-tooltip="true" />
+            <!-- <el-table-column label="证件号码" align="center" prop="caseNum" :show-overflow-tooltip="true" /> -->
+            <el-table-column label="邮箱地址" align="center" prop="mailAddress" />
+            <el-table-column label="发送时间" align="center" prop="sendTime" :show-overflow-tooltip="true" />
+            <!-- <el-table-column label="文书类型" align="center" prop="hearDate" :show-overflow-tooltip="true" /> -->
+            <!-- 缴费人 -->
+            <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
+            <el-table-column label="内容" align="center" prop="mailContent"></el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList(queryParams)" />
+       
+    </div>
+</template>
+  
+<script>
+import {
+    emailList,
+} from "@/api/deliveryRecord/deliveryRecord.js";
+
+import { getDicts } from '@/api/system/dict/data.js'
+export default {
+    name: "paymentList",
+    dicts: ["case_status"],
+    components: { },
+    data() {
+        return {
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+            },
+            caseStatus: [],
+            // 遮罩层
+            loading: false,
+            // 总条数
+            total: 0,
+            // 表格数据
+            form: {},
+            // 校验表单
+            rules: {},
+            dataList: [],
+        };
+    },
+    created() {
+        getDicts("case_status").then(res => {
+            this.caseStatus = res.data;
+            this.getList(this.queryParams);
+        })
+    },
+    methods: {
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList(this.queryParams);
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 查询列表数据
+        getList(parms) {
+            this.loading = true;
+            emailList(parms).then((response) => {
+                this.dataList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped></style>

src/views/deliveryRecord/smsRecord.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+            <el-form-item label="案件编号" prop="caseNum">
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="案件状态" prop="caseStatus">
+                <el-select v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable
+                    @keyup.enter.native="handleQuery">
+                    <el-option v-for="dict in caseStatus" :key="dict.dictSort" :label="dict.dictLabel"
+                        :value="dict.dictSort"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-table v-loading="loading" :data="dataList" style="width: 100%">
+            <el-table-column label="序号" type="index" align="center">
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
+            <el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
+            <el-table-column label="发送时间" align="center" prop="sendTime" />
+            <el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true" />
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList(queryParams)" />
+       
+    </div>
+</template>
+  
+<script>
+import {
+    smsList,
+} from "@/api/deliveryRecord/deliveryRecord.js";
+
+import { getDicts } from '@/api/system/dict/data.js'
+export default {
+    name: "paymentList",
+    dicts: ["case_status"],
+    components: { },
+    data() {
+        return {
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+            },
+            caseStatus: [],
+            // 遮罩层
+            loading: false,
+            // 总条数
+            total: 0,
+            // 表格数据
+            form: {},
+            // 校验表单
+            rules: {},
+            dataList: [],
+        };
+    },
+    created() {
+        getDicts("case_status").then(res => {
+            this.getList(this.queryParams);
+        })
+    },
+    methods: {
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList(this.queryParams);
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 查询列表数据
+        getList(parms) {
+            this.loading = true;
+            smsList(parms).then((response) => {
+                this.dataList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped></style>

src/views/officialSeal/officialSealList.vue

@@ -0,0 +1,103 @@
+<template>
+    <div class="app-container">
+        <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+            <el-form-item label="案件编号" prop="caseNum">
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form> -->
+        <el-table v-loading="loading" :data="dataList" style="width: 100%">
+            <el-table-column label="序号" type="index" align="center">
+                <template slot-scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="仲裁机构名称" align="center" prop="caseNum" :show-overflow-tooltip="true" />
+            <el-table-column label="公章名称" align="center" prop="mailName" :show-overflow-tooltip="true" />
+            <el-table-column label="经办人姓名" align="center" prop="caseNum" :show-overflow-tooltip="true" />
+            <el-table-column label="经办人手机号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
+            <el-table-column label="认证时间" align="center" prop="mailAddress" />
+            <el-table-column label="认证状态" align="center" prop="sendTime" :show-overflow-tooltip="true" />
+            <el-table-column label="是否启用" align="center" prop="caseStatusName">
+                <template slot-scope="scope">
+                    <el-switch v-model="dataList[scope.$index].depytype" active-text="是" inactive-text="否">
+                    </el-switch>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-thumb">认证</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-view">查看详情</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList(queryParams)" />
+
+    </div>
+</template>
+  
+<script>
+import {
+    emailList,
+} from "@/api/deliveryRecord/deliveryRecord.js";
+
+import { getDicts } from '@/api/system/dict/data.js'
+export default {
+    name: "paymentList",
+    dicts: ["case_status"],
+    components: {},
+    data() {
+        return {
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+            },
+            caseStatus: [],
+            // 遮罩层
+            loading: false,
+            // 总条数
+            total: 0,
+            // 表格数据
+            form: {},
+            // 校验表单
+            rules: {},
+            dataList: [],
+        };
+    },
+    created() {
+        getDicts("case_status").then(res => {
+            this.caseStatus = res.data;
+            this.getList(this.queryParams);
+        })
+    },
+    methods: {
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList(this.queryParams);
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 查询列表数据
+        getList(parms) {
+            this.loading = true;
+            emailList(parms).then((response) => {
+                this.dataList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped></style>

src/views/system/dept/index.vue

@@ -2,21 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -27,40 +18,22 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd(1)"
+          v-hasPermi="['system:dept:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
+    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
@@ -70,28 +43,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']">新增</el-button>
+          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
+            @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -100,7 +57,12 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
+          <!-- <el-col :span="24" v-if="form.parentId !== 0">
+            <el-form-item label="上级部门" prop="parentId">
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24" v-if="flag">
             <el-form-item label="上级部门" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
             </el-form-item>
@@ -136,14 +98,18 @@
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="部门类型" prop="deptType">
+              <el-input v-model="form.deptType" placeholder="请输入部门编码" maxlength="50" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
+                  :label="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -168,6 +134,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      flag:false,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -199,6 +166,9 @@ export default {
         deptName: [
           { required: true, message: "部门名称不能为空", trigger: "blur" }
         ],
+        deptType: [
+          { required: true, message: "部门类型不能为空", trigger: "blur" }
+        ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
@@ -272,6 +242,12 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
+      console.log(row,"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL");
+      if(row == 1){
+        this.flag = false;
+      }else{
+        this.flag = true;
+      }
       this.reset();
       if (row != undefined) {
         this.form.parentId = row.deptId;
@@ -307,7 +283,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.deptId != undefined) {
@@ -328,12 +304,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function () {
         return delDept(row.deptId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 };