8.24提交修改

yuyu

2023-08-24 cd17c45d39c727185b3c5ffb5a20e3dfac4dfb75

8.24提交修改

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -272,7 +272,6 @@
                this.total = res.data.total
            },

<<<<<<< HEAD
    // 重置方法
    reset() {
      // 重置搜索条件
@@ -326,79 +325,6 @@
    }
  }
}
=======
            // 重置方法
            reset() {
                // 重置搜索条件
                this.searchData.code = ''
                this.searchData.name = ''
                this.searchData.department = ''
                this.radioValue = 0
                // 重新获取数据
                this.getCommisionList()
            },
            async radioclick() {
                // 处理点击radio的时间
                console.log('radioValue', this.radioValue)
                if (this.radioValue === 0) {
                    this.getCommisionList()
                } else {
                    const res = await getCommisionList({
                        pageNo: this.currentPage,
                        pageSize: this.pageSize,
                        inspectionStatus: this.radioValue
                    })
                    // console.log(res)
                    this.commisionTable = res.data.row
                    this.total = res.data.total
                }

            },
            // 每页条数改变时触发 选择一页显示多少行
            async handleSizeChange(val) {
                // console.log(`每页 ${val} 条`)
                this.currentPage = 1
                this.pageSize = val
                if (this.radioValue === 0) {
                    this.getCommisionList()
                } else {
                    const res = await getCommisionList({
                        pageNo: this.currentPage,
                        pageSize: this.pageSize,
                        inspectionStatus: this.radioValue
                    })
                    this.commisionTable = res.data.row
                    this.total = res.data.total
                }
            },
            // 当前页改变时触发 跳转其他页
            async handleCurrentChange(val) {
                // console.log(`当前页: ${val}`)
                this.currentPage = val
                if (this.radioValue === 0) {
                    this.getCommisionList()
                } else {
                    const res = await getCommisionList({
                        pageNo: this.currentPage,
                        pageSize: this.pageSize,
                        inspectionStatus: this.radioValue
                    })
                    this.commisionTable = res.data.row
                    this.total = res.data.total
                }
            },
            goToaddCommision() {
                // this.$router.push('/inspectionManagement/commissionInspection/addCommision')
                // this.showDetail = true
                selectViewUUID({
                    day: this.day
                }).then(res => {
                    this.viewId = res.data
                })
            }
        }
    }
>>>>>>> d94af68ec3f6317124df81296b08c7c110641fca
</script>

<style scoped>
@@ -409,7 +335,6 @@
        justify-content: space-between;
        padding: 5px 24px 0px 24px;

<<<<<<< HEAD
.top-bar{
    margin: -25px -15px;
    background: #fff;
@@ -472,12 +397,6 @@
          }
      }
    }
=======
        .sermargin {
            margin-right: 60px;
        }
    }
>>>>>>> d94af68ec3f6317124df81296b08c7c110641fca

    .rightBtn {
        background-color: rgb(1, 102, 226);
@@ -525,4 +444,5 @@
    .vue_qr_div{
        text-align: center;
    }
}
</style>