Parcourir la source

Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

luowei il y a 2 ans
Parent
commit
15ae899887

+ 95 - 64
src/views/system/dept/dialog.edit.vue

@@ -23,7 +23,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="机构名称">
+              <el-form-item label="机构名称" prop="name">
                 <el-input v-model="form.name" placeholder="请输入机构名称" />
               </el-form-item>
             </el-col>
@@ -70,33 +70,32 @@
             </el-col>
           </el-row>
           <el-row>
-          <el-col :span="12" >
-            <el-form-item label="机构类型" prop="type">
-              <el-select
-              prop="type"
-              label="机构类型"
-              v-model="form.type"
-              placeholder="请选择机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-            </el-form-item>
-          </el-col>
-         
-        </el-row>
+            <el-col :span="12">
+              <el-form-item label="机构类型" prop="type">
+                <el-select
+                  prop="type"
+                  label="机构类型"
+                  v-model="form.type"
+                  placeholder="请选择机构类型"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_org_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否可用" prop="isLock">
                 <el-switch
                   v-model="form.isLock"
-                  :active-value="1"
-                  :inactive-value="0"
+                  :active-value="0"
+                  :inactive-value="1"
                 >
                 </el-switch>
               </el-form-item>
@@ -161,7 +160,7 @@
             width="180"
           >
             <template slot-scope="scope">
-              <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
+              <span>{{ formatTime(scope.row.dateOfCompliance,"YYYY-MM-DD") }}</span>
             </template>
           </el-table-column>
 
@@ -218,7 +217,12 @@
       width="500px"
       append-to-body
     >
-      <el-form ref="orgform" :model="orgform" label-width="80px">
+      <el-form
+        ref="orgform"
+        :model="orgform"
+        label-width="80px"
+        :rules="rules2"
+      >
         <el-form-item label="标准" prop="standard">
           <el-input v-model="orgform.standard" placeholder="请输入标准" />
         </el-form-item>
@@ -226,7 +230,7 @@
           <el-date-picker
             clearable
             v-model="orgform.dateOfCompliance"
-            type="datetime"
+            type="date"
             value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择达标日期"
           >
@@ -295,7 +299,7 @@ export default {
   dicts: ["sys_normal_disable", "sys_org_type"],
   data() {
     return {
-      tempRow:null,
+      tempRow: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -313,19 +317,26 @@ export default {
       orgform: {},
       //默认选中节点
       defaultKeys: [],
-
+      //表单验证
+      rules2: {
+        standard: [{ required: true, message: "请输入标准", trigger: "blur" }],
+        dateOfCompliance: [
+          { required: true, message: "请输入达标日期", trigger: "blur" },
+        ],
+      },
       rules: {
         parentId: [
           { required: true, message: "上级机构不能为空", trigger: "blur" },
         ],
+        sort: [{ required: true, message: "排序号不能为空", trigger: "blur" }],
+        type: [
+          { required: true, message: "机构类型不能为空", trigger: "blur" },
+        ],
+        isLock: [{ required: true, message: "状态不能为空", trigger: "blur" }],
         name: [
           { required: true, message: "机构名称不能为空", trigger: "blur" },
         ],
-        orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" },
-        ],
-        isLock: [{ required: true, message: "状态不能为空", trigger: "blur" }],
-        phone: [
+        managerPhone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
@@ -370,19 +381,28 @@ export default {
     orgcancel() {
       this.orgopen = false;
       this.orgreset();
-      this.tempRow="";
+      this.tempRow = "";
     },
     /** 提交按钮 */
     submitOrgForm() {
-      let dat = { standard: this.orgform.standard,
-        dateOfCompliance:this.orgform.dateOfCompliance,
-        certificateEvidence:this.orgform.certificateEvidence,
-        certificate:this.orgform.certificate,
-        evidence:this.orgform.evidence
-      };
-      this.constructionList.splice(this.tempRow, 1)
-      this.constructionList.push(dat);
-      this.orgopen = false;
+      this.$refs.orgform.validate((valid) => {
+        if (valid) {
+          // 表单验证通过,提交数据或执行其他操作
+          let dat = {
+            standard: this.orgform.standard,
+            dateOfCompliance: this.orgform.dateOfCompliance,
+            certificateEvidence: this.orgform.certificateEvidence,
+            certificate: this.orgform.certificate,
+            evidence: this.orgform.evidence,
+          };
+          this.constructionList.splice(this.tempRow, 1);
+          this.constructionList.push(dat);
+          this.orgopen = false;
+        } else {
+          // 表单验证未通过,显示错误信息
+        }
+      });
+
       // this.orgform.orgId = this.orgid;
       // this.$refs["orgform"].validate((valid) => {
       //   if (valid) {
@@ -407,7 +427,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleOrgDelete(row) {
-      this.constructionList.splice(row, 1)
+      this.constructionList.splice(row, 1);
       // this.$modal
       //   .confirm('是否确认删除机构物防建设编号为"' + orgids + '"的数据项?')
       //   .then(function () {
@@ -422,10 +442,10 @@ export default {
     /** 修改按钮操作 */
     handleOrgUpdate(row) {
       this.orgreset();
-      this.tempRow=row;
+      this.tempRow = row;
       this.orgform = row;
-        this.orgopen = true;
-        this.orgtitle = "修改机构物防建设";
+      this.orgopen = true;
+      this.orgtitle = "修改机构物防建设";
       // const id = row.id || this.orgids;
       // getOrgPhysicalDefenseConstruction(id).then((response) => {
       //   // console.log(response)
@@ -484,7 +504,7 @@ export default {
       this.constructionList = [];
       if (row != 0) {
         // console.log(row,111111111111)
-        
+
         this.orgid = row.orgid;
         this.form = row;
         // this.form.isLock2=row.isLock;
@@ -493,9 +513,9 @@ export default {
           getExtendByOrgId(row.id).then((data) => {
             console.log(data.data);
             if (data.data != null) {
-              this.form.orgExtendId=data.data.id,
-              this.form.cashAddingRoomRemoteControl =
-                data.data.cashAddingRoomRemoteControl;
+              (this.form.orgExtendId = data.data.id),
+                (this.form.cashAddingRoomRemoteControl =
+                  data.data.cashAddingRoomRemoteControl);
               this.form.detachedLobbyEquipment =
                 data.data.detachedLobbyEquipment;
               this.form.detachedWallPenetratingEquipment =
@@ -510,24 +530,35 @@ export default {
 
     // 事件
     onHide() {
+      this.$emit("success")
       this.isShow = false;
     },
 
     onSubmit() {
-      this.$refs.form.validate(async (isValidate) => {
-        this.form.isLock = this.form.isLock ? 0 : 1;
-        this.form.cashAddingRoomRemoteControl = this.form
-          .cashAddingRoomRemoteControl
-          ? 1
-          : 0;
-        this.form.constructionList=this.constructionList;
-        // console.log(this.form);
-        addOrUpdate(this.form).then((data) => {
-          this.$modal.msgSuccess("成功");
-          this.onHide();
-        });
-        // this.$emit("success");
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          // 表单验证通过,提交数据或执行其他操作
+          this.form.isLock = this.form.isLock ? 1 : 0;
+          this.form.cashAddingRoomRemoteControl = this.form
+            .cashAddingRoomRemoteControl
+            ? 1
+            : 0;
+          this.form.constructionList = this.constructionList;
+          // console.log(this.form);
+          addOrUpdate(this.form).then((data) => {
+            this.$modal.msgSuccess("成功");
+            this.$emit("success")
+            this.onHide();
+          });
+        } else {
+          // 表单验证未通过,显示错误信息
+        }
       });
+
+      // this.$refs.form.validate(async (isValidate) => {
+
+      //   // this.$emit("success");
+      // });
     },
 
     // 事件

+ 75 - 27
src/views/system/dept/extend.vue

@@ -24,12 +24,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item v-if="type == 4" label="天气区域编码">
-              <el-input v-model="weatherAreaCode" placeholder="天气区域编码"></el-input>
+              <el-input v-model="weatherAreaCode" placeholder="天气区域编码" @input="handleInput2"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="type == 4" label="营业场所面积">
-              <el-input v-model="premisesArea" placeholder="营业场所面积"></el-input>
+            <el-form-item v-if="type == 4" label="营业场所面积" >
+              <el-input v-model="premisesArea" placeholder="营业场所面积" @input="handleInput"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -79,12 +79,12 @@
           v-hasPermi="['system:construction:add']">新增</el-button>
         <el-table border size="small" v-loading="orgloading" :data="constructionList"
           @selection-change="handleOrgSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column type="selection" width="55" align="center" v-if="false" />
+          <el-table-column type="index" label="序号" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
           <el-table-column label="达标日期" align="center" prop="dateOfCompliance" width="180">
             <template slot-scope="scope">
-              <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
+              <span>{{ formatTime(scope.row.dateOfCompliance,"YYYY-MM-DD") }}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column
@@ -173,12 +173,12 @@
           @click="handleBusinessAdd" v-hasPermi="['system:BankPhysicalDefenseConstruction:add']">新增</el-button>
         <el-table border size="small" v-loading="businessloading" :data="BusinessPhysicalDefenseConstructionList"
           @selection-change="handleBusinessSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column type="selection" width="55"  v-if="false" align="center" />
+          <el-table-column type="index" label="序号" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
           <el-table-column label="达标日期" align="center" prop="dateOfCompliance" width="180">
             <template slot-scope="scope">
-              <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
+              <span>{{ formatTime(scope.row.dateOfCompliance,"YYYY-MM-DD") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="证书佐证" align="center" prop="certificateEvidence">
@@ -223,12 +223,12 @@
           v-hasPermi="['system:BankPhysicalDefenseConstruction:add']">新增</el-button>
         <el-table border size="small" v-loading="bankloading" :data="BankPhysicalDefenseConstructionList"
           @selection-change="handleBankSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column type="selection" width="55"  v-if="false" align="center" />
+          <el-table-column type="index" label="序号" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
           <el-table-column label="达标日期" align="center" prop="dateOfCompliance" width="180">
             <template slot-scope="scope">
-              <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
+              <span>{{ formatTime(scope.row.dateOfCompliance,"YYYY-MM-DD") }}</span>
             </template>
           </el-table-column>
           <el-table-column label="证书佐证" align="center" prop="certificateEvidence">
@@ -259,12 +259,12 @@
     </div>
     <!-- 添加或修改业务库物防建设对话框 -->
     <el-dialog :title="Businesstitle" :visible.sync="Businessopen" width="500px" append-to-body>
-      <el-form ref="Businessform" :model="Businessform" label-width="80px">
+      <el-form ref="Businessform" :model="Businessform"  :rules="rules" label-width="80px">
         <el-form-item label="标准" prop="standard">
           <el-input v-model="Businessform.standard" placeholder="请输入标准" />
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
-          <el-date-picker clearable v-model="Businessform.dateOfCompliance" type="datetime"
+          <el-date-picker clearable v-model="Businessform.dateOfCompliance" type="date"
             value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择达标日期">
           </el-date-picker>
         </el-form-item>
@@ -298,13 +298,13 @@
       </div>
     </el-dialog>
     <!-- 添加或修改银行物防建设对话框 -->
-    <el-dialog :title="Banktitle" :visible.sync="Bankopen" width="500px" append-to-body>
-      <el-form ref="Bankform" :model="Bankform" label-width="80px">
+    <el-dialog :title="Banktitle" :visible.sync="Bankopen"  width="500px" append-to-body>
+      <el-form ref="Bankform" :model="Bankform" label-width="80px" :rules="rules">
         <el-form-item label="标准" prop="standard">
           <el-input v-model="Bankform.standard" placeholder="请输入标准" />
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
-          <el-date-picker clearable v-model="Bankform.dateOfCompliance" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker clearable v-model="Bankform.dateOfCompliance" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择达标日期">
           </el-date-picker>
         </el-form-item>
@@ -342,12 +342,12 @@
     </el-dialog>
 
     <el-dialog :title="orgtitle" :visible.sync="orgopen" width="500px" append-to-body>
-      <el-form ref="orgform" :model="orgform" label-width="80px">
+      <el-form ref="orgform" :model="orgform" label-width="80px" :rules="rules">
         <el-form-item label="标准" prop="standard">
           <el-input v-model="orgform.standard" placeholder="请输入标准" />
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
-          <el-date-picker clearable v-model="orgform.dateOfCompliance" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker clearable v-model="orgform.dateOfCompliance" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择达标日期">
           </el-date-picker>
         </el-form-item>
@@ -416,6 +416,16 @@ export default {
   components: {},
   data() {
     return {
+      //表单验证
+      rules: {
+        standard: [
+          { required: true, message: '请输入标准', trigger: 'blur' }
+        ],
+        dateOfCompliance: [
+          { required: true, message: '请输入达标日期', trigger: 'blur' }
+        ]
+      },
+
       //基础信息key
       infoKeys: [
         { label: "机构名称", key: "name" },
@@ -534,6 +544,14 @@ export default {
   },
   mounted() { },
   methods: {
+    handleInput() {
+      // 使用正则表达式过滤输入,只保留数字和小数点
+      this.premisesArea = this.premisesArea.replace(/[^0-9.]/g, '');
+    },
+    handleInput2() {
+      // 使用正则表达式过滤输入,只保留数字和小数点
+      this.weatherAreaCode = this.weatherAreaCode.replace(/[^a-zA-Z0-9]/g, '');
+    },
     request() { },
     handleChange(value) { },
     getOrgInfo() {
@@ -542,14 +560,14 @@ export default {
         if (!data.data) return;
         let res = data.data;
         this.dataInfo = this.infoKeys.map((v, i) => {
-          console.log(v, res[v.key], "vvvvv");
+          // console.log(v, res[v.key], "vvvvv");
           v.value = res[v.key];
           return v;
         });
         this.type = data.data.type;
         this.isLock = data.data.isLock;
 
-        console.log(this.dataInfo, "info");
+        // console.log(this.dataInfo, "info");
       });
     },
 
@@ -654,9 +672,10 @@ export default {
     },
     /** 提交按钮 */
     submitBusinessForm() {
-      this.Businessform.orgId = this.$route.params.id;
-      this.$refs["Businessform"].validate((valid) => {
+      this.$refs.Businessform.validate((valid) => {
         if (valid) {
+          // 表单验证通过,提交数据或执行其他操作
+          this.Businessform.orgId = this.$route.params.id;
           this.Businessform.type = 2;
           if (this.Businessform.id != null) {
             updateOrgPhysicalDefenseConstruction(this.Businessform).then(
@@ -675,8 +694,17 @@ export default {
               }
             );
           }
+        } else {
+          // 表单验证未通过,显示错误信息
         }
       });
+
+      
+      // this.$refs["Businessform"].validate((valid) => {
+      //   if (valid) {
+
+      //   }
+      // });
     },
     /** 删除按钮操作 */
     handleBusinessDelete(row) {
@@ -741,9 +769,10 @@ export default {
     },
     /** 提交按钮 */
     submitBankForm() {
-      this.Bankform.orgId = this.$route.params.id;
-      this.$refs["Bankform"].validate((valid) => {
+      this.$refs.Bankform.validate((valid) => {
         if (valid) {
+          // 表单验证通过,提交数据或执行其他操作
+          this.Bankform.orgId = this.$route.params.id;
           this.Bankform.type = 3;
           if (this.Bankform.id != null) {
             updateOrgPhysicalDefenseConstruction(this.Bankform).then(
@@ -762,8 +791,17 @@ export default {
               }
             );
           }
+        } else {
+          // 表单验证未通过,显示错误信息
         }
       });
+
+      
+      // this.$refs["Bankform"].validate((valid) => {
+      //   if (valid) {
+
+      //   }
+      // });
     },
     /** 删除按钮操作 */
     handleBankDelete(row) {
@@ -826,9 +864,10 @@ export default {
     },
     /** 提交按钮 */
     submitOrgForm() {
-      this.orgform.orgId = this.$route.params.id;
-      this.$refs["orgform"].validate((valid) => {
+      this.$refs.orgform.validate((valid) => {
         if (valid) {
+          // 表单验证通过,提交数据或执行其他操作
+          this.orgform.orgId = this.$route.params.id;
           this.orgform.type = 1;
           if (this.orgform.id != null) {
             updateOrgPhysicalDefenseConstruction(this.orgform).then(
@@ -845,8 +884,17 @@ export default {
               this.getOrgPhysicalDefenseConstructionInfo();
             });
           }
+        } else {
+          // 表单验证未通过,显示错误信息
         }
       });
+
+      
+      // this.$refs["orgform"].validate((valid) => {
+      //   if (valid) {
+
+      //   }
+      // });
     },
     /** 删除按钮操作 */
     handleOrgDelete(row) {

+ 269 - 112
src/views/system/dept/index.vue

@@ -4,49 +4,112 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入机构名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
+          <el-input
+            v-model="deptName"
+            placeholder="请输入机构名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
         </div>
         <div class="tree-container">
-          <div style="margin-bottom: 10px;">
-            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">是否关联下级机构</el-checkbox>
+          <div style="margin-bottom: 10px">
+            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox"
+              >是否关联下级机构</el-checkbox
+            >
           </div>
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
-            :default-checked-keys="defaultKeys" @node-click="handleNodeClick" />
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            :default-expanded-keys="defaultKeys"
+            :default-checked-keys="defaultKeys"
+            @node-click="handleNodeClick"
+          />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-
         <!--    搜索条件    -->
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+        >
           <el-form-item label="机构名称" prop="name">
-            <el-input v-model="queryParams.name" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入机构名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="状态" prop="isLock">
-            <el-select v-model="queryParams.isLock" placeholder="机构状态" clearable>
-              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-                :value="dict.value" />
+            <el-select
+              v-model="queryParams.isLock"
+              placeholder="机构状态"
+              clearable
+            >
+              <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>
-            <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-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-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="showDialogEdit(0)"
-              v-hasPermi="['system:dept:add']">新增离行式自助银行</el-button>
-              <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="handleAdd(row)"
-              v-hasPermi="['system:dept:add']">新增中心业务库</el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="showDialogEdit(0)"
+              v-hasPermi="['system:dept:add']"
+              >新增离行式自助银行</el-button
+            >
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd(row)"
+              v-hasPermi="['system:dept:add']"
+              >新增中心业务库</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="deptList" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="deptList"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column label="序号" align="center" min-width="30">
             <template v-slot:default="scope">
               <span v-text="getPageIndex(scope.$index)"> </span>
@@ -55,16 +118,25 @@
           <el-table-column prop="code" label="编码"></el-table-column>
           <el-table-column prop="type" label="机构类型">
             <template v-slot="scope">
-              <dict-tag :options="dict.type.sys_org_type" :value="scope.row.type" />
+              <dict-tag
+                :options="dict.type.sys_org_type"
+                :value="scope.row.type"
+              />
             </template>
           </el-table-column>
           <el-table-column prop="name" label="机构名称"></el-table-column>
           <el-table-column prop="isLock" label="状态">
             <template v-slot="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isLock" />
+              <dict-tag
+                :options="dict.type.sys_normal_disable"
+                :value="scope.row.isLock"
+              />
             </template>
           </el-table-column>
-          <el-table-column prop="weatherCityCode" label="天气区域编码"></el-table-column>
+          <el-table-column
+            prop="weatherCityCode"
+            label="天气区域编码"
+          ></el-table-column>
           <el-table-column prop="address" label="地址"></el-table-column>
           <el-table-column label="负责人及电话" align="center">
             <template v-slot:default="scope">
@@ -73,33 +145,78 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
             <template slot-scope="scope">
-              <router-link :to="'/system/dept-extend/extend/' + scope.row.id" class="link-type">
-                <el-button size="mini" type="text" icon="el-icon-plus"
-                  v-hasPermi="['system:dept:extend']">补充信息</el-button>
+              <router-link
+                :to="'/system/dept-extend/extend/' + scope.row.id"
+                class="link-type"
+              >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-plus"
+                  v-hasPermi="['system:dept:extend']"
+                  >补充信息</el-button
+                >
               </router-link>
-              
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="showDialogEdit(scope.row)"
-                v-hasPermi="['system:dept:edit']">修改</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="showDialogEdit(scope.row)"
+                v-hasPermi="['system:dept:edit']"
+                >修改</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>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
     <!-- 添加或修改机构对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" @close="closeHandler" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="600px"
+      @close="closeHandler"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
-            <el-form-item v-if="this.pId !=-1" label="上级机构" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级机构" />
+            <el-form-item
+              v-if="this.pId != -1"
+              label="上级机构"
+              prop="parentId"
+            >
+              <treeselect
+                v-model="form.parentId"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                placeholder="选择上级机构"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -111,81 +228,117 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="sort">
-              <el-input-number v-model="form.sort" controls-position="right" :min="0" />
+              <el-input-number
+                v-model="form.sort"
+                controls-position="right"
+                :min="0"
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="负责人" prop="manager">
-              <el-input v-model="form.manager" placeholder="请输入负责人" maxlength="20" />
+              <el-input
+                v-model="form.manager"
+                placeholder="请输入负责人"
+                maxlength="20"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入联系电话"
+                maxlength="11"
+              />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
-          <el-col :span="12" >
+          <el-col :span="12">
             <el-form-item label="机构类型" prop="type">
               <el-select
-              prop="type"
-              label="机构类型"
-              v-model="form.type"
-              placeholder="请选择机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+                prop="type"
+                label="机构类型"
+                v-model="form.type"
+                placeholder="请选择机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_org_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
-         
         </el-row>
 
         <el-row>
           <el-col :span="12" v-if="false">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input
+                v-model="form.email"
+                placeholder="请输入邮箱"
+                maxlength="50"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="机构状态" prop="isLock">
               <el-radio-group v-model="form.isLock">
-                <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>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="title == '修改机构'" type="primary" @click="changeSubmitForm">确 定</el-button>
-        <el-button v-if="title == '添加机构'" type="primary" @click="addSubmitForm">确 定</el-button>
+        <el-button
+          v-if="title == '修改机构'"
+          type="primary"
+          @click="changeSubmitForm"
+          >确 定</el-button
+        >
+        <el-button
+          v-if="title == '添加机构'"
+          type="primary"
+          @click="addSubmitForm"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <DialogEdit ref="dialogEdit" ></DialogEdit>
+    <DialogEdit ref="dialogEdit" @success="refs"></DialogEdit>
   </div>
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import {
+  listDept,
+  getDept,
+  delDept,
+  addDept,
+  updateDept,
+  listDeptExcludeChild,
+} from "@/api/system/dept";
 import { deptTreeSelect } from "@/api/system/public";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import DialogEdit from "@/views/system/dept/dialog.edit.vue";
 export default {
   name: "Dept",
-  dicts: ['sys_normal_disable', 'sys_org_type'],
-  components: { Treeselect ,DialogEdit},
+  dicts: ["sys_normal_disable", "sys_org_type"],
+  components: { Treeselect, DialogEdit },
   data() {
     return {
       // 遮罩层
@@ -213,7 +366,7 @@ export default {
       checked: false,
       defaultProps: {
         children: "children",
-        label: "name"
+        label: "name",
       },
       // 查询参数
       queryParams: {
@@ -228,66 +381,65 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          { required: true, message: "上级机构不能为空", trigger: "blur" }
+          { required: true, message: "上级机构不能为空", trigger: "blur" },
         ],
         name: [
-          { required: true, message: "机构名称不能为空", trigger: "blur" }
+          { required: true, message: "机构名称不能为空", trigger: "blur" },
         ],
         orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" }
-        ],
-        isLock: [
-          { required: true, message: "状态不能为空", trigger: "blur" }
+          { required: true, message: "显示排序不能为空", trigger: "blur" },
         ],
+        isLock: [{ required: true, message: "状态不能为空", trigger: "blur" }],
         email: [
           {
             type: "email",
             message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
+            trigger: ["blur", "change"],
+          },
         ],
         phone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
+            trigger: "blur",
+          },
+        ],
       },
       //默认选中节点
-      defaultKeys: []
+      defaultKeys: [],
     };
   },
   computed: {
     isShow() {
-      if((this.pId==null&&this.pId!=-1)){
-        return true
+      if (this.pId == null && this.pId != -1) {
+        return true;
       }
-    }
+    },
   },
   created() {
     this.getDeptTree();
     this.getList();
   },
   methods: {
-    closeHandler(){
-     // alert(11111)
+    closeHandler() {
+      // alert(11111)
     },
     getPageIndex($index) {
       //表格序号
-      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-
+      return (
+        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      );
     },
     //自定义数据
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
-        delete node.children
+        delete node.children;
       }
       return {
         id: node.id,
         label: node.name,
-        children: node.children
-      }
+        children: node.children,
+      };
     },
     /** 下穿状态改变*/
     changeCheckBox() {
@@ -295,7 +447,7 @@ export default {
     },
     /** 查询机构下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
         this.defaultKeys.push(response.data[0].id);
         this.queryParams.parentId = response.data[0].id;
@@ -315,7 +467,7 @@ export default {
     /** 查询机构列表 */
     getList() {
       this.loading = true;
-      listDept(this.queryParams).then(response => {
+      listDept(this.queryParams).then((response) => {
         this.deptList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -329,7 +481,7 @@ export default {
       return {
         id: node.id,
         label: node.name,
-        children: node.children
+        children: node.children,
       };
     },
     // 取消按钮
@@ -348,7 +500,7 @@ export default {
         phone: undefined,
         email: undefined,
         status: "0",
-        isLock: "0"
+        isLock: "0",
       };
       this.resetForm("form");
     },
@@ -369,7 +521,6 @@ export default {
       }
       this.open = true;
       this.title = "添加机构";
-
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
@@ -382,23 +533,23 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      getDept(row.id).then(response => {
+      getDept(row.id).then((response) => {
         this.form = response.data;
         this.pId = response.data.parentId;
         this.open = true;
         this.title = "修改机构";
       });
       if (this.pId != -1) {
-        listDeptExcludeChild(row.id).then(response => {
+        listDeptExcludeChild(row.id).then((response) => {
           this.deptOptions = this.handleTree(response.data, "id");
         });
       }
     },
     /** 提交按钮 */
     changeSubmitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          updateDept(this.form).then(response => {
+          updateDept(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -408,9 +559,9 @@ export default {
       });
     },
     addSubmitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          addDept(this.form).then(response => {
+          addDept(this.form).then((response) => {
             this.$modal.msgSuccess("新增成功");
             this.open = false;
             this.getList();
@@ -421,32 +572,38 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function () {
-        return delDept(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-        this.getDeptTree();
-      }).catch(() => { });
+      this.$modal
+        .confirm('是否确认删除名称为"' + row.name + '"的数据项?')
+        .then(function () {
+          return delDept(row.id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+          this.getDeptTree();
+        })
+        .catch(() => {});
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
+      this.ids = selection.map((item) => item.userId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
-    showDialogEdit(row){
-      console.log(row,33333333333)
-// row.id=row.orgid;
+    showDialogEdit(row) {
       this.$refs.dialogEdit.show(row);
     },
+    refs() {
+      this.getList();
+      this.getDeptTree();
+    },
   },
   watch: {
     // 根据名称筛选机构树
     deptName(val) {
       this.$refs.tree.filter(val);
-    }
-  }
+    },
+  },
 };
 </script>
 

+ 9 - 2
src/views/system/user/index.vue

@@ -85,7 +85,11 @@
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isLock" />
             </template>
           </el-table-column>
-          <el-table-column label="是否管理人员" align="center" key="phone" prop="phone" v-if="columns[5].visible" width="120" />
+          <el-table-column label="是否管理人员" align="center" key="isManager" prop="isManager" v-if="columns[5].visible" width="120" >
+            <template slot-scope="scope">
+              {{ scope.row.isManager>0?"是":"否" }}
+            </template>
+          </el-table-column>
           <el-table-column label="登录IP" align="center" key="lastIp" prop="lastIp" v-if="columns[6].visible" width="120" />
           <el-table-column label="登录时间" align="center" key="lastTime" prop="lastTime" v-if="columns[7].visible"
             width="120" />
@@ -140,7 +144,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="14">
-            <el-form-item label="用户角色">
+            <el-form-item label="用户角色" prop="roleIds">
               <el-select style="width: 100%;" v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
                   :disabled="item.status == 1"></el-option>
@@ -305,6 +309,9 @@ export default {
         name: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
+        roleIds: [
+          { required: true, message: "用户角色不能为空", trigger: "blur" }
+        ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }