linwenxin 1 éve
szülő
commit
b83d0a8cca

+ 5 - 5
src/views/setting/menus/index.vue

@@ -389,7 +389,7 @@ export default {
                       this.$successMsg('删除成功')
                       getMenuDetail({ moduleId: this.operateType === 1 ? this.editParentId : this.editChildId }).then(
                         res => {
-                          this.tableData = res.data.childList
+                          this.tableData = res.data.childList.filter(item=>item.type!==2)
                         }
                       )
                     })
@@ -536,8 +536,8 @@ export default {
             status: res.data.status,
             isCache: res.data.isCache,
             childList: res.data.childList
-          }
-          this.tableData = res.data.childList
+          };
+          this.tableData = res.data.childList.filter(item=>item.type!==2)
         })
       }
     },
@@ -559,7 +559,7 @@ export default {
               this.$successMsg('编辑成功')
               this.chongzhi()
               getMenuDetail({ moduleId: this.operateType === 1 ? this.editParentId : this.editChildId }).then(res => {
-                this.tableData = res.data.childList
+                this.tableData = res.data.childList.filter(item=>item.type!==2)
               })
             })
           } else {
@@ -568,7 +568,7 @@ export default {
               this.$successMsg('添加成功')
               this.chongzhi()
               getMenuDetail({ moduleId: this.operateType === 1 ? this.editParentId : this.editChildId }).then(res => {
-                this.tableData = res.data.childList
+                this.tableData = res.data.childList.filter(item=>item.type!==2)
               })
             })
           }

+ 4 - 1
src/views/workOrder/workOrderPool/detailModule/SettleAccounts/index.vue

@@ -12,7 +12,7 @@
       <el-button size="mini" @click="queding">确定结算</el-button>
     </div>
     <div v-else style="box-sizing: border-box;padding: 16px;">
-      <el-button size="mini" @click="itemOrderBaseSettleNormReset">重新结算</el-button>
+      <el-button v-if="showbtn" type="danger" plain size="mini" @click="itemOrderBaseSettleNormReset">重新结算</el-button>
     </div>
   </zj-page-container>
 </template>
@@ -39,6 +39,7 @@ export default {
       classifyList: [],
       otherList: [],
       formData: {},
+      showbtn:false,
     }
   },
   computed: {
@@ -1173,6 +1174,7 @@ export default {
             item.settleNum = item.orderNum
             normList.push({ ...item, pfuqinid: pfuqinid, zijideid: 0, bianji: res.data.settleStatus == 'YJS' ? false : true })
             item.workerList.map((resdata, ind_) => {
+              if(resdata.poolStatus === "NO"){ this.showbtn = true }
               if (ind_ !== 0) { normList.push({ pfuqinid: pfuqinid, zijideid: ind_ }) }
               if (ind_ == item.workerList.length - 1) { pfuqinid += (ind_ + 1) }
             })
@@ -1183,6 +1185,7 @@ export default {
             item.settleNum = item.orderNum
             otherNormList.push({ ...item, pfuqinid: qtpfuqinid, zijideid: 0, bianji: res.data.settleStatus == 'YJS' ? false : true })
             item.workerList.map((resdata, ind_) => {
+              if(resdata.poolStatus === "NO"){ this.showbtn = true }
               if (ind_ !== 0) { otherNormList.push({ pfuqinid: qtpfuqinid, zijideid: ind_ }) }
               if (ind_ == item.workerList.length - 1) { qtpfuqinid += (ind_ + 1) }
             })