部门换接口

This commit is contained in:
helloDy 2024-04-22 15:19:35 +08:00
parent aacf87f6d3
commit c7cd6e7b1e
10 changed files with 38 additions and 18 deletions

View File

@ -1,8 +1,8 @@
### ###
# @Author: zhp # @Author: zhp
# @Date: 2024-04-12 14:30:48 # @Date: 2024-04-12 14:30:48
# @LastEditTime: 2024-04-12 14:31:16 # @LastEditTime: 2024-04-22 15:19:09
# @LastEditors: zhp # @LastEditors: DY
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置

View File

@ -1,7 +1,7 @@
/* /*
* @Author: Do not edit * @Author: Do not edit
* @Date: 2023-10-21 11:50:46 * @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-10-30 14:37:28 * @LastEditTime: 2024-04-19 17:13:24
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
*/ */
@ -66,3 +66,12 @@ export function getCoreDepartmentList(query) {
params: query params: query
}) })
} }
// 设备获得所有列表
export function getDepartmentList(query) {
return request({
url: '/system/dept/list-all-simple',
method: 'get',
params: query
})
}

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-25 15:44:49 * @LastEditTime: 2024-04-22 15:04:40
* @Description: * @Description:
--> -->
<template> <template>
@ -165,7 +165,7 @@ import SmallTitle from './SmallTitle';
import { parseTime } from '@/utils/ruoyi'; import { parseTime } from '@/utils/ruoyi';
import attrAdd from './attr-add'; import attrAdd from './attr-add';
import {DICT_TYPE, getDictDatas} from "@/utils/dict"; import {DICT_TYPE, getDictDatas} from "@/utils/dict";
import { getCoreDepartmentList } from "@/api/base/coreDepartment"; import { getDepartmentList } from "@/api/base/coreDepartment";
import { groupClassesListAll } from '@/api/monitoring/teamProduction' import { groupClassesListAll } from '@/api/monitoring/teamProduction'
import { getDictDataLabel } from '@/utils/dict'; import { getDictDataLabel } from '@/utils/dict';
@ -289,7 +289,7 @@ export default {
return item return item
}) || []; }) || [];
// //
const res1 = await getCoreDepartmentList(); const res1 = await getDepartmentList();
this.departmentOptions = res1.data || [] this.departmentOptions = res1.data || []
// //
let inspectorList = []; let inspectorList = [];

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-15 18:38:52 * @LastEditTime: 2024-04-22 14:56:03
* @Description: * @Description:
--> -->
<template> <template>
@ -99,7 +99,7 @@ import {
createCheckOrder, createCheckOrder,
updateCheckOrder, updateCheckOrder,
} from '@/api/equipment/base/inspection/settings'; } from '@/api/equipment/base/inspection/settings';
import { getCoreDepartmentList } from '@/api/base/coreDepartment'; import { getDepartmentList } from '@/api/base/coreDepartment';
import { groupClassesListAll } from '@/api/monitoring/teamProduction'; import { groupClassesListAll } from '@/api/monitoring/teamProduction';
import { getDictDataLabel } from '@/utils/dict'; import { getDictDataLabel } from '@/utils/dict';
// import { getEquipmentAll } from '@/api/base/equipment' // import { getEquipmentAll } from '@/api/base/equipment'
@ -195,7 +195,7 @@ export default {
}, },
async getDict() { async getDict() {
// //
const res = await getCoreDepartmentList(); const res = await getDepartmentList();
this.departmentOptions = res.data || []; this.departmentOptions = res.data || [];
const res1 = await groupClassesListAll(); const res1 = await groupClassesListAll();
this.groupOptions = this.groupOptions =

View File

@ -320,7 +320,7 @@ export default {
async getList(source = 'department') { async getList(source = 'department') {
const urls = [ const urls = [
'/base/core-production-line/listAll', '/base/core-production-line/listAll',
'/base/core-department/listAll', '/system/dept/list-all-simple',
'/base/core-worker/listAll', '/base/core-worker/listAll',
]; ];
let res; let res;

View File

@ -540,7 +540,7 @@ export default {
async getList(source = 'department') { async getList(source = 'department') {
const urls = [ const urls = [
'/base/core-production-line/listAll', '/base/core-production-line/listAll',
'/base/core-department/listAll', 'system/dept/list-all-simple',
'/base/core-worker/listAll', '/base/core-worker/listAll',
]; ];
let res; let res;

View File

@ -609,7 +609,7 @@ export default {
async getList(source = 'department') { async getList(source = 'department') {
const urls = [ const urls = [
'/base/core-production-line/listAll', '/base/core-production-line/listAll',
'/base/core-department/listAll', '/system/dept/list-all-simple',
'/base/core-worker/listAll', '/base/core-worker/listAll',
]; ];
let res; let res;

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: DY * @LastEditors: DY
* @LastEditTime: 2024-03-13 15:55:36 * @LastEditTime: 2024-04-19 17:13:45
* @Description: * @Description:
--> -->
<template> <template>
@ -114,7 +114,7 @@
import basicAdd from '../../../../core/mixins/basic-add'; import basicAdd from '../../../../core/mixins/basic-add';
// import { getCoreProductAttrPage, deleteCoreProductAttr } from "@/api/base/coreProduct"; // import { getCoreProductAttrPage, deleteCoreProductAttr } from "@/api/base/coreProduct";
import { getWorkerList } from '@/api/base/worker' import { getWorkerList } from '@/api/base/worker'
import { getCoreDepartmentList } from "@/api/base/coreDepartment"; import { getDepartmentList } from "@/api/base/coreDepartment";
import { createPlan, updatePlan, getCode, getPlan } from '@/api/equipment/base/maintain/planconfig'; import { createPlan, updatePlan, getCode, getPlan } from '@/api/equipment/base/maintain/planconfig';
import { getCorePLList } from '@/api/base/coreProductionLine'; import { getCorePLList } from '@/api/base/coreProductionLine';
import { parseTime } from '../../../../core/mixins/code-filter'; import { parseTime } from '../../../../core/mixins/code-filter';
@ -175,7 +175,7 @@ export default {
async getDict() { async getDict() {
// //
this.menuOptions = [] this.menuOptions = []
const res = await getCoreDepartmentList(); const res = await getDepartmentList();
this.departmentlList = res.data.map(item => { this.departmentlList = res.data.map(item => {
item.parentId = item.parentId ? item.parentId : 0 item.parentId = item.parentId ? item.parentId : 0
return item return item

View File

@ -25,6 +25,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="重置方式" prop="resetMethod" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
<el-radio-group v-model="dataForm.resetMethod">
<el-radio :label="0">自动</el-radio>
<el-radio :label="1">手动</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="检测内容" prop="inspectionDetIdList" <el-form-item label="检测内容" prop="inspectionDetIdList"
:rules="[{ required: true, message: '不能为空', trigger: 'change' }]"> :rules="[{ required: true, message: '不能为空', trigger: 'change' }]">
@ -109,6 +117,7 @@ export default {
sectionId: null, sectionId: null,
productionLineId: null, productionLineId: null,
inspectionDetIdList:[], inspectionDetIdList:[],
resetMethod: 0
}, },
disabled:false, disabled:false,
formLoading: true, formLoading: true,
@ -143,7 +152,7 @@ export default {
methods: { methods: {
init(obj) { init(obj) {
// console.log(productionLineId); // console.log(productionLineId);
console.log(obj) console.log('你好打印', obj)
this.getProductionLineList() this.getProductionLineList()
this.getQualityInspectionDetList() this.getQualityInspectionDetList()
this.visible = true this.visible = true
@ -162,6 +171,7 @@ export default {
console.log(res); console.log(res);
this.dataForm.inspectionDetIdList = res.data this.dataForm.inspectionDetIdList = res.data
this.dataForm.productionLineId = obj.productionLineId this.dataForm.productionLineId = obj.productionLineId
this.dataForm.resetMethod = obj.resetMethod
this.getWorksectionList(obj.productionLineId) this.getWorksectionList(obj.productionLineId)
this.dataForm.sectionId = obj.sectionId this.dataForm.sectionId = obj.sectionId
}) })

View File

@ -151,7 +151,8 @@ export default {
productionLineId:item.productionLineId, productionLineId:item.productionLineId,
productionLineName:item.productionLineName, productionLineName:item.productionLineName,
sectionId: item.sectionId, sectionId: item.sectionId,
sectionName: item.sectionName sectionName: item.sectionName,
resetMethod: item.resetMethod
} }
}) })
this.listQuery.total = response.data.total; this.listQuery.total = response.data.total;