Merge branch 'master' of http://git.datuai.com/luoyibo/ykt-web

src/views/basics/basicParameter/ptWorkstation/DetailForm.vue

@@ -102,12 +102,13 @@ const formData = ref<PtWorkstationForm>({
 const formRules = reactive({
   stationId: [{ required: true, message: '工作站id不能为空', trigger: 'blur' }],
   stationName: [{ required: true, message: '工作站名称不能为空', trigger: 'blur' }],
-  stationNumb: [{ required: true, message: '工作站编号不能为空', trigger: 'blur' }],
+  stationNumb: [{ required: true, message: '工作站编号不能为空', trigger: 'blur' },
+  ],
   stationType: [{ required: true, message: '工作站类型不能为空', trigger: 'change' }],
   ip: [{ required: true, message: 'IP地址不能为空', trigger: 'blur' }],
   usablePort: [{ required: true, message: '可用串口不能为空', trigger: 'blur' }],
   commPort: [{ required: true, message: '服务端口不能为空', trigger: 'blur' }],
-  serverPort: [{ required: true, message: '服务器端口不能为空', trigger: 'blur' }],
+  serverPort: [{ required: true, message: '服务器端口不能为空', trigger: 'blur' }]
 });
 /** 当前组件方法 */
 /** 窗体打开事件 */

src/views/payment/account/facePhoto.vue

@@ -30,9 +30,9 @@
                 <el-form-item label="学/工号" prop="userNumb">
                   <el-input v-model="queryParams.userNumb" placeholder="请输入学/工号" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
-                <el-form-item label="手机号码" prop="phone">
+                <!-- <el-form-item label="手机号码" prop="phone">
                   <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                   <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -46,6 +46,9 @@
             <el-button v-has-permi="['payment:ptUserAccount:edit']" type="primary" plain @click="dialogVisible = true">批量上传照片</el-button>
           </template>
           <div class="list-image" style="height: 52vh; overflow-y: auto">
+            <template v-if="total == 0">
+              <p style="color: dimgray;">暂无数据</p> 
+            </template>
             <div v-for="user in ptUserAccountList" :key="user.userNumb" class="block">
               <span>姓名：{{ user.realName }}</span>
               <span class="demonstration">学号：{{ user.userNumb }}</span>
@@ -64,6 +67,7 @@
                 <el-icon v-else class="avatar-uploader-icon-2"><Plus /></el-icon>
               </el-upload>
             </div>
+            
           </div>
         </el-card>
         <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
@@ -134,7 +138,7 @@ const initFormData: PtUserAccountForm = {
   userNumb: '',
   realName: '',
   category: '',
-  phone: undefined,
+  phone: '',
   accountStatus: '1',
   freezeStatus: 'N',
   consumePwd: undefined,
@@ -185,9 +189,9 @@ const getTreeSelect = async () => {
 const getList = async () => {
   loading.value = true;
   const res = await api.listPtUserAccount4Select(proxy?.addDateRange(queryParams.value, dateRange.value));
-  loading.value = false;
   ptUserAccountList.value = res.rows;
   total.value = res.total;
+  loading.value = false;
 };
 
 /** 节点单击事件 */

src/views/system/user/index.vue

@@ -28,7 +28,7 @@
                   <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
                 <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+                  <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
                 </el-form-item>
 
                 <el-form-item label="状态" prop="status">
@@ -165,8 +165,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            <el-form-item label="手机号码" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -353,7 +353,7 @@ const initFormData: UserForm = {
   userName: '',
   nickName: undefined,
   password: '',
-  phonenumber: undefined,
+  phone: undefined,
   email: undefined,
   sex: undefined,
   status: '0',
@@ -368,7 +368,7 @@ const initData: PageData<UserForm, UserQuery> = {
     pageNum: 1,
     pageSize: 10,
     userName: '',
-    phonenumber: '',
+    phone: '',
     status: '',
     deptId: '',
     roleId: ''