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

优化页面字段

This commit is contained in:
BianLzhaoMin 2024-07-09 17:51:47 +08:00
parent 8e07744e10
commit 1f83edc71d
8 changed files with 38 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-ui/src/views/claimAndreturn/return/scrap/component/config.js
View File

@ -140,7 +140,7 @@ export const dialogConfigReturnDet = {
export const getSelList = () => { export const getSelList = () => {
new Promise(async (resolve) => { new Promise(async resolve => {
const { data: unitRes } = await getUnitInfoSelectApi() const { data: unitRes } = await getUnitInfoSelectApi()
unitList = unitRes.map((e) => { unitList = unitRes.map((e) => {
e.value = e.unitId e.value = e.unitId
@ -157,7 +157,7 @@ export const getSelList = () => {
typeList = typeRes typeList = typeRes
resolve() resolve()
}).then(() => { }).then(() => {
config.formLabel.map((item) => { config.formLabel.map(item => {
if (item.f_model === 'unitId') { if (item.f_model === 'unitId') {
item.f_selList = unitList item.f_selList = unitList
return item return item
@ -172,7 +172,7 @@ export const getSelList = () => {
} }
}) })
configReturn.formLabel.map((item) => { configReturn.formLabel.map(item => {
if (item.f_model === 'typeId') { if (item.f_model === 'typeId') {
item.f_selList = proList item.f_selList = proList
return item return item

3
sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue
View File

@ -258,7 +258,7 @@
size="small" size="small"
maxlength="50" maxlength="50"
style="width: 350px" style="width: 350px"
></el-input> />
</el-form-item> </el-form-item>
<el-form-item label="损坏原因：" prop="scrapType"> <el-form-item label="损坏原因：" prop="scrapType">
<el-radio-group <el-radio-group
@ -462,6 +462,7 @@ export default {
}, },
// 编辑退料 // 编辑退料
handleEditReturn(data) { handleEditReturn(data) {
// manageType 0、编码退料 1、数量退料
if (data.manageType == 0) { if (data.manageType == 0) {
this.isQuery = true this.isQuery = true
this.isNumDetails = false this.isNumDetails = false

2
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -166,7 +166,7 @@
align="center" align="center"
:selectable=" :selectable="
(row) => { (row) => {
return row.repairStatusCode == 44 return row.repairStatusCode == 44 && row.commit == 0
} }
" "
/> />

2
sgzb-ui/src/views/repairTest/repairScrap/index.vue
View File

@ -167,7 +167,7 @@
align="center" align="center"
:selectable=" :selectable="
(row) => { (row) => {
return row.repairStatusCode == 44 return row.repairStatusCode == 44 && row.commit == 0
} }
" "
/> />

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

@ -207,22 +207,18 @@ export default {
getForecastWasteListApi, getForecastWasteListApi,
getSelList, getSelList,
getTypeListSel, getTypeListSel,
/* 驳回原因 */ rejectReason: '', // 驳回原因
rejectReason: '', selAuditingList: [], // 选中的审核数据
/* 选中的审核数据 */ sendParams: {}, // 弹框内列表请求参数
selAuditingList: [], userId: sessionStorage.getItem('userId'), // 当前登录的用户id
/* 请求参数 */ tbAllChecked: false, // 判断当前设备是否全部审核过
sendParams: {}, dataCondition: [], // 导出taskId列表
/* 当前登录的用户id */ isRefresh: false,
userId: sessionStorage.getItem('userId'),
/* 审核参数 */ /* 审核参数 */
auditingParams: { auditingParams: {
taskId: '', taskId: '',
scrapDetailList: [], scrapDetailList: [],
}, },
tbAllChecked: false, // 判断当前设备是否全部审核过
dataCondition: [], // 导出taskId列表
isRefresh: false,
} }
}, },
created() { created() {
@ -256,6 +252,7 @@ export default {
getDialogTbSelList(list) { getDialogTbSelList(list) {
this.selAuditingList = list this.selAuditingList = list
}, },
/* 主列表复选框勾选后数据 */
getTableSelectionList(list) { getTableSelectionList(list) {
this.dataCondition = [] this.dataCondition = []
if (list.length > 0) if (list.length > 0)
@ -341,11 +338,6 @@ export default {
}, },
/* 数据导出 */ /* 数据导出 */
handleExport(data) { handleExport(data) {
console.log(
'🚀 ~ 导出 ~ this.dataCondition:',
data,
this.dataCondition,
)
if (this.dataCondition.length > 0) if (this.dataCondition.length > 0)
data.dataCondition = this.dataCondition data.dataCondition = this.dataCondition
this.download( this.download(

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

@ -26,7 +26,6 @@
> >
<!-- 批量提交报废 --> <!-- 批量提交报废 -->
<el-button <el-button
type="success" type="success"
plain plain
@ -191,27 +190,28 @@ export default {
getPreScrapListApi, getPreScrapListApi,
getDialogListApi, getDialogListApi,
tableSelList: [], tableSelList: [],
sendParams: {
taskId: '',
}, // 列表查看时参数
temp: false, temp: false,
getSelList, getSelList,
getTypeListSel, getTypeListSel,
imgCommonUrl: process.env.VUE_APP_BASE_API + '/system', imgCommonUrl: process.env.VUE_APP_BASE_API + '/system',
auditingList: [],
/* 提交报废申请参数 */ pageContent: '驳回退料',
parentId: '',
// 提交报废申请参数
submitScrapParams: { submitScrapParams: {
taskIdList: [], taskIdList: [],
deptIds: [], deptIds: [],
}, },
auditingList: [], // 驳回退料弹框内数据查询参数
sendParamsAuditing: { sendParamsAuditing: {
taskId: '', taskId: '',
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
pageContent: '驳回退料', // 弹框内列表查询参数
parentId: '', sendParams: {
taskId: '',
},
} }
}, },
created() { created() {

31
sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
View File

@ -158,18 +158,17 @@
</DialogModel> </DialogModel>
</div> </div>
</template> </template>
<script> <script>
import {
getDispositionListApi,
submitDispositionApi,
getDialogListApi,
} from '@/api/scrap/forecastWaste.js'
import TableModel from '@/components/TableModel' import TableModel from '@/components/TableModel'
import DialogModel from '@/components/DialogModel' import DialogModel from '@/components/DialogModel'
import ScrapSource from '../../component/scrapSource.vue' import ScrapSource from '../../component/scrapSource.vue'
import ScrapImg from '../../component/scrapImg.vue' import ScrapImg from '../../component/scrapImg.vue'
import { config, dialogConfig, getSelList } from './config.js' import { config, dialogConfig, getSelList } from './config.js'
import {
getDispositionListApi,
submitDispositionApi,
getDialogListApi,
} from '@/api/scrap/forecastWaste.js'
export default { export default {
components: { components: {
TableModel, TableModel,
@ -183,26 +182,15 @@ export default {
dialogConfig, dialogConfig,
getDispositionListApi, getDispositionListApi,
getDialogListApi, getDialogListApi,
/* 选中的列表数据 */ selectionList: [], // 选中的列表数据
selectionList: [], rejectReason: '', // 驳回原因
/* 驳回原因 */
rejectReason: '',
fileType: ['png', 'jpg', 'jpeg', 'pdf', 'doc', 'xls', 'docx'], fileType: ['png', 'jpg', 'jpeg', 'pdf', 'doc', 'xls', 'docx'],
uploadFileList: [], uploadFileList: [],
sendParams: {}, sendParams: {},
fileList: [], fileList: [],
tbSelectList: [], tbSelectList: [],
/* 处置提交参数 */ dispositionParams: [], // 处置参数
filePreviewUrl: process.env.VUE_APP_BASE_API + '/system', // 附件预览地址
dispositionParams: [],
// dispositionParams: {
// taskId: '',
// fileUrl: '', // 附件url
// fileName: '', // 附件名称
// disposition: 1, // 处置状态 0、未通过 1、通过
// },
/* 附件预览地址 */
filePreviewUrl: process.env.VUE_APP_BASE_API + '/system',
getSelList, getSelList,
} }
}, },
@ -266,7 +254,6 @@ export default {
this.$message.error('请先上传文件') this.$message.error('请先上传文件')
return return
} }
let fileUrl = '' let fileUrl = ''
let fileName = '' let fileName = ''
this.uploadFileList.map((e) => { this.uploadFileList.map((e) => {

15
sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
View File

@ -198,13 +198,11 @@ export default {
dialogConfig, dialogConfig,
getScrapListApi, getScrapListApi,
getDialogListApi, getDialogListApi,
/* 选中的列表数据 */ selectionList: [], // 选中的列表数据
selectionList: [], rejectReason: '', // 驳回原因
/* 驳回原因 */
rejectReason: '',
sendParams: {}, // 列表查看时参数
deptId: sessionStorage.getItem('deptId'), deptId: sessionStorage.getItem('deptId'),
auditingList: [], // 审批详情的列表
getSelList,
/* 审核参数 */ /* 审核参数 */
auditingParams: { auditingParams: {
deptId: parseInt(sessionStorage.getItem('deptId')), deptId: parseInt(sessionStorage.getItem('deptId')),
@ -213,10 +211,7 @@ export default {
status: '', status: '',
reasonRejection: '', reasonRejection: '',
}, },
sendParams: {}, // 弹框内列表查看时参数
/* 审批详情的列表 */
auditingList: [],
getSelList,
} }
}, },
created() { created() {