手持机

src/main/java/com/izouma/awesomeadmin/web/SysMenuController.java

@@ -154,6 +154,8 @@ public class SysMenuController {
         return new Result(false, "获取失败");
     }
 
+
+
     @RequestMapping(value = "/userHandheldMenuTree", method = RequestMethod.GET)
     @ResponseBody
     public Result userHandheldMenuTree(@RequestParam("userId") Integer userId) {

src/main/vue/src/entries/admin.js

@@ -308,6 +308,54 @@ Vue.prototype.getTime = function(str, useDateType) {
     return format(new Date(str), useDateType, { locale: zh })
 }
 
+Vue.prototype.getCowList = function(cow) {
+        return new Promise((resolve, reject) => {
+            axios.get('http://116.62.160.108/mfMISWS/wsCow.asmx/GetLiveCows', {
+                params: {
+                    farmName: this.$store.state.farmName,
+                    cowID: cow
+                },
+                withCredentials: false
+            }).then(res => {
+                var cowList = []
+                var xml = this.getXml(res.data)
+                if (xml.getElementsByTagName("rtnDataTable")[0].getElementsByTagName("Table").length != 0) {
+                    var list = xml.getElementsByTagName("rtnDataTable")[0].getElementsByTagName("Table")
+                    for (var i = 0; i < list.length && i <= 30; i++) {
+                        cowList.push({
+                            value: list[i].getElementsByTagName('牛号')[0].innerHTML
+                        })
+                    }
+
+                }
+                resolve(cowList)
+            })
+        })
+    }
+    //String转Xml
+Vue.prototype.getXml = function(xmlString) {
+    if (document.all) {
+        var xmlDom = new ActiveXObject("Microsoft.XMLDOM");
+        xmlDom.loadXML(xmlString);
+        return xmlDom;
+    } else return new DOMParser().parseFromString(xmlString, "text/xml");
+
+}
+
+Vue.prototype.queryCow = function(queryString, cb) {
+    if (queryString.length > 3) {
+        this.getCowList(queryString).then(list => {
+            var results = list
+
+            cb(results)
+        });
+
+    } else {
+        cb([])
+    }
+}
+
+
 const updateTableHeight = () => {
     try {
         const total = document.getElementsByTagName('main')[0].clientHeight;

src/main/vue/src/pages/HandleCalf.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width='26%'  style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -24,7 +24,7 @@
         </el-aside>
         <el-main class="containMain">
             <div class="contentTitle">犊牛信息登记</div>
-            <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+            <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;width:522px">
                 <el-form-item label="" label-width="0">
                     <el-input v-model="formData.cowID" placeholder="请输入新生犊牛牛号" 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>
@@ -71,7 +71,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <el-aside class="containAside" max-width="450px" width='25%' style=" margin-left: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">牛只信息</div>
                 <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size='small'>

src/main/vue/src/pages/HandleDiagnosis.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container style="flex-grow:1">
-    <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+    <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
       <div class="asideInfo">
         <div class="contentTitle">
           {{pageTitle}}
@@ -27,7 +27,7 @@
     </el-aside>
     <el-main class="containMain">
       <div class="contentTitle">{{pageTitle}}</div>
-      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;width:522px;">
         <el-form-item label label-width="0">
           <el-input v-model="formData.cowID" disabled prefix-icon="el-icon-search" style="width:300px" maxlength="8" clearable></el-input>
           <!-- <el-button type="primary" @click="getNowCow" style="width:90px;margin-left:12px">确认</el-button> -->
@@ -115,7 +115,7 @@
         </div>
       </el-form>
     </el-main>
-    <el-aside class="containAside" width="450px">
+    <el-aside class="containAside" max-width="450px" width='25%'>
       <div class="asideInfo">
         <div class="contentTitle">牛只信息</div>
         <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size="small">

src/main/vue/src/pages/HandleDryMilk.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container style="flex-grow:1" v-loading="loading">
-    <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+    <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
       <div class="asideInfo">
         <div class="contentTitle">
           {{pageTitle}}
@@ -34,7 +34,7 @@
     </el-aside>
     <el-main class="containMain">
       <div class="contentTitle">干奶信息登记</div>
-      <el-form ref="form" :model="formData" label-width="100px" style="margin-top:20px;">
+      <el-form ref="form" :model="formData" label-width="100px" style="margin-top:20px;width:522px;">
         <el-form-item label label-width="0">
           <el-input v-model="formData.cowID" prefix-icon="el-icon-search" disabled style="width:300px"></el-input>
           <!-- <el-button type="primary" @click="getNowCow" style="width:90px;margin-left:12px">确认</el-button> -->
@@ -70,7 +70,7 @@
         </div>
       </el-form>
     </el-main>
-    <el-aside class="containAside" width="450px" style=" margin-left: 10px;" v-if="!isBath">
+    <el-aside class="containAside" max-width="450px" width='25%' style=" margin-left: 10px;" v-if="!isBath">
       <div class="asideInfo">
         <div class="contentTitle">牛只信息</div>
         <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size="small">

src/main/vue/src/pages/HandleFeeding.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width="26%" style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -94,7 +94,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <el-aside class="containAside" max-width="450px" width='25%' style=" margin-left: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">牛只信息</div>
                 <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size='small'>

src/main/vue/src/pages/HandleFeedingMagnet.vue

@@ -0,0 +1,165 @@
+<template>
+  <el-container style="flex-grow:1">
+    <el-main class="containMain">
+      <div class="contentTitle">{{pageTitle}}</div>
+      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+        <el-form-item label label-width="0">
+          <el-autocomplete prefix-icon="el-icon-search" v-model="formData.cowID" :fetch-suggestions="queryCow" placeholder="请输入牛号" style="width:300px" clearable @select="getNowCow"></el-autocomplete>
+          <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>
+    
+
+        <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="450px">
+      <div class="asideInfo">
+        <div class="contentTitle">牛只信息</div>
+        <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'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() {
+  
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {
+        cowID: '',
+      },
+      tableData: []
+    }
+  },
+  computed: {
+    ...mapState(['userInfo', 'allHeight']),
+    pageTitle() {
+      return this.$route.meta.title
+    }
+  },
+  watch: {
+    'formData.cowID'() {
+
+      if (this.formData.cowID.length != 8) {
+        return
+      }
+      this.getNowCow()
+    }
+  },
+  methods: {
+    onSave() {
+      if (this.formData.cowID.length != 8) {
+        this.$message({
+          message: '请录入牛只牛号',
+          type: 'warning'
+        });
+        return
+      }
+
+
+      this.getHaleInfo('wsVeterinary', 'addFeedMagnet', [{
+        cowID: this.formData.cowID,
+        feedingDate: Date.parse(new Date()),
+        operators: 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 = ''
+        }
+      })
+    },
+    getNowCow() {
+      this.getHaleInfo('wsVeterinary', 'getFeedMagnetByCowID', [this.formData.cowID], 'json').then((data) => {
+        // console.log(data)
+        data = this.JsonSort(['牛号', '当前牛舍','繁殖状态','泌乳状态','投喂磁石日期','投喂磁石人'], data)
+        var list = []
+        Object.keys(data).forEach(item => {
+          list.push({
+            key: item,
+            value: data[item]
+          })
+        })
+      
+        // console.log(list)
+
+        this.tableData = list
+
+      }).catch(() => {
+        this.formData.cowID = ''
+      })
+    },
+    
+  }
+}
+</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;
+  }
+}
+
+.contentTitle {
+  font-size: 16px;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 1);
+  line-height: 22px;
+  letter-spacing: 1px;
+  padding-bottom: 14px;
+}
+
+.containAside {
+  padding: 0;
+  margin-left: 10px;
+  display: flex;
+  flex-direction: column;
+  .asideInfo {
+    flex-grow: 1;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    padding: 15px;
+  }
+}
+</style>

src/main/vue/src/pages/HandleHoofCare.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -43,7 +43,7 @@
         </el-aside>
         <el-main class="containMain">
             <div class="contentTitle">{{nowTaskJson.name}}信息登记</div>
-            <el-form ref="form" :model="formData" style="margin-top:20px;" label-width="80px">
+            <el-form ref="form" :model="formData" style="margin-top:20px;width:522px;" label-width="80px">
                 <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>
@@ -95,7 +95,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <el-aside class="containAside" max-width="450px" width='25%' style=" margin-left: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">牛只信息</div>
                 <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size='small'>

src/main/vue/src/pages/HandleImmunopotency.vue

@@ -0,0 +1,435 @@
+<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="80px" 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-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>
+        </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: '',
+        isMate: '0',
+        mateMode: '',
+        bull: '',
+        person: '',
+        reason: ''
+      },
+      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()
+    },
+    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
+      }
+
+      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) => {
+        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()
+        }
+      })
+    },
+    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 = []
+        Object.keys(data).forEach(item => {
+          list.push({
+            key: item,
+            value: data[item]
+          })
+        })
+
+        this.editCowInfo = data
+   
+
+        this.tableData = list
+      
+   
+
+    },
+    rowClick(row) {
+      this.formData = {
+        cowID: row['牛号']
+        }
+
+      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>

src/main/vue/src/pages/HandleInitial.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -45,7 +45,7 @@
         </el-aside>
         <el-main class="containMain">
             <div class="contentTitle">初检信息登记</div>
-            <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+            <el-form ref="form" :model="formData" label-width="80px" 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>
@@ -72,7 +72,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <el-aside class="containAside" max-width="450px" width='25%' style=" margin-left: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">牛只信息</div>
                 <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size='small'>

src/main/vue/src/pages/HandleMatch.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -22,9 +22,9 @@
                 </el-table>
             </div>
         </el-aside>
-        <el-main class="containMain">
+        <el-main class="containMain" >
             <div class="contentTitle">配种信息登记</div>
-            <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+            <el-form ref="form" :model="formData" label-width="80px" 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>
@@ -87,7 +87,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <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-70)+'px'" size='small'>

src/main/vue/src/pages/HandleOutcome.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container style="flex-grow:1">
-    <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+    <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
       <div class="asideInfo">
         <div class="contentTitle">
           {{pageTitle}}
@@ -26,7 +26,7 @@
     </el-aside>
     <el-main class="containMain">
       <div class="contentTitle">{{pageTitle}}</div>
-      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;width:522px">
         <el-form-item label label-width="0">
           <el-input v-model="formData.cowID" disabled prefix-icon="el-icon-search" style="width:300px" maxlength="8" clearable></el-input>
           <!-- <el-button type="primary" @click="getNowCow" style="width:90px;margin-left:12px">确认</el-button> -->
@@ -76,7 +76,7 @@
         </div>
       </el-form>
     </el-main>
-    <el-aside class="containAside" width="450px">
+    <el-aside class="containAside" max-width="450px" width='25%'>
       <div class="asideInfo">
         <div class="contentTitle">牛只信息</div>
         <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size="small">

src/main/vue/src/pages/HandlePerinatal.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container style="flex-grow:1">
-    <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+    <el-aside class="containAside" max-width="500px" width="26%" style=" margin-right: 10px;">
       <div class="asideInfo">
         <div class="contentTitle">
           {{pageTitle}}
@@ -27,7 +27,7 @@
     </el-aside>
     <el-main class="containMain">
       <div class="contentTitle">{{pageTitle}}</div>
-      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+      <el-form ref="form" :model="formData" label-width="80px" 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" clearable></el-input>
           <el-button type="primary" @click="getNowCow" style="width:90px;margin-left:12px">确认</el-button>
@@ -54,7 +54,7 @@
         </div>
       </el-form>
     </el-main>
-    <el-aside class="containAside" width="450px">
+    <el-aside class="containAside" max-width="450px" width='25%'>
       <div class="asideInfo">
         <div class="contentTitle">牛只信息</div>
         <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size="small">

src/main/vue/src/pages/HandlePerinatalCare.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -53,7 +53,7 @@
         </el-aside>
         <el-main class="containMain">
             <div class="contentTitle">{{nowTaskJson.name}}信息登记</div>
-            <el-form ref="form" :model="formData" style="margin-top:20px;" label-width="120px">
+            <el-form ref="form" :model="formData" style="margin-top:20px;width:522px;" label-width="120px">
                 <el-form-item label="" label-width="0">
                     <el-input v-model="formData.cowID" disabled 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> -->
@@ -94,7 +94,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <el-aside class="containAside" max-width="450px" width='25%' style=" margin-left: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">牛只信息</div>
                 <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size='small'>

src/main/vue/src/pages/HandleProhibition.vue

@@ -0,0 +1,195 @@
+<template>
+  <el-container style="flex-grow:1">
+    <el-main class="containMain">
+      <div class="contentTitle">{{pageTitle}}</div>
+      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+        <el-form-item label label-width="0">
+          <el-autocomplete prefix-icon="el-icon-search" v-model="formData.cowID" :fetch-suggestions="queryCow" placeholder="请输入牛号" style="width:300px" clearable @select="getNowCow"></el-autocomplete>
+          <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="操作原因" v-if="formData.isMate">
+          <el-select v-model="formData.reason" placeholder="请选择">
+            <el-option v-for="item in reasons" :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">{{formData.isMate?'禁配':'解禁'}}</el-button>
+        </div>
+      </el-form>
+    </el-main>
+    <el-aside class="containAside" width="450px">
+      <div class="asideInfo">
+        <div class="contentTitle">牛只信息</div>
+        <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'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.getHaleInfo('wsBreeding', 'getNomateReason', [], 'list').then((data) => {
+      this.reasons = data
+
+    })
+
+  },
+  data() {
+    return {
+      saving: false,
+      formData: {
+        cowID: '',
+        reason: '',
+        isMate: false
+      },
+      reasons: [],
+      tableData: []
+    }
+  },
+  computed: {
+    ...mapState(['userInfo', 'allHeight']),
+    pageTitle() {
+      return this.$route.meta.title
+    }
+  },
+  watch: {
+    'formData.cowID'() {
+
+      if (this.formData.cowID.length != 8) {
+        return
+      }
+      this.getNowCow()
+    }
+  },
+  methods: {
+    onSave() {
+      if (this.formData.cowID.length != 8) {
+        this.$message({
+          message: '请录入牛只牛号',
+          type: 'warning'
+        });
+        return
+      }
+
+      if (this.formData.isMate && !this.formData.reason) {
+        this.$message({
+          message: '请选择禁配原因',
+          type: 'warning'
+        });
+        return
+      }
+
+
+      this.getHaleInfo('wsBreeding', 'addNomate', [{
+        cowID: this.formData.cowID,
+        nomateDate: Date.parse(new Date()),
+        nomateProperty: this.formData.isMate ? true : false,
+        nomateReason: this.formData.reason,
+        operators: 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.formData.reason = ''
+        }
+      })
+    },
+    getNowCow() {
+
+      this.getHaleInfo('wsCow', 'getCowExtendInfoByCowID', [this.formData.cowID, 1], 'json').then((data) => {
+        // console.log(data)
+        data = this.JsonSort(['牛号', '当前牛舍'], data)
+        var list = []
+        Object.keys(data).forEach(item => {
+          list.push({
+            key: item,
+            value: data[item]
+          })
+        })
+        this.formData.reason = ''
+        if (data['是否禁配'] == '未禁配') {
+          this.formData.isMate = true
+        }
+        else {
+          this.formData.isMate = false
+        }
+
+        // console.log(list)
+
+        this.tableData = list
+
+      }).catch(() => {
+        this.formData.cowID = ''
+      })
+    },
+    
+  }
+}
+</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;
+  }
+}
+
+.contentTitle {
+  font-size: 16px;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 1);
+  line-height: 22px;
+  letter-spacing: 1px;
+  padding-bottom: 14px;
+}
+
+.containAside {
+  padding: 0;
+  margin-left: 10px;
+  display: flex;
+  flex-direction: column;
+  .asideInfo {
+    flex-grow: 1;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    padding: 15px;
+  }
+}
+</style>

src/main/vue/src/pages/HandleRecheck.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -45,7 +45,7 @@
         </el-aside>
         <el-main class="containMain">
             <div class="contentTitle">复检信息登记</div>
-            <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+            <el-form ref="form" :model="formData" label-width="80px" 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>
@@ -72,7 +72,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <el-aside class="containAside" max-width="450px" width='25%'  style=" margin-left: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">牛只信息</div>
                 <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size='small'>

src/main/vue/src/pages/HandleSampling.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container style="flex-grow:1">
-    <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+    <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
       <div class="asideInfo">
         <div class="contentTitle">
           {{pageTitle}}
@@ -18,7 +18,7 @@
     </el-aside>
     <el-main class="containMain">
       <div class="contentTitle">过抗采样信息登记</div>
-      <el-form ref="form" :model="formData" style="margin-top:20px;" label-width="120px">
+      <el-form ref="form" :model="formData" style="margin-top:20px;width:522px;" label-width="120px">
         <el-form-item label label-width="0">
           <el-autocomplete v-model="formData.cowID" style="width:300px" prefix-icon="el-icon-search" :fetch-suggestions="querySearchAsync" placeholder="请输入内容" @select="handleSelect"></el-autocomplete>
           <!-- <el-input v-model="formData.cowID" prefix-icon="el-icon-search" style="width:300px" maxlength="8"></el-input> -->
@@ -39,7 +39,7 @@
         </div>
       </el-form>
     </el-main>
-    <el-aside class="containAside" width="450px" style="margin-left: 10px;">
+    <el-aside class="containAside" max-width="450px" width='25%' style="margin-left: 10px;">
       <div class="asideInfo">
         <div class="contentTitle">牛只信息</div>
         <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size="small">

src/main/vue/src/pages/HandleSimultaneousMatch.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="flex-grow:1">
-        <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+        <el-aside class="containAside" max-width="500px" width='26%' style=" margin-right: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">{{pageTitle}}
 
@@ -44,7 +44,7 @@
         </el-aside>
         <el-main class="containMain">
             <div class="contentTitle">同期配种信息登记</div>
-            <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+            <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;width:522px;">
                 <el-form-item label="" label-width="0">
                     <el-input v-model="formData.cowID" disabled 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> -->
@@ -96,7 +96,7 @@
                 </div>
             </el-form>
         </el-main>
-        <el-aside class="containAside" width="450px" style=" margin-left: 10px;">
+        <el-aside class="containAside" max-width="450px" width='25%' style=" margin-left: 10px;">
             <div class="asideInfo">
                 <div class="contentTitle">牛只信息</div>
                 <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size='small'>

src/main/vue/src/pages/HandleTreatment.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container style="flex-grow:1">
-    <el-aside class="containAside" width="500px" style=" margin-right: 10px;">
+    <el-aside class="containAside" max-width="500px" width="26%" style=" margin-right: 10px;">
       <div class="asideInfo">
         <div class="contentTitle">
           {{pageTitle}}
@@ -26,7 +26,7 @@
     </el-aside>
     <el-main class="containMain">
       <div class="contentTitle">{{pageTitle}}</div>
-      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;">
+      <el-form ref="form" :model="formData" label-width="80px" style="margin-top:20px;width:522px;">
         <el-form-item label label-width="0">
           <el-input v-model="formData.cowID" disabled prefix-icon="el-icon-search" style="width:300px" maxlength="8" clearable></el-input>
           <!-- <el-button type="primary" @click="getNowCow" style="width:90px;margin-left:12px">确认</el-button> -->
@@ -113,7 +113,7 @@
         </div>
       </el-form>
     </el-main>
-    <el-aside class="containAside" width="450px">
+    <el-aside class="containAside" max-width="450px" width="25%">
       <div class="asideInfo">
         <div class="contentTitle">牛只信息</div>
         <el-table class="handleTable" border :data="tableData" style="width: 100%" :height="(allHeight-70)+'px'" size="small">
@@ -656,7 +656,7 @@ export default {
 
     },
     sureStop() {
-      var time = new Date(this.editCowInfo['发病日期']).getTime()+28800000
+      var time = new Date(this.editCowInfo['发病日期']).getTime() + 28800000
       var targetDate = new Date(time - 16 * 60 * 60 * 1000);
       this.getHaleInfo('wsVeterinary', 'diseaseDrugEnd', [
         this.editCowInfo['牛号'], Date.parse(targetDate), this.editCowInfo['疾病类型'], this.editCowInfo['疾病名称'], Date.parse(new Date()), (Date.parse(new Date()) + this.stopForm.sampleDate * 3600000)

src/main/vue/src/router/index.js

@@ -545,6 +545,36 @@ const router = new Router({
                         type: '手持机录入',
                         title: '盲乳登记'
                     }
+                },
+                {
+                    path: '/handleProhibition',
+                    name: 'handleProhibition',
+                    component: () =>
+                        import ('../pages/HandleProhibition'),
+                    meta: {
+                        type: '手持机录入',
+                        title: '禁配解禁'
+                    }
+                },
+                {
+                    path: '/handleFeedingMagnet',
+                    name: 'handleFeedingMagnet',
+                    component: () =>
+                        import ('../pages/HandleFeedingMagnet'),
+                    meta: {
+                        type: '手持机录入 ',
+                        title: '投喂磁石'
+                    }
+                },
+                {
+                    path: '/handleImmunopotency',
+                    name: 'handleImmunopotency',
+                    component: () =>
+                        import ('../pages/HandleImmunopotency'),
+                    meta: {
+                        type: '手持机录入 ',
+                        title: '免疫效价'
+                    }
                 }
             ]
         },