Merge branch 'feature/times' into feature/fence_shed

# Conflicts:
#	src/views/formulationPlan/dhedFormula/index.vue

src/views/basicData/defaultParameter/function/index.vue

@@ -225,7 +225,7 @@ export default {
       decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
       isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
-      numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
+      numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' },{ id: '4', name: '5' },{ id: '5', name: '6' }], // 班次数量
       feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同
       leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '剩料分配' }],
       weightDecimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }, { id: '4', name: '四位小数' }], // 重量小数点位数

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -1279,6 +1279,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: '第六班' }]
         }
       })
     },

src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -674,51 +674,41 @@ export default {
       postJson(url, data).then(response => {
         console.log(response.data.list[0].inforvalue)
         if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{
-            id: 1,
-            name: '第一班'
-          }]
+          this.frequencyList = [{ id: 1, name: '第一班' }]
         } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{
-            id: 1,
-            name: '第一班'
-          },
-          {
-            id: 2,
-            name: '第二班'
-          }
+          this.frequencyList = [
+            { id: 1, name: '第一班' },
+            { id: 2, name: '第二班' }
           ]
         } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{
-            id: 1,
-            name: '第一班'
-          },
-          {
-            id: 2,
-            name: '第二班'
-          },
-          {
-            id: 3,
-            name: '第三班'
-          }
+          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: '第四班'
-          }
+          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: '第六班' }
           ]
         }
       })

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -699,6 +699,23 @@ export default {
             { 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: '第六班' },
+          ]
         }
       })
     },

src/views/formulationPlan/premixedPlan/index.vue

@@ -330,6 +330,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: '第六班' }]
         }
       })
     },

src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -585,6 +585,43 @@
               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 == 4) {
+            this.frequencyList = [{
+              id: '1',
+              name: '第一班'
+            }, {
+              id: '2',
+              name: '第二班'
+            }, {
+              id: '3',
+              name: '第三班'
+            }, {
+              id: '4',
+              name: '第四班'
+            }, {
+              id: '5',
+              name: '第五班'
+            }, {
+              id: '6',
+              name: '第六班'
+            }]
           }
         })
       },