src/views/custom/receive/index.vue

@@ -679,7 +679,7 @@ export default {
     })
     this.get_select_list()
     // this.get_table_data()
-    this.getPendingList()
+    // this.getPendingList()
   },
 
   methods: {
@@ -756,7 +756,7 @@ export default {
       this.pending.getdataListParm.parammaps.logindeptId = this.getdataListParm.parammaps.logindeptId
       this.pending.getdataListParm.parammaps.loginpastureId = this.getdataListParm.parammaps.loginpastureId
       this.pending.getdataListParm.parammaps.empId = this.getdataListParm.parammaps.empId
-      this.pending.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
+      this.pending.getdataListParm.parammaps.pastureId =this.getdataListParm.parammaps.pastureId || Cookies.get('pastureid')
       this.pending.getdataListParm.parammaps.deptId = Cookies.get('departmentid')
       GetDataByName(this.pending.getdataListParm).then(response => {
         this.pending.total = response.data.total3
@@ -1355,6 +1355,7 @@ export default {
         })
         this.getDepartDownList()
         this.get_table_data()
+        this.getPendingList()
       })
     },
     getDepartDownList() {

src/views/custom/subscribe/index.vue

@@ -342,12 +342,12 @@
             size="mini"
             @click="handleExamine6(row)"
           >审核</el-button>
-          <!-- 奶厅 -->
+          <!-- 奶厅职能中心 -->
           <el-button
             v-if="
               isSubscribeExamineNT &&
                 row.departmentName == '挤奶处' &&
-                ((row.examine !== 1 && row.statue == 5) || row.statue == 11)  &&  (!row.isPasturd || row.isRolePasturd )
+                ((row.examine !== 1 && row.statue == 5) || row.statue == 11)
             "
             style="display: inline-block"
             type="success"
@@ -2803,7 +2803,7 @@ export default {
     })
     this.get_select_list()
     // this.get_table_data()
-    this.getPendingList()
+    // this.getPendingList()
     this.getProviderList()
     console.log(this.$store.state.user,'user')
   },
@@ -2940,6 +2940,7 @@ export default {
       this.isSubscribeExamineNT = isSubscribeExamineNT
     },
     getPendingList() {
+
       this.pending.getdataListParm.parammaps.pastureName =
         this.getdataListParm.parammaps.pastureName
       this.pending.getdataListParm.parammaps.orderNumber =
@@ -2960,10 +2961,9 @@ export default {
         this.getdataListParm.parammaps.loginpastureId
       this.pending.getdataListParm.parammaps.empId =
         this.getdataListParm.parammaps.empId
-      this.pending.getdataListParm.parammaps.pastureId = this.getdataListParm.parammaps.pastureId ||  Cookies.get('pastureid')
 
       this.pending.getdataListParm.parammaps.deptId =  Cookies.get('departmentid')
-
+      this.pending.getdataListParm.parammaps.pastureId = this.getdataListParm.parammaps.pastureId ||  Cookies.get('pastureid')
 
       GetDataByName(this.pending.getdataListParm).then((response) => {
         this.pending.total = response.data.total3
@@ -5715,6 +5715,7 @@ export default {
         })
         this.getDepartDownList()
         this.get_table_data()
+        this.getPendingList()
       })
     },
     getDepartDownList() {