linan 4 年之前
父节点
当前提交
3a96b91370
共有 3 个文件被更改,包括 20 次插入44 次删除
  1. 1 32
      src/views/breed/commoditySheepFile.vue
  2. 1 1
      src/views/breed/seedSheepFile.vue
  3. 18 11
      src/views/production/batch.vue

+ 1 - 32
src/views/breed/commoditySheepFile.vue

@@ -22,7 +22,7 @@
 
                     <el-table-column prop="fatherId" label="父亲ID"></el-table-column>
                     <el-table-column prop="motherId" label="母亲ID"></el-table-column>
-                    <el-table-column prop="birthWeight" label="出生重量"></el-table-column>
+                    <el-table-column prop="birthWeight" label="出生重量(kg)"></el-table-column>
                     <el-table-column label="出生时间">
                         <template v-slot="scope">
                             <span>{{ scope.row['birthday'].substr(0,10) }}</span>
@@ -36,37 +36,6 @@
                         </template>
                     </el-table-column>
 
-                    <!-- <el-table-column label="种母羊等级">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
-                                <span v-if="item.value == scope.row['level']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="查情时间">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="是否发情">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['estrusStatus']" :key="item.value">
-                                <span v-if="item.value == scope.row['ifEstrus']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="操作人">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['workerList']" :key="item.value">
-                                <span
-                                    v-if="item.id == scope.row['opeUser']"
-                                >{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </el-table-column> -->
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">
                             <el-popconfirm title="是否删除此设备的信息?" @onConfirm="del(scope.row)">

+ 1 - 1
src/views/breed/seedSheepFile.vue

@@ -10,7 +10,7 @@
                     <el-button type="primary" @click="getSeedSheepList">查找</el-button>
                 </el-col>
                 <el-col :span="10">
-                    <el-button type="primary" @click="add">新增档案</el-button>暂时别删,要测试删除的话,先自己新增几条数据,别删已经存在的,这关乎到种羊档案
+                    <el-button type="primary" @click="add">新增档案</el-button>暂时别删,要测试删除的话,先自己新增几条数据,别删已经存在的,这关乎到系谱信息档案
                 </el-col>
                 <el-col :span="4">
                     <el-button-group>

+ 18 - 11
src/views/production/batch.vue

@@ -83,7 +83,10 @@
                     </el-table-column>
                     <el-table-column prop="status" label="状态">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['prductSheedStatus']" :key="item.value">
+                            <div
+                                v-for="item in $store.state['prductSheedStatus']"
+                                :key="item.value"
+                            >
                                 <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
                             </div>
                         </template>
@@ -93,7 +96,7 @@
                 <el-row type="flex" justify="end" style="margin-top: 20px">
                     <el-col :span="14">
                         <el-button @click="toggleSelection()">取消选择</el-button>
-                        <el-button type="primary" plain @click="add">
+                        <el-button type="primary" plain @click="create">
                             生成批次
                             <i class="el-icon-arrow-right el-icon--right"></i>
                         </el-button>
@@ -136,7 +139,11 @@
 </template>
 
 <script>
-import { reqBatchList, reqAddBatch, reqSeedEweSheepList } from "@/api/production.js";
+import {
+    reqBatchList,
+    reqAddBatch,
+    reqSeedEweSheepList
+} from "@/api/production.js";
 
 const pageSize = 10;
 const rules = {};
@@ -184,11 +191,11 @@ export default {
                             this.getBatchList();
                             // 获取批次管理列表
                             this.getSeedSheepList();
-                            // this.$message.success("成功11!");
                             if (res.errCode) {
                                 this.$message.error(res.errMsg);
                             } else {
-                                this.$message.success("成功");
+                                this.$message.success("生产批次成功!");
+                                this.toggleSelection();
                             }
                             // 清空选项
                             this.toggleSelection();
@@ -196,7 +203,7 @@ export default {
                         })
                         .catch(err => {
                             console.log(err);
-                            this.$message.error("失败22!");
+                            this.$message.error("生产批次失败!");
                         });
                 } else {
                     return false;
@@ -240,14 +247,16 @@ export default {
         toggleSelection(rows) {
             if (rows) {
                 rows.forEach(row => {
-                    this.$refs.multipleTableCreateBatch.toggleRowSelection(row);
+                    this.$refs["multipleTableCreateBatch"].toggleRowSelection(
+                        row
+                    );
                 });
             } else {
-                this.$refs.multipleTableCreateBatch.clearSelection();
+                this.$refs["multipleTableCreateBatch"].clearSelection();
             }
         },
         // 创建批次
-        add() {
+        create() {
             if (this.multipleSelection.length <= 0) {
                 this.$message.warning("请选择羊");
                 return;
@@ -263,13 +272,11 @@ export default {
             this.btnFlag = v;
         },
         pageChange(p) {
-            console.log(p);
             this.pageNum = p;
             // 批次列表
             this.getBatchList();
         },
         pageChange_2(p) {
-            console.log(p);
             this.pageNum_2 = p;
             // 获取批次管理列表
             this.getSeedSheepList();