Browse Source

配方模板的编辑权限,日执行修改计划的栏舍配方部分增加了栏舍筛选

段小段 1 year ago
parent
commit
8e0046b836

+ 2 - 2
.env.development

@@ -6,12 +6,12 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 
 
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
 # VUE_APP_BASE_API = 'http://tmrwatch.cn/'
 
 # 测试线
-VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
+# VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
 
 # VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
 

BIN
dist.zip


+ 9 - 1
src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue

@@ -1,5 +1,9 @@
 <template>
   <div>
+    <div class="search">
+      <el-input v-model="table.getdataListParm.parammaps.barName" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;" placeholder="栏舍名称" />
+      <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="handleSearch()">查询</el-button>
+    </div>
     <div class="table">
       <el-table
         :key="table.tableKey"
@@ -126,7 +130,8 @@ export default {
           pagecount: 12,
           returntype: 'Map',
           parammaps: {
-            pastureid: Cookies.get('pastureid')
+            pastureid: Cookies.get('pastureid'),
+            barName:''
           }
         },
         tableKey: 0,
@@ -237,6 +242,9 @@ export default {
         }, 100)
       })
     },
+    handleSearch(){
+      this.getList()
+    },
     handleSpan() {
       this.mergekeys.forEach(key => {
         this.spanObj[key] = []

+ 1 - 1
src/views/formulationPlan/recipeTemplate/index.vue

@@ -1126,7 +1126,7 @@ export default {
   },
   methods: {
     getButtons() {
-      const Edit = 'FormulationEvaluation'
+      const Edit = 'RecipeTemplate'
       const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
       this.isRoleEdit = isRoleEdit
     },