fz 2 лет назад
Родитель
Сommit
c7944211fa

+ 8
- 0
src/api/caseAccess/caseEntry.js Просмотреть файл

73
     data: data,
73
     data: data,
74
   });
74
   });
75
 }
75
 }
76
+// 获取证据目录
77
+export function evidenceTree(data) {
78
+  return request({
79
+    url: "/evidence/evidenceTree",
80
+    method: "get",
81
+    params: data,
82
+  });
83
+}

+ 19
- 0
src/api/deliveryRecord/deliveryRecord.js Просмотреть файл

1
+import request from '@/utils/request'
2
+
3
+// 查询邮件列表
4
+export function emailList(data) {
5
+    return request({
6
+        url: '/sendMailRecord/list',
7
+        method: 'get',
8
+        params: data
9
+    })
10
+}
11
+
12
+// 查询短信列表
13
+export function smsList(data) {
14
+    return request({
15
+        url: '/caseApplication/smsRecord',
16
+        method: 'post',
17
+        data: data
18
+    })
19
+}

+ 1
- 1
src/views/caseManagement/caseList.vue Просмотреть файл

132
           <el-button size="mini" type="text" icon="el-icon-unlock"
132
           <el-button size="mini" type="text" icon="el-icon-unlock"
133
             v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1"
133
             v-if="checkPermi(['caseManagement:list:lock']) && scope.row.lockStatus == 1"
134
             @click="ulockClick(scope.row)">解锁</el-button>
134
             @click="ulockClick(scope.row)">解锁</el-button>
135
-          <el-button size="mini" type="text" icon="el-icon-upload" @click="uploadCase(scope.row)">上传证据目录</el-button>
135
+          <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>
136
           <!-- <el-button
136
           <!-- <el-button
137
             size="mini"
137
             size="mini"
138
             type="text"
138
             type="text"

+ 1
- 0
src/views/caseManagement/components/evidenceDialog.vue Просмотреть файл

78
         // },
78
         // },
79
         // 文件上传之前处理
79
         // 文件上传之前处理
80
         beforeAvatarUpload(file) {
80
         beforeAvatarUpload(file) {
81
+            this.uploadFiles = [];
81
             this.uploadFiles.push(file)
82
             this.uploadFiles.push(file)
82
         },
83
         },
83
         // 用户点击上传调用
84
         // 用户点击上传调用

+ 9
- 3
src/views/caseManagement/components/formateCourtDialog.vue Просмотреть файл

4
     <el-dialog
4
     <el-dialog
5
       title="组庭审核"
5
       title="组庭审核"
6
       :visible="showformateCourt"
6
       :visible="showformateCourt"
7
+      v-if="showformateCourt"
7
       @close="cancel"
8
       @close="cancel"
8
-      :destroy-on-close="true"
9
+      destroy-on-close
9
       center
10
       center
10
     >
11
     >
11
       <el-form label-width="150px" v-if="!noArbitrator">
12
       <el-form label-width="150px" v-if="!noArbitrator">
36
           {{ formateCourtData.arbitratorName }}
37
           {{ formateCourtData.arbitratorName }}
37
         </el-tag>
38
         </el-tag>
38
       </div>
39
       </div>
39
-      <div v-if="isAgreePendTral !== 1">
40
+      <div v-if="noArbitrator || isAgreePendTral == 0">
40
         <el-table
41
         <el-table
41
           :data="dataList"
42
           :data="dataList"
42
           style="width: 100%"
43
           style="width: 100%"
46
           <el-table-column
47
           <el-table-column
47
             type="selection"
48
             type="selection"
48
             width="55"
49
             width="55"
49
-            v-if="isAgreePendTral == 0"
50
+            v-if="noArbitrator || isAgreePendTral == 0"
50
           >
51
           >
51
           </el-table-column>
52
           </el-table-column>
52
           <el-table-column
53
           <el-table-column
122
     this.getarbitrAtor();
123
     this.getarbitrAtor();
123
   },
124
   },
124
   watch: {
125
   watch: {
126
+    showformateCourt(val){
127
+      if(val){
128
+        this.isAgreePendTral = 1;
129
+      }
130
+    },
125
     formateCourtData: {
131
     formateCourtData: {
126
       handler(val) {
132
       handler(val) {
127
         if (val.arbitratorName == null) {
133
         if (val.arbitratorName == null) {

+ 59
- 51
src/views/caseManagement/components/uploadCaseDialog.vue Просмотреть файл

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
         <el-dialog title="上传证据目录" :visible="uploadCaseVisable" @close="cancel" center :distroy-on-close="true">
3
         <el-dialog title="上传证据目录" :visible="uploadCaseVisable" @close="cancel" center :distroy-on-close="true">
4
-            <el-upload class="upload-demo" ref="upload" action="https://jsonplaceholder.typicode.com/posts/"
5
-                :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
6
-                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
7
-                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
4
+            <el-upload class="upload-demo" :before-upload="beforeUpload" ref="upload" accept=".zip"
5
+                action="https://jsonplaceholder.typicode.com/posts/" :action="UploadUrl()" :headers="headers"
6
+                :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove"  :on-success="handleSuccess" :file-list="fileList"
7
+                :auto-upload="false">
8
+                <el-button slot="trigger" size="small" type="primary" :disabled="flagBtn">选取文件</el-button>
9
+                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload" :disabled="flagBtn">上传压缩包</el-button>
10
+                <div slot="tip" class="el-upload__tip">只能上传zip文件,并且格式为一级目录上传申请书证据材料,二级目录为申请书和证据材料</div>
8
             </el-upload>
11
             </el-upload>
9
             <div class="title">证据目录结构</div>
12
             <div class="title">证据目录结构</div>
10
             <el-tree :data="data" @node-click="handleNodeClick"></el-tree>
13
             <el-tree :data="data" @node-click="handleNodeClick"></el-tree>
13
 </template>
16
 </template>
14
 <!-- hearDate -->
17
 <!-- hearDate -->
15
 <script>
18
 <script>
16
-// import { updateHeardate } from '@/api/caseManagement/caseManagement'
19
+import { evidenceTree } from '@/api/caseAccess/caseEntry.js'
20
+import { getToken } from "@/utils/auth";
17
 export default {
21
 export default {
18
     props: ["uploadCaseVisable", "uploadCaseData"],
22
     props: ["uploadCaseVisable", "uploadCaseData"],
19
     data() {
23
     data() {
20
         return {
24
         return {
21
             fileList: [],
25
             fileList: [],
22
-            data: [{
23
-                label: '寓件编号_中请人名称 / 中请人',
24
-                children: [
25
-                    {
26
-                        label: '1_货款申调表pdf',
27
-                    },
28
-                    {
29
-                        label: '2_款白同pdf',
30
-                    },
31
-                    {
32
-                        label: '3_抵押证明材林pdt',
33
-                    },
34
-                    {
35
-                        label: '5.贷款利期罚息计算表pdf',
36
-                    },
37
-                    {
38
-                        label: '6.数字签名验证报告.pdl',
39
-                    },
40
-                    {
41
-                        label: '7_律师费明妞报售.pdt',
42
-                    },
43
-                ]
26
+            data: [],
27
+            headers: {
28
+                Authorization: "Bearer " + getToken(),
44
             },
29
             },
45
-            {
46
-                label: '寓件编号_中请人名称 / 中请人',
47
-                children: [
48
-                    {
49
-                        label: '1_货款申调表pdf',
50
-                    },
51
-                    {
52
-                        label: '2_款白同pdf',
53
-                    },
54
-                    {
55
-                        label: '3_抵押证明材林pdt',
56
-                    },
57
-                    {
58
-                        label: '5.贷款利期罚息计算表pdf',
59
-                    },
60
-                    {
61
-                        label: '6.数字签名验证报告.pdl',
62
-                    },
63
-                    {
64
-                        label: '7_律师费明妞报售.pdt',
65
-                    },
66
-                ]
67
-            }],
30
+            filedata: {
31
+                id:this.uploadCaseData.id
32
+            },
33
+            flagBtn:false
68
         };
34
         };
69
     },
35
     },
70
     watch: {
36
     watch: {
71
-
37
+        uploadCaseVisable(val) {
38
+            if (val) {
39
+                this.evidenceTreeFn({ caseId: this.uploadCaseData.id })
40
+            }
41
+        }
72
     },
42
     },
73
     created() {
43
     created() {
74
 
44
 
75
     },
45
     },
76
     methods: {
46
     methods: {
47
+        UploadUrl() {
48
+            return window.location.origin + "/API/caseApplication/uploadZipFile";
49
+        },
77
         cancel() {
50
         cancel() {
78
             this.$emit("uploadCaseCancel");
51
             this.$emit("uploadCaseCancel");
79
         },
52
         },
80
         submitUpload() {
53
         submitUpload() {
54
+            this.filedata.id = this.uploadCaseData.id
81
             this.$refs.upload.submit();
55
             this.$refs.upload.submit();
82
         },
56
         },
83
         handleRemove(file, fileList) {
57
         handleRemove(file, fileList) {
88
         },
62
         },
89
         handleNodeClick(data) {
63
         handleNodeClick(data) {
90
             console.log(data);
64
             console.log(data);
65
+        },
66
+        // 递归替换key
67
+        setData(data) {
68
+            data.forEach((val, i) => {
69
+                val.label = val.evidenceName
70
+                this.setData(val.children)
71
+            })
72
+        },
73
+        // 获取证据目录
74
+        evidenceTreeFn(data) {
75
+            evidenceTree(data).then(res => {
76
+                this.setData(res.data);
77
+                this.data = res.data;
78
+                if(this.data.length > 0){
79
+                    this.flagBtn = true;
80
+                }else{
81
+                    this.flagBtn = false;
82
+                }
83
+            })
84
+        },
85
+        handleSuccess(){
86
+            this.evidenceTreeFn({ caseId: this.uploadCaseData.id })
87
+        },
88
+        beforeUpload(file) {
89
+            console.log(file.type);
90
+            const isZip = file.type === 'application/x-zip-compressed'
91
+            if (!isZip) {
92
+                this.$message.error('只能上传zip格式的文件')
93
+            }
94
+            return isZip
91
         }
95
         }
92
     },
96
     },
93
 };
97
 };
100
     font-size: 18px;
104
     font-size: 18px;
101
     font-weight: 600;
105
     font-weight: 600;
102
 }
106
 }
107
+
108
+.el-upload__tip {
109
+    color: red;
110
+}
103
 </style>
111
 </style>

+ 94
- 0
src/views/deliveryRecord/emailRecord.vue Просмотреть файл

1
+<template>
2
+    <div class="app-container">
3
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
4
+            <el-form-item label="案件编号" prop="caseNum">
5
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
6
+            </el-form-item>
7
+            <el-form-item>
8
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
9
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
10
+            </el-form-item>
11
+        </el-form>
12
+        <el-table v-loading="loading" :data="dataList" style="width: 100%">
13
+            <el-table-column label="序号" type="index" align="center">
14
+                <template slot-scope="scope">
15
+                    <span>{{
16
+                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
17
+                    }}</span>
18
+                </template>
19
+            </el-table-column>
20
+            <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
21
+            <el-table-column label="名称" align="center" prop="mailName" :show-overflow-tooltip="true" />
22
+            <!-- <el-table-column label="证件号码" align="center" prop="caseNum" :show-overflow-tooltip="true" /> -->
23
+            <el-table-column label="邮箱地址" align="center" prop="mailAddress" />
24
+            <el-table-column label="发送时间" align="center" prop="sendTime" :show-overflow-tooltip="true" />
25
+            <!-- <el-table-column label="文书类型" align="center" prop="hearDate" :show-overflow-tooltip="true" /> -->
26
+            <!-- 缴费人 -->
27
+            <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
28
+            <el-table-column label="内容" align="center" prop="mailContent"></el-table-column>
29
+        </el-table>
30
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
31
+            @pagination="getList(queryParams)" />
32
+       
33
+    </div>
34
+</template>
35
+  
36
+<script>
37
+import {
38
+    emailList,
39
+} from "@/api/deliveryRecord/deliveryRecord.js";
40
+
41
+import { getDicts } from '@/api/system/dict/data.js'
42
+export default {
43
+    name: "paymentList",
44
+    dicts: ["case_status"],
45
+    components: { },
46
+    data() {
47
+        return {
48
+            queryParams: {
49
+                pageNum: 1,
50
+                pageSize: 10,
51
+            },
52
+            caseStatus: [],
53
+            // 遮罩层
54
+            loading: false,
55
+            // 总条数
56
+            total: 0,
57
+            // 表格数据
58
+            form: {},
59
+            // 校验表单
60
+            rules: {},
61
+            dataList: [],
62
+        };
63
+    },
64
+    created() {
65
+        getDicts("case_status").then(res => {
66
+            this.caseStatus = res.data;
67
+            this.getList(this.queryParams);
68
+        })
69
+    },
70
+    methods: {
71
+        /** 搜索按钮操作 */
72
+        handleQuery() {
73
+            this.queryParams.pageNum = 1;
74
+            this.getList(this.queryParams);
75
+        },
76
+        /** 重置按钮操作 */
77
+        resetQuery() {
78
+            this.resetForm("queryForm");
79
+            this.handleQuery();
80
+        },
81
+        // 查询列表数据
82
+        getList(parms) {
83
+            this.loading = true;
84
+            emailList(parms).then((response) => {
85
+                this.dataList = response.rows;
86
+                this.total = response.total;
87
+                this.loading = false;
88
+            });
89
+        },
90
+    },
91
+};
92
+</script>
93
+  
94
+<style lang="scss" scoped></style>

+ 95
- 0
src/views/deliveryRecord/smsRecord.vue Просмотреть файл

1
+<template>
2
+    <div class="app-container">
3
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
4
+            <el-form-item label="案件编号" prop="caseNum">
5
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
6
+            </el-form-item>
7
+            <el-form-item label="案件状态" prop="caseStatus">
8
+                <el-select v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable
9
+                    @keyup.enter.native="handleQuery">
10
+                    <el-option v-for="dict in caseStatus" :key="dict.dictSort" :label="dict.dictLabel"
11
+                        :value="dict.dictSort"></el-option>
12
+                </el-select>
13
+            </el-form-item>
14
+            <el-form-item>
15
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
16
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
17
+            </el-form-item>
18
+        </el-form>
19
+        <el-table v-loading="loading" :data="dataList" style="width: 100%">
20
+            <el-table-column label="序号" type="index" align="center">
21
+                <template slot-scope="scope">
22
+                    <span>{{
23
+                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
24
+                    }}</span>
25
+                </template>
26
+            </el-table-column>
27
+            <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
28
+            <el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
29
+            <el-table-column label="发送时间" align="center" prop="sendTime" />
30
+            <el-table-column label="发送内容" align="center" prop="sendContent" :show-overflow-tooltip="true" />
31
+        </el-table>
32
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
33
+            @pagination="getList(queryParams)" />
34
+       
35
+    </div>
36
+</template>
37
+  
38
+<script>
39
+import {
40
+    smsList,
41
+} from "@/api/deliveryRecord/deliveryRecord.js";
42
+
43
+import { getDicts } from '@/api/system/dict/data.js'
44
+export default {
45
+    name: "paymentList",
46
+    dicts: ["case_status"],
47
+    components: { },
48
+    data() {
49
+        return {
50
+            queryParams: {
51
+                pageNum: 1,
52
+                pageSize: 10,
53
+            },
54
+            caseStatus: [],
55
+            // 遮罩层
56
+            loading: false,
57
+            // 总条数
58
+            total: 0,
59
+            // 表格数据
60
+            form: {},
61
+            // 校验表单
62
+            rules: {},
63
+            dataList: [],
64
+        };
65
+    },
66
+    created() {
67
+        getDicts("case_status").then(res => {
68
+            this.getList(this.queryParams);
69
+        })
70
+    },
71
+    methods: {
72
+        /** 搜索按钮操作 */
73
+        handleQuery() {
74
+            this.queryParams.pageNum = 1;
75
+            this.getList(this.queryParams);
76
+        },
77
+        /** 重置按钮操作 */
78
+        resetQuery() {
79
+            this.resetForm("queryForm");
80
+            this.handleQuery();
81
+        },
82
+        // 查询列表数据
83
+        getList(parms) {
84
+            this.loading = true;
85
+            smsList(parms).then((response) => {
86
+                this.dataList = response.rows;
87
+                this.total = response.total;
88
+                this.loading = false;
89
+            });
90
+        },
91
+    },
92
+};
93
+</script>
94
+  
95
+<style lang="scss" scoped></style>

+ 103
- 0
src/views/officialSeal/officialSealList.vue Просмотреть файл

1
+<template>
2
+    <div class="app-container">
3
+        <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
4
+            <el-form-item label="案件编号" prop="caseNum">
5
+                <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable @keyup.enter.native="handleQuery" />
6
+            </el-form-item>
7
+            <el-form-item>
8
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
9
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
10
+            </el-form-item>
11
+        </el-form> -->
12
+        <el-table v-loading="loading" :data="dataList" style="width: 100%">
13
+            <el-table-column label="序号" type="index" align="center">
14
+                <template slot-scope="scope">
15
+                    <span>{{
16
+                        (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
17
+                    }}</span>
18
+                </template>
19
+            </el-table-column>
20
+            <el-table-column label="仲裁机构名称" align="center" prop="caseNum" :show-overflow-tooltip="true" />
21
+            <el-table-column label="公章名称" align="center" prop="mailName" :show-overflow-tooltip="true" />
22
+            <el-table-column label="经办人姓名" align="center" prop="caseNum" :show-overflow-tooltip="true" />
23
+            <el-table-column label="经办人手机号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
24
+            <el-table-column label="认证时间" align="center" prop="mailAddress" />
25
+            <el-table-column label="认证状态" align="center" prop="sendTime" :show-overflow-tooltip="true" />
26
+            <el-table-column label="是否启用" align="center" prop="caseStatusName">
27
+                <template slot-scope="scope">
28
+                    <el-switch v-model="dataList[scope.$index].depytype" active-text="是" inactive-text="否">
29
+                    </el-switch>
30
+                </template>
31
+            </el-table-column>
32
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
33
+                <template slot-scope="scope">
34
+                    <el-button size="mini" type="text" icon="el-icon-thumb">认证</el-button>
35
+                    <el-button size="mini" type="text" icon="el-icon-view">查看详情</el-button>
36
+                </template>
37
+            </el-table-column>
38
+        </el-table>
39
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
40
+            @pagination="getList(queryParams)" />
41
+
42
+    </div>
43
+</template>
44
+  
45
+<script>
46
+import {
47
+    emailList,
48
+} from "@/api/deliveryRecord/deliveryRecord.js";
49
+
50
+import { getDicts } from '@/api/system/dict/data.js'
51
+export default {
52
+    name: "paymentList",
53
+    dicts: ["case_status"],
54
+    components: {},
55
+    data() {
56
+        return {
57
+            queryParams: {
58
+                pageNum: 1,
59
+                pageSize: 10,
60
+            },
61
+            caseStatus: [],
62
+            // 遮罩层
63
+            loading: false,
64
+            // 总条数
65
+            total: 0,
66
+            // 表格数据
67
+            form: {},
68
+            // 校验表单
69
+            rules: {},
70
+            dataList: [],
71
+        };
72
+    },
73
+    created() {
74
+        getDicts("case_status").then(res => {
75
+            this.caseStatus = res.data;
76
+            this.getList(this.queryParams);
77
+        })
78
+    },
79
+    methods: {
80
+        /** 搜索按钮操作 */
81
+        handleQuery() {
82
+            this.queryParams.pageNum = 1;
83
+            this.getList(this.queryParams);
84
+        },
85
+        /** 重置按钮操作 */
86
+        resetQuery() {
87
+            this.resetForm("queryForm");
88
+            this.handleQuery();
89
+        },
90
+        // 查询列表数据
91
+        getList(parms) {
92
+            this.loading = true;
93
+            emailList(parms).then((response) => {
94
+                this.dataList = response.rows;
95
+                this.total = response.total;
96
+                this.loading = false;
97
+            });
98
+        },
99
+    },
100
+};
101
+</script>
102
+  
103
+<style lang="scss" scoped></style>

+ 43
- 67
src/views/system/dept/index.vue Просмотреть файл

2
   <div class="app-container">
2
   <div class="app-container">
3
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
3
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
4
       <el-form-item label="部门名称" prop="deptName">
4
       <el-form-item label="部门名称" prop="deptName">
5
-        <el-input
6
-          v-model="queryParams.deptName"
7
-          placeholder="请输入部门名称"
8
-          clearable
9
-          @keyup.enter.native="handleQuery"
10
-        />
5
+        <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" />
11
       </el-form-item>
6
       </el-form-item>
12
       <el-form-item label="状态" prop="status">
7
       <el-form-item label="状态" prop="status">
13
         <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
8
         <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
14
-          <el-option
15
-            v-for="dict in dict.type.sys_normal_disable"
16
-            :key="dict.value"
17
-            :label="dict.label"
18
-            :value="dict.value"
19
-          />
9
+          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
10
+            :value="dict.value" />
20
         </el-select>
11
         </el-select>
21
       </el-form-item>
12
       </el-form-item>
22
       <el-form-item>
13
       <el-form-item>
27
 
18
 
28
     <el-row :gutter="10" class="mb8">
19
     <el-row :gutter="10" class="mb8">
29
       <el-col :span="1.5">
20
       <el-col :span="1.5">
30
-        <el-button
31
-          type="primary"
32
-          plain
33
-          icon="el-icon-plus"
34
-          size="mini"
35
-          @click="handleAdd"
36
-          v-hasPermi="['system:dept:add']"
37
-        >新增</el-button>
21
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd(1)"
22
+          v-hasPermi="['system:dept:add']">新增</el-button>
38
       </el-col>
23
       </el-col>
39
       <el-col :span="1.5">
24
       <el-col :span="1.5">
40
-        <el-button
41
-          type="info"
42
-          plain
43
-          icon="el-icon-sort"
44
-          size="mini"
45
-          @click="toggleExpandAll"
46
-        >展开/折叠</el-button>
25
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
47
       </el-col>
26
       </el-col>
48
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
27
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
49
     </el-row>
28
     </el-row>
50
 
29
 
51
-    <el-table
52
-      v-if="refreshTable"
53
-      v-loading="loading"
54
-      :data="deptList"
55
-      row-key="deptId"
56
-      :default-expand-all="isExpandAll"
57
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
58
-    >
30
+    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId" :default-expand-all="isExpandAll"
31
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
59
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
32
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
60
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
33
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
61
       <el-table-column prop="status" label="状态" width="100">
34
       <el-table-column prop="status" label="状态" width="100">
62
         <template slot-scope="scope">
35
         <template slot-scope="scope">
63
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
36
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
64
         </template>
37
         </template>
65
       </el-table-column>
38
       </el-table-column>
66
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
39
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
70
       </el-table-column>
43
       </el-table-column>
71
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
44
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
72
         <template slot-scope="scope">
45
         <template slot-scope="scope">
73
-          <el-button
74
-            size="mini"
75
-            type="text"
76
-            icon="el-icon-edit"
77
-            @click="handleUpdate(scope.row)"
78
-            v-hasPermi="['system:dept:edit']"
79
-          >修改</el-button>
80
-          <el-button
81
-            size="mini"
82
-            type="text"
83
-            icon="el-icon-plus"
84
-            @click="handleAdd(scope.row)"
85
-            v-hasPermi="['system:dept:add']"
86
-          >新增</el-button>
87
-          <el-button
88
-            v-if="scope.row.parentId != 0"
89
-            size="mini"
90
-            type="text"
91
-            icon="el-icon-delete"
92
-            @click="handleDelete(scope.row)"
93
-            v-hasPermi="['system:dept:remove']"
94
-          >删除</el-button>
46
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
47
+            v-hasPermi="['system:dept:edit']">修改</el-button>
48
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
49
+            v-hasPermi="['system:dept:add']">新增</el-button>
50
+          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
51
+            @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
95
         </template>
52
         </template>
96
       </el-table-column>
53
       </el-table-column>
97
     </el-table>
54
     </el-table>
100
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
57
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
101
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
58
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
102
         <el-row>
59
         <el-row>
103
-          <el-col :span="24" v-if="form.parentId !== 0">
60
+          <!-- <el-col :span="24" v-if="form.parentId !== 0">
61
+            <el-form-item label="上级部门" prop="parentId">
62
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
63
+            </el-form-item>
64
+          </el-col> -->
65
+          <el-col :span="24" v-if="flag">
104
             <el-form-item label="上级部门" prop="parentId">
66
             <el-form-item label="上级部门" prop="parentId">
105
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
67
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
106
             </el-form-item>
68
             </el-form-item>
136
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
98
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
137
             </el-form-item>
99
             </el-form-item>
138
           </el-col>
100
           </el-col>
101
+          <!-- <el-col :span="12">
102
+            <el-form-item label="部门类型" prop="deptType">
103
+              <el-input v-model="form.deptType" placeholder="请输入部门编码" maxlength="50" />
104
+            </el-form-item>
105
+          </el-col> -->
106
+        </el-row>
107
+        <el-row>
139
           <el-col :span="12">
108
           <el-col :span="12">
140
             <el-form-item label="部门状态">
109
             <el-form-item label="部门状态">
141
               <el-radio-group v-model="form.status">
110
               <el-radio-group v-model="form.status">
142
-                <el-radio
143
-                  v-for="dict in dict.type.sys_normal_disable"
144
-                  :key="dict.value"
145
-                  :label="dict.value"
146
-                >{{dict.label}}</el-radio>
111
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
112
+                  :label="dict.value">{{ dict.label }}</el-radio>
147
               </el-radio-group>
113
               </el-radio-group>
148
             </el-form-item>
114
             </el-form-item>
149
           </el-col>
115
           </el-col>
168
   components: { Treeselect },
134
   components: { Treeselect },
169
   data() {
135
   data() {
170
     return {
136
     return {
137
+      flag:false,
171
       // 遮罩层
138
       // 遮罩层
172
       loading: true,
139
       loading: true,
173
       // 显示搜索条件
140
       // 显示搜索条件
199
         deptName: [
166
         deptName: [
200
           { required: true, message: "部门名称不能为空", trigger: "blur" }
167
           { required: true, message: "部门名称不能为空", trigger: "blur" }
201
         ],
168
         ],
169
+        deptType: [
170
+          { required: true, message: "部门类型不能为空", trigger: "blur" }
171
+        ],
202
         orderNum: [
172
         orderNum: [
203
           { required: true, message: "显示排序不能为空", trigger: "blur" }
173
           { required: true, message: "显示排序不能为空", trigger: "blur" }
204
         ],
174
         ],
272
     },
242
     },
273
     /** 新增按钮操作 */
243
     /** 新增按钮操作 */
274
     handleAdd(row) {
244
     handleAdd(row) {
245
+      console.log(row,"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL");
246
+      if(row == 1){
247
+        this.flag = false;
248
+      }else{
249
+        this.flag = true;
250
+      }
275
       this.reset();
251
       this.reset();
276
       if (row != undefined) {
252
       if (row != undefined) {
277
         this.form.parentId = row.deptId;
253
         this.form.parentId = row.deptId;
307
       });
283
       });
308
     },
284
     },
309
     /** 提交按钮 */
285
     /** 提交按钮 */
310
-    submitForm: function() {
286
+    submitForm: function () {
311
       this.$refs["form"].validate(valid => {
287
       this.$refs["form"].validate(valid => {
312
         if (valid) {
288
         if (valid) {
313
           if (this.form.deptId != undefined) {
289
           if (this.form.deptId != undefined) {
328
     },
304
     },
329
     /** 删除按钮操作 */
305
     /** 删除按钮操作 */
330
     handleDelete(row) {
306
     handleDelete(row) {
331
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
307
+      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
332
         return delDept(row.deptId);
308
         return delDept(row.deptId);
333
       }).then(() => {
309
       }).then(() => {
334
         this.getList();
310
         this.getList();
335
         this.$modal.msgSuccess("删除成功");
311
         this.$modal.msgSuccess("删除成功");
336
-      }).catch(() => {});
312
+      }).catch(() => { });
337
     }
313
     }
338
   }
314
   }
339
 };
315
 };