bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

由阿胡

This commit is contained in:
BianLzhaoMin 2024-04-28 16:55:12 +08:00
parent 8e964622fb
commit 83863f7e22
8 changed files with 1155 additions and 806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-ui/src/components/TableModel/index.vue
View File

@ -132,7 +132,7 @@
data() { data() {
return { return {
total: 0, total: 0,
tableList: [], tableList: [{ demo: 123 }],
/* 分页参数 */ /* 分页参数 */
pageParams: { pageParams: {
pageNum: 1, pageNum: 1,

1822
sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
View File

File diff suppressed because it is too large Load Diff

2
sgzb-ui/src/views/scrapManage/component/auditingDetails.vue
View File

@ -20,7 +20,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="审批意见"> <el-table-column align="center" label="审批意见">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.reasonRejection || '同意' }} {{ row.reasonRejection }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

2
sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
View File

@ -64,7 +64,7 @@ export const dialogConfig = {
innerTitle: '', innerTitle: '',
innerVisible: false, innerVisible: false,
handleColShow: false, // 是否显示操作列 handleColShow: false, // 是否显示操作列
pageShow: false, // 是否显示分页组件 pageShow: true, // 是否显示分页组件
isSelShow: false,// 表格是否需要复选框 isSelShow: false,// 表格是否需要复选框
isFormShow: true, // 是否显示表单查询组件 isFormShow: true, // 是否显示表单查询组件
formLabel: [ formLabel: [

1
sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
View File

@ -114,6 +114,7 @@
</TableModel> </TableModel>
<el-row <el-row
class="dialog-common-btn" class="dialog-common-btn"
style="margin-top: 20px"
v-if="dialogConfig.outerTitle == '审核'" v-if="dialogConfig.outerTitle == '审核'"
> >
<el-button size="mini" type="primary" @click="auditingPass" <el-button size="mini" type="primary" @click="auditingPass"

4
sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js
View File

@ -40,9 +40,7 @@ export const dialogConfig = {
isSelShow: false,// 表格是否需要复选框 isSelShow: false,// 表格是否需要复选框
isFormShow: true, // 是否显示表单查询组件 isFormShow: true, // 是否显示表单查询组件
formLabel: [ formLabel: [
{ f_label: '关键字', f_model: 'keywords', f_type: 'ipt' }, { f_label: '设备类型', f_model: 'keywords', f_type: 'ipt' },
{ f_label: '类型名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
{ f_label: '规格型号', f_model: 'backPro', f_type: 'sel', f_selList: [] },
], ],
columnsList: [ columnsList: [

100
sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue
View File

@ -3,6 +3,7 @@
<div> <div>
<TableModel <TableModel
:config="config" :config="config"
:sendParams="sendParams"
@getTableSelectionChange="getTableSelectionChange" @getTableSelectionChange="getTableSelectionChange"
> >
<template slot="export"> <template slot="export">
@ -13,13 +14,14 @@
</el-row> </el-row>
</template> </template>
<template slot-scope="{ data }" slot="handle"> <template slot-scope="{ data }" slot="handle">
<el-button <el-button type="text" size="mini" @click="handlePreview(data)"
v-for="btn in handleBtn" >查看</el-button
:key="btn.id" >
type="text" <el-button type="text" size="mini" @click="handleEdit(data)"
size="mini" >编辑退料</el-button
@click="handleBtnEvent(data, btn.id)" >
>{{ btn.btn_title }}</el-button <el-button type="text" size="mini" @click="handleRevoke(data)"
>撤回</el-button
> >
</template> </template>
</TableModel> </TableModel>
@ -30,7 +32,47 @@
@closeDialogInner="closeDialogInner" @closeDialogInner="closeDialogInner"
> >
<template slot="outerContent"> <template slot="outerContent">
<TableModel :config="dialogConfig" /> <template v-if="dialogConfig.outerTitle === '查看'">
<TableModel :config="dialogConfig" />
</template>
<template v-if="dialogConfig.outerTitle === '编辑退料'">
<TableModel :config="dialogConfig">
<template slot="export">
<el-row :gutter="10" class="mb8">
<el-button type="success" plain size="mini"
>批量合格</el-button
>
<el-button type="warning" plain size="mini"
>批量维修</el-button
>
<el-button type="danger" plain size="mini"
>批量预报废</el-button
>
</el-row>
</template>
<template slot-scope="{ data }" slot="handle">
<el-button
type="text"
size="mini"
style="color: #95d475"
>合格</el-button
>
<el-button
type="text"
size="mini"
style="color: #eebe77"
>维修</el-button
>
<el-button
type="text"
size="mini"
style="color: #f89898"
>预报废</el-button
>
</template>
</TableModel>
</template>
</template> </template>
</DialogModel> </DialogModel>
</div> </div>
@ -41,6 +83,7 @@
import DialogModel from '@/components/DialogModel' import DialogModel from '@/components/DialogModel'
import SelDepart from '../../component/selDepart.vue' import SelDepart from '../../component/selDepart.vue'
import { config, dialogConfig } from './config' import { config, dialogConfig } from './config'
import { receiveView } from '@/api/claimAndRefund/return'
export default { export default {
name: 'auditingReturn', name: 'auditingReturn',
components: { components: {
@ -48,36 +91,37 @@
DialogModel, DialogModel,
SelDepart, SelDepart,
}, },
props: {
sendParams: {
type: Object,
default: () => {
return {}
},
},
},
data() { data() {
return { return {
config, config,
dialogConfig, dialogConfig,
handleBtn: [ receiveView,
{ btn_title: '查看', id: 1 },
{ btn_title: '编辑退料', id: 2 },
{ btn_title: '撤回', id: 3 },
],
} }
}, },
methods: { methods: {
/* 按钮操作 */ /* 按钮操作 */
handleBtnEvent(data, id) { handlePreview(row) {
switch (id) { this.dialogConfig.outerTitle = '查看'
case 1: this.dialogConfig.handleColShow = false
this.dialogConfig.outerTitle = '查看' this.dialogConfig.outerWidth = '70%'
this.dialogConfig.outerWidth = '70%'
break
case 2:
this.dialogConfig.outerTitle = '编辑退料'
this.dialogConfig.outerWidth = '70%'
break
case 3:
this.dialogConfig.outerTitle = '撤回'
break
}
this.dialogConfig.outerVisible = true this.dialogConfig.outerVisible = true
}, },
handleEdit(row) {
this.dialogConfig.outerTitle = '编辑退料'
this.dialogConfig.handleColShow = true
this.dialogConfig.outerWidth = '70%'
this.dialogConfig.outerVisible = true
},
handleRevoke(row) {},
getTableSelectionChange() {}, getTableSelectionChange() {},
closeDialog(val) { closeDialog(val) {
this.dialogConfig.outerVisible = val this.dialogConfig.outerVisible = val

28
sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
View File

@ -129,7 +129,7 @@
<span>驳回退料</span> <span>驳回退料</span>
<el-button type="text" @click="handleBack">返回</el-button> <el-button type="text" @click="handleBack">返回</el-button>
</el-row> </el-row>
<AuditingReturn /> <AuditingReturn :sendParams="sendParamsAuditing" />
</template> </template>
</div> </div>
</template> </template>
@ -173,6 +173,7 @@
deptIds: [], deptIds: [],
}, },
auditingList: [], auditingList: [],
sendParamsAuditing: {},
} }
}, },
created() { created() {
@ -200,21 +201,26 @@
this.dialogConfig.outerVisible = true this.dialogConfig.outerVisible = true
}, },
handleReject(row) { handleReject(row) {
this.sendParamsAuditing.taskId = row.taskId
this.temp = !this.temp this.temp = !this.temp
}, },
/* 关闭选择审批部门弹框 */ /* 关闭选择审批部门弹框 */
async closeDepartSel(val, list) { async closeDepartSel(val, list) {
if (list.length > 1) { console.log(list, '选择的部门---')
list.map((e) => {
this.submitScrapParams.deptIds.push(e.id) if (list.length < 1) {
}) this.$message.error('请选择审批部门')
const res = await submitScrapApi(this.submitScrapParams) return
if (res.code == 200) { }
this.$message.success('已提交成功') list.map((e) => {
this.dialogConfig.outerVisible = val this.submitScrapParams.deptIds.push(e.id)
this.$refs.listingTbRef.getList() })
} const res = await submitScrapApi(this.submitScrapParams)
if (res.code == 200) {
this.$message.success('已提交成功')
this.dialogConfig.outerVisible = val
this.$refs.listingTbRef.getList()
} }
this.submitScrapParams.deptIds = this.submitScrapParams.deptIds =
this.submitScrapParams.taskIdList = [] this.submitScrapParams.taskIdList = []