0307

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="请输入载具编号" clearable style="width: 180px" v-model.trim="carrierParams.code" @keydown.enter.prevent @keyup.enter="handleQueryCarrier" />
+          <el-input placeholder="请输入载具编号" :disabled="carrierCategoryList.length == 0" clearable style="width: 180px" v-model.trim="carrierParams.code" @keydown.enter.prevent @keyup.enter="handleQueryCarrier" />
         </el-form-item>
         <el-form-item>
           <el-button type="info" icon="Search" :disabled="carrierCategoryList.length == 0" @click="handleQueryCarrier">搜索</el-button>
@@ -221,22 +221,34 @@ function handleShowCategoryDialog(data) {
 const handleDeleteCategory = (data) => {
    // 禁用按钮点击
    disableButtons();
+   var showErrorMessage = false
   proxy.$modal
     .confirm('确定删除选中项？')
     .then(() => {
       categoryLoading.value = true
       carrierLoading.value = true
+      if (data.children) {
+         showErrorMessage = true;
+         return Promise.reject(new Error("HasChildrenError"));
+      }
       return delCategory(data.id)
     })
     .then(() => {
-      proxy.$modal.msgSuccess('操作成功！')
-      getCategories()
+      if (!showErrorMessage) {
+        proxy.$modal.msgSuccess('操作成功！');
+        getCategories();
+      }
     })
     .catch(() => {
       categoryLoading.value = false
       carrierLoading.value = false
     })
     .finally(() => {
+      if (showErrorMessage) {
+        proxy.$modal.msgError("该载具类别下有子类别，不能删除！");
+      }
+      categoryLoading.value = false
+      carrierLoading.value = false
       // 启用按钮点击
       enableButtons();
     })

src/views/business/daywork/index.vue

@@ -17,6 +17,7 @@
             v-model.trim="queryDayworkParams.productionPlanNo"
             @keyup.enter="handleQuery"
             @keydown.enter.prevent
+            :disabled="dayworkList.length === 0"
             clearable
             style="width: 200px"
           />
@@ -30,8 +31,9 @@
             v-model.trim="queryDayworkParams.productDescription"
             @keyup.enter="handleQuery"
             @keydown.enter.prevent
+            :disabled="dayworkList.length === 0"
             clearable
-            style="width: 120px"
+            style="width: 130px"
           />
         </el-form-item>
         <el-form-item class="section-title" label="请选择当前工段：">

src/views/business/department/index.vue

@@ -221,7 +221,7 @@ function handleAdd() {
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  getDept(row.id).then((res) => {})
+  // getDept(row.id).then((res) => {})
   proxy.$refs.deptRef.open(row)
 }
 
@@ -268,10 +268,15 @@ function handleUpdateUser(row) {
 
 /** 删除按钮操作 */
 function handleDelete(row) {
+  var showErrorMessage = false
   const _ids = row.id || ids.value
   proxy.$modal
     .confirm('是否确认删除选中的数据项？')
     .then(function () {
+      if (row.children) {
+         showErrorMessage = true;
+         return Promise.reject(new Error("HasChildrenError"));
+      }
       return delDept(_ids)
     })
     .then(() => {
@@ -279,6 +284,11 @@ function handleDelete(row) {
       proxy.$modal.msgSuccess('删除成功！')
     })
     .catch(() => {})
+    .finally(() => {
+      if (showErrorMessage) {
+        proxy.$modal.msgError("该部门下有子部门，不能删除！");
+      }
+    })
 }
 /** 人员删除按钮操作 */
 function handleUserDelete(row) {

src/views/business/deptEquipment/index.vue

@@ -42,6 +42,7 @@
             v-model.trim="queryParams.code"
             type="text"
             style="width: 200px"
+            :disabled="workSectionList.length === 0"
             placeholder="请输入资源组名称"
             :clearable="true"
             @keydown.enter.prevent
@@ -81,6 +82,7 @@
             style="width: 220px"
             placeholder="请输入资源编码/资源名称"
             :clearable="true"
+            :disabled="groupList.length === 0"
             @keydown.enter.prevent
             @keyup.enter="handleQueryResourceGroupDetail"
           />
@@ -129,7 +131,7 @@
             </el-button>
           </el-form-item>
           <el-form-item label="工序名称：" >
-          <el-input v-model.trim="queryDeptProcessParams.processAlias" placeholder="请输入工序名称" clearable style="width: 155px" @keyup.enter="handleQueryProcess" @keydown.enter.prevent  />
+          <el-input v-model.trim="queryDeptProcessParams.processAlias" placeholder="请输入工序名称" :disabled="workSectionList.length === 0" clearable style="width: 155px" @keyup.enter="handleQueryProcess" @keydown.enter.prevent  />
         </el-form-item>
         <el-form-item>
           <el-button type="info" icon="Search" :disabled="workSectionList.length === 0"  @click="handleQueryProcess">搜索</el-button>

src/views/business/equipment/index.vue

@@ -12,7 +12,6 @@
             clearable
             style="width: 180px"
             @keydown.enter.prevent
-            @keyup.enter="filterNode"
           />
         </el-form-item>
         <el-form-item>
@@ -100,6 +99,7 @@
             v-model.trim="queryParams.equipmentCode"
             @keydown.enter.prevent
             @keyup.enter="handleRefreshEquipment"
+            :disabled="equipmentCategoryList.length == 0"
             clearable
             style="width: 180px"
           />
@@ -355,16 +355,31 @@ const filterNode = (value, data) => {
   return data.name.indexOf(value) !== -1;
 };
 
+
 const handleDeleteCategory = (data) => {
+  var showErrorMessage = false
   proxy.$modal
     .confirm("确定删除数据项？")
     .then(() => {
-      delCategory(data.id).then(() => {
+      if (data.children) {
+         showErrorMessage = true;
+         return Promise.reject(new Error("HasChildrenError"));
+      }
+      return delCategory(data.id)
+        
+    })
+    .then(() => {
+      if (!showErrorMessage) {
         handleRefreshCategory();
         proxy.$modal.msgSuccess("操作成功！");
-      });
+      }
+    })
+    .catch(() => {})
+    .finally(() => {
+      if (showErrorMessage) {
+        proxy.$modal.msgError("该设备类别下有子类别，不能删除！");
+      }
     })
-    .catch(() => {});
 };
 
 /** 设备类别表格 current-change 事件 */

src/views/business/reject/index.vue

@@ -40,7 +40,7 @@
       <el-form class="list-search-container" :model="carrierRejectParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="载具操作明细" />
         <el-form-item label="载具编号：">
-          <el-input placeholder="请输入载具编号" clearable style="width: 180px" v-model.trim="carrierRejectParams.code" @keydown.enter.prevent @keyup.enter="handleQueryCarrier" />
+          <el-input placeholder="请输入载具编号" :disabled="carrierCategoryList.length == 0" clearable style="width: 180px" v-model.trim="carrierRejectParams.code" @keydown.enter.prevent @keyup.enter="handleQueryCarrier" />
         </el-form-item>
         <el-form-item label="载具状态：">
           <el-select v-model="carrierRejectParams.isAbandoned" clearable placeholder="请选择载具状态" style="width: 150px">

src/views/business/resourcePlan/index.vue

@@ -9,7 +9,7 @@
           <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="请输入资源组名称" v-model.trim="queryParams.code" style="width: 150px" clearable  @keyup.enter="handleQuery" @keydown.enter.prevent  />
+          <el-input placeholder="请输入资源组名称" :disabled="resourceGroupList.length === 0" v-model.trim="queryParams.code" style="width: 150px" clearable  @keyup.enter="handleQuery" @keydown.enter.prevent  />
         </el-form-item>
         <el-form-item>
           <el-button type="info" icon="Search" :disabled="resourceGroupList.length === 0" @click="handleQuery">搜索</el-button>
@@ -45,7 +45,7 @@
       <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" placeholder="请输入厂家/生产计划单号/产品描述" clearable style="width: 250px" @keyup.enter="handleQueryPlanDetails" @keydown.enter.prevent  />
+          <el-input v-model.trim="queryItemParams.productionPlanNo" :disabled="planDetailList.length === 0" placeholder="请输入厂家/生产计划单号/产品描述" clearable style="width: 250px" @keyup.enter="handleQueryPlanDetails" @keydown.enter.prevent  />
         </el-form-item>
         <el-form-item >
           <el-button type="info" icon="Search" :disabled="planDetailList.length === 0" @click="handleQueryPlanDetails">搜索</el-button>

src/views/business/tenant/index.vue

@@ -4,11 +4,11 @@
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item class="section-title" label="厂别管理" />
       <el-form-item label="企业名称：" prop="orgName">
-        <el-input v-model.trim="queryParams.orgName" placeholder="请输入企业名称" @keyup.enter="handleQuery" @keydown.enter.prevent />
+        <el-input v-model.trim="queryParams.orgName" placeholder="请输入企业名称" clearable @keyup.enter="handleQuery" @keydown.enter.prevent style="width: 150px;" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <!-- <el-button icon="Refresh" @click="resetQuery">重置</el-button> -->
         <el-button type="primary" icon="Plus" @click="handleShowFormDialog(null)" v-hasPermi="['business:tenant:add']">新增</el-button>
       </el-form-item>
     </el-form>

src/views/system/role/index.vue

@@ -18,7 +18,7 @@
       </el-form-item> -->
       <el-form-item>
         <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <!-- <el-button icon="Refresh" @click="resetQuery">重置</el-button> -->
       </el-form-item>
     </el-form>
 

src/views/system/user/index.vue

@@ -30,15 +30,15 @@
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="管理员列表" />
         <el-form-item label="用户名称：" prop="userName">
-          <el-input v-model.trim="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 130px" @keyup.enter="handleQuery" />
+          <el-input v-model.trim="queryParams.userName" :disabled="tenantList.length == 0" placeholder="请输入用户名称" clearable style="width: 130px" @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="手机号码：" prop="phoneNumber">
-          <el-input v-model.trim="queryParams.phoneNumber" placeholder="请输入手机号码" clearable style="width: 130px" @keyup.enter="handleQuery" />
+          <el-input v-model.trim="queryParams.phoneNumber" :disabled="tenantList.length == 0" placeholder="请输入手机号码" clearable style="width: 130px" @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item>
           <span>&emsp;&emsp;</span>
           <el-button type="info" icon="Search" :disabled="tenantList.length == 0" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <!-- <el-button icon="Refresh" @click="resetQuery">重置</el-button> -->
           <el-button type="primary" icon="Plus" :disabled="tenantList.length == 0" @click="handleShowFormDialog(null)" v-hasPermi="['system:user:add']">新增</el-button>
           <!-- <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button> -->
         </el-form-item>