权限管理

src/pages/authority/organization/organizationedit.vue

@@ -34,7 +34,6 @@
             ref="servicepic"
             directory="manage"
           ></upload-file>
-          <span class="removepic" @click="removepic">更换封面</span>
         </el-form-item>
 
         <el-form-item prop="desc">

src/pages/authority/user/organizationuser.vue

@@ -46,15 +46,15 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="systemname">
+        <el-form-item prop="systemname" v-if="form.type!==1">
           <p class="formname">业务系统名称：</p>
           <el-input v-model="form.systemname"></el-input>
         </el-form-item>
-        <el-form-item prop="domain">
+        <el-form-item prop="domain" v-if="form.type==3||form.type==4">
           <p class="formname">域名：</p>
           <el-input v-model="form.domain"></el-input>
         </el-form-item>
-        <el-form-item prop="ip">
+        <el-form-item prop="ip" v-if="form.type==3||form.type==4">
           <p class="formname">IP白名单：</p>
           <el-input v-model="form.ip"></el-input>
         </el-form-item>
@@ -70,7 +70,7 @@
           <p class="formname">邮箱：</p>
           <el-input v-model="form.email"></el-input>
         </el-form-item>
-        <el-form-item prop="origin">
+        <el-form-item prop="origin" v-if="form.type!==1">
           <p class="formname">用户组织机构：</p>
           <el-select v-model="form.origin" placeholder="请选择">
             <el-option
@@ -136,6 +136,16 @@ export default {
     uploadFile,
   },
   data() {
+    var check_phone = (rule, value, callback) => {
+      var phone_ruler=/^(?:(?:\+|00)86)?1[3-9]\d{9}$/
+        setTimeout(() => {
+          if (!phone_ruler.test(value)) {
+            callback(new Error('请输入正确电话号码'));
+          } else {
+            callback();
+          }
+        });
+      };
     var checkip = (rule, value, callback) => {
       var reg = /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g;
       setTimeout(() => {
@@ -196,21 +206,53 @@ export default {
       ],
       origin_arr: [],
       rules: {
+        account: [
+          { required: true, message: "请输入账号", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "请输入密码", trigger: "blur" },
+        ],
+        nickname: [
+          { required: true, message: "请输入昵称", trigger: "blur" },
+        ],
+        type: [
+          { required: true, message: "请选择用户类型", trigger: "change" },
+        ],
+        systemname: [
+          { required: true, message: "请输入系统名称", trigger: "blur" },
+        ],
+        contact: [
+          { required: true, message: "请输入联系人", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "请输入电话号码", trigger: "blur" },
+          { validator: check_phone,  trigger: "blur" },
+        ],
         able: [
           { required: true, message: "请选择是否禁用", trigger: "change" },
         ],
-        // domain:[
-        //     { required: true, message: '请输入域名', trigger: 'blur' }
-        // ],
+        origin: [
+          { required: true, message: "请选择组织机构", trigger: "change" },
+        ],
+        domain:[
+            { required: true, message: '请输入域名', trigger: 'blur' }
+        ],
         ip: [
-          // { required: true, message: '请输入ip地址', trigger: 'blur' }
+          { required: true, message: '请输入ip地址', trigger: 'blur' }
         ],
       },
       edit_flag: 0,
       baseinfo: {},
     };
   },
-  watch: {},
+  watch: {
+    'form.type'(n,o){
+      this.form.systemname = ''
+      this.form.domain = ''
+      this.form.ip = ''
+      this.form.origin = ''
+    }
+  },
   computed: {},
   created() {
     this.get_now_user();
@@ -241,35 +283,48 @@ export default {
         .put(`/apaas/backmgt/user/initalPasswd/${this.$route.params.id}`)
         .then((response) => {
           console.log(response);
-          this.$message.success("修改成默认密码成功 默认密码：123456");
+          if(response.data.success){
+            this.$message.success("修改成默认密码成功 默认密码：123456");
+          }else{
+            this.$message.error("修改密码失败");
+          }
         })
-        .catch((response) => {});
+        .catch((response) => {
+          this.$message.error("修改密码失败");
+        });
     },
     get_user() {
       this.$http
         .get(`/apaas/backmgt/user/detail/${this.$route.params.id}`)
         .then((response) => {
           console.log(response);
-          let data = response.data.data;
-          this.form = {
-            account: data.user_id,
-            password: "******",
-            nickname: data.user_name,
-            type: data.is_admin,
-            systemname: data.system_name,
-            contact: data.link_man,
-            phone: data.phone + "",
-            email: data.email,
-            origin: data.department_id,
-            able: data.state,
-            desc: data.description,
-            person: data.create_user,
-            date: data.create_date,
-            ip: this.transform_func(data.ip_whitelist),
-            domain: data.domain_name,
-          };
+          if(response.data.success){
+            let data = response.data.data;
+            this.form = {
+              account: data.user_id,
+              password: "******",
+              nickname: data.user_name,
+              type: data.is_admin,
+              systemname: data.system_name,
+              contact: data.link_man,
+              phone: data.phone + "",
+              email: data.email,
+              origin: data.department_id,
+              able: data.state,
+              desc: data.description,
+              person: data.create_user,
+              date: data.create_date,
+              ip: this.transform_func(data.ip_whitelist),
+              domain: data.domain_name,
+            };
+          }else{
+            this.$message.error("获取数据失败");
+          }
+          
         })
-        .catch((response) => {});
+        .catch((response) => {
+          this.$message.error("获取数据失败");
+        });
     },
     transform_func(arr) {
       var temp = "";
@@ -283,16 +338,23 @@ export default {
       this.$http
         .get("/apaas/backmgt/department/list")
         .then((response) => {
-          let data = response.data.data;
-          // this.originoptions = data
-          data.forEach((e) => {
-            this.originoptions.push({
-              label: e.department_name,
-              value: e.department_id,
+          if(response.data.success){
+            let data = response.data.data;
+            // this.originoptions = data
+            data.forEach((e) => {
+              this.originoptions.push({
+                label: e.department_name,
+                value: e.department_id,
+              });
             });
-          });
+          }else{
+            this.$message.error("获取组织失败");
+          }
+          
         })
-        .catch(function(response) {});
+        .catch(function(response) {
+           this.$message.error("获取组织失败");
+        });
     },
     removepic() {
       this.$refs.servicepic.handleRemove();
@@ -303,6 +365,7 @@ export default {
     add_user() {
       var temp = {
         user_id: this.form.account, // 用户名
+        password:this.form.password,
         user_name: this.form.nickname, // 昵称
         system_name: this.form.systemname, //系统名称
         phone: this.form.phone + "", // 电话号
@@ -316,11 +379,15 @@ export default {
         link_man: this.form.contact,
       };
       this.$http
-        .post(`/apaas/backmgt/user/register`, temp)
+        .post(`/apaas/backmgt/user/add`, temp)
         .then((response) => {
           console.log(response);
-          this.backPage();
-          this.$message.success("新增成功");
+          if(response.data.success){
+            this.backPage();
+            this.$message.success("新增成功");
+          }else{
+            this.$message.error("新增失败");
+          }    
         })
         .catch((response) => {
           this.$message.error("新增失败");
@@ -345,9 +412,12 @@ export default {
       this.$http
         .put(`/apaas/backmgt/user/put`, temp)
         .then((response) => {
-          console.log(response);
-          this.backPage();
-          this.$message.success("修改成功");
+          if(response.data.success){
+            this.backPage();
+            this.$message.success("修改成功");
+          }else{
+            this.$message.error("修改失败");
+          }
         })
         .catch((response) => {
           this.$message.error("修改失败");
@@ -367,6 +437,9 @@ export default {
           return false;
         }
       });
+    },
+    check_account(){
+      
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();

src/pages/workbench/fwgl/serviceEdit.vue

@@ -54,7 +54,7 @@
           <upload-file
             :multiple="false"
             :max="1"
-            type="picture"
+            type="cropper"
             :readOnly="false"
             fit="fill"
             :list="imgList"
@@ -62,7 +62,6 @@
             @getNewList="getNewList"
             ref="servicepic"
           ></upload-file>
-          <span class="removepic" v-if="now_user==2" @click="removepic">更换封面</span>
         </el-form-item>
         <el-form-item v-if="now_user==0" prop="code" :rules="[
           { required: true, message: '请输入接口编码', trigger: 'blur' },

src/pages/workbench/yygl/app_edit.vue

@@ -51,7 +51,6 @@
             @getNewList="getNewList"
             ref="servicepic"
           ></upload-file>
-          <span class="removepic" @click="removepic">更换封面</span>
         </el-form-item> 
 
         <el-form-item