Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/orgTreeSelect/index.vue

@@ -3,36 +3,20 @@
   <el-popover placement="bottom-start" :disabled="disabled" v-model="visible">
     <!--  选中的值  -->
     <div slot="reference" class="tags-box">
-      <i
-        v-if="sNodeList.length > 0 && !disabled"
-        class="el-icon-circle-close close-icon"
-        @click="clear"></i>
-      <el-tag type="success" v-for="v in sNodeList" :key="v.id">{{v.name}}</el-tag>
+      <i v-if="sNodeList.length > 0 && !disabled" class="el-icon-circle-close close-icon" @click="clear"></i>
+      <el-tag type="success" v-for="v in sNodeList" :key="v.id">{{ v.name }}</el-tag>
     </div>
 
     <!--  文本框    -->
-    <el-input
-      style="width: 100%; margin-bottom: 20px"
-      v-model="queryForm.value"
-      @input="serchTreeHandler"
-      placeholder="请输入查询机构名称"
-    ></el-input>
+    <el-input style="width: 100%; margin-bottom: 20px" v-model="queryForm.value" @input="serchTreeHandler"
+      placeholder="请输入查询机构名称"></el-input>
     <!--  下拉框   -->
     <el-row :gutter="20" type="flex" align="middle">
       <el-col :span="14" :xs="24">
-        <el-select
-          :disabled="disable"
-          v-model="queryForm.type"
-          placeholder="请选择过滤机构类型"
-          clearable
-          @change="serchTreeHandler"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_org_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="parseInt(dict.value)"
-          ></el-option>
+        <el-select :disabled="disable" v-model="queryForm.type" placeholder="请选择过滤机构类型" clearable
+          @change="serchTreeHandler">
+          <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
+            :value="parseInt(dict.value)"></el-option>
         </el-select>
       </el-col>
       <el-col :span="10" :xs="24">
@@ -41,19 +25,9 @@
     </el-row>
     <!--  机构树   -->
     <div class="tree-box">
-      <el-tree
-        ref="tree"
-        :data="orgTree"
-        :props="defaultProps"
-        node-key="id"
-        show-checkbox
-        :check-strictly="true"
-        :expand-on-click-node="false"
-        :default-checked-keys="nodes"
-        :default-expanded-keys="nodes"
-        @node-click="handleNodeClick"
-        @check="onCheck"
-        :filter-node-method="filterNode">
+      <el-tree ref="tree" :data="orgTree" :props="treeProps" node-key="id" show-checkbox :check-strictly="true"
+        :expand-on-click-node="false" :default-checked-keys="nodes" :default-expanded-keys="nodes"
+        @node-click="handleNodeClick" @check="onCheck" :filter-node-method="filterNode">
       </el-tree>
     </div>
   </el-popover>
@@ -104,6 +78,12 @@ export default {
       default: false,
       required: false,
     },
+    // 机构树上能选择的机构类型
+    enabledCheckOrgTypes: {
+      type: [Number,Array],
+      default: [],
+      required: false,
+    }
   },
   data() {
     return {
@@ -124,6 +104,11 @@ export default {
       sNodeList: [],
       //默认显示及展开的node
       nodes: [],
+      treeProps:{          
+          disabled: this.getNodedisabled,
+          children: "children",
+          label: "name",
+      }
     };
   },
   mounted() {
@@ -133,11 +118,11 @@ export default {
     defaultNode: {
       immediate: true,
       handler(n) {
-        if(!n || n.length === 0)return;
+        if (!n || n.length === 0) return;
         this.nodes = this.defaultNode;
         this.$nextTick(() => {
           let arr = [];
-          this.defaultNode.forEach(v=>{
+          this.defaultNode.forEach(v => {
             let node = this.$refs.tree.getNode(v);
             arr.push(node.data)
           })
@@ -165,96 +150,120 @@ export default {
       //   },
       // },
     },
-
+    defaultProps: {
+      handler(n) {
+        if (n) {
+         this.treeProps.label=n.label;
+         this.treeProps.children=n.children;         
+        }
+      },
+    }
 
   },
   methods: {
-      clear() {
-        this.sNodeList = [];
-        this.$refs.tree.setCheckedKeys([]);
-        this.$refs.tree.setCurrentKey(null);
-        this.nodes = [];
-        this.$emit("selectNode", JSON.stringify(this.sNodeList));
-      },
-      //筛选条件变化
-      serchTreeHandler() {
-        this.$refs.tree.filter(this.queryForm);
-      },
-      /** 查询机构下拉树结构 */
-      getDeptTree() {
-        if (this.customRequest) {
-          this.customRequest().then((response) => {
-            this.treeList = response.data;
-            return
-          });
-        }
-        this.orgTree = this.$store.getters.orgTree;
-        if (this.hangsheTree) {
-          this.orgTree = this.$store.getters.depTree;
-        }
-      },
-      filterNode(value, data, node) {
-        if (this.queryForm.value && this.queryForm.type) {
-          return (
-            data.name.indexOf(this.queryForm.value) !== -1 &&
-            data.type == this.queryForm.type
-          );
-        }
-        if (this.queryForm.value) {
-          return data.name.indexOf(this.queryForm.value) !== -1;
-        }
-        if (this.queryForm.type) {
-          return data.type == this.queryForm.type;
+    clear() {
+      this.sNodeList = [];
+      this.$refs.tree.setCheckedKeys([]);
+      this.$refs.tree.setCurrentKey(null);
+      this.nodes = [];
+      this.$emit("selectNode", JSON.stringify(this.sNodeList));
+    },
+    //筛选条件变化
+    serchTreeHandler() {
+      this.$refs.tree.filter(this.queryForm);
+    },
+    /** 查询机构下拉树结构 */
+    getDeptTree() {
+      if (this.customRequest) {
+        this.customRequest().then((response) => {
+          this.treeList = response.data;
+          return
+        });
+      }
+      this.orgTree = this.$store.getters.orgTree;
+      if (this.hangsheTree) {
+        this.orgTree = this.$store.getters.depTree;
+      }
+    },
+    getNodedisabled(node) {
+      //console.log("getNodedisabled",node,this.enabledCheckOrgTypes)
+      if (this.enabledCheckOrgTypes) {        
+        if (Array.isArray(node)) {
+          if (this.params.enabledOrgTypeList.findIndex((x) => x === node.type) == -1) {
+            return true;
+          } 
         }
-        return true;
-      },
-
-      handleNodeClick() {
-      },
-      onCheck(data, checked, tree) {
-        if (this.checked) {
-          let checkNodes = this.$refs.tree.getCheckedNodes();
-          let type = this.queryForm.type;
-          let recursionFn = function(tree) {
-            tree.forEach((item) => {
-              if (type == item.type) {
-                checkNodes.push(item);
-                //console.log('name',checkNodes.indexOf(item))
-                //checkNodes.indexOf(item) >= 0? checkNodes.splice(checkNodes.indexOf(item),1):checkNodes.push(item);
-              }
-              if (item.children?.length > 0) {
-                recursionFn(item.children)
-              } else {
-                return;
-              }
-            });
+        else {
+          if (this.enabledCheckOrgTypes !== node.type) {
+            return true;
           }
-         // 递归查询
-          recursionFn(data.children);
-          let arr = checkNodes.filter(v=>{
-            return v.type == this.queryForm.type}
-          );
-          this.$refs.tree.setCheckedNodes(arr);
-          this.sNodeList = this.$refs.tree.getCheckedNodes();
-          return
         }
-        // debugger;
-        this.sNodeList = this.$refs.tree.getCheckedNodes();
-        this.$emit("selectNode", JSON.stringify(this.sNodeList));
-      },
+      }
+      return false;
+    },
+    filterNode(value, data, node) {
+      if (this.queryForm.value && this.queryForm.type) {
+        return (
+          data.name.indexOf(this.queryForm.value) !== -1 &&
+          data.type == this.queryForm.type
+        );
+      }
+      if (this.queryForm.value) {
+        return data.name.indexOf(this.queryForm.value) !== -1;
+      }
+      if (this.queryForm.type) {
+        return data.type == this.queryForm.type;
+      }
+      return true;
+    },
 
-      getSubOrgIdsByOrgType(topOrg, orgType, orgIdList) {
-        if (!topOrg) return;
-        if (topOrg.type == orgType) {
-          orgIdList.push(topOrg);
-        }
-        if (topOrg.children && topOrg.children.length > 0) {
-          topOrg.children.forEach((item) => {
-            this.getSubOrgIdsByOrgType(item, orgType, orgIdList);
+    handleNodeClick() {
+    },
+    onCheck(data, checked, tree) {
+      if (this.checked) {
+        let checkNodes = this.$refs.tree.getCheckedNodes();
+        let type = this.queryForm.type;
+        let recursionFn = function (tree) {
+          tree.forEach((item) => {
+            if (type == item.type) {
+              checkNodes.push(item);
+              //console.log('name',checkNodes.indexOf(item))
+              //checkNodes.indexOf(item) >= 0? checkNodes.splice(checkNodes.indexOf(item),1):checkNodes.push(item);
+            }
+            if (item.children?.length > 0) {
+              recursionFn(item.children)
+            } else {
+              return;
+            }
           });
         }
-      },
+        // 递归查询
+        recursionFn(data.children);
+        let arr = checkNodes.filter(v => {
+          return v.type == this.queryForm.type
+        }
+        );
+        this.$refs.tree.setCheckedNodes(arr);
+        this.sNodeList = this.$refs.tree.getCheckedNodes();
+        return
+      }
+      // debugger;
+      this.sNodeList = this.$refs.tree.getCheckedNodes();
+      this.$emit("selectNode", JSON.stringify(this.sNodeList));
+    },
+
+    getSubOrgIdsByOrgType(topOrg, orgType, orgIdList) {
+      if (!topOrg) return;
+      if (topOrg.type == orgType) {
+        orgIdList.push(topOrg);
+      }
+      if (topOrg.children && topOrg.children.length > 0) {
+        topOrg.children.forEach((item) => {
+          this.getSubOrgIdsByOrgType(item, orgType, orgIdList);
+        });
+      }
     },
+  },
   model: {
     prop: "defaultNode",
     event: "selectNode",
@@ -279,15 +288,18 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
   cursor: pointer;
-  > span {
+
+  >span {
     margin: 5px 10px;
   }
+
   &:hover {
     .close-icon {
       display: block;
       color: #666;
     }
   }
+
   .close-icon {
     position: absolute;
     top: 30%;
@@ -296,6 +308,7 @@ export default {
     cursor: pointer;
   }
 }
+
 .tree-box {
   margin-top: 20px;
   max-height: 300px;

src/views/core/accessPlan/index.vue

@@ -89,15 +89,14 @@
               <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
             </template>
           </el-table-column>
-          <!--<el-table-column label="修改人" align="center" prop="updateBy" />
-          <el-table-column label="修改时间" align="center" prop="updateTime" />-->
+     
           <el-table-column label="备注" align="center" prop="description"/>
           <el-table-column label="操作" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                          v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
               </el-button>
-              <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0" icon="el-icon-arrow-down"
+              <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0 && scope.row.planStatus==0" icon="el-icon-arrow-down"
                          @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
               </el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -356,6 +355,8 @@
       changeSelect(val) {
         findRoleByType(val).then(response => {
           this.roleList = response;
+          this.queryParams.roleId=null;
+          this.form.roleId=null;
         })
       },
       /** 查询机构树数据 */
@@ -370,6 +371,9 @@
       resetQuery() {
         this.resetForm("queryForm");
         this.handleQuery();
+        allRole().then(response => {
+        this.roleList = response.data;
+      });
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
@@ -392,6 +396,9 @@
           this.form = response.data;
           this.open = true;
           this.title = "修改监控调阅计划";
+          findRoleByType(this.form.orgType).then(response => {
+          this.roleList = response;
+        })
         });
       },
       /** 提交按钮 */

src/views/core/edu/plan/index.vue

@@ -224,6 +224,7 @@
                 :queryData="form.execOrgType"
                 ref="orgTreeSelect"
                 @selectNode="queryNode"
+                :enabledCheckOrgTypes="form.execOrgType"
                 :disable="true">
               </org-tree-select>
             </el-form-item>
@@ -429,8 +430,8 @@ export default {
       return row.belongOrgId == this.$store.getters.orgId
     },
     checkCanDel(row) {
-      //    计划所属机构=当前登陆人机构  && 创建机构为省联社  && 不是被下发的  && 计划下不存在已有执行任务的情况
-      return row.belongOrgId == this.$store.getters.orgId && row.createByTopOrg != 1 && row.issue == 0 && row.done != 1
+      // 计划所属机构=当前登陆人机构  && 创建机构为省联社  && 不是被下发的  && 计划下不存在已有执行任务的情况
+      return row.belongOrgId == this.$store.getters.orgId && row.issue != 1 && row.done != 1
     },
     //省联社下发的计划不显示“删除”按钮
     checkCreateByTopOrg(row) {
@@ -452,7 +453,7 @@ export default {
       //console.log("xxx")
       this.open = false;
       this.reset();
-      this.$refs['orgTreeSelect'].clear();      
+      this.$refs['orgTreeSelect'].clear();
       this.$refs["upload"].clearFiles();
     },
     // 表单重置

src/views/core/materials/index.vue

@@ -102,7 +102,7 @@
           </el-table-column>
           <el-table-column label="上传人" align="center" prop="createBy"/>
           <el-table-column label="上传时间" align="center" prop="createTime"/>
-          <el-table-column label="附件" align="center" prop="fileList"/>
+          <el-table-column label="附件" align="center" prop="fileNames"/>
           <el-table-column scoped-slot="remark" align="center" prop="remark" label="备注">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.remark">{{ scope.row.remark }}</div>

src/views/system/dept/extend.vue

@@ -125,37 +125,33 @@
     <div v-if="type == 4" class="info-box">
       <!--  下拉框选择    -->
       <div>
-        <span>是否自有产权</span>
-        <el-select style="margin-left: 30px;"
-                v-model="ownership"
-                placeholder="是否自有产权"
+        <el-form
+          inline
+          class="demo-form-inline"
+          label-position="left"
+          label-width="120px"
+        >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="是否自有产权">
+              <el-select
+                         v-model="ownership"
+                         placeholder="是否自有产权"
               >
                 <el-option
-                  v-for="dict in dict.type.org_extend_is"
+                  v-for="dict in dict.type.property_situation"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
                 ></el-option>
               </el-select>
-        <!-- <el-switch
-          v-model="ownership"
-          active-text
-          inactive-text="是否自有产权"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch> -->
-        <!-- <el-switch
-          style="margin-left: 50px"
-          v-model="outsideArea"
-          active-text
-          inactive-text="是否区域外"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch> -->
-        <span style="margin-left: 209px;">是否区域外</span>
-        <el-select style="margin-left: 45px;"
-                v-model="outsideArea"
-                placeholder="是否区域外"
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否区域外">
+              <el-select
+                         v-model="outsideArea"
+                         placeholder="是否区域外"
               >
                 <el-option
                   v-for="dict in dict.type.org_extend_is"
@@ -163,7 +159,11 @@
                   :label="dict.label"
                   :value="dict.value"
                 ></el-option>
-              </el-select>
+            </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        </el-form>
       </div>
       <!--  表格   -->
       <div style="margin-top: 30px">
@@ -296,13 +296,13 @@
             </div>
           </el-col> -->
             <!--            <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>-->
-          
+
         </el-row>
       </div>
     </div>
     <el-switch
       v-if="type == 4"
-      style="margin-top: 30px"
+      style="margin-top: 30px; margin-left: 30px"
       v-model="businessLibrary"
       active-text
       inactive-text="是否有业务库"
@@ -1120,6 +1120,7 @@ export default {
     "org_extend_self_service_bank_standard",
     "org_extend_detached_standard",
     "org_extend_is",
+    "property_situation"
   ],
   props: [],
   components: {},

src/views/system/dept/index.vue

@@ -102,7 +102,7 @@
               size="mini"
               @click="showDialogEdit(0)"
               v-hasPermi="['system:dept:add']"
-              >新增离行式自助银行</el-button
+              ></el-button
             >
             <el-button
               type="primary"
@@ -291,6 +291,9 @@
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
+                  v-show="addIndex == 2
+                  || (addIndex == 3 && dict.value == 5)
+                  || (addIndex == 3 && dict.value == 6)"
                 />
               </el-select>
             </el-form-item>
@@ -399,6 +402,8 @@ export default {
       deptList: [],
       // 总条数
       total: 0,
+      //新增机构打开标识
+      addIndex: 1,
       // 机构树选项
       deptOptions: [],
       deptOptions2: [],
@@ -575,6 +580,7 @@ export default {
     async handleAdd() {
       // console.log(this.queryParams.parentId, "this.queryParams.parentId");
       // console.log(this.form.parentId, "this.form.parentId");
+      this.addIndex = 3;
       this.reset();
       if (this.queryParams.parentId != undefined) {
         if (this.pId != -1) {
@@ -598,10 +604,11 @@ export default {
     },
     /** 修改按钮操作 */
     async handleUpdate(row) {
+      this.addIndex = 2;
       this.reset();
       getDept(row.id).then((response) => {
         this.form = response.data;
-        
+
         this.pId = response.data.parentId;
       });
       if (this.pId != -1) {
@@ -619,9 +626,10 @@ export default {
     },
     /** 提交按钮 */
     changeSubmitForm() {
+      this.addIndex = 2;
+      debugger
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          console.log(this.form, "this.form");
           updateDept(this.form).then((response) => {
             this.$modal.msgSuccess("处理成功");
             this.open = false;
@@ -632,6 +640,7 @@ export default {
       });
     },
     addSubmitForm() {
+      this.addIndex = 3;
       this.$refs["form"].validate((valid) => {
         if (valid) {
           addDept(this.form).then((response) => {

src/views/system/device/index.vue

@@ -113,7 +113,7 @@
     <el-dialog :title="title" :visible="open" width="800px" append-to-body @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="所属机构" prop="orgId">
               <tree-select
                 style="width: 100%"
@@ -122,18 +122,16 @@
               </tree-select>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="资产类别" prop="assetType">
               <el-select style="width: 100%;" v-model="form.assetType" placeholder="请选择" @change="changeSelectDevice">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
-                  :value="`${dict.value}`"></el-option>
+                           :value="`${dict.value}`"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-
           <el-col :span="12">
             <el-form-item label="设备分类" prop="deviceType">
               <el-select style="width: 100%" v-model="form.deviceType" placeholder="请选择">
@@ -141,13 +139,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="设备名称" prop="deviceName">
               <el-input v-model="form.deviceName" placeholder="请输入" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备品牌" prop="deviceBrand">
+              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="30" />
+            </el-form-item>
+          </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.deviceType == 2" label="主机" prop="hostId">
@@ -168,12 +172,6 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="设备品牌" prop="deviceBrand">
-              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="30" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
             <el-form-item  v-if="form.assetType == 0" label="有效期至" prop="checkTime">
               <el-date-picker style="width: 100%" clearable v-model="form.checkTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择时间">

src/views/system/user/extend.vue

@@ -81,7 +81,7 @@
         </el-row>
 
         <el-row>
-   
+
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="持证上岗未通过原因" prop="certificateFailReason">
               <el-select style="width: 217px;" v-model="formData.certificateFailReason" placeholder="请选择">
@@ -135,13 +135,13 @@
                 @input="getImgUrl"></image-upload>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+          <!--<el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="示例图">
               <div style="width: 280px;">
                 <el-image :src="uplp"></el-image>
               </div>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
       </el-form>
     </div>

src/views/system/user/index.vue

@@ -335,7 +335,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="10">
+          <el-col :span="20">
             <el-form-item label="所属机构" prop="orgId">
               <tree-select
                 v-model="form.orgId"
@@ -348,11 +348,13 @@
               />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="10">
             <el-form-item label="用户角色" prop="roleIds">
               <el-select
-              ref="mySelect"
-              @visible-change="selectRoles"
+                ref="mySelect"
+                @visible-change="selectRoles"
                 style="width: 100%"
                 v-model="form.roleIds"
                 multiple
@@ -368,18 +370,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="手机号码" prop="phone">
-              <el-input
-                v-model="form.phone"
-                placeholder="请输入手机号码"
-                maxlength="11"
-                :readonly="form.source == 1"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="10">
             <el-form-item label="用户性别">
               <el-select
@@ -397,24 +387,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.phone" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.isLock">
-                <el-radio
-                  v-for="dict in dict.type.sys_user_is_lock"
-                  :key="`${dict.value}`"
-                  :label="dict.value"
-                  :disabled="form.source == 1"
-                  >{{ dict.label }}</el-radio
-                >
-              </el-radio-group>
+            <el-form-item label="手机号码" prop="phone">
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入手机号码"
+                maxlength="11"
+                :readonly="form.source == 1"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -429,6 +411,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.isLock">
+                <el-radio
+                  v-for="dict in dict.type.sys_user_is_lock"
+                  :key="`${dict.value}`"
+                  :label="dict.value"
+                  :disabled="form.source == 1"
+                  >{{ dict.label }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>