优化

src/router/routes.js

@@ -44,6 +44,7 @@ import storeList from '@/views/material/storeList.vue'
 /* 育种管理 */
 import gradeAssess from '@/views/cultivateSeed/gradeAssess.vue'
 import virtualMating from '@/views/cultivateSeed/sub/virtualMating.vue'
+import clan from '@/views/cultivateSeed/sub/clan.vue'
 
 /* 设备管理 */
 import environmentMonitoring from '@/views/device/environmentMonitoring.vue'
@@ -234,6 +235,11 @@ export default [
 				name: 'virtualMating',
 				component: virtualMating
 			},
+			{
+				path: 'clan',
+				name: 'clan',
+				component: clan
+			},
 			/* 设备管理 */
 			{
 				path: 'environmentMonitoring',

src/store/index.js

@@ -20,18 +20,8 @@ export default new Vuex.Store({
 	},
 	getters: {},
 	mutations: {
-		
-		setWorkerList(state, workerList) {
-			state.workerList = workerList
-		},
-		setAreaList(state, areaList) {
-			state.areaList = areaList
-		},
-		setDrugBasicsList(state, drugBasicsList) {
-			state.drugBasicsList = drugBasicsList
-		},
-		seetBatchList(state, batchList) {
-			state.batchList = batchList
+		setState(state, [key,val]) {
+			state[key] = val
 		}
 	},
 	actions: {
@@ -42,7 +32,7 @@ export default new Vuex.Store({
 				pageSize: 1000,
 				pageNum: 1
 			}).then(res => {
-				commit('setWorkerList', res.content)
+				commit('setState', ['workerList', res.content])
 			})
 		},
 		/* 获取栋舍列表 登录后在  home、areaInfo时调用了*/
@@ -52,7 +42,7 @@ export default new Vuex.Store({
 				pageSize: 1000,
 				pageNum: 1
 			}).then(res => {
-				commit('setAreaList', res.content)
+				commit('setState', ['areaList', res.content])
 			})
 		},
 		/* 获取基础药品列表 登录后在  home时调用了*/
@@ -62,7 +52,7 @@ export default new Vuex.Store({
 				pageSize: 1000,
 				pageNum: 1
 			}).then(res => {
-				commit('setDrugBasicsList', res.content)
+				commit('setState', ['drugBasicsList', res.content])
 			})
 		},
 		/* 获取批次列表 登录后在 home、batch.vue时调用了*/
@@ -72,7 +62,7 @@ export default new Vuex.Store({
 				pageSize: 1000,
 				pageNum: 1
 			}).then(res => {
-				commit('seetBatchList', res.content)
+				commit('setState', ['batchList', res.content])
 			})
 		}
 	}

src/store/publicType.js

@@ -101,15 +101,93 @@ const examiningReportType = [
     { label: "未通过", value: 0 },
     { label: "通过", value: 1 }
 ]
+
+// 羊产品类型
+const sheepProductType = [
+    '带骨羊前腿(A)',
+    '带骨羊前腿(AA)',
+    '带骨羊前腿(AAA)',
+    '羔羊肉卷(2500g/卷)',
+    '羔羊精卷(2500g/卷)',
+    '法式羊后腿',
+    '中式羊后腿',
+    '带骨羊后腿',
+    '羔羊肉砖',
+    '羔羊后腿肉卷',
+    '羔羊后腱骨',
+    '羔羊前腱骨',
+    '羔羊干棒骨',
+    '羔羊全排(A)',
+    '羔羊全排(AA)',
+    '羔羊全排(AAA)',
+    '羔羊龙骨',
+    '羊碎骨肉',
+    '罗肌肉',
+    '羊背筋',
+    '羊菲力(500g/包)',
+    '羊霖',
+    '羊颈排',
+    '羔羊半排',
+    '羊心',
+    '羊肺',
+    '羊肝',
+    '羔羊寸排(1000g/包)',
+    '方切后腿(240g/包)',
+    '腰油',
+    '膘油',
+    '羊鞭',
+    '废弃',
+    '肚油',
+    '羊宝',
+    '羊尾油',
+    '羊板筋',
+    '鞭根肉',
+    '羔羊后腿包(2500g/包)',
+    '羊尾芯',
+    '精致羊后腿包(2500g/包)',
+    '精致羊后腿卷(2500g/卷)',
+    '精致羊肉卷(2500g/卷)',
+    '十二肋法排(A)',
+    '十二肋法排(AA)',
+    '十二肋法排(AAA)',
+    '蝴蝶排(240g/包)',
+    '七肋法排',
+    '肋间肉',
+    '五分肉块',
+    '羊肉包(2500g/包)',
+    '羊油腰',
+    '羊蝎子(500g/包)',
+    '法式小切(500g/包)',
+    '单指排(500g/包)',
+    '羔羊寸排(500g/包)',
+    '前腿切片(500g/包)',
+    '羊胴体(剥皮)',
+    '羊胴体(烫毛)',
+    '羊头(带毛)',
+    '羊头(去毛)',
+    '羊蹄(带毛)',
+    '羊蹄(去毛)',
+    '羊皮',
+    '羊皮(次)',
+    '羊肥肠(2500g/包)',
+    '羊小肠',
+    '湖羊前半截',
+    '羊胴体分割',
+    '羊肚(毛肚)',
+    '羊肚(净肚)'
+]
 /* workerList 员工列表  动态获取了 在home.vue中获取了 */
 /* areaList 栋舍信息  动态获取了 在home.vue中获取了 */
 /* drugBasicsList 基础药品列表   动态获取了 在home.vue中获取了 */
 /* batchList 批次列表   动态获取了 在home.vue、batch.vue中获取了 */
 
+
+
+
 export default {
     seedSheedSource, seedSheedLevel, seedSheedStatus, seedColor, seedDensity,
     fetationStatus, estrusStatus, vaccineStyle, sheepType, cureStatus, periodOfValidityUnit
-    , drugStatus, harmlessConfirmStatus, examiningSheepType, examiningReportType
+    , drugStatus, harmlessConfirmStatus, examiningSheepType, examiningReportType, sheepProductType
 }
 
 

src/views/Home/Home.vue

@@ -136,13 +136,10 @@ export default {
         },
         // 菜单展开
         handleOpen(key, keyPath) {
-            console.log(key, keyPath);
             localStorage.setItem("defaultUnfoldedMenu", "" + key);
         },
         // 菜单收取
-        handleClose(key, keyPath) {
-            console.log(key, keyPath);
-        },
+        handleClose(key, keyPath) {},
         // 点击菜单项
         onClickMenu(item) {
             let _this = this;

src/views/cultivateSeed/gradeAssess.vue

@@ -32,7 +32,6 @@
         <section>
             <article class="table">
                 <el-table
-                    ref="multipleTable"
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"

src/views/cultivateSeed/sub/clan.vue

@@ -0,0 +1,9 @@
+<template>
+    <div>
+        <el-page-header @back="$router.go(-1)">
+            <template v-slot:content>
+                <h4>系谱管理</h4>
+            </template>
+        </el-page-header>
+    </div>
+</template>

src/views/production/examiningReport.vue

@@ -21,7 +21,7 @@
                     tooltip-effect="dark"
                     style="width: 100%"
                 >
-                    <el-table-column prop="id" label="序号"></el-table-column>
+                    <el-table-column prop="id" label="序号" width="100"></el-table-column>
                     <el-table-column prop="targetCode" label="羊只编码(批次)"></el-table-column>
                     <el-table-column label="检测对象">
                         <template v-slot="scope">
@@ -52,7 +52,7 @@
                         </template>
                     </el-table-column>
                 </el-table>
-
+                
                 <el-row type="flex" justify="end">
                     <el-col :span="8" class="pagination">
                         <el-pagination