Merge remote-tracking branch 'origin/master'

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 供应商自助管理系统
+VUE_APP_TITLE = 供应商自助管理平台
 
 # 开发环境配置
 ENV = 'development'

src/views/myLogin.vue

@@ -95,13 +95,15 @@
       style="
         position: absolute;
         bottom: 0;
-        margin-left: 36%;
+        font-size: 12px;
-        font-size: 18px;
         color: white;
+        width: 100%;
+        display: flex;
+        justify-content: center;
       "
     >
       <a href="http://www.xmglxp.com/" target="_blank">
-        软件名称: 医院UDI管理系统
+        软件名称: 供应商自助管理平台
       </a>
       <a
         href="http://www.xmglxp.com/"
@@ -158,6 +160,7 @@ export default {
     };
   },
   methods: {
+    // 滑块验证
     verifyAlert(text) {
       if (text === "success") {
         this.loginForm.verificationCode = true;
@@ -165,7 +168,7 @@ export default {
         this.loginForm.verificationCode = false;
       }
     },
-    // handleLogin() {
+    /*  // handleLogin() {
     //   if (!this.ruleForm.verificationCode) {
     //     this.$message({
     //       message: '请进行验证',
@@ -208,7 +211,7 @@ export default {
     //       return false;
     //     }
     //   });
-    // },
+    // }, */
 
     getCookie() {
       const username = Cookies.get("username");
@@ -224,33 +227,41 @@ export default {
     handleLogin() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          this.loading = true;
+          if (this.loginForm.verificationCode) {
-          if (this.loginForm.rememberMe) {
+            this.loading = true;
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            if (this.loginForm.rememberMe) {
-            Cookies.set("password", encrypt(this.loginForm.password), {
+              Cookies.set("username", this.loginForm.username, { expires: 30 });
-              expires: 30,
+              Cookies.set("password", encrypt(this.loginForm.password), {
-            });
+                expires: 30,
-            // Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
+              });
+              // Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
+            } else {
+              Cookies.remove("username");
+              Cookies.remove("password");
+              // Cookies.remove('rememberMe');
+            }
+
+            this.$store
+              .dispatch("Login", this.loginForm)
+              .then((res) => {
+                this.$router
+                  .push({ path: this.redirect || "/" })
+                  .catch((res) => {});
+              })
+              .catch((res) => {
+                this.loading = false;
+                this.$refs.checkV.refresh();
+                this.$message.error(res);
+                if (this.captchaEnabled) {
+                  this.getCode();
+                }
+              });
           } else {
-            Cookies.remove("username");
+            this.$message({
-            Cookies.remove("password");
+              message: "请向右滑动完成验证",
-            // Cookies.remove('rememberMe');
+              type: "warning",
-          }
-          this.$store
-            .dispatch("Login", this.loginForm)
-            .then((res) => {
-              this.$router
-                .push({ path: this.redirect || "/" })
-                .catch((res) => {});
-            })
-            .catch((res) => {
-              this.loading = false;
-              this.$refs.checkV.refresh();
-              this.$message.error(res);
-              if (this.captchaEnabled) {
-                this.getCode();
-              }
             });
+          }
         }
       });
     },
@@ -287,6 +298,7 @@ $light_gray: #eee;
   background-image: url("../assets/login.jpg");
   background-size: 100vw 100vh;
   height: 100%;
+  overflow: hidden;
 
   input:-webkit-autofill,
   input:-webkit-autofill:hover,
@@ -388,12 +400,6 @@ $light_gray: #eee;
     cursor: pointer;
   }
 
-  .thirdparty-button {
-    /*position: absolute;*/
-    /*right: .4666rem;*/
-    /*bottom: .37333rem;*/
-  }
-
   .box-card {
     margin-top: -20px;
     height: 550px;

src/views/register.vue

@@ -594,6 +594,19 @@ export default {
         callback();
       }
     };
+    //限制统一信用号
+    const validatePatt = (rule, value, callback) => {
+      if (
+        /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/.test(
+          value
+        ) === false
+      ) {
+        callback(new Error("请输入有效的的社会统一信用号"));
+      } else {
+        // 校验通过
+        callback();
+      }
+    };
     return {
       inputQuery: {
         nickName: null,
@@ -678,6 +691,7 @@ export default {
 
         creditNum: [
           { required: true, message: "请输入统一社会信用号", trigger: "blur" },
+          { validator: validatePatt, trigger: "blur" },
         ],
         area: [{ required: true, message: "请选择所属地区", trigger: "blur" }],
         detailAddr: [

src/views/system/dept/authDept.vue

@@ -582,7 +582,7 @@ export default {
     },
     /* 获取列表 */
     getList() {
-      let qwe = this.checkdefault;
+      let line = this.checkdefault;
       this.loading = true;
       filterList(this.filterQuery)
         .then((response) => {
@@ -591,11 +591,11 @@ export default {
           this.list = this.handleTree(depList, "code", "pcode");
           //默认选中第一行列表
           this.$nextTick(() => {
-            console.log(qwe);
+            console.log(line);
-            if (qwe === null) {
+            if (line === null) {
               this.$refs.deptTableRef.setCurrentRow(depList[0]);
             } else {
-              this.$refs.deptTableRef.setCurrentRow(qwe);
+              this.$refs.deptTableRef.setCurrentRow(line);
             }
           });
         })

src/views/system/dept/invWarehouse.vue

@@ -9,15 +9,8 @@
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item class="query-form-item" label="仓库类型:">
+        <el-form-item label="仓库类型:" prop="advanceType" >
-          <el-input
+          <el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 90%">
-
-            clearable
-            placeholder="仓库类型"
-          ></el-input>
-        </el-form-item> -->
-        <el-form-item label="仓库类型" prop="advanceType">
-          <el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
             <el-option label="入账库" :value="1"/>
             <el-option label="预验收库" :value="2"/>
             <el-option label="寄售库" :value="3"/>