diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
index dc911326db..114de6b73a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
@@ -58,47 +58,55 @@
-
-
-
+
+
+
修改
调整
-
-
- {{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}
-
-
-
-
- {{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
-
-
-
-
-
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}
+
+
+
+
+ {{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
+
+
+
+
+
+
+
@@ -841,4 +849,12 @@ export default {
margin-left: 120px !important;
width: calc(100% - 115px);
}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+ height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+ height: 100% !important;
+}
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
index 7a4c355b0b..8ff6546308 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
@@ -56,52 +56,63 @@
-
-
-
+
+
+
编辑
查看
-
-
- {{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}
-
-
-
-
- {{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}
+
+
+
+
+ {{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -559,4 +570,12 @@ export default {
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
index bcca43b973..d5892e58d6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
@@ -57,43 +57,54 @@
-
-
-
+
+
+
修改
调整
-
-
- {{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}
-
-
-
-
- {{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}
+
+
+
+
+ {{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
index 794aa4a28b..1df8cd08c9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
@@ -48,45 +48,52 @@
-
-
-
+
+
+
编辑
查看
-
-
- {{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : scope.row.state == '5' ? '分配中' : scope.row.state == '6' ? '' : scope.row.state == '已分配' ? '' : '' }}
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : scope.row.state == '5' ? '分配中' : scope.row.state == '6' ? '' : scope.row.state == '已分配' ? '' : '' }}
+
+
+
+
+ {{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+