修改分页

backend/src/dashoo.cn/modi_webapi/app/api/personnel/personnel.go

@@ -17,8 +17,6 @@ func (c *Controller) GetAllPersonnel(r *ghttp.Request){
 	page := request.GetPageInfo(r)
 	where := ""
 
-
-
 	if name := r.GetString("Name"); name != ""{
 		if where == ""{
 			where = fmt.Sprintf(" PersonnelName LIKE '%%%v%%'", name)
@@ -76,7 +74,11 @@ func (c *Controller) AddPersonnel(r *ghttp.Request){
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
 	}
-
+	// 查询code是否存在
+	info, _ := personnel.GetPersonnelByCode(Personnel.PersonneCode)
+	if info != nil {
+		response.Json(r, 1, "人员编号已存在")
+	}
 	realName := r.GetParamVar("realname").String()
 	userId := r.GetParamVar("userid").Int()
 	currentTime := gtime.Now()

backend/src/dashoo.cn/modi_webapi/app/service/personnel/personnel.go

@@ -21,3 +21,11 @@ func GetAllPersonnel(page request.PageInfo, where string, result *[]Entity)(err
 func FindPersonnelCount(where string)(int, error){
 	return recordsTable.Where(where).Count()
 }
+
+// 根据Code查询
+func GetPersonnelByCode(Code string) (res *Entity, err error){
+	model := recordsTable.Where("PersonneCode", Code)
+	var result *Entity
+	err = model.Struct(&result)
+	return result, nil
+}

frontend_web/src/views/personnel/index.vue

@@ -13,22 +13,6 @@
                     v-model="search.Name"
                     placeholder="请输入人员姓名"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="设备大类"
-                      class="sbutton_margin">
-          <el-select style="width:140px;"
-                     v-model="search.classification"
-                     clearable
-                     placeholder="请选择设备大类">
-            <el-option v-for="item in classificationlist"
-                       :key="item.Value"
-                       :label="item.Value"
-                       :value="item.Value">
-            </el-option>
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="创建时间" class="sbutton_margin">
-          <el-date-picker   style="width: 220px" v-model="CalibrationTime" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束日期"></el-date-picker>
-        </el-form-item> -->
         <el-button size="mini"
                    type="primary"
                    @click="initDatas()"
@@ -59,15 +43,12 @@
                        align="center"
                        fixed='right'>
         <template slot-scope="scope">
-          <!-- <router-link :to="'/personnel/' + scope.row.Id + '/personneledit'"> -->
-          <!-- <router-link :to="'/personnel/personneldetails?id='+scope.row.Id +''"> -->
           <el-button size="mini"
                      title="编辑"
                      type="primary"
                      @click="personneledit(scope.row.Id)"
                      icon="el-icon-edit"
                      circle></el-button>
-          <!-- </router-link> -->
           <el-button size="mini"
                      type="danger"
                      title="删除"
@@ -75,29 +56,6 @@
                      style="margin-left:5px;"
                      icon="el-icon-delete"
                      circle></el-button>
-          <!-- <router-link :to="'/personnel/maintainlog?id='+scope.row.Id +''">
-              <el-button size="mini"   title="质量管理" type="warning" style="margin-left:5px;" icon="fa fa-flask" circle>
-              </el-button>
-            </router-link>
-            <router-link :to="'/personnel/instrumenrunrecord?id='+scope.row.Id +''">
-              <el-button size="mini"   title="运行记录" type="warning" style="margin-left:5px;" icon="fa fa-tachometer" circle>
-              </el-button>
-            </router-link> -->
-          <!-- <el-dropdown>
-                <el-button size="mini"   type="success" >
-                  更多
-                  <i class="el-icon-arrow-down el-icon--right"></i>
-                </el-button>
-                <el-dropdown-menu slot="dropdown">
-
-                  <el-dropdown-item>
-
-                  </el-dropdown-item>
-                  <el-dropdown-item>
-
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown> -->
         </template>
       </el-table-column>
       <el-table-column prop="PersonnelName"
@@ -127,31 +85,11 @@
                        align="center"
                        min-width="120px"
                        show-overflow-tooltip></el-table-column>
-
-      <!-- <el-table-column prop="CalibrationTime"
-                         sortable
-                         label="校准时间"
-                         align="center"
-                         width="140px"
-                         show-overflow-tooltip>
-          <template slot-scope="scope">{{ jstimehandle(scope.row.CalibrationTime +'') }}</template>
-        </el-table-column> -->
-
-      <!-- <el-table-column prop="CalibrationDeadline"
-                         sortable
-                         align="center"
-                         width="100px"
-                         label="校准期限"></el-table-column> -->
       <el-table-column prop="Address"
                        align="center"
                        min-width="100px"
                        label="地址"></el-table-column>
 
-      <!-- <el-table-column prop="Type"
-                       min-width="160px"
-                       label="类型"
-                       align="center"
-                       show-overflow-tooltip></el-table-column> -->
     </el-table>
     <!-- </el-card> -->
     <addpersonnellog ref="addpersonnel"
@@ -179,15 +117,7 @@
 </template>
 
 <script>
-// import {
-//   classificationlist,
-//   searchdata,
-//   deletepersonnel
-// } from '@/api/personnel'
 import PersonnelApi from '@/api/personnel'
-// import {
-//   deletetriggerlistfordid
-// } from '@/api/trigger'
 import addpersonnellog from './components/personneladd'
 import addpersonneleditlog from './components/personneledit'
 export default {
@@ -219,20 +149,6 @@ export default {
         Code: '',
         classification: ''
       },
-      statelist: [
-        {
-          stateName: '正常',
-          Id: 1
-        },
-        {
-          stateName: '维修',
-          Id: 2
-        },
-        {
-          stateName: '闲置',
-          Id: 3
-        }
-      ],
       // 列表排序
       Column: {
         Order: '',
@@ -262,32 +178,21 @@ export default {
       this.$refs.addpersonnel.dialogvisible = false
       this.currpage = 1
       this.initDatas()
-      // this.getclassificationlist()
     },
     // 编辑 返回页面
     handleCloseEdit () {
       this.$refs.personneledit.dialogvisible = false
-      // this.getclassificationlist()
       this.initDatas()
     },
     // 初始化列表数据
     initDatas () {
       let _this = this
-      let CalibrationTime = []
       if (!_this.CalibrationTime) {
         _this.CalibrationTime = []
       }
-      // 解析时间
-      // if (_this.CalibrationTime.length === 2) {
-      //   _this.CalibrationTime[1].setHours(23)
-      //   _this.CalibrationTime[1].setMinutes(59)
-      //   _this.CalibrationTime[1].setSeconds(59)
-      //   CalibrationTime.push(_this.formatDateTime(_this.CalibrationTime[0]))
-      //   CalibrationTime.push(_this.formatDateTime(_this.CalibrationTime[1]))
-      // }
       let params = {
-        _currentPage: this.currpage,
-        _size: this.size,
+        current: this.currpage,
+        size: this.size,
         Code: this.search.Code,
         Classification: this.search.classification,
         Name: this.search.Name,
@@ -297,44 +202,7 @@ export default {
       PersonnelApi.getAllPersonnel(params)
         .then(res => {
           _this.activities = res.records
-          //   for (let i = 0; i < _this.activities.length; i++) {
-          //     var addTime = _this.addDate(_this.activities[i].CalibrationTime, 2)
-          //     var tdate = 0
-          //     if (_this.activities[i].CalibrationDeadlineType === 1) {
-          //       addTime = _this.addDate(_this.activities[i].CalibrationTime, _this.activities[i].CalibrationDeadline)
-          //       tdate = _this.count(new Date(addTime))
-          //       _this.activities[i].CalibrationDeadlineType = '天'
-          //     } else if (_this.activities[i].CalibrationDeadlineType === 2) {
-          //       addTime = _this.addDate(_this.activities[i].CalibrationTime, (_this.activities[i].CalibrationDeadline) * 7)
-          //       tdate = _this.count(new Date(addTime))
-          //       _this.activities[i].CalibrationDeadlineType = '周'
-          //     } else if (_this.activities[i].CalibrationDeadlineType === 3) {
-          //       addTime = _this.addDate(_this.activities[i].CalibrationTime, (_this.activities[i].CalibrationDeadline) * 30)
-          //       tdate = _this.count(new Date(addTime))
-          //       _this.activities[i].CalibrationDeadlineType = '月'
-          //     } else if (_this.activities[i].CalibrationDeadlineType === 4) {
-          //       addTime = _this.addDate(_this.activities[i].CalibrationTime, (_this.activities[i].CalibrationDeadline) * 365)
-          //       tdate = _this.count(new Date(addTime))
-          //       _this.activities[i].CalibrationDeadlineType = '年'
-          //     }
-          //     if (tdate >= 30) {
-          //       _this.activities[i].tYPE = 1
-          //     } else if (tdate < 30 && tdate >= 0) {
-          //       _this.activities[i].tYPE = 2
-          //     } else if (tdate < 0) {
-          //       _this.activities[i].tYPE = 3
-          //     }
-          //   }
-
-          //   for (let i = 0; i < _this.activities.length; i++) {
-          //     // _this.activities[i].CalibrationDeadline = _this.activities[i].CalibrationDeadline + ''
-          //     _this.activities[i].CalibrationDeadline = _this.activities[i].CalibrationDeadline + '' + _this.activities[i].CalibrationDeadlineType
-          //   }
-
-          //   _this.totalsize = response.info.currentItemCount
-          // })
-          // .catch(function (error) {
-          //   console.log(error)
+          _this.totalsize = res.total
         })
     },
     handleSizeChange (val) {