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

src/api/officialSeal/officialSeal.js

         params: data
     })
 }
+// 启用或者禁用公章
+export function updateSealLockStatus(data) {
+    return request({
+        url: '/deptIdentify/updateSealLockStatus',
+        method: 'post',
+        data: data
+    })
+}
+// 删除未认证的数据
+export function deleteSeal(data) {
+    return request({
+        url: '/deptIdentify/delete',
+        method: 'delete',
+        params: data
+    })
+}
+// 修改机构信息
+export function sealUpdate(data) {
+    return request({
+        url: '/deptIdentify/update',
+        method: 'put',
+        data: data
+    })
+}

src/views/officialSeal/components/addInstitution.vue

 <template>
     <div>
-        <el-dialog title="新增机构" :visible="operateVisable" @close="cancel" width="600px" center :distroy-on-close="true">
+        <el-dialog :title="title" :visible="operateVisable" v-if="operateVisable" @close="cancel" width="600px" center
+            :distroy-on-close="true">
             <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
                 <el-form-item label="机构名称" prop="identifyName">
                     <el-input v-model="ruleForm.identifyName"></el-input>
 </template>
 <script>
 import {
-    insert
+    insert,
 } from "@/api/officialSeal/officialSeal.js";
 export default {
-    props: ["operateVisable",],
+    props: ["operateVisable"],
     data() {
         return {
+            title: "新增机构",
             ruleForm: {},
             rules: {
                 identifyName: [
                     { required: true, message: '请输入机构名称', trigger: 'blur' },
-                    // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
                 ],
                 operName: [
                     { required: true, message: '请输入经办人姓名', trigger: 'blur' },
     watch: {
         operateVisable(val) {
             if (val) {
-
+               
             }
         }
     },
     },
     methods: {
         // 新增部门
-        insertFn(data){
-            insert(data).then(res=>{
+        insertFn(data) {
+            insert(data).then(res => {
                 this.$modal.msgSuccess("新增成功！");
                 this.$emit("cancelFilingreview");
                 this.$emit('getList');
             })
         },
+        // // 编辑
+        // sealUpdateFn(data) {
+        //     sealUpdate(data).then(res => {
+        //         this.$modal.msgSuccess("修改成功！");
+        //         this.$emit("cancelFilingreview");
+        //         this.$emit('getList');
+        //     })
+        // },
         // 提交form表单
         submitForm() {
             this.$refs['ruleForm'].validate((valid) => {
                 if (valid) {
                     this.insertFn(this.ruleForm)
-                } 
+                }
             });
+
         },
         cancel() {
             this.$emit("cancelFilingreview");

src/views/officialSeal/components/eidtInstitution.vue

+<template>
+    <div>
+        <el-dialog :title="title" :visible="editVisable" v-if="editVisable" @close="cancel" width="600px" center
+            :distroy-on-close="true">
+            <el-form :model="editForm" :rules="rules" ref="editForm" label-width="130px" class="demo-editForm">
+                <el-form-item label="机构名称" prop="identifyName">
+                    <el-input v-model="editForm.identifyName"></el-input>
+                </el-form-item>
+                <el-form-item label="经办人姓名" prop="operName">
+                    <el-input v-model="editForm.operName"></el-input>
+                </el-form-item>
+                <el-form-item label="经办人手机号" prop="operPhone">
+                    <el-input v-model="editForm.operPhone"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+                <el-button type="primary" @click="submitForm" class="endbutton"><span>确认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import {
+    sealUpdate
+} from "@/api/officialSeal/officialSeal.js";
+export default {
+    props: ["editVisable","editData"],
+    data() {
+        return {
+            title: "修改机构",
+            editForm: {},
+            rules: {
+                identifyName: [
+                    { required: true, message: '请输入机构名称', trigger: 'blur' },
+                ],
+                operName: [
+                    { required: true, message: '请输入经办人姓名', trigger: 'blur' },
+                ],
+                operPhone: [
+                    { required: true, message: '请输入手机号', trigger: 'blur' },
+                    { pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/, message: '请输入正确的手机号码', trigger: 'blur', },
+                ],
+            }
+        };
+    },
+    watch: {
+        editVisable(val) {
+            if (val) {
+               this.editForm = this.editData;
+            }
+        }
+    },
+    created() {
+
+    },
+    methods: {
+        // 编辑
+        sealUpdateFn(data) {
+            sealUpdate(data).then(res => {
+                this.$modal.msgSuccess("修改成功！");
+                this.$emit("cancelEdit");
+                this.$emit('getList');
+            })
+        },
+        // 提交form表单
+        submitForm() {
+            this.$refs['editForm'].validate((valid) => {
+                if (valid) {
+                    this.sealUpdateFn({
+                        identifyName:this.editForm.identifyName,
+                        operName:this.editForm.operName,
+                        operPhone:this.editForm.operPhone,
+                        id:this.editForm.id,
+                    })
+                }
+            });
+
+        },
+        cancel() {
+            this.$emit("cancelEdit");
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped>
+.steps {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.radiobox {
+    margin-top: 30px;
+}
+</style>

src/views/officialSeal/components/sealManage.vue

 <template>
     <div>
         <el-dialog title="公章列表" :visible="sealVisable" @close="cancel" width="800px" center :distroy-on-close="true">
-            <el-table :data="dataList" style="width: 100%">
+            <el-table v-loading="loading" :data="dataList" style="width: 100%">
                 <el-table-column label="序号" type="index" align="center">
                     <template slot-scope="scope">
                         <span>{{
                     :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="印章图片" align="center" prop="annexPath">
                     <template slot-scope="scope">
-                        <!-- <el-image style="width: 40px; height: 40px;"
-                            :src="imgUrl + scope.row.annexPath"
+                        <el-image style="width: 40px; height: 40px;" :src="imgUrl + scope.row.annexPath"
                             :preview-src-list="srcList">
-                        </el-image> -->
-                        <span>{{ imgUrl + scope.row.annexPath }}</span>
+                        </el-image>
+                        <!-- <span>{{ imgUrl + scope.row.annexPath }}</span> -->
                     </template>
                 </el-table-column>
                 <el-table-column label="是否启用" align="center" prop="sealStatus">
                     <template slot-scope="scope">
                         <el-tag type="success" v-if="scope.row.isUse == 1">已启用</el-tag>
-                        <el-tag type="info" v-if="scope.row.isUse == 0">未启用</el-tag>
+                        <el-tag type="info"
+                            v-if="(scope.row.isUse == 0 || scope.row.isUse == null) && scope.row.sealStatus !== 0">未启用</el-tag>
+                        <el-tag type="danger" v-if="scope.row.sealStatus == 0">审核中</el-tag>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
-                        <el-button size="mini" @click="DeptIndefiUrl(scope.row)" type="text" icon="el-icon-thumb"
-                        v-if="scope.row.isUse == 0">启用</el-button>
-                        <el-button size="mini" @click="DeptIndefiUrl(scope.row)" type="text" icon="el-icon-thumb"
-                        v-if="scope.row.isUse == 1">禁用</el-button>
+                        <el-button size="mini" @click="isUseChange(scope.row.id, 1)" type="text" icon="el-icon-thumb"
+                            v-if="(scope.row.isUse == 0 || scope.row.isUse == null) && scope.row.sealStatus !== 0">启用</el-button>
+                        <el-button size="mini" @click="isUseChange(scope.row.id, 0)" type="text" icon="el-icon-thumb"
+                            v-if="scope.row.isUse == 1">禁用</el-button>
                     </template>
                 </el-table-column>
             </el-table>
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize" @pagination="sealListFn(queryParams)" />
         </el-dialog>
     </div>
 </template>
 <script>
 import {
-    sealList
+    sealList,
+    updateSealLockStatus
 } from "@/api/officialSeal/officialSeal.js";
 export default {
-    props: ["sealVisable","sealData"],
+    props: ["sealVisable", "sealData"],
     data() {
         return {
+            loading: false,
             srcList: ["https://img2.baidu.com/it/u=1814561676,2470063876&fm=253&fmt=auto&app=138&f=JPEG?w=750&h=500"],
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
             },
             dataList: [
-                
+
             ],
-            imgUrl:""
+            total: 0,
+            imgUrl: ""
         };
     },
     watch: {
         sealVisable(val) {
             if (val) {
-                this.sealListFn({id:this.sealData.id})
-                // console.log(this.sealData,"LLLLLLLLLLLLLLLLL");
+                this.queryParams.id = this.sealData.id;
+                this.sealListFn(this.queryParams)
             }
         }
     },
             this.imgUrl = window.location.origin;
         },
         // 查询列表数据
-        sealListFn(data){
-            sealList(data).then(res=>{
+        sealListFn(data) {
+            this.loading = true;
+            sealList(data).then(res => {
                 this.dataList = res.rows;
+                this.total = res.total;
+                this.loading = false;
+            })
+        },
+        // 更新公章状态
+        updateSealLockStatusFn(data) {
+            updateSealLockStatus(data).then(res => {
+                this.$message.success('更新状态成功');
+                this.sealListFn(this.queryParams);
             })
         },
+        // 启用或者禁用公章
+        isUseChange(id, type) {
+            let params = {
+                id: id,
+                isUse: type
+            }
+            this.$modal
+                .confirm("是否更改状态")
+                .then((res) => {
+                    this.updateSealLockStatusFn(params);
+                })
+        },
         cancel() {
             this.$emit("cancelSeal");
         },

src/views/officialSeal/components/uploadSeal.vue

 <template>
     <div>
         <el-dialog title="上传公章" :visible="uploadVisable" v-if="uploadVisable" @close="cancel" width="600px" center>
-            <el-upload class="avatar-uploader" :before-upload="beforeUpload" :on-success="handleSuccess" ref="upload" :action="UploadUrl()"
-                :headers="headers" :data="filedata" :on-remove="handleRemove" :on-change="handleChange"
-                :show-file-list="false" :file-list="fileList" :auto-upload="false">
+            <el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="90px"
+                class="demo-ruleForm">
+                <el-form-item label="印章名称" prop="sealName">
+                    <el-input v-model="ruleForm.sealName"></el-input>
+                </el-form-item>
+            </el-form>
+            <el-upload class="avatar-uploader" :before-upload="beforeUpload" :on-success="handleSuccess" ref="upload"
+                :action="UploadUrl()" :headers="headers" :data="filedata" :on-remove="handleRemove"
+                :on-change="handleChange" :show-file-list="false" :file-list="fileList" :auto-upload="false">
                 <img v-if="imageUrl" :src="imageUrl" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
                 id: this.uploadData.id
             },
             flagBtn: false,
-            imageUrl: ""
+            imageUrl: "",
+            ruleForm: {},
+            rules: {
+                sealName: [
+                    { required: true, message: '请输入印章名称', trigger: 'blur' },
+                ],
+            }
         };
     },
     watch: {
 
     },
     methods: {
-        // 提交
-        submitForm() {
-
-        },
         cancel() {
             this.$emit("cancelUpload");
         },
             return window.location.origin + "/API/deptIdentify/sealUpload";
         },
         submitUpload() {
-            this.filedata.id = this.uploadData.id
-            this.$refs.upload.submit();
+            this.$refs['ruleForm'].validate((valid) => {
+                if (valid) {
+                    this.filedata.id = this.uploadData.id;
+                    this.filedata.sealName = this.ruleForm.sealName;
+                    this.$refs.upload.submit();
+                }
+            });
         },
         handleRemove(file, fileList) {
             console.log(file, fileList);
             }
             return isImg
         },
-        handleSuccess(){
+        handleSuccess() {
             this.$message.success('上传成功')
         }
     },
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
     cursor: pointer;
+    margin-left: 90px;
 }
 
 ::v-deep .avatar-uploader .el-upload:hover {

src/views/officialSeal/officialSealList.vue

                         v-if="scope.row.isUse == '未启用' && scope.row.identifyStatus == '已认证'">启用</el-button>
                     <el-button size="mini" @click="uploadSeal(scope.row)" type="text"
                         v-if="scope.row.identifyStatus == '已认证'" icon="el-icon-upload2">上传公章</el-button>
-                        <el-button size="mini" @click="sealManage(scope.row)" type="text"
+                    <el-button size="mini" @click="sealManage(scope.row)" type="text"
                         v-if="scope.row.identifyStatus == '已认证'" icon="el-icon-upload2">公章管理</el-button>
+                    <el-button size="mini" @click="sealDelete(scope.row)" type="text" icon="el-icon-delete">删除</el-button>
+                    <el-button size="mini" @click="eidtSeal(scope.row)" type="text"
+                        v-if="scope.row.identifyStatus == '未认证'" icon="el-icon-edit">修改</el-button>
                 </template>
             </el-table-column>
         </el-table>
         </uploadSeal>
         <sealManage :sealVisable="sealVisable" @cancelSeal="cancelSeal" :sealData="sealData">
         </sealManage>
+        <eidtInstitution :editVisable="editVisable" @cancelEdit="cancelEdit" @getList="getList" :editData="editData"></eidtInstitution>
     </div>
 </template>
   
     deptIdentifyList,
     enableDept,
     selectDeptIndefiUrl,
+    deleteSeal
 } from "@/api/officialSeal/officialSeal.js";
 
 import addInstitution from "./components/addInstitution";
 import uploadSeal from "./components/uploadSeal";
 import sealManage from "./components/sealManage";
+import eidtInstitution from "./components/eidtInstitution";
 export default {
     name: "paymentList",
     components: {
         addInstitution,
         uploadSeal,
-        sealManage
+        sealManage,
+        eidtInstitution
     },
     data() {
         return {
             dataList: [1],
             operateVisable: false,//新增弹窗
             uploadVisable: false,//上传弹窗
-            sealVisable:false,//公章列表弹窗
+            sealVisable: false,//公章列表弹窗
             uploadData: {},
-            sealData:{}
+            sealData: {},
+            editVisable:false,
+            editData:{}
         };
     },
     created() {
         this.getList(this.queryParams)
     },
     methods: {
+        // 删除
+        sealDelete(row){
+            this.$modal
+                .confirm("是否更改状态")
+                .then((res) => {
+                    this.deleteSealFn({id:row.id})
+                })
+        },
+        // 删除接口
+        deleteSealFn(data){
+            deleteSeal(data).then(res=>{
+                this.$modal.msgSuccess("删除成功！");
+                this.getList(this.queryParams);
+            })
+        },
         // 公章管理
-        sealManage(row){
+        sealManage(row) {
             this.sealVisable = true;
             this.sealData = row;
         },
-        cancelSeal(){
+        cancelSeal() {
             this.sealVisable = false;
         },
         // 上传公章
         addInstitution() {
             this.operateVisable = true;
         },
+        // 编辑
+        eidtSeal(row){
+            this.editVisable = true;
+            this.editData = row;
+        },
+        cancelEdit(){
+            this.editVisable = false;
+        },
         // 启用认证按钮
         changeStatus(row) {
             this.$modal.confirm('是否进行启用？')