牧场选择出现问题，修正

src/views/main-navbar.vue

@@ -18,10 +18,11 @@
         class="site-navbar__menu site-navbar__menu--right"
         mode="horizontal">
         <el-menu-item>
-<!--          <template slot="title" v-if="farmId > 0">-->
-<!--            <span>{{farmName}}</span>-->
-<!--          </template>-->
-          <template slot="title">
+          <!-- 拥有牧场 id 的不允许选择牧场，没有的则允许 -->
+          <template slot="title" v-if="farmId > 0">
+            <span>{{farmName}}</span>
+          </template>
+          <template slot="title" v-else>
             <el-select
               placeholder="牧场"
               v-model="formFarmId"
@@ -114,7 +115,7 @@
     data () {
       return {
         updatePassowrdVisible: false,
-        farmId: '',
+        farmId: 0,
         farmName: '',
         farmList: [], // 牧场List
         formFarmId: Number(localStorage.getItem('farmId')),
@@ -192,6 +193,7 @@
         if (this.$cookie.get('farmId') === 'null') {
           this.initFind()
         }
+        this.getFarmName()
 
         // this.farmId = this.$cookie.get('farmId') === 'null'? undefined: parseInt(this.$cookie.get('farmId'))
         // if (this.formFarmId) {
@@ -244,6 +246,24 @@
           console.log(res)
         })
       },
+      // 获取牧场名称
+      getFarmName() {
+        // this.farmName = this.farmId? this.farmList.filter(item => item.id === this.farmId)[0].name: 0
+        this.$http({
+          url: this.$http.adornUrl('/sys/user/info'),
+          method: 'get',
+          params: this.$http.adornParams()
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            // this.loading = false
+            // this.userId = data.user.userId
+            // this.userName = data.user.username
+            this.farmId = data.user.farmId || 0
+            this.farmName = this.farmId? this.farmList.filter(item => item.id === this.farmId)[0].name: 0
+            // this.token = data.user.token
+          }
+        })
+      },
       // 修改密码
       updatePasswordHandle () {
         this.updatePassowrdVisible = true

src/views/main.vue

@@ -86,7 +86,6 @@
             this.loading = false
             this.userId = data.user.userId
             this.userName = data.user.username
-            // this.token = data.user.token
           }
         })
       }

src/views/modules/breed/bfood.vue

@@ -2,21 +2,15 @@
   <div class="mod-role">
     <div class="rect rect-form">
       <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item style="width: 100px">
-          <el-select placeholder="猪舍"></el-select>
-        </el-form-item>
-        <el-form-item style="width: 100px">
-          <el-select placeholder="单元"></el-select>
-        </el-form-item>
-        <el-form-item style="width: 100px">
-          <el-select placeholder="栏期"></el-select>
+        <el-form-item>
+          <el-input v-model="dataForm.ingredients" placeholder="饲料名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.roleName" placeholder="角色名称" clearable></el-input>
+          <el-input v-model="dataForm.details" placeholder="详细信息" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.roleName" placeholder="角色名称" clearable></el-input>
-        </el-form-item> -->
+          <el-input v-model="dataForm.stage" placeholder="使用阶段" clearable></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button 
             icon="el-icon-search"
@@ -113,7 +107,9 @@
     data () {
       return {
         dataForm: {
-          roleName: ''
+          ingredients: '',
+          details: '',
+          stage: ''
         },
         dataList: [],
         pageIndex: 1,
@@ -139,7 +135,10 @@
           method: 'get',
           params: this.$http.adornParams({
             'page': this.pageIndex,
-            'limit': this.pageSize
+            'limit': this.pageSize,
+            'ingredients': this.dataForm.ingredients || undefined,
+            'details': this.dataForm.details || undefined,
+            'stage': this.dataForm.stage || undefined
           })
         }).then(({data}) => {
           console.log('这是饲料种类配方');

src/views/modules/breed/btransfer-update.vue

@@ -146,7 +146,6 @@
         this.dataForm.id = ''
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
-          console.log(pigs);
           let ids = []
           let eartags = []
           this.dataForm.pigIds = []
@@ -243,8 +242,6 @@
       // 根据栋舍选择限制单元和栏期
       pigstyChange (val) {
         this.unitSelectedList = this.unitList.filter(item => item.pigstyId === val)
-        console.log(this.unitList);
-        console.log(this.unitSelectedList);
         // this.periodSelectedList = this.periodList.filter(item => item.pigstyId === val)
       },
       // 需要先选择猪舍，才能选择单元或栏期

src/views/modules/breed/btransfer.vue

@@ -218,27 +218,27 @@
               align="center"
               label="栏期">
             </el-table-column>
-            <!-- <el-table-column
+            <el-table-column
               fixed="right"
               header-align="center"
               align="center"
               label="操作">
               <template slot-scope="scope">
-                <el-button
+                <!-- <el-button
                   type="text"
                   size="medium"
                   style="color: rgb(24,144,255)">
                   查看
-                </el-button>
+                </el-button> -->
                 <el-button
                   type="text"
                   size="medium"
                   @click="addOrUpdateHandle(scope.row)"
                   style="color: rgb(24,144,255)">
-                  修改
+                  转栏
                 </el-button>
               </template>
-            </el-table-column> -->
+            </el-table-column>
           </el-table>
           <el-pagination
             @size-change="sizeChangeHandle"
@@ -475,9 +475,9 @@
         this.dataListSelections = val
       },
       // 新增 / 修改
-      addOrUpdateHandle (id) {
+      addOrUpdateHandle (pig) {
         this.addOrUpdateVisible = true
-        var ids = id ? [id] : this.dataListSelections.map(item => {
+        var ids = pig ? [{id: pig.id, eartag: pig.eartag}] : this.dataListSelections.map(item => {
           return {
             id: item.id,
             eartag: item.eartag

src/views/modules/health/hdisease.vue

@@ -182,7 +182,7 @@
         <!--  弹框      -->
         <el-dialog
           :title="!dataForm.id ? '新增' : '修改'"
-          :close-on-click-modal="false"
+          @close="onCancel"
           :visible.sync="visible"
           width="600px">
           <el-form
@@ -315,7 +315,7 @@ export default {
         treatmentPlan: '',
         causeName: '',
         sympotomName: '',
-        result: 1,
+        result: 3,
         offTime: ''
       },
       options: [
@@ -550,9 +550,12 @@ export default {
         treatmentPlan: '',
         causeName: '',
         sympotomName: '',
-        result: 1,
+        result: 3,
         offTime: ''
       }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
     }
   },
   created () {

src/views/modules/health/htreat.vue

@@ -60,6 +60,20 @@
                   :disabled="selectList.length <= 0">
                 删 除
               </el-button>
+              <el-button
+                icon="el-icon-warning"
+                @click="dieOrRecoveryHandle(2)" 
+                type="danger"
+                :disabled="selectList.length <= 0">
+                死 亡
+              </el-button>
+              <el-button
+                icon="el-icon-view"
+                @click="dieOrRecoveryHandle(1)" 
+                type="danger"
+                :disabled="selectList.length <= 0">
+                康 复
+              </el-button>
             </el-form-item>
           </el-form>
           <el-table
@@ -135,8 +149,8 @@
               label="治疗结果">
               <template slot-scope="scope">
                 <span v-if="scope.row.result === 1">康 复</span>
-                <span v-else-if="scope.row.result === 2">死 亡</span>
-                <span v-else-if="scope.row.result === 3">无害化处理</span>
+                <span v-else-if="scope.row.result === 2">死亡（无害化处理）</span>
+                <span v-else-if="scope.row.result === 3">治疗中</span>
               </template>
             </el-table-column>
 <!--            <el-table-column-->
@@ -334,11 +348,11 @@ export default {
         },
         {
           id: 2,
-          name: '死亡'
+          name: '死亡（无害化处理）'
         },
         {
           id: 3,
-          name: '无害化处理'
+          name: '治疗中'
         }
       ],
       options1: [
@@ -409,6 +423,40 @@ export default {
       this.page = val
       this.init()
     },
+    // 批量死亡 or 康复
+    dieOrRecoveryHandle (result) {
+      let ids = this.selectList.map(item => item.id)
+      let eartags = this.selectList.map(item => item.pigId)
+      if (this.selectList.length > 0) {
+        let that = this
+        this.$confirm(`确定批量修改耳标号${eartags.join(',')}的猪只的治疗结果为${result === 1? '康复': '死亡'}?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          that.$http({
+            url: that.$http.adornUrl('/management/healthmedicalrecord/updateCureResult'),
+            method: 'post',
+            data: that.$http.adornData({ ids, result }, false)
+          }).then(res => {
+            if (res.data.code === 0) {
+              this.$message.success('修改成功！')
+              this.init()
+              this.selectList = []
+            } else {
+              this.$message.error(res.data.msg)
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消修改'
+          })
+        })
+      } else {
+        this.$message.error('请选择要修改的数据！')
+      }
+    },
     // 批量删除
     delAll () {
       let ids = this.selectList.map(item => item.id)
@@ -559,7 +607,7 @@ export default {
         treatmentPlan: '',
         causeName: '',
         sympotomName: '',
-        result: 1,
+        result: 3,
         offTime: ''
       }
     }

src/views/modules/health/hvaccine.vue

@@ -10,6 +10,23 @@
             <el-form-item style="width: 200px">
               <el-input placeholder="耳标" style="width: 200px" v-model="searchForm.earTag"></el-input>
             </el-form-item>
+            <el-form-item style="width: 200px">
+              <el-input placeholder="疫苗名称" style="width: 200px" v-model="searchForm.vaccineName"></el-input>
+            </el-form-item>
+            <el-form-item style="width: 140px">
+              <el-select
+                ref="slelctRef"
+                v-model="searchForm.manId"
+                style="width: 100%"
+                placeholder="操作人">
+                <el-option
+                  v-for="item in manList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button icon="el-icon-search" @click="init">查 询</el-button>
             </el-form-item>
@@ -123,7 +140,7 @@
         <!--  弹框      -->
         <el-dialog
             :title="!dataForm.id ? '新增' : '修改'"
-            :close-on-click-modal="false"
+            @close="onCancel"
             :visible.sync="visible"
             width="600px">
           <el-form
@@ -149,7 +166,6 @@
             <el-form-item label="操作人" prop="manId">
               <el-select
                   ref="slelctRef"
-                  @change="onChangeMan($event)"
                   v-model="dataForm.manId"
                   style="width: 100%">
                 <el-option
@@ -184,7 +200,9 @@ export default {
   data () {
     return {
       searchForm: {
-        earTag: ''
+        earTag: '',
+        vaccineName: '',
+        manId: ''
       },
       tableData: [],
       dataListLoading: false,
@@ -207,7 +225,7 @@ export default {
           {required: true, message: '疫苗名称不能为空', trigger: 'blur'}
         ],
         manId: [
-          {required: true, message: '操作人不能为空', trigger: 'change'}
+          {required: true, message: '操作人不能为空', trigger: 'blur'}
         ]
       },
       selectList: []
@@ -233,7 +251,9 @@ export default {
       let params = {
         page: this.page,
         limit: this.limit,
-        eartag: this.searchForm.earTag
+        eartag: this.searchForm.earTag || undefined,
+        vaccineName: this.searchForm.vaccineName || undefined,
+        manId: this.searchForm.manId || undefined
       }
       this.$http({
         url: this.$http.adornUrl('/management/healthimmunerecord/list'),
@@ -257,13 +277,18 @@ export default {
     },
     // 修改
     addOrUpdateHandle (row) {
-      this.dataForm = {
-        id: row.id,
-        pigId: row.pigId,
-        vaccineName: row.vaccineName,
-        manId: row.manId
+      if (row) {
+        this.dataForm = {
+          id: row.id,
+          pigId: row.pigId,
+          vaccineName: row.vaccineName,
+          manId: row.manId
+        }
       }
       this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
     },
     deleteHandle (id) {
       let ids = [id]
@@ -290,6 +315,7 @@ export default {
     },
     onChangeMan (id) {
       let man = {}
+      console.log(id);
       man = this.manList.find(item => {
         return item.id === id
       })
@@ -318,6 +344,10 @@ export default {
                 duration: 1500
               })
               this.init()
+              if (this.dataForm.id) this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
             } else {
               this.$message.error(data.msg)
             }
@@ -327,6 +357,8 @@ export default {
     },
     clearAll () {
       this.searchForm.earTag = ''
+      this.searchForm.vaccineName = ''
+      this.searchForm.manId = ''
     },
     delAll () {
       let ids = this.selectList.map(pig => pig.id)
@@ -365,6 +397,9 @@ export default {
         manId: '',
         manName: ''
       }
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
     }
   },
   created () {
@@ -372,6 +407,7 @@ export default {
   },
   activated () {
     this.init()
+    this.getManList()
   }
 }
 </script>

src/views/modules/pigbasic/pbpedigree.vue

@@ -143,12 +143,12 @@
             height="587"
             :header-cell-style="{background:'rgb(245,245,245)',color:'#000',height: '45px',fontSize: '13px',fontWeight: 'normal',borderBottom: '1px solid #ccc'}" 
             :cell-style="{color: '#888',fontSize: '13px'}">
-            <el-table-column
+            <!-- <el-table-column
               type="selection"
               header-align="center"
               align="center"
               width="50">
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="id"
               header-align="center"

src/views/modules/sys/menu.vue

@@ -81,7 +81,7 @@
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('sys:menu:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.menuId)">修改</el-button>
-            <el-button v-if="isAuth('sys:menu:delete')" type="text" size="small" @click="deleteHandle(scope.row.menuId)">删除</el-button>
+            <el-button v-if="isAuth('sys:menu:delete')" type="text" size="small" @click="deleteHandle(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -133,8 +133,10 @@
         })
       },
       // 删除
-      deleteHandle (id) {
-        this.$confirm(`确定对[id=${id}]进行[删除]操作?`, '提示', {
+      deleteHandle (menu) {
+        let id = menu.menuId
+        let name = menu.name
+        this.$confirm(`确定删除名称${name}的菜单操作?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -145,13 +147,14 @@
             data: this.$http.adornData()
           }).then(({data}) => {
             if (data && data.code === 0) {
+              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
+                // onClose: () => {
+                //   this.getDataList()
+                // }
               })
             } else {
               this.$message.error(data.msg)

src/views/modules/sys/role-add-or-update.vue

@@ -24,7 +24,6 @@
           :props="menuListTreeProps"
           node-key="menuId"
           ref="menuListTree"
-          :default-expand-all="true"
           show-checkbox>
         </el-tree>
       </el-form-item>

src/views/modules/sys/role.vue

@@ -80,7 +80,7 @@
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.roleId)">修改</el-button>
-            <el-button v-if="isAuth('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.roleId)">删除</el-button>
+            <el-button v-if="isAuth('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -169,11 +169,10 @@
         })
       },
       // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.roleId
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+      deleteHandle (role) {
+        var ids = role? [role.roleId] : this.dataListSelections.map(item => item.roleId )
+        var names = role? [role.roleName] : this.dataListSelections.map(item => item.roleName )
+        this.$confirm(`确定${id ? '删除' : '批量删除'}名称${names.join(',')}]角色?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -184,13 +183,14 @@
             data: this.$http.adornData(ids, false)
           }).then(({data}) => {
             if (data && data.code === 0) {
+              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
+                // onClose: () => {
+                //   this.getDataList()
+                // }
               })
             } else {
               this.$message.error(data.msg)

src/views/modules/sys/user-add-or-update.vue

@@ -15,9 +15,6 @@
       <el-form-item label="姓名" prop="username">
         <el-input v-model="dataForm.username"></el-input>
       </el-form-item>
-      <el-form-item v-if="!dataForm.userId" label="密码" prop="password">
-        <el-input v-model="dataForm.password"></el-input>
-      </el-form-item>
       <el-form-item label="性别" prop="sex">
         <el-select 
           v-model="dataForm.sex"
@@ -42,6 +39,9 @@
       <el-form-item label="手机" prop="mobile">
         <el-input v-model="dataForm.mobile"></el-input>
       </el-form-item>
+      <el-form-item v-if="!dataForm.userId" label="密码" prop="password">
+        <el-input v-model="dataForm.password"></el-input>
+      </el-form-item>
       <el-form-item label="邮箱" prop="email">
         <el-input v-model="dataForm.email"></el-input>
       </el-form-item>

src/views/modules/sys/user.vue

@@ -177,7 +177,7 @@
                 label="操作">
                 <template slot-scope="scope">
                   <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</el-button>
-                  <el-button v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</el-button>
+                  <el-button v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -341,11 +341,10 @@
         })
       },
       // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.roleId
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+      deleteHandle (user) {
+        let ids = user ? [user.userId] : this.dataListSelections.map(item => item.userId)
+        let names = user ? [user.username] : this.dataListSelections.map(item => item.username)
+        this.$confirm(`确定${user ? '删除' : '批量删除'}姓名${names.join(',')}的用户?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -356,13 +355,14 @@
             data: this.$http.adornData(ids, false)
           }).then(({data}) => {
             if (data && data.code === 0) {
+              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
+                // onClose: () => {
+                  
+                // }
               })
             } else {
               this.$message.error(data.msg)