部门换接口

.env.dev

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

src/api/base/coreDepartment.js

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

src/views/equipment/base/inspection/Confirm/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-25 15:44:49
+ * @LastEditTime: 2024-04-22 15:04:40
  * @Description:
 -->
 <template>
@@ -165,7 +165,7 @@ import SmallTitle from './SmallTitle';
 import { parseTime } from '@/utils/ruoyi';
 import attrAdd from './attr-add';
 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 { getDictDataLabel } from '@/utils/dict';
 
@@ -289,7 +289,7 @@ export default {
 				return item
 			}) || [];
 			// 部门列表
-			const res1 = await getCoreDepartmentList();
+			const res1 = await getDepartmentList();
 			this.departmentOptions = res1.data || []
 			// 巡检人
 			let inspectorList = [];

src/views/equipment/base/inspection/Settings/add.vue

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

src/views/equipment/base/maintain/Confirm/WaitingList--add--unplanned.vue

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

src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue

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

src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue

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

src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue

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

src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue

@@ -25,6 +25,14 @@
           </el-select>
         </el-form-item>
       </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-form-item label="检测内容" prop="inspectionDetIdList"
           :rules="[{ required: true, message: '不能为空', trigger: 'change' }]">
@@ -109,6 +117,7 @@ export default {
         sectionId: null,
         productionLineId: null,
         inspectionDetIdList:[],
+        resetMethod: 0
       },
       disabled:false,
 			formLoading: true,
@@ -143,7 +152,7 @@ export default {
   methods: {
     init(obj) {
       // console.log(productionLineId);
-      console.log(obj)
+      console.log('你好打印', obj)
       this.getProductionLineList()
       this.getQualityInspectionDetList()
       this.visible = true
@@ -162,6 +171,7 @@ export default {
             console.log(res);
             this.dataForm.inspectionDetIdList = res.data
             this.dataForm.productionLineId = obj.productionLineId
+            this.dataForm.resetMethod = obj.resetMethod
             this.getWorksectionList(obj.productionLineId)
             this.dataForm.sectionId = obj.sectionId
           })

src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue

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