panhui 7 年 前
コミット
f9e77af59c

+ 1 - 1
src/main/java/com/izouma/awesomeadmin/web/SysMenuController.java

@@ -151,7 +151,7 @@ public class SysMenuController {
         if (trees != null) {
             return new Result(true, trees);
         }
-        return new Result(false, "获取失败");
+        return new Result(false, " ;;;获取失败");
     }
 
 

+ 365 - 0
src/main/vue/src/pages/HandleImmunopotency.1.vue

@@ -0,0 +1,365 @@
+<template>
+  <el-container style="flex-grow:1">
+    <el-aside class="containAside" max-width="500px" width="26%" style=" margin-right: 10px;">
+      <div class="asideInfo">
+        <div class="contentTitle">
+          {{task==1?'免疫任务':'免疫效价'}}
+          <!-- <span>{{list.length}}头奶牛</span> -->
+          <el-select v-model="task" placeholder="请选择" size="mini" style="float:right">
+            <el-option v-for="item in taskList" :key="item.type" :label="item.name" :value="item.type"></el-option>
+          </el-select>
+        </div>
+        <div class="selectContent">
+          <el-select v-model="taskNO" placeholder="请选择任务" style="width:230px">
+            <el-option v-for="item in taskNOList" :key="item['任务单编号']" :label="item['免疫检疫名称']" :value="item['任务单编号']"></el-option>
+          </el-select>
+
+          <el-select v-model="cowshed" v-if="taskNO" placeholder="请选择牛舍" style="width:230px">
+            <el-option v-for="item in cowshedList" :key="item['当前牛舍']" :label="item['当前牛舍']" :value="item['当前牛舍']"></el-option>
+          </el-select>
+        </div>
+        <div class="tableNum">{{list.length}}头奶牛</div>
+        <el-table class="handleTable" border :data="list" style="width: 100%" :height="(allHeight-220)+'px'" size="small" @row-click="rowClick">
+          <el-table-column prop="牛号" label="牛号" fixed="left" align="center"></el-table-column>
+          <el-table-column prop="当前牛舍" label="牛舍" align="center"></el-table-column>
+        </el-table>
+      </div>
+    </el-aside>
+    <el-main class="containMain">
+      <div class="contentTitle">配种信息登记</div>
+      <el-form ref="form" :model="formData" label-width="120px" style="margin-top:20px;width:522px">
+        <el-form-item label label-width="0">
+          <el-input v-model="formData.cowID" prefix-icon="el-icon-search" style="width:300px" maxlength="8"></el-input>
+          <el-button type="primary" @click="getNowCow" style="width:90px;margin-left:12px">确认</el-button>
+        </el-form-item>
+        <div class="sub" v-if="tableData.length>0">操作牛号:{{tableData[0].value}}</div>
+        <el-form-item label="是否进行操作">
+          <el-radio-group v-model="formData.isEdit">
+            <el-radio label="0">是</el-radio>
+            <el-radio label="1">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <div style="margin-top:80px">
+          <el-button @click="onSave" type="primary" style="width:98px;" size="mediu">确认保存</el-button>
+        </div>
+      </el-form>
+    </el-main>
+    <el-aside class="containAside" width="25%" max-width="450px" style=" margin-left: 10px;">
+      <div class="asideInfo">
+        <div class="contentTitle">牛只信息</div>
+        <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-120)+'px'" size="small">
+          <el-table-column prop="key" label="参数"></el-table-column>
+          <el-table-column prop="value" label="当前牛只信信息"></el-table-column>
+        </el-table>
+      </div>
+    </el-aside>
+  </el-container>
+</template>
+<script>
+import formValidator from '../formValidator'
+import axios from 'axios'
+import { mapState } from 'vuex'
+export default {
+  created() {
+    //配种列表
+    this.getTask()
+
+
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {
+        cowID: '',
+        isEdit: '0'
+      },
+      mateModes: [],
+      methods: ['人工观察', '计步器揭发', '同期发情'],
+      bulls: [],
+      tableData: [],
+      list: [],
+      editCowInfo: {},
+      reasonList: [],
+      taskList: [{
+        name: '免疫任务',
+        type: 1
+      }, {
+        name: '免疫效价',
+        type: 2
+      }],
+      task: 1,
+      taskNOList: [],
+      taskNO: '',
+      cowshedList: [],
+      cowshed: ''
+    }
+  },
+  computed: {
+    ...mapState(['userInfo', 'allHeight']),
+    pageTitle() {
+      return this.$route.meta.title
+    },
+    bullMsg() {
+      var jsonp = {}
+      if (this.formData.bull) {
+        this.bulls.forEach(item => {
+          if (item['牛号'] == this.formData.bull) {
+            jsonp = item
+          }
+        })
+      }
+
+      return jsonp
+
+
+    }
+  },
+  watch: {
+    'formData.reason'() {
+      setTimeout(() => {
+        this.formData.remark = this.remarks[0]
+      }, 100)
+    },
+    'formData.cowID'() {
+      if (this.formData.cowID.length != 8) {
+        return
+      }
+      this.getNowCow()
+    },
+    task() {
+      this.getTask()
+      this.taskNO=''
+      this.cowshed=''
+    },
+    taskNO() {
+      this.list = []
+      this.cowshed = ''
+      if (this.taskNO) {
+        this.getList('')
+      }
+
+    },
+    cowshed() {
+      if (this.cowshed) {
+        this.getList(this.cowshed)
+      }
+    }
+  },
+  methods: {
+    getList(cowshed) {
+      this.getHaleInfo('wsVeterinary', 'getIQTaskDetail', [
+        this.$store.state.farmName, this.task, this.taskNO, cowshed
+      ], 'list').then((data) => {
+        console.log(data)
+        if (!cowshed) {
+          this.cowshedList = data
+        }
+        else {
+          this.list = data
+        }
+
+
+      })
+    },
+    getTask() {
+      this.getHaleInfo('wsVeterinary', 'getIQTask', [
+        this.$store.state.farmName, this.task
+      ], 'list').then((data) => {
+        console.log(data)
+        this.taskNOList = data
+
+
+      })
+    },
+    onSave() {
+      if (!this.formData.cowID) {
+        this.$message({
+          message: '请录入牛只牛号',
+          type: 'warning'
+        });
+        return
+      }
+
+      
+      this.formData.operators = this.userInfo.username
+
+      this.getHaleInfo('wsVeterinary', 'updateIQInfo', [
+         this.formData.cowID, this.taskNO, this.task, '', '', this.userInfo.username
+      ], 'json').then((data) => {
+        console.log(data)
+        if (data.rtnCode == -1) {
+          // this.$message({
+          //     message: data.rtnMessage,
+          //     type: 'warning'
+          // });
+          this.$alert(data.rtnMessage, '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.formData.cowID = ''
+            }
+          });
+        }
+        else {
+          this.$message({
+            message: '录入成功',
+            type: 'success'
+          });
+          this.formData.cowID = ''
+          this.getList(this.cowshed)
+        }
+      })
+    },
+    notMatch() {
+
+      if (!this.formData.reason) {
+        this.$message({
+          message: '请选择未配原因',
+          type: 'warning'
+        });
+        return
+      }
+
+      if (!this.formData.person) {
+        this.$message({
+          message: '请选择配种员',
+          type: 'warning'
+        });
+        return
+      }
+      this.getHaleInfo('wsBreeding', 'updateHeatingByNomate', [
+        this.formData.cowID, this.formData.reason, this.formData.person
+      ], 'json').then((data) => {
+        console.log(data)
+        if (data.rtnCode == -1) {
+          this.$alert(data.rtnMessage, '提示', {
+            confirmButtonText: '确定',
+            callback: action => {
+              this.formData.cowID = ''
+            }
+          });
+        }
+        else {
+          this.$message({
+            message: '录入成功',
+            type: 'success'
+          });
+          this.formData.cowID = ''
+          this.getList()
+        }
+      })
+    },
+    getNowCow(data) {
+
+
+      var list = []
+      data = this.JsonSort(['牛号', '任务单编号'], data)
+      Object.keys(data).forEach(item => {
+        list.push({
+          key: item,
+          value: data[item]
+        })
+      })
+
+      this.editCowInfo = data
+
+
+      this.tableData = list
+
+
+
+    },
+    rowClick(row) {
+      this.formData = {
+        cowID: row['牛号'],
+        isEdit: '0'
+      }
+
+      this.getNowCow(row)
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.containMain {
+  background: rgba(255, 255, 255, 1);
+  border-radius: 4px;
+  padding: 15px;
+  // margin-right: 10px;
+  .contentTitle {
+    border-bottom: 1px solid #f2f4f5;
+  }
+  // min-width: 450px;
+
+  .sub {
+    font-size: 14px;
+    font-weight: 600;
+    color: rgba(102, 102, 102, 1);
+    line-height: 20px;
+    margin-bottom: 40px;
+    padding-left: 20px;
+  }
+}
+
+.tableNum {
+  font-size: 13px;
+  font-weight: bold;
+  color: rgba(102, 102, 102, 1);
+  line-height: 18px;
+  padding-bottom: 15px;
+}
+.selectContent {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20px 0;
+}
+
+.contentTitle {
+  font-size: 16px;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 1);
+  line-height: 22px;
+  letter-spacing: 1px;
+  padding-bottom: 14px;
+  span {
+    font-size: 13px;
+    color: rgba(102, 102, 102, 1);
+    line-height: 18px;
+    margin-left: 10px;
+  }
+}
+
+.containAside {
+  padding: 0;
+
+  display: flex;
+  flex-direction: column;
+  .asideInfo {
+    flex-grow: 1;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    padding: 15px;
+  }
+}
+
+.item {
+  .item-title {
+    font-size: 14px;
+    font-weight: bold;
+
+    color: rgba(0, 0, 0, 1);
+    line-height: 20px;
+    letter-spacing: 1px;
+  }
+
+  .text {
+    font-size: 13px;
+    color: rgba(0, 0, 0, 1);
+    line-height: 18px;
+    letter-spacing: 1px;
+    word-wrap: break-word;
+    padding: 10px 0 15px;
+  }
+}
+</style>

+ 30 - 98
src/main/vue/src/pages/HandleImmunopotency.vue

@@ -22,61 +22,23 @@
         <el-table class="handleTable" border :data="list" style="width: 100%" :height="(allHeight-220)+'px'" size="small" @row-click="rowClick">
           <el-table-column prop="牛号" label="牛号" fixed="left" align="center"></el-table-column>
           <el-table-column prop="当前牛舍" label="牛舍" align="center"></el-table-column>
-       
         </el-table>
       </div>
     </el-aside>
     <el-main class="containMain">
       <div class="contentTitle">配种信息登记</div>
-      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;width:522px">
+      <el-form ref="form" :model="formData" label-width="120px" style="margin-top:20px;width:522px">
         <el-form-item label label-width="0">
           <el-input v-model="formData.cowID" prefix-icon="el-icon-search" style="width:300px" maxlength="8"></el-input>
           <el-button type="primary" @click="getNowCow" style="width:90px;margin-left:12px">确认</el-button>
         </el-form-item>
         <div class="sub" v-if="tableData.length>0">操作牛号:{{tableData[0].value}}</div>
-        <el-form-item label="建议配种">
-          <el-radio-group v-model="formData.isMate">
+        <el-form-item label="是否进行操作">
+          <el-radio-group v-model="formData.isEdit">
             <el-radio label="0">是</el-radio>
             <el-radio label="1">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <template v-if="formData.isMate==0">
-          <el-form-item label="配种方式">
-            <el-select v-model="formData.mateMode" placeholder="请选择">
-              <el-option v-for="item in mateModes" :key="item['详细方式']" :label="item['详细方式']" :value="item['详细方式']"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="配种冻精">
-            <el-select v-model="formData.bull" placeholder="请选择">
-              <el-option v-for="item in bulls" :key="item['牛号']" :label="item['牛号']" :value="item['牛号']"></el-option>
-            </el-select>
-
-            <div>
-              <el-popover placement="right" width="200" trigger="hover">
-                <div class="conetnt">
-                  <div class="item" v-for="(item,key) in bullMsg">
-                    <div class="item-title">{{key}}</div>
-                    <div class="text">{{item}}</div>
-                  </div>
-                </div>
-                <el-button type="text" slot="reference">查看此冻精详情</el-button>
-              </el-popover>
-            </div>
-          </el-form-item>
-        </template>
-        <template v-else>
-          <el-form-item label="未配原因">
-            <el-select v-model="formData.reason" placeholder="请选择">
-              <el-option v-for="item in reasonList" :key="item['名称']" :label="item['名称']" :value="item['名称']"></el-option>
-            </el-select>
-          </el-form-item>
-        </template>
-
-        <el-form-item label="配种员">
-          <el-select v-model="formData.person" placeholder="请选择">
-            <el-option v-for="item in [userInfo.username]" :key="item" :label="item" :value="item"></el-option>
-          </el-select>
-        </el-form-item>
 
         <div style="margin-top:80px">
           <el-button @click="onSave" type="primary" style="width:98px;" size="mediu">确认保存</el-button>
@@ -110,11 +72,7 @@ export default {
       saving: false,
       formData: {
         cowID: '',
-        isMate: '0',
-        mateMode: '',
-        bull: '',
-        person: '',
-        reason: ''
+        isEdit: '0'
       },
       mateModes: [],
       methods: ['人工观察', '计步器揭发', '同期发情'],
@@ -171,6 +129,8 @@ export default {
     },
     task() {
       this.getTask()
+      this.taskNO=''
+      this.cowshed=''
     },
     taskNO() {
       this.list = []
@@ -208,7 +168,7 @@ export default {
       ], 'list').then((data) => {
         console.log(data)
         this.taskNOList = data
-        
+
 
       })
     },
@@ -221,44 +181,12 @@ export default {
         return
       }
 
-      if (this.formData.isMate == '1') {
-        this.notMatch()
-        return
-      }
-
-
-      if (!this.formData.bull) {
-        this.$message({
-          message: '请选择冻精',
-          type: 'warning'
-        });
-        return
-      }
-
-      if (!this.formData.person) {
-        this.$message({
-          message: '请选择配种员',
-          type: 'warning'
-        });
-        return
-      }
+      
       this.formData.operators = this.userInfo.username
 
-      this.getHaleInfo('wsBreeding', 'addMateInfo', [{
-        "cowID": this.formData.cowID,
-        "mateDate": Date.parse(new Date()),
-        "currFarm": this.$store.state.farmName,
-        "currGroup": this.editCowInfo['当前牛舍'],
-        "currCategory": this.editCowInfo['牛只类别'],
-        "groCode": this.editCowInfo['泌乳状态'],
-        "repCode": this.editCowInfo['繁殖状态'],
-        "currLact": parseInt(this.editCowInfo['当前胎次']),
-        "mateMode": this.formData.mateMode,
-        "mateBull": this.formData.bull,
-        "mateTimes": parseInt(this.editCowInfo['配次']) + 1,
-        "semens": this.bullMsg['女儿数'],
-        "operators": this.formData.person
-      }], 'json').then((data) => {
+      this.getHaleInfo('wsVeterinary', 'updateIQInfo', [
+         this.formData.cowID, this.taskNO, this.task, '', '', this.userInfo.username
+      ], 'json').then((data) => {
         console.log(data)
         if (data.rtnCode == -1) {
           // this.$message({
@@ -278,7 +206,7 @@ export default {
             type: 'success'
           });
           this.formData.cowID = ''
-          this.getList()
+          this.getList(this.cowshed)
         }
       })
     },
@@ -323,27 +251,31 @@ export default {
     },
     getNowCow(data) {
 
-    
-        var list = []
-        Object.keys(data).forEach(item => {
-          list.push({
-            key: item,
-            value: data[item]
-          })
+   
+
+
+      var list = []
+      data = this.JsonSort(['牛号', '任务单编号'], data)
+      Object.keys(data).forEach(item => {
+        list.push({
+          key: item,
+          value: data[item]
         })
+      })
+
+      this.editCowInfo = data
+
+
+      this.tableData = list
 
-        this.editCowInfo = data
-   
 
-        this.tableData = list
-      
-   
 
     },
     rowClick(row) {
       this.formData = {
-        cowID: row['牛号']
-        }
+        cowID: row['牛号'],
+        isEdit: '0'
+      }
 
       this.getNowCow(row)
     }

+ 10 - 0
src/main/vue/src/router/index.js

@@ -575,6 +575,16 @@ const router = new Router({
                         type: '手持机录入 ',
                         title: '免疫效价'
                     }
+                },
+                {
+                    path: '/handlePhoto',
+                    name: 'handlePhoto',
+                    component: () =>
+                        import ('../pages/HandlePhoto'),
+                    meta: {
+                        type: '手持机录入 ',
+                        title: '犊牛拍照'
+                    }
                 }
             ]
         },