From cd17c45d39c727185b3c5ffb5a20e3dfac4dfb75 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期四, 24 八月 2023 13:45:27 +0800
Subject: [PATCH] 8.24提交修改
---
src/views/inspectionManagement/commissionInspection/index.vue | 82 ----------------------------------------
1 files changed, 1 insertions(+), 81 deletions(-)
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 8f14387..58579bc 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.3