Merge remote-tracking branch 'origin/master'

src/views/basic/product/productUdiType.vue

@@ -31,7 +31,7 @@
         <el-table-column prop="remark" label="备注"></el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button type="text"  @click="handleSubForm( scope.row, 'add')" :disabled="scope.row.code==10000">新增</el-button>
+            <el-button type="text"  @click="handleSubForm( scope.row, 'add')">新增</el-button>
             <el-button type="text"  @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
             <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleDelInv(scope.row)">删除</el-button>
             <el-button type="text" v-if="scope.row.code!=10000"  @click.native.stop="addHospProduct( scope.row)">绑定</el-button>
@@ -232,7 +232,7 @@ export default {
         this.subData = JSON.parse(JSON.stringify(data));
       } else if (formName === "add") {
         this.subData= {
-          parentCode:JSON.parse(JSON.stringify(data)).parentCode
+          parentCode:JSON.parse(JSON.stringify(data)).code
         };
       }
       this.getTreeselect(data);

src/views/inventory/InvCountOrderModify.vue

@@ -170,7 +170,7 @@
           </el-form-item>
           <el-form-item>
             <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
               <el-button type="primary" icon="search" @click="queryInvProductsList"
               >查询
               </el-button

src/views/inventory/InvCountOrderNew.vue

@@ -239,8 +239,10 @@ export default {
     addCountOrder(type) {
       this.formVisible = true;
       this.formName = 'add_' + type;
-      this.countOrder = {};
       this.countType = type;
+      this.countOrder = {
+        countType: this.countType
+      };
     },
     printOrder(row) {
       let query = {moduleId: 6};

src/views/myLogin.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="login-container">
-    <div>
+    <div class="textTitle">
       <h3 class="toptitle">平潭协和医院</h3>
+      <h3 class="topSubtitle">医院UDI管理系统</h3>
     </div>
     <el-form
       class="card-box login-form"
@@ -232,6 +233,32 @@ export default {
               type: "warning",
             });
           }
+          this.loading = true;
+          if (this.loginForm.rememberMe) {
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              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.$message.error(res);
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
         }
       });
     },
@@ -269,6 +296,7 @@ $light_gray: #eee;
   background-size: 100vw 100vh;
   height: 100%;
   overflow: hidden;
+  display: flex;
 
   input:-webkit-autofill,
   input:-webkit-autofill:hover,
@@ -327,14 +355,20 @@ $light_gray: #eee;
     font-weight: bold;
     margin-bottom: 50px;
   }
+  .textTitle {
+    width: 50%;
+    font-size: 45px;
+  }
 
   .toptitle {
-    position: absolute;
-    font-size: 55px;
     color: #ffffff;
-    margin: 50px auto 0.5333rem 50px;
     text-align: center;
-    font-weight: bold;
+    margin-top: 132px;
+    margin-bottom: -10px;
+  }
+  .topSubtitle {
+    color: #fcd38b;
+    text-align: center;
   }
 
   .login-form {

src/views/purchase/cert/supCertificationAdd.vue

@@ -6,12 +6,12 @@
         <el-row>
           <el-col span="6">
             <el-form-item label="企业名称:">
-              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称"></el-input>
+              <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col span="6">
             <el-form-item label="社会信用号:">
-              <el-input v-model="filterQuery.creditCode" style="width: 90%" placeholder="请输入社会信用号"></el-input>
+              <el-input v-model="filterQuery.creditCode" style="width: 90%" placeholder="请输入社会信用号" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col span="6">

src/views/purchase/company/supCompanyAdd.vue

@@ -5,12 +5,12 @@
                 <el-row>
                   <el-col span="6">
                     <el-form-item label="企业名称">
-                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称"></el-input>
+                        <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称" clearable></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col span="6">
                     <el-form-item label="社会信用号">
-                        <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入社会信用号"></el-input>
+                        <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入社会信用号" clearable></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>