diff --git a/sgzb-ui/src/views/scrapManage/component/tableModel.vue b/sgzb-ui/src/views/scrapManage/component/tableModel.vue
index 7e3146a8..a07b7471 100644
--- a/sgzb-ui/src/views/scrapManage/component/tableModel.vue
+++ b/sgzb-ui/src/views/scrapManage/component/tableModel.vue
@@ -7,7 +7,6 @@
>
-
- 操作
-
+ 操作
{{ check.t_label }}
@@ -160,7 +160,13 @@
data() {
return {
total: 0,
- tableList: [],
+ tableList: [
+ { demo: '123' },
+ { demo: '123' },
+ { demo: '123' },
+ { demo: '123' },
+ { demo: '123' },
+ ],
pageParams: {
pageNum: 1,
pageSize: 10,
@@ -170,14 +176,17 @@
},
created() {
this.getList()
- console.log(this.tableColumCheck, '获取的', this.tableProps)
+ this.columCheckList = this.tableProps
+ this.columCheckList = this.columCheckList.map((e) => {
+ this.$set(e, 'checked', true)
+ return e
+ })
},
computed: {
- tableColumCheck() {
- return this.tableProps
- },
tableColumCheckProps() {
- return this.tableColumCheck.filter((e) => (e.checked = true))
+ return this.columCheckList.filter((e) => {
+ return e.checked != false
+ })
},
},
methods: {
@@ -227,4 +236,12 @@
margin-bottom: 5px;
cursor: pointer;
}
+
+ .handel-text {
+ cursor: pointer;
+ }
+ .handel-text:hover {
+ text-decoration: underline;
+ color: #409eff;
+ }
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn.vue
index 36dd1a55..eba7a8cb 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn.vue
@@ -10,18 +10,30 @@
:handleWidth="`180px`"
@getTableSelectionChange="getTableSelectionChange"
>
-
+
- 完成退料
+
+ {{ btn.btn_title }}
+
+
@@ -40,10 +52,35 @@
data() {
return {
config,
+ title: '',
+ dialogVisible: false,
+
+ handleBtn: [
+ { btn_title: '查看', id: 1 },
+ { btn_title: '编辑退料', id: 2 },
+ { btn_title: '撤回', id: 3 },
+ ],
}
},
methods: {
+ /* 按钮操作 */
+ handleBtnEvent(data, id) {
+ switch (id) {
+ case 1:
+ this.title = '查看'
+ this.dialogWidth = '70%'
+ break
+ case 2:
+ this.title = '编辑退料'
+ this.dialogWidth = '70%'
+ break
+ }
+ this.dialogVisible = true
+ },
getTableSelectionChange() {},
+ closeDialog(val) {
+ this.dialogVisible = val
+ },
},
}
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue
index 0ece0712..73aaf691 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing.vue
@@ -1,13 +1,5 @@
-
{
- this.temp = !this.temp
- }
- "
- >测试
@@ -85,6 +77,10 @@
+
+ 驳回退料
+ 返回
+
@@ -123,6 +119,7 @@
{ btn_title: '查看', id: 1 },
{ btn_title: '提交报废', id: 2 },
{ btn_title: '审批详情', id: 3 },
+ { btn_title: '驳回退料', id: 4 },
],
temp: false,
}
@@ -137,7 +134,7 @@
this.previewDetails = true
break
case 2:
- this.title = '选择审批部门'
+ this.title = '提交报废'
this.dialogWidth = '50%'
this.selDepart = true
break
@@ -146,6 +143,9 @@
this.dialogWidth = '50%'
this.auditingShow = true
break
+ case 4:
+ this.temp = !this.temp
+ break
}
this.dialogVisible = true
@@ -178,6 +178,10 @@
getTableSelectionChange(val) {
this.tableSelList = val
},
+ handleBack() {
+ this.temp = !this.temp
+ this.dialogVisible = false
+ },
},
}
@@ -186,4 +190,13 @@
::v-deep .el-page-header__left {
display: none;
}
+ .back-text {
+ margin-bottom: 8px;
+ padding: 0 5px;
+ box-shadow: 1px 1px #ccc;
+
+ span {
+ font-weight: bold;
+ }
+ }