0308

src/views/business/carrier/index.vue

@@ -56,7 +56,7 @@
       <el-form class="list-search-container" :model="carrierParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="载具管理" />
         <el-form-item label="载具编号：">
-          <el-input placeholder="请输入载具编号" :disabled="!carrierFlag" clearable style="width: 180px" v-model.trim="carrierParams.code" @keydown.enter.prevent @keyup.enter="handleQueryCarrier" />
+          <el-input placeholder="请输入载具编号" :disabled="!carrierFlag" clearable style="width: 180px" v-model.trim="carrierParams.code" @keydown.enter.prevent />
         </el-form-item>
         <el-form-item>
           <el-button type="info" icon="Search" :disabled="carrierCategoryList.length == 0" @click="handleQueryCarrier">搜索</el-button>

src/views/business/daywork/index.vue

@@ -15,9 +15,7 @@
           <el-input
             placeholder="请输入生产计划单号/批次号"
             v-model.trim="queryDayworkParams.productionPlanNo"
-            @keyup.enter="handleQuery"
             @keydown.enter.prevent
-            :disabled="dayworkList.length === 0"
             clearable
             style="width: 200px"
           />
@@ -29,9 +27,7 @@
           <el-input
             placeholder="请输入产品描述"
             v-model.trim="queryDayworkParams.productDescription"
-            @keyup.enter="handleQuery"
             @keydown.enter.prevent
-            :disabled="dayworkList.length === 0"
             clearable
             style="width: 130px"
           />
@@ -46,7 +42,7 @@
           />
         </el-form-item>
         <el-form-item style="margin-left: 0">
-          <el-button type="info" icon="Search" :disabled="dayworkList.length === 0" @click="handleQuery"
+          <el-button type="info" icon="Search" :disabled="deptList.length === 0" @click="handleQuery"
             >搜索
           </el-button>
         </el-form-item>

src/views/business/equipment/index.vue

@@ -298,11 +298,17 @@ const getCategoryList = () => {
   listCategory(queryEquipmentCategoryParams.value).then((response) => {
     equipmentCategoryList.value = response.rows;
     equipmentCategoryTotal.value = response.total;
+    console.log(equipmentCategoryList.value.length)
+    if(equipmentCategoryList.value.length > 0) {
     currentCategory.value = equipmentCategoryList.value[0];
     nextTick(() => {
       proxy.$refs.categoryTable.setCurrentKey(currentCategory.value.id)
       handleCurrentCategoryChange(currentCategory.value)
     })
+  }
+  else {
+    equipmentDetailList.value = []
+  }
     equipmentCategoryLoading.value = false;
   });
 };
@@ -348,10 +354,10 @@ watch(name, (val) => {
   proxy.$refs["categoryTable"].filter(val);
 });
 const filterNode = (value, data) => {
-  queryParams.value.equipmentCode = ''
   if (!value) {
     return true;
   }
+  queryParams.value.equipmentCode = ''
   return data.name.indexOf(value) !== -1;
 };
 

src/views/business/reject/index.vue

@@ -129,7 +129,9 @@ const getCategories = () => {
       proxy.$refs.categoryTable.setCurrentKey(currentCategory.value.id)
       handleCurrentCategoryChange(currentCategory.value)
     })
-      //getCarriersReject()
+    }
+    else {
+      carrierRejectList.value = []
     }
   })
 }
@@ -159,6 +161,7 @@ const filterNode = (value, data) => {
   }
   carrierRejectParams.value.code = ''
   carrierRejectParams.value.isAbandoned = null
+  handleCurrentCategoryChange(carrierCategoryList.value[0])
   return data.name.indexOf(value) !== -1
 }
 function getNodeIndex(data) {

src/views/business/resourcePlan/index.vue

@@ -9,10 +9,10 @@
           <el-select-v2 v-model="queryParams.deptId" :options="deptList" placeholder="请选择工段" style="width: 100%" @change="handleChangeDeptId" />
         </el-form-item>
         <el-form-item label="资源组名称：">
-          <el-input placeholder="请输入资源组名称" :disabled="resourceGroupList.length === 0" v-model.trim="queryParams.code" style="width: 150px" clearable  @keyup.enter="handleQuery" @keydown.enter.prevent  />
+          <el-input placeholder="请输入资源组名称"  v-model.trim="queryParams.code" style="width: 150px" clearable  @keydown.enter.prevent  />
         </el-form-item>
         <el-form-item>
-          <el-button type="info" icon="Search" :disabled="resourceGroupList.length === 0" @click="handleQuery">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="deptList.length === 0"  @click="handleQuery">搜索</el-button>
         </el-form-item>
       </el-form>
       <div class="el-table-container">
@@ -45,10 +45,10 @@
       <el-form class="list-search-container" :inline="true" >
         <el-form-item class="section-title" label="生产计划" label-width="60px" />
         <el-form-item label="生产计划信息：" >
-          <el-input v-model.trim="queryItemParams.productionPlanNo" :disabled="planDetailList.length === 0" placeholder="请输入厂家/生产计划单号/产品描述" clearable style="width: 250px" @keyup.enter="handleQueryPlanDetails" @keydown.enter.prevent  />
+          <el-input v-model.trim="queryItemParams.productionPlanNo"  placeholder="请输入厂家/生产计划单号/产品描述" clearable style="width: 250px"  @keydown.enter.prevent  />
         </el-form-item>
         <el-form-item >
-          <el-button type="info" icon="Search" :disabled="planDetailList.length === 0" @click="handleQueryPlanDetails">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="!currentResourceGroup.id" @click="handleQueryPlanDetails">搜索</el-button>
           <el-button type="primary" icon="Plus" :disabled="!currentResourceGroup.id" @click="handleOpenPlanDetailDialog()">新增</el-button>
           <el-button type="danger" icon="Delete" :disabled="!currentResourceGroup.id ||planDetailIds.length == 0" @click="handleDeletePlanDetail()">批量删除</el-button>
         </el-form-item>

src/views/business/turnover/index.vue

@@ -99,6 +99,9 @@ function getWorkSections() {
     if (workSectionList.value.length > 0) {
       proxy.$refs.workSectionTable.setCurrentRow(workSectionList.value[0])
     }
+    else {
+      turnoverList.value = []
+    }
     workSectionLoading.value = false
   })
 }

src/views/business/workshop/index.vue

@@ -85,6 +85,8 @@ const queryParams = ref({
   name: ''
 })
 const queryDeptParams = ref({
+  pageSize : 10,
+  pageNum: 1,
   deptCode: ''
 })
 
@@ -96,14 +98,19 @@ function getList() {
   listWorkshop(queryParams.value).then((res) => {
     if (res.code == 200) {
       workshopList.value = res.rows
-      if (workshopList.value.length > 0) {
-        proxy.$refs.workshopTable.setCurrentRow(workshopList.value[0])
+      loading.value = false
+      console.log(workshopList.value.length)
+      if (workshopList.value.length >0) {
+        getdeptList(workshopList.value[0])
       } else {
+        console.log("888")
         deptList.value = []
+        total.value = 0
+        console.log(deptList.value.length)
       }
     }
   })
-  loading.value = false
+  
 }
 function handleSearch() {
   getList()
@@ -168,9 +175,11 @@ function handleDeptSelected(selection) {
   })
 }
 function getdeptList() {
+  console.log("777")
+  deptLoading.value = true
   queryDeptParams.value.workshopId = currentWorkshop.value.id
+  console.log(total.value)
   listDept(queryDeptParams.value).then((res) => {
-    console.log(res)
     if (res.code == 200) {
       deptList.value = res.rows
       total.value = res.total