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

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

@@ -545,7 +545,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除教育培训计划"' + row.planName).then(function () {
+      this.$modal.confirm('是否确认删除教育培训计划:' + row.planName).then(function () {
         return delPlan(ids);
       }).then(() => {
         this.getList();

src/views/system/dept/index.vue

@@ -170,7 +170,12 @@
                 :to="'/system/dept-extend/extend/' + scope.row.id"
                 class="link-type"
               >
-                <el-button v-if="scope.row.type==4||scope.row.type==10||scope.row.type==5"
+                <el-button
+                  v-if="
+                    scope.row.type == 4 ||
+                    scope.row.type == 10 ||
+                    scope.row.type == 5
+                  "
                   size="mini"
                   type="text"
                   icon="el-icon-plus"
@@ -237,8 +242,12 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="机构名称" prop="name" v-if="!form.source">
-              <el-input v-model="form.name" placeholder="请输入机构名称" />
+            <el-form-item label="机构名称" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入机构名称"
+                :readonly="form.source == 1"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -262,20 +271,22 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="负责人" prop="manager" v-if="!form.source">
+            <el-form-item label="负责人" prop="manager">
               <el-input
                 v-model="form.manager"
                 placeholder="请输入负责人"
                 maxlength="20"
+                :readonly="form.source == 1"
               />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone" v-if="!form.source">
+            <el-form-item label="联系电话" prop="phone">
               <el-input
                 v-model="form.phone"
                 placeholder="请输入联系电话"
                 maxlength="11"
+                :readonly="form.source == 1"
               />
             </el-form-item>
           </el-col>
@@ -283,11 +294,12 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="sort" v-if="!form.source">
+            <el-form-item label="显示排序" prop="sort">
               <el-input-number
                 v-model="form.sort"
                 controls-position="right"
                 :min="0"
+                :disabled="form.source == 1"
               />
             </el-form-item>
           </el-col>
@@ -304,12 +316,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="机构状态" prop="isLock" v-if="!form.source">
+            <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"
+                  :disabled="form.source == 1"
                   >{{ dict.label }}</el-radio
                 >
               </el-radio-group>
@@ -390,7 +403,7 @@ export default {
         name: undefined,
         status: undefined,
         parentId: undefined,
-        checkSub:true,
+        checkSub: true,
       },
       // 表单参数
       form: {},

src/views/system/user/index.vue

@@ -296,35 +296,29 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="用户名称" prop="username" v-if="!form.source">
+            <el-form-item label="用户名称" prop="username"  >
               <el-input
                 v-model="form.username"
                 placeholder="请输入用户名"
                 maxlength="30"
-              />
+              :readonly="form.source==1"/>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="用户昵称" prop="name" v-if="!form.source">
+            <el-form-item label="用户昵称" prop="name" >
               <el-input
                 v-model="form.name"
                 placeholder="请输入用户昵称"
                 maxlength="30"
-              />
+              :readonly="form.source==1"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="所属机构" prop="orgId" v-if="!form.source">
-              <tree-select
-                v-model="form.orgId"
-                :options="deptOptions"
-                :show-count="true"
-                :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }"
-                placeholder="请选择归属机构"
-              />
+            <el-form-item label="所属机构" prop="orgId" >
+              <tree-select v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属机构" :disabled="form.source==1"/>
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -348,20 +342,21 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="手机号码" prop="phone" v-if="!form.source">
+            <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="用户性别" v-if="!form.source">
+            <el-form-item label="用户性别" >
               <el-select
                 style="width: 100%"
                 v-model="form.gender"
                 placeholder="请选择性别"
+                :disabled="form.source==1"
               >
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
@@ -398,12 +393,12 @@
         </el-row>
         <el-row>
           <el-col :span="14">
-            <el-form-item label="状态" v-if="!form.source">
+            <el-form-item label="状态" >
               <el-radio-group v-model="form.isLock">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="`${dict.value}`"
-                  :label="dict.value"
+                  :label="dict.value" :disabled="form.source==1"
                   >{{ dict.label }}</el-radio
                 >
               </el-radio-group>