部门搜索

yudao-ui-admin-vue3/src/views/pressure2/orderConfirm/boilerDetail.vue

@@ -361,9 +361,9 @@
               />
             </el-form-item>
 
-            <el-form-item label="部门" prop="deptId">
+            <el-form-item label="部门" prop="relateDepartment">
               <DeptSelect
-                v-model="equipQueryParams.deptId"
+                v-model="equipQueryParams.relateDepartment"
                 placeholder="请选择部门"
                 clearable
                 class="!w-240px"
@@ -734,7 +734,7 @@ const equipQueryParams = ref({
   equipStreet: undefined as number[] | undefined,
   equipCode: '',
   productNo: '',
-  deptId: '',
+  relateDepartment: '' as string | number | undefined,
   typeList: [] as string[],
   nextDate: [] as string[],
   useStatus: [] as string[],
@@ -991,7 +991,7 @@ const disabledDate = (time: Date) => {
 
 // 设备查询相关
 const handleEquipQuery = async (isUpdateContact: boolean = false) => {
-  loading.value = true
+  equipLoading.value = true
   try {
     const params = {
       pageNo: equipQueryParams.value.pageNo,
@@ -999,12 +999,14 @@ const handleEquipQuery = async (isUpdateContact: boolean = false) => {
       orderId: orderDetail.value?.id,
       equipCode: equipQueryParams.value.equipCode,
       productNo: equipQueryParams.value.productNo,
-      deptId: equipQueryParams.value.deptId,
+      relateDepartment: equipQueryParams.value.relateDepartment,
       equipDistrict: equipQueryParams.value.equipDistrict,
       equipStreet: equipQueryParams.value.equipStreet,
       typeList: equipQueryParams.value.typeList || [],
       nextDate: equipQueryParams.value.nextDate || [],
-      useStatus: equipQueryParams.value.useStatus || [],
+      useStatus: equipQueryParams.value.useStatus && equipQueryParams.value.useStatus.length > 0
+        ? equipQueryParams.value.useStatus.map((item) => +item)
+        : [],
       unitName: formData.value.useUnitName.name,
     }
     
@@ -1053,7 +1055,7 @@ const handleEquipQuery = async (isUpdateContact: boolean = false) => {
     }
       
   } finally {
-    loading.value = false
+    equipLoading.value = false
   }
 }
 const handleEquipCodeFn = (id?: number) => {
@@ -1068,7 +1070,7 @@ const resetEquipQuery = () => {
     equipStreet: undefined,
     equipCode: '',
     productNo: '',
-    deptId: '',
+    relateDepartment: '',
     typeList: [],
     nextDate: [],
     useStatus: [],

yudao-ui-admin-vue3/src/views/pressure2/orderConfirm/pipeDetail.vue

@@ -23,9 +23,9 @@
             <!--              />-->
             <!--            </el-form-item>-->
 
-            <el-form-item label="部门" prop="deptId">
+            <el-form-item label="部门" prop="relateDepartment">
               <DeptSelect
-                v-model="equipQueryParams.deptId"
+                v-model="equipQueryParams.relateDepartment"
                 placeholder="请选择部门"
                 clearable
                 class="!w-240px"
@@ -787,7 +787,7 @@ const equipQueryParams = ref({
   equipStreet: undefined as number[] | undefined,
   equipCode: '',
   productNo: '',
-  deptId: '',
+  relateDepartment: '' as string | number | undefined,
   typeList: [] as string[],
   nextDate: [] as string[],
   useStatus: [] as string[],
@@ -1141,7 +1141,7 @@ const handleSortChange = ({ prop, order }) => {
 
 // 设备查询相关
 const handleEquipQuery = async (isUpdateContact: boolean = false) => {
-  loading.value = true
+  equipLoading.value = true
   try {
     const params = {
       pageNo: equipQueryParams.value.pageNo,
@@ -1149,12 +1149,14 @@ const handleEquipQuery = async (isUpdateContact: boolean = false) => {
       orderId: orderDetail.value?.id,
       equipCode: equipQueryParams.value.equipCode,
       productNo: equipQueryParams.value.productNo,
-      deptId: equipQueryParams.value.deptId,
+      relateDepartment: equipQueryParams.value.relateDepartment,
       equipDistrict: equipQueryParams.value.equipDistrict,
       equipStreet: equipQueryParams.value.equipStreet,
       typeList: equipQueryParams.value.typeList || [],
       nextDate: equipQueryParams.value.nextDate || [],
-      useStatus: equipQueryParams.value.useStatus || [],
+      useStatus: equipQueryParams.value.useStatus && equipQueryParams.value.useStatus.length > 0
+        ? equipQueryParams.value.useStatus.map((item) => +item)
+        : [],
       unitName: formData.value.useUnitName.name,
     }
     
@@ -1213,7 +1215,7 @@ const handleEquipQuery = async (isUpdateContact: boolean = false) => {
     }
       
   } finally {
-    loading.value = false
+    equipLoading.value = false
   }
 }
 const handleEquipCodeFn = (id?: number) => {
@@ -1228,7 +1230,7 @@ const resetEquipQuery = () => {
     equipStreet: undefined,
     equipCode: '',
     productNo: '',
-    deptId: '',
+    relateDepartment: '',
     typeList: [],
     nextDate: [],
     useStatus: [],

yudao-ui-admin-vue3/src/views/pressure2/schedule/components/AddEquipDialog.vue

@@ -86,9 +86,9 @@
       </el-form-item>
 
       <!-- 设备状态 -->
-      <el-form-item label="设备状态" prop="status">
+      <el-form-item label="设备状态" prop="useStatus">
         <el-select
-          v-model="queryParams.status"
+          v-model="queryParams.useStatus"
           multiple
           placeholder="选择使用状态"
           clearable
@@ -256,7 +256,7 @@ const queryParams = ref({
   equipCode: '',
   nextDate: [] as string[],
   relateDepartment: undefined as string | undefined,
-  status: ['100'] as string[],
+  useStatus: ['100'] as string[],
   typeList: [] as string[]
 })
 
@@ -276,7 +276,7 @@ const getList = async () => {
       equipStreet: queryParams.value.equipStreet,
       typeList: queryParams.value.typeList || [],
       nextDate: queryParams.value.nextDate || [],
-      status: queryParams.value.status || [],
+      useStatus: queryParams.value.useStatus || [],
       notTaskId: '',
       notOrderId: '',
       unitCode: props?.unitCode,
@@ -337,7 +337,7 @@ const resetQuery = () => {
     equipCode: '',
     nextDate: [],
     relateDepartment: undefined,
-    status: ['100'],
+    useStatus: ['100'],
     typeList: []
   }