Prechádzať zdrojové kódy

更新四班次为六班次

duanxiaoduan 1 rok pred
rodič
commit
c8f3fdc558

+ 2 - 1
src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -788,7 +788,8 @@ export default {
       this.selectList = val
     },
     changeTemplateFormulation(item) {
-      this.create.temp.ftname = this.templateFormulationList.find(obj => obj.id === item).tname
+      this.create.temp.ftname = this.templateFormulationList.find(obj => obj.id === item).tname
+      this.create.temp.ftvolume = this.templateFormulationList.find(obj => obj.id === item).volume
       this.getCreateList1()
     },
     changeTimes(item) {

+ 1 - 1
src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -296,7 +296,7 @@ export default {
           for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
             const obj = {}
             obj.id = String(i)
-            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }
+            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
             this.samplingSelection.frequencyList.push(obj)
           }
         } else {

+ 2 - 0
src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -787,6 +787,7 @@ export default {
     },
     changeTemplateFormulation(item) {
       this.create.temp.ftname = this.templateFormulationList.find(obj => obj.id === item).tname
+      this.create.temp.ftvolume = this.templateFormulationList.find(obj => obj.id === item).volume
       this.getCreateList1()
     },
     changeTimes(item) {
@@ -1120,6 +1121,7 @@ export default {
           if(parseFloat(this.create.temp.ftvolume) !== 0 &&  parseFloat(this.create.temp.sumweight) !== 0){
             this.create.temp.volume = (parseFloat(this.create.temp.sumweight) / parseFloat(this.create.temp.ftvolume)).toFixed(2)
           }else{
+            console.log(22)
             this.create.temp.volume = 0
           }
         } else {

+ 1 - 1
src/views/shedProduction/dungScores/index.vue

@@ -423,7 +423,7 @@ export default {
           for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
             const obj = {}
             obj.id = String(i)
-            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }
+            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
             this.frequencyList.push(obj)
           }
         } else {

+ 1 - 1
src/views/shedProduction/dutyRecord/index.vue

@@ -338,7 +338,7 @@ export default {
           for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
             const obj = {}
             obj.id = String(i)
-            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }
+            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
             this.frequencyList.push(obj)
           }
         } else {

+ 1 - 1
src/views/shedProduction/fecalScreen/index.vue

@@ -394,7 +394,7 @@ export default {
           for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
             const obj = {}
             obj.id = String(i)
-            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }
+            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
             this.frequencyList.push(obj)
           }
         } else {

+ 1 - 1
src/views/shedProduction/formulaDryMatter/index.vue

@@ -378,7 +378,7 @@ export default {
           for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
             const obj = {}
             obj.id = String(i)
-            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }
+            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
             this.frequencyList.push(obj)
           }
         } else {

+ 1 - 1
src/views/shedProduction/materialRemainingRecord/index.vue

@@ -355,7 +355,7 @@ export default {
           for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
             const obj = {}
             obj.id = String(i)
-            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }
+            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
             this.frequencyList.push(obj)
           }
         } else {

+ 1 - 1
src/views/shedProduction/performance/index.vue

@@ -193,7 +193,7 @@
                 <!-- <el-select v-if="create.dialogStatus=='create'" v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width: 100%;" @change="changeCowclass">
                   <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.id" />
                 </el-select> -->
-              <el-select v-if="create.dialogStatus=='create'"  v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width:95%;padding:10px 0;" @change="changeParent">
+              <el-select v-if="create.dialogStatus=='create'"  v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width: 100%;" @change="changeParent">
                 <el-option v-for="item in parentList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
                 <!-- <el-input v-else ref="cowclass" v-model="create.temp.cowclass" disabled class="filter-item" placeholder="牲畜类别" /> -->

+ 6 - 0
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -2511,6 +2511,12 @@ export default {
         } else if (response.data.list[0].inforvalue == 4) {
           this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
           this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+        } else if (response.data.list[0].inforvalue == 5) {
+          this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }]
+          this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }]
+        } else if (response.data.list[0].inforvalue == 6) {
+          this.tab2.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }, { id: '6', name: '第六班' }]
+          this.tab3.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }, { id: '5', name: '第五班' }, { id: '6', name: '第六班' }]
         }
       })
     },

+ 4 - 0
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -984,6 +984,10 @@ export default {
           this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
         } else if (response.data.list[0].inforvalue == 4) {
           this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
+        } else if (response.data.list[0].inforvalue == 5) {
+          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' },{ id: '5', name: '第五班' }]
+        } else if (response.data.list[0].inforvalue == 6) {
+          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' },{ id: '5', name: '第五班' },{ id: '6', name: '第六班' }]
         }
       })
     },