guoyujia 1 éve
szülő
commit
0bab901b40

+ 1 - 1
src/views/business/carrier/index.vue

@@ -59,7 +59,7 @@
           <el-input placeholder="请输入载具编号" 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" @click="handleQueryCarrier">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="carrierCategoryList.length == 0" @click="handleQueryCarrier">搜索</el-button>
           <!-- <el-button type="success" icon="Refresh" @click="handleRefreshCarrier">刷新</el-button> -->
           <!-- <el-button type="primary" icon="Plus" @click="handleShowCarrierDialog(null)" v-hasPermi="['business:carrier:add']">新增</el-button> -->
           <el-button :disabled="selections.length == 0" type="warning" icon="Download" @click="handleBatchDownloadQrCode">批量下载二维码</el-button>

+ 1 - 1
src/views/business/daywork/index.vue

@@ -44,7 +44,7 @@
           />
         </el-form-item>
         <el-form-item style="margin-left: 0">
-          <el-button type="info" icon="Search" @click="handleQuery"
+          <el-button type="info" icon="Search" :disabled="dayworkList.length === 0" @click="handleQuery"
             >搜索
           </el-button>
         </el-form-item>

+ 1 - 1
src/views/business/department/index.vue

@@ -51,7 +51,7 @@
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="员工" />
         <el-form-item>
-          <el-button type="primary" icon="Plus"  @click="openUser">新增</el-button>
+          <el-button type="primary" icon="Plus" :disabled="deptList.length == 0"  @click="openUser">新增</el-button>
           <el-button type="danger" icon="Delete" :disabled="ids.length == 0"  @click="handleUserDelete"> 删除</el-button>
         </el-form-item>
       </el-form>

+ 5 - 5
src/views/business/deptEquipment/index.vue

@@ -35,7 +35,7 @@
           <el-form class="list-search-container" :inline="true" style="display:flex ;">
             <el-form-item class="section-title" label="资源组" />
             <el-form-item >
-              <el-button type="primary" icon="Plus" @click="handleShowEquipmentFormDialog()" v-hasPermi="['business:deptEquipment:add']">新增</el-button>
+              <el-button type="primary" icon="Plus" :disabled="workSectionList.length === 0" @click="handleShowEquipmentFormDialog()" v-hasPermi="['business:deptEquipment:add']">新增</el-button>
             </el-form-item>
             <el-form-item label="资源组名称:">
           <el-input
@@ -49,7 +49,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="info" icon="Search" @click="handleQueryResourceGroup">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="workSectionList.length === 0" @click="handleQueryResourceGroup">搜索</el-button>
         </el-form-item>
           </el-form>
           <!-- 列表区 -->
@@ -86,7 +86,7 @@
           />
         </el-form-item>
         <el-form-item style="margin-right: 0px;">
-          <el-button type="info" icon="Search" @click="handleQueryResourceGroupDetail">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="groupList.length === 0" @click="handleQueryResourceGroupDetail">搜索</el-button>
         </el-form-item>
           </el-form>
           <!-- 列表区 -->
@@ -123,7 +123,7 @@
         <el-form class="list-search-container" :inline="true">
           <el-form-item class="section-title" label="添加工序" />
           <el-form-item>
-            <el-button type="primary" icon="Plus" @click="handleShowProcessFormDialog()" v-hasPermi="['business:deptEquipment:add']">新增</el-button>
+            <el-button type="primary" icon="Plus" :disabled="workSectionList.length === 0" @click="handleShowProcessFormDialog()" v-hasPermi="['business:deptEquipment:add']">新增</el-button>
             <el-button type="danger" icon="Delete" @click="handledelDeptProcess" :disabled="deptProcessIds.length === 0" v-hasPermi="['business:deptEquipment:remove']">
               删除
             </el-button>
@@ -132,7 +132,7 @@
           <el-input v-model.trim="queryDeptProcessParams.processAlias" placeholder="请输入工序名称" clearable style="width: 155px" @keyup.enter="handleQueryProcess" @keydown.enter.prevent  />
         </el-form-item>
         <el-form-item>
-          <el-button type="info" icon="Search" @click="handleQueryProcess">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="workSectionList.length === 0"  @click="handleQueryProcess">搜索</el-button>
         </el-form-item>
         </el-form>
         <div class="el-table-container">

+ 3 - 26
src/views/business/equipment/index.vue

@@ -15,15 +15,6 @@
             @keyup.enter="filterNode"
           />
         </el-form-item>
-        <!-- <el-form-item>
-          <el-button
-            type="info"
-            icon="Search"
-            @keydown.enter.prevent
-            @click="handleRefreshEquipmentCategory"
-            >搜索</el-button
-          >
-        </el-form-item> -->
         <el-form-item>
           <el-button
             type="primary"
@@ -38,21 +29,6 @@
       <!-- 设备类别列表区域 -->
       <div class="el-table-container">
         <div class="el-table-inner-container" >
-          <!-- <el-table v-loading="equipmentCategoryLoading" ref="categoryTable" :data="equipmentCategoryList" height="100%" row-key="id" :indent="20" highlight-current-row default-expand-all @current-change="handleCurrentCategoryChange">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="name" label="设备类别名称" width="100" header-align="center" />
-            <el-table-column prop="remark" label="备注" header-align="center" />
-            <el-table-column label="操作" width="140" align="center">
-              <template #default="scope">
-                <el-button link type="warning" icon="Edit" @click="handleShowEquipmentCategoryDialog(scope.row.id)" v-hasPermi="['business:equipment:edit']">
-                  编辑
-                </el-button>
-                <el-button link type="danger" icon="Delete" @click="handleDeleteCategory(scope.row.id)" v-hasPermi="['business:equipment:remove']">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table> -->
           <el-tree
             ref="categoryTable"
             v-loading="equipmentCategoryLoading"
@@ -129,7 +105,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="info" icon="Search" @click="handleRefreshEquipment"
+          <el-button type="info" icon="Search" :disabled="equipmentCategoryList.length == 0" @click="handleRefreshEquipment"
             >搜索</el-button
           >
         </el-form-item>
@@ -137,6 +113,7 @@
           <el-button
             type="primary"
             icon="Plus"
+            :disabled="equipmentCategoryList.length == 0"
             @click="handleShowEquipmentDetailDialog(null)"
             v-hasPermi="['business:equipment:add']"
             >新增</el-button
@@ -383,8 +360,8 @@ const handleDeleteCategory = (data) => {
     .confirm("确定删除数据项?")
     .then(() => {
       delCategory(data.id).then(() => {
-        proxy.$modal.msgSuccess("操作成功!");
         handleRefreshCategory();
+        proxy.$modal.msgSuccess("操作成功!");
       });
     })
     .catch(() => {});

+ 1 - 1
src/views/business/reject/index.vue

@@ -48,7 +48,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" icon="Search" @click="handleQueryCarrier">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="carrierCategoryList.length == 0" @click="handleQueryCarrier">搜索</el-button>
         </el-form-item>
       </el-form>
 

+ 2 - 2
src/views/business/resourcePlan/index.vue

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

+ 1 - 1
src/views/business/turnover/index.vue

@@ -33,7 +33,7 @@
       <el-form class="list-search-container" :inline="true">
         <el-form-item class="section-title" label="周转位置" />
         <el-form-item>
-          <el-button type="primary" icon="Plus" @click="handleShowTurnoverFormDialog(null)" v-hasPermi="['business:turnover:add']">新增</el-button>
+          <el-button type="primary" icon="Plus" :disabled="workSectionList.length === 0" @click="handleShowTurnoverFormDialog(null)" v-hasPermi="['business:turnover:add']">新增</el-button>
         </el-form-item>
       </el-form>
 

+ 1 - 1
src/views/business/workshop/index.vue

@@ -39,7 +39,7 @@
       <el-form class="list-search-container" :model="queryDeptParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="工段" />
         <el-form-item>
-          <el-button type="primary" icon="Plus" @click="handleAddDept">新增</el-button>
+          <el-button type="primary" icon="Plus" :disabled="workshopList.length == 0" @click="handleAddDept">新增</el-button>
           <el-button type="danger" icon="Delete" :disabled="ids.length == 0" @click="handleDeptDelete">
             删除</el-button>
         </el-form-item>

+ 4 - 4
src/views/system/role/authUser.vue

@@ -23,10 +23,10 @@
 
     <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="40" align="center" />
-      <el-table-column label="员工编号" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="员工姓名" prop="nickName" :show-overflow-tooltip="true" />
-      <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-      <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+      <el-table-column label="员工编号" prop="userName" align="center"/>
+      <el-table-column label="员工姓名" prop="nickName" align="center" />
+      <el-table-column label="邮箱" prop="email" align="center" />
+      <el-table-column label="手机" prop="phonenumber" align="center" />
       <el-table-column label="状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />

+ 2 - 2
src/views/system/user/index.vue

@@ -37,9 +37,9 @@
         </el-form-item>
         <el-form-item>
           <span>&emsp;&emsp;</span>
-          <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button type="info" icon="Search" :disabled="tenantList.length == 0" @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          <el-button type="primary" icon="Plus" @click="handleShowFormDialog(null)" v-hasPermi="['system:user:add']">新增</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>
       </el-form>