lmx 1 mesiac pred
rodič
commit
58f9341576

+ 3 - 2
src/views/company/wxAccount/index.vue

@@ -89,6 +89,7 @@
       <el-table-column label="微信号" align="center" prop="wxNo" />
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="员工" align="center" prop="companyUserName" />
+      <el-table-column label="微信备注前缀" align="center" prop="wxRemark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -142,7 +143,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="微信备注前缀" prop="wxRemark">
-          <el-input :disabled="title=='修改个微账号'" v-model="form.wxRemark"  :maxlength="6" placeholder="请输入六位微信备注前缀" />
+          <el-input :disabled="title=='修改个微账号'" v-model="form.wxRemark"  :maxlength="6" placeholder="请输入6位微信备注前缀(数字/字母/中文)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -210,7 +211,7 @@ export default {
         wxRemark: [
           { required: true, message: '请输入微信备注前缀', trigger: 'blur' },
           { len: 6, message: '微信备注前缀必须为6位', trigger: 'blur' },
-          { pattern: /^\d{6}$/, message: '微信备注前缀只能输入6位数字', trigger: 'blur' }
+          { pattern: /^[0-9a-zA-Z\u4e00-\u9fa5]{6}$/, message: '微信备注前缀只能输入6位数字、字母或中文', trigger: 'blur' }
         ]
       }
     };

+ 54 - 3
src/views/components/QwUserSelect.vue

@@ -328,14 +328,65 @@ export default {
     margin-left: 10px;
     vertical-align: bottom;
   }
-  .el-dialog__wrapper{
+  .el-dialog__wrapper {
     z-index: 100000;
   }
-  .app-container{padding: 0}
-  .dialog-footer{
+  .app-container {
+    padding: 0;
+  }
+  .dialog-footer {
     position: absolute;
     bottom: 0;
     right: 20px;
     background: #FFF;
   }
+
+  .drawer-container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    padding: 0 16px;
+  }
+
+  .search-card {
+    margin-bottom: 12px;
+  }
+  .search-card >>> .el-card__body {
+    padding: 16px 16px 0;
+  }
+  .search-form >>> .el-form-item {
+    margin-bottom: 16px;
+  }
+  .search-form >>> .el-form-item__content {
+    width: calc(100% - 80px);
+  }
+  .search-form >>> .el-select,
+  .search-form >>> .el-date-editor {
+    width: 100%;
+  }
+
+  .table-card {
+    flex: 1;
+    overflow: hidden;
+    margin-bottom: 12px;
+  }
+  .table-card >>> .el-card__body {
+    padding: 12px 16px;
+  }
+  .card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .footer-actions {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    padding: 12px 0;
+    border-top: 1px solid #EBEEF5;
+  }
+  .footer-actions .el-button + .el-button {
+    margin-left: 10px;
+  }
 </style>