员工信息性别对照更改，种羊档案增加公母羊筛选需求

src/store/index.js

@@ -2,8 +2,9 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import publicType from './publicType.js' // 公共的类型 
 import { reqWorkerList, reqBuildList } from "@/api/fileInfo.js";
-import { reqBasicsInfoList} from "@/api/material.js";
+import { reqBasicsInfoList } from "@/api/material.js";
 import { reqBatchList } from "@/api/production.js";
+import { reqStoreList } from "@/api/material.js";
 
 Vue.use(Vuex)
 
@@ -11,15 +12,16 @@ export default new Vuex.Store({
 	strict: true,
 	state: {
 		token: localStorage.getItem("token"),
-		workerList: [{id:1}], // 员工列表 (加{id:1} 是为了防止刷新时报错，因为设置默认值时用到过)
-		areaList: [{id:1}],  // 栋舍列表
-		drugBasicsList: [{id:1}],  // 基础药品列表
+		workerList: [{ id: 1 }], // 员工列表 (加{id:1} 是为了防止刷新时报错，因为设置默认值时用到过)
+		areaList: [{ id: 1 }],  // 栋舍列表
+		drugBasicsList: [{ id: 1 }],  // 基础药品列表
 		batchList: [],  // 批次列表
+		storeList: [],  // 批次列表
 		...publicType
 	},
 	getters: {},
 	mutations: {
-		setState(state, [key,val]) {
+		setState(state, [key, val]) {
 			state[key] = val
 		}
 	},
@@ -63,6 +65,16 @@ export default new Vuex.Store({
 			}).then(res => {
 				commit('setState', ['batchList', res.content])
 			})
+		},
+		/* 获取库存列表 登录后在 storeList.vue时调用了*/
+		getStoreList({ commit }) {
+			reqStoreList({
+				searchStr: '',
+				pageSize: 1000,
+				pageNum: 1
+			}).then(res => {
+				commit('setState', ['storeList', res.content])
+			})
 		}
 	}
 })

src/views/Home/Home.vue

@@ -124,6 +124,8 @@ export default {
         this.$store.dispatch('getDrugBasicsList')
         // 获取批次列表 给后面下拉选择器使用
         this.$store.dispatch('getBatchList')
+        // 获取库存列表 给后面下拉选择器使用
+        this.$store.dispatch('getStoreList')
     },
     methods: {
         // 收取菜单按钮

src/views/breed/seedSheepFile.vue

@@ -9,18 +9,20 @@
                 <el-col :span="4">
                     <el-button type="primary" @click="getSeedSheepList">查找</el-button>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="10">
                     <el-button type="primary" @click="add">新增档案</el-button>
                 </el-col>
+                <el-col :span="4">
+                    <el-button-group>
+                        <el-button :type="sheepType==0?'primary':''" @click="shiftSheepType(0)">种母羊</el-button>
+                        <el-button :type="sheepType==1?'primary':''" @click="shiftSheepType(1)">种公羊</el-button>
+                    </el-button-group>
+                </el-col>
             </el-row>
         </header>
         <section>
             <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
+                <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
                     <el-table-column prop="id" label="种母羊编码" width="100"></el-table-column>
                     <el-table-column label="入场时间" width="200">
                         <template v-slot="scope">
@@ -48,7 +50,9 @@
                     <el-table-column prop="feederName" label="饲养员">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['workerList']" :key="item.value">
-                                <span v-if="item.id == scope.row['feeder']">{{ `${item.name}(${item.position})` }}</span>
+                                <span
+                                    v-if="item.id == scope.row['feeder']"
+                                >{{ `${item.name}(${item.position})` }}</span>
                             </div>
                         </template>
                     </el-table-column>
@@ -174,6 +178,7 @@ export default {
         return {
             page: 1,
             searchStr: "",
+            sheepType: 0,
             tableData: [],
             totalPages: 0,
             isShow: false,
@@ -185,7 +190,7 @@ export default {
                 status: 1,
                 cost: 3000,
                 weight: 48,
-                feeder: this.$store.state['workerList'][0].id,
+                feeder: this.$store.state["workerList"][0].id,
                 level: 1
             }
         };
@@ -218,6 +223,7 @@ export default {
             reqSeedSheepList({
                 pageNum: this.page,
                 pageSize,
+                gender: this.sheepType,
                 searchStr: this.searchStr
             })
                 .then(res => {
@@ -228,6 +234,12 @@ export default {
                     console.log(err);
                 });
         },
+        // 羊类型切换
+        shiftSheepType(sheepType) {
+            if(sheepType == this.sheepType) return
+            this.sheepType = sheepType
+            this.getSeedSheepList()
+        },
 
         add() {
             this.isShow = true;

src/views/device/video.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="video">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">视频监控</h2>
-        <video width="1400" autoplay controls loop>
+        <video width="1400" autoplay  loop>
             <source src="./source/video2.mp4" type="video/mp4" />
         </video>
     </div>

src/views/fileInfo/workerInfo.vue

@@ -26,7 +26,7 @@
                     <el-table-column prop="gender" label="性别" width="80">
                         <template v-slot="scope">
                             <span v-if="scope.row.gender==1">男</span>
-                            <span v-if="scope.row.gender==2">女</span>
+                            <span v-if="scope.row.gender==0">女</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="age" label="年龄" width="100"></el-table-column>
@@ -75,7 +75,7 @@
                         <el-form-item label="性别">
                             <el-radio-group v-model="formData.gender">
                                 <el-radio :label="1">男</el-radio>
-                                <el-radio :label="2">女</el-radio>
+                                <el-radio :label="0">女</el-radio>
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="年龄">

src/views/material/materialOutStore.vue

@@ -74,17 +74,17 @@
                                 placeholder="选择日期"
                             ></el-date-picker>
                         </el-form-item>
-                        <el-form-item label="药品">
-                            <el-select v-model="formData.medicineId" filterable placeholder="请选择">
+                        <el-form-item label="库存ID">
+                            <el-select v-model="formData.stockId" filterable placeholder="请选择">
                                 <el-option
-                                    v-for="item in $store.state['drugBasicsList']"
+                                    v-for="item in $store.state['storeList']"
                                     :key="item.id"
-                                    :label="`${item.name}`"
+                                    :label="`${item.medicineName}(${item.number})/${item.mfd.substr(0,10)}`"
                                     :value="item.id"
                                 ></el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="购买人">
+                        <el-form-item label="领取人">
                             <el-select v-model="formData.user" filterable placeholder="请选择">
                                 <el-option
                                     v-for="item in $store.state['workerList']"
@@ -132,7 +132,7 @@ export default {
             isShow: false,
             formData: {
                 outTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
-                medicineId: null,
+                stockId: null,
                 number: 120,
                 user: null,
                 remark: "备注",

src/views/material/storeList.vue

@@ -100,10 +100,7 @@
 </template>
 
 <script>
-import {
-    reqStoreList,
-    reqAddStore
-} from "@/api/material.js";
+import { reqStoreList, reqAddStore } from "@/api/material.js";
 
 const pageSize = 10;
 const rules = {};
@@ -118,9 +115,9 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                inTime: this.$moment().format('YYYY-MM-DD 00:00:00'),
+                inTime: this.$moment().format("YYYY-MM-DD 00:00:00"),
                 medicineId: "12",
-                mfd: this.$moment().format('YYYY-MM-DD 00:00:00'),
+                mfd: this.$moment().format("YYYY-MM-DD 00:00:00"),
                 source: "兽药经销商",
                 number: 168,
                 price: 8.5
@@ -141,6 +138,8 @@ export default {
                         .then(res => {
                             // 库存盘点列表
                             this.getStoreList();
+                            // 获取库存列表 给后面下拉选择器使用
+                            this.$store.dispatch("getStoreList");
                             this.$message.success("成功！");
                             // this.isShow = false
                         })