权限修改

front-vue/src/views/system/company/certification.vue

@@ -49,7 +49,7 @@
               营业执照及身份证请上传最新证件原件的彩色扫描件，如使用复印件请加盖公章上传；
             </p>
             <p>
-              2. 图片支持格式：jpg /jpeg /png /bmp格式，图片大小不超过3M；
+              2. 图片支持格式：jpg /jpeg /png 格式，图片大小不超过3M；
             </p>
             <p>
               3.上传图片后，系统将自动识别并填写相关信息，请核对系统识别结果是否准确;
@@ -1414,12 +1414,11 @@ export default {
     beforeAvatarUpload(file) {
       const isJPG =
         file.type === "image/jpeg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp";
+        file.type === "image/png";
       const isLt2M = file.size / 1024 / 1024 < 3;
 
       if (!isJPG) {
-        this.$message.error("上传图片只能是 JPG/PNG/BMP 格式");
+        this.$message.error("上传图片只能是 JPG/PNG/ 格式");
       }
       if (!isLt2M) {
         this.$message.error("上传图片大小不能超过 3MB");
@@ -1852,7 +1851,7 @@ export default {
         if(!this.form.pbaiBankName){
            this.$message.error("对公账户开户银行不能为空!");
         }else if(!this.form.pbaiBankaccountId){
-           this.$message.error("对公账户银行账户不能为空!");
+           this.$message.error("对公账户银行账号不能为空!");
         }else{
         const loading = this.$loading({
           lock: true,

front-vue/src/views/system/fundSide/fundSide.vue

@@ -658,12 +658,11 @@ export default {
     beforeAvatarUpload(file) {
       const isJPG =
         file.type === "image/jpeg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp";
+        file.type === "image/png" ;
       const isLt2M = file.size / 1024 / 1024 < 3;
 
       if (!isJPG) {
-        this.$message.error("上传图片只能是 JPG/JPEG/PNG/BMP 格式");
+        this.$message.error("上传图片只能是 JPG/JPEG/PNG 格式");
       }
       if (!isLt2M) {
         this.$message.error("上传图片大小不能超过 3MB");

front-vue/src/views/system/user/index.vue

@@ -236,7 +236,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="600"
+            width="500"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -256,7 +256,7 @@
                 v-hasPermi="['system:ownUser:adminChange']"
                 v-if="
                   scope.row.scyType == '03' &&
-                  scope.row.company != '000000' &&
+                  company.scyId != '000000' &&
                   scope.row.sucrHandler == '0'
                 "
                 >变更管理员</el-button
@@ -269,10 +269,10 @@
                 v-hasPermi="['system:ownUser:handlerChange']"
                 v-if="
                   scope.row.scyType != '03' &&
-                  scope.row.qperator == '1' &&
+                  qperator == '1' &&
                   scope.row.sucrHandler == '0' &&
-                  scope.row.handleCompany == '01' &&
-                  scope.row.company != '000000'
+                  handleCompany == '01' &&
+                  company.scyId != '000000'
                 "
                 >申请变更经办人</el-button
               >
@@ -284,9 +284,9 @@
                 v-hasPermi="['system:ownUser:confirmChange']"
                 v-if="
                   scope.row.scyType != '03' &&
-                  scope.row.qperator == '1' &&
+                  qperator == '1' &&
                   scope.row.handleChange == '00' &&
-                  scope.row.company == '000000'
+                  company.scyId == '000000'
                 "
                 >确认变更经办人</el-button
               >
@@ -436,7 +436,7 @@
             class="upload-demo"
             :class="{ uoloadSty: showBtnImg, disUoloadSty: noneBtnImg }"
             action=""
-            accept=".jpg, .jpeg, .png, .JPG, .JPEG, .PNG"
+            accept=".jpg, .jpeg, .png"
             :http-request="sfzRequest"
             :on-preview="handlePictureCardPreview"
             :before-upload="beforeAvatarUpload"
@@ -467,13 +467,13 @@
           <el-upload
             ref="upload"
             class="upload-demo"
-            :class="{ uoloadSty: showsBtnImg, disUoloadSty: nonesBtnImg }"
+            :class="{ uoloadAxq: showsBtnImg, disUoloadAxq: nonesBtnImg }"
             action=""
-            accept=".jpg, .jpeg, .png, .JPG, .JPEG, .PNG"
+            accept=".jpg, .jpeg, .png"
             :http-request="sqsRequest"
             :on-preview="sqsPictureCardPreview"
             :before-upload="beforeAvatarUpload"
-            :on-remove="beforeRemove"
+            :on-remove="sqsRemove"
             :on-change="dealImgChange"
             multiple
             :limit="1"
@@ -626,6 +626,9 @@ export default {
       sqsList: [],
 
       limitCountImg: 1,
+      handleCompany: null,
+      company: null,
+      qperator:null,
       //当前登录用户企业id
       signCompanyId: "",
       //姓名
@@ -944,30 +947,26 @@ export default {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
         (response) => {
-          this.userList = response.rows;
-          getOwnCompany().then((response) => {
-            this.company = response.data;
-            console.log(this.company.scyId);
-          });
-          qperatorQuery().then((response) => {
-            for (let i = 0; i < this.userList.length; i++) {
-              this.userList[i].qperator = response.data[0].sucrHandler;
-              this.userList[i].company = this.company.scyId;
-              console.log(this.userList[i].userId);
-              handlerDo(this.userList[i]).then((response) => {
-                this.userList[i].handleChange = response.data.handleChange;
-                console.log(response.data.handleChange);
-              });
-              handleUser().then((response) => {
-                this.userList[i].handleCompany = response.data.handleCompany;
-              });
-            }
-            console.log(this.userList);
-          });
+          let userList = response.rows;
+          for (let i = 0; i < userList.length; i++) {
+            handlerDo(userList[i]).then((response) => {
+              userList[i].handleChange = response.data.handleChange;
+            });
+          }
+          this.userList = userList;
           this.total = response.total;
           this.loading = false;
         }
       );
+      handleUser().then((response) => {
+        this.handleCompany = response.data.handleCompany;
+      });
+      getOwnCompany().then((response) => {
+        this.company = response.data;
+      });
+      qperatorQuery().then((response) => {
+        this.qperator = response.data[0].sucrHandler;
+      });
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {