Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/Sys/Password.vue

@@ -23,11 +23,11 @@
       :close-on-click-modal="false">
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="submitForm()" label-width="80px"
         :size="size" style="text-align:left;">
-        <el-form-item label="编码" prop="code">
-          <el-input v-model="dataForm.code" placeholder="请输入编码"></el-input>
+        <el-form-item label="编码" prop="code" >
+          <el-input v-model="dataForm.code" placeholder="请输入编码" :disabled="dataForm.id"></el-input>
         </el-form-item>
         <el-form-item label="功能描述" prop="name">
-          <el-input v-model="dataForm.name" placeholder="请输入功能"></el-input>
+          <el-input v-model="dataForm.name" placeholder="请输入功能" :disabled="dataForm.id"></el-input>
         </el-form-item>
         <el-form-item label="旧密码" prop="originalPassword" v-if="dataForm.id">
           <el-input v-model="dataForm.originalPassword" placeholder="请输入旧密码"
@@ -119,9 +119,10 @@ export default {
     },
     // 显示编辑界面
     handleEdit: function (scope) {
+      let obj=Object.assign({}, scope.row);
+      obj.password=''
+      this.dataForm = obj;
       this.dialogVisible = true;
-      scope.row.password=''
-      this.dataForm = Object.assign({}, scope.row);
     },
     // 菜单树选中
     handleTreeSelectChange(data, node) {