Преглед на файлове

处理了一个 种羊档案的bug

linan преди 4 години
родител
ревизия
2018d7ba80
променени са 5 файла, в които са добавени 18 реда и са изтрити 10 реда
  1. 1 1
      src/main.js
  2. 1 1
      src/views/breed/collectSeedLog.vue
  3. 1 1
      src/views/breed/parturitionLog.vue
  4. 14 6
      src/views/breed/seedSheepFile.vue
  5. 1 1
      src/views/breed/shiftFieldLog.vue

+ 1 - 1
src/main.js

@@ -11,7 +11,7 @@ import './assets/css/reset.scss'
 
 import moment from 'moment'
 moment.locale('zh-cn');  // 汉化
-Vue.prototype.$moment = moment;  // 赋值使用
+Vue.prototype.$moment = moment; 
 
 Vue.use(vueModuleLoader, { store }).use(ElementUI);
 

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

@@ -31,7 +31,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="opeTime" label="采精时间"></el-table-column>
+                    <el-table-column prop="opeTime" label="采精时间" width="180"></el-table-column>
                     <el-table-column prop="yield" label="射精量(ml)"></el-table-column>
                     <el-table-column label="密度">
                         <template v-slot="scope">

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

@@ -24,7 +24,7 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="sheepId" label="种母羊编号"></el-table-column>
-                    <el-table-column prop="opeTime" label="分娩时间"></el-table-column>
+                    <el-table-column prop="opeTime" label="分娩时间" width="180"></el-table-column>
                     <el-table-column prop="number" label="产羔个数"></el-table-column>
                     <el-table-column prop="averageWeight" label="羔羊均重(kg)"></el-table-column>
                     <el-table-column prop="healthyNum" label="健仔数"></el-table-column>

+ 14 - 6
src/views/breed/seedSheepFile.vue

@@ -42,7 +42,13 @@
                     </el-table-column>
                     <el-table-column prop="cost" label="成本价格(元)"></el-table-column>
                     <el-table-column prop="weight" label="体重(kg)"></el-table-column>
-                    <el-table-column prop="feederName" label="饲养员"></el-table-column>
+                    <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>
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="等级评级">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
@@ -120,10 +126,12 @@
 
                         <el-form-item label="饲养员">
                             <el-select v-model="formData.feeder" placeholder="请选择">
-                                <el-option label="甲" :value="90003"></el-option>
-                                <el-option label="乙" :value="2"></el-option>
-                                <el-option label="丙" :value="3"></el-option>
-                                <el-option label="丁" :value="4"></el-option>
+                                <el-option
+                                    v-for="item in $store.state['workerList']"
+                                    :key="item.id"
+                                    :label="`${item.name}(${item.position})`"
+                                    :value="item.id"
+                                ></el-option>
                             </el-select>
                         </el-form-item>
 
@@ -174,7 +182,7 @@ export default {
                 status: 1,
                 cost: 3000,
                 weight: 48,
-                feeder: 90003,
+                feeder: this.$store.state['workerList'][0].id,
                 level: 1
             }
         };

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

@@ -24,7 +24,7 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column prop="opeTime" label="转舍时间"></el-table-column>
+                    <el-table-column prop="opeTime" label="转舍时间" width="180"></el-table-column>
                     <el-table-column label="转出栋舍">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['areaList']" :key="item.value">