08-15提交

src/views/basicData/feedTable/index.vue

@@ -247,18 +247,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="单价1：" prop="uprice">
+              <el-form-item label="单价：" prop="uprice">
                 <el-input ref="uprice" v-model="create.temp.uprice"  class="filter-item" placeholder="最多俩位小数" type="number" step="0.01" style="width: 100%;" />
               </el-form-item>
-            </el-col>
-            <!-- // 现代牧业专用 -->
-            <el-col :span="6">
-              <el-form-item label="饲料组：" prop="feedgroupid">
-                <el-select v-model="create.temp.feedgroupid" filterable placeholder="饲料组" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in feedGroupList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-              <!-- // 现代牧业专用 -->
             </el-col>
           </el-row>
           <el-row>
@@ -770,10 +761,7 @@ export default {
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['跳转延时'] },
         { name: 'getFeedclassByBig', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getDictByName2', offset: 0, pagecount: 0, params: ['计划类型'] },
-        { name: 'getTMRListEnableTypeFeed', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid'), eqtype: '4' }},
-        // 现代牧业专用
-        { name: 'getFeedgroup', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid')}},
-        // 现代牧业专用
+        { name: 'getTMRListEnableTypeFeed', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid'), eqtype: '4' }}
       ],
       requestParams2: {
         name: 'getSysoptEnable', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), inforname: 'isSmallMaterial' }
@@ -786,10 +774,7 @@ export default {
       feedTypeList: [], // 饲料分类
       planTypeList: [], // 计划类型
       smallMaterialList: [], // 小料秤
-      jmpList: [{ id: '0', name: '否' }, { id: '1', name: '是' }], // 无上域
-      // 现代牧业专用
-      feedGroupList:[],
-      // 现代牧业专用
+      jmpList: [{ id: '0', name: '否' }, { id: '1', name: '是' }], // 无上域
       table: {
         tableKey: 0,
         list: [],
@@ -828,10 +813,7 @@ export default {
           printgroupid :[{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          // 现代牧业专用
-          feedgroupid: [{ type: 'number', required: true, message: '必填', trigger: 'blur' }],
-          // 现代牧业专用
+          feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
         }
       },
 
@@ -1121,10 +1103,7 @@ export default {
         this.jumpDelayList = response.data.getDictByName.list
         this.feedTypeList = response.data.getFeedclassByBig.list
         this.planTypeList = response.data.getDictByName2.list
-        this.smallMaterialList = response.data.getTMRListEnableTypeFeed.list
-        // 现代牧业专用
-        this.feedGroupList = response.data.getFeedgroup.list
-        // 现代牧业专用
+        this.smallMaterialList = response.data.getTMRListEnableTypeFeed.list
       })
     },