Merge branch 'master' of http://gitlab.91isoft.com:90/zhangbotao/intelligent_station_web

src/api/resDatasetInfo.js

+import request from '@/utils/request'
+import Qs from 'qs'
+
+/**
+* 1. 列表查询
+* 2. 查询详细信息
+* 3. 新增
+* 4. 修改
+* 5. 逻辑删除
+* 6. 导出
+*
+*/
+
+// 1. 查询数据集信息列表
+export function listResDatasetInfo(query) {
+  return request({
+    url: '/resdatasetinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 2. 查询数据集信息详细信息
+export function getResDatasetInfo(businessId) {
+  return request({
+    url: '/resdatasetinfo/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 3. 新增数据集信息
+export function addResDatasetInfo(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/resdatasetinfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 4. 修改数据集信息
+export function updateResDatasetInfo(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/resdatasetinfo/update/' + businessId,
+    method: 'put',
+    data
+  })
+}
+
+// 5. 逻辑删除数据集信息
+export function delResDatasetInfo(businessId) {
+  return request({
+    url: '/resdatasetinfo/deleteLogical/' + businessId,
+    method: 'delete'
+  })
+}
+
+// 6. 导出数据集信息
+export function exportResDatasetInfo(query) {
+  return request({
+    url: '/resdatasetinfo/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/busStudentInfo/index.vue

@@ -96,11 +96,6 @@
             {{ scope.row.userName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="用户" prop="userId" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.userId || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="姓名" prop="stuName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.stuName || '-' }}
@@ -132,11 +127,6 @@
             {{ scope.row.remarks || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
           <template slot-scope="scope">
             <el-button
@@ -168,11 +158,8 @@
         <el-form-item label="学号" prop="userCode">
           <el-input v-model.trim="form.userCode" show-word-limit :maxlength="255" placeholder="请输入学号" />
         </el-form-item>
-        <el-form-item label="账号（关联sys_user)" prop="userName">
-          <el-input v-model.trim="form.userName" show-word-limit :maxlength="255" placeholder="请输入账号（关联sys_user)" />
-        </el-form-item>
-        <el-form-item label="用户（关联sys_user）" prop="userId">
-          <el-input-number v-model.trim="form.userId" controls-position="right" :min="0" />
+        <el-form-item label="账号" prop="userName">
+          <el-input v-model.trim="form.userName" show-word-limit :maxlength="255" placeholder="请输入账号" />
         </el-form-item>
         <el-form-item label="姓名" prop="stuName">
           <el-input v-model.trim="form.stuName" show-word-limit :maxlength="255" placeholder="请输入姓名" />
@@ -251,6 +238,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        userCode: [
+          { required: true, message: '学号不能为空', trigger: 'blur' }
+        ],
+        userName: [
+          { required: true, message: '账号不能为空', trigger: 'blur' }
+        ],
+        stuName: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        stuPhone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' }
+        ],
+        classesId: [
+          { required: true, message: '班级不能为空', trigger: 'blur' }
+        ]
       }
     }
   },
@@ -360,9 +362,13 @@ export default {
             })
           } else {
             addBusStudentInfo(this.form).then(response => {
-              this.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
+              if (response.code === 200) {
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.$message.error(response.message)
+              }
             })
           }
         }